Namespace service accounts created in tests (hashicorp#939)

Signed-off-by: Modular Magician <[email protected]>
modular-magician · Jul 12, 2019 · df3582c · df3582c
1 parent cb36bdc
commit df3582c
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 65 deletions.
diff --git a/google-beta/resource_bigtable_instance_iam_test.go b/google-beta/resource_bigtable_instance_iam_test.go
@@ -120,12 +120,12 @@ func testAccBigtableInstanceIamBinding_basic(instance, account, role string) str
 
 resource "google_service_account" "test-account1" {
   account_id   = "%s-1"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Bigtable Instance IAM Testing Account"
 }
 
 resource "google_service_account" "test-account2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Bigtable instance Iam Testing Account"
 }
 
 resource "google_bigtable_instance_iam_binding" "binding" {
@@ -142,12 +142,12 @@ func testAccBigtableInstanceIamBinding_update(instance, account, role string) st
 	return fmt.Sprintf(testBigtableInstanceIam+`
 resource "google_service_account" "test-account1" {
   account_id   = "%s-1"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Bigtable Instance IAM Testing Account"
 }
 
 resource "google_service_account" "test-account2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Bigtable Instance IAM Testing Account"
 }
 
 resource "google_bigtable_instance_iam_binding" "binding" {
@@ -165,7 +165,7 @@ func testAccBigtableInstanceIamMember(instance, account, role string) string {
 	return fmt.Sprintf(testBigtableInstanceIam+`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Bigtable Instance IAM Testing Account"
 }
 
 resource "google_bigtable_instance_iam_member" "member" {
@@ -180,7 +180,7 @@ func testAccBigtableInstanceIamPolicy(instance, account, role string) string {
 	return fmt.Sprintf(testBigtableInstanceIam+`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Bigtable Instance IAM Testing Account"
 }
 
 data "google_iam_policy" "policy" {

diff --git a/google-beta/resource_compute_subnetwork_iam_test.go b/google-beta/resource_compute_subnetwork_iam_test.go
@@ -119,7 +119,7 @@ func testAccComputeSubnetworkIamBinding_basic(account, region, subnetworkName, r
 	return fmt.Sprintf(`
 resource "google_service_account" "test_account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Subnetwork Iam Testing Account"
 }
 
 resource "google_compute_network" "network" {
@@ -148,12 +148,12 @@ func testAccComputeSubnetworkIamBinding_update(account, region, subnetworkName,
 	return fmt.Sprintf(`
 resource "google_service_account" "test_account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Subnetwork Iam Testing Account"
 }
 
 resource "google_service_account" "test_account_2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Subnetwork Iam Testing Account"
 }
 
 resource "google_compute_network" "network" {
@@ -185,7 +185,7 @@ func testAccComputeSubnetworkIamMember_basic(account, region, subnetworkName, ro
 	return fmt.Sprintf(`
 resource "google_service_account" "test_account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Subnetwork Iam Testing Account"
 }
 
 resource "google_compute_network" "network" {
@@ -214,7 +214,7 @@ func testAccComputeSubnetworkIamPolicy_basic(account, region, subnetworkName, ro
 	return fmt.Sprintf(`
 resource "google_service_account" "test_account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Subnetwork Iam Testing Account"
 }
 
 resource "google_compute_network" "network" {

diff --git a/google-beta/resource_dataproc_cluster_iam_test.go b/google-beta/resource_dataproc_cluster_iam_test.go
@@ -121,12 +121,12 @@ func testAccDataprocClusterIamBinding_basic(cluster, account, role string) strin
 
 resource "google_service_account" "test-account1" {
   account_id   = "%s-1"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Dataproc Cluster IAM Testing Account"
 }
 
 resource "google_service_account" "test-account2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Dataproc Cluster Iam Testing Account"
 }
 
 resource "google_dataproc_cluster_iam_binding" "binding" {
@@ -144,12 +144,12 @@ func testAccDataprocClusterIamBinding_update(cluster, account, role string) stri
 	return fmt.Sprintf(testDataprocIamSingleNodeCluster+`
 resource "google_service_account" "test-account1" {
   account_id   = "%s-1"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Dataproc Cluster IAM Testing Account"
 }
 
 resource "google_service_account" "test-account2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Dataproc Cluster Iam Testing Account"
 }
 
 resource "google_dataproc_cluster_iam_binding" "binding" {
@@ -168,7 +168,7 @@ func testAccDataprocClusterIamMember(cluster, account, role string) string {
 	return fmt.Sprintf(testDataprocIamSingleNodeCluster+`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Dataproc Cluster IAM Testing Account"
 }
 
 resource "google_dataproc_cluster_iam_member" "member" {
@@ -183,7 +183,7 @@ func testAccDataprocClusterIamPolicy(cluster, account, role string) string {
 	return fmt.Sprintf(testDataprocIamSingleNodeCluster+`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Dataproc Cluster IAM Testing Account"
 }
 
 data "google_iam_policy" "policy" {

diff --git a/google-beta/resource_dataproc_job_iam_test.go b/google-beta/resource_dataproc_job_iam_test.go
@@ -141,12 +141,12 @@ func testAccDataprocJobIamBinding_basic(cluster, job, account, role string) stri
 	return fmt.Sprintf(testDataprocIamJobConfig+`
 resource "google_service_account" "test-account1" {
   account_id   = "%s-1"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Dataproc Job IAM Testing Account"
 }
 
 resource "google_service_account" "test-account2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Dataproc Job Iam Testing Account"
 }
 
 resource "google_dataproc_job_iam_binding" "binding" {
@@ -165,12 +165,12 @@ func testAccDataprocJobIamBinding_update(cluster, job, account, role string) str
 	return fmt.Sprintf(testDataprocIamJobConfig+`
 resource "google_service_account" "test-account1" {
   account_id   = "%s-1"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Dataproc Job IAM Testing Account"
 }
 
 resource "google_service_account" "test-account2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Dataproc Job Iam Testing Account"
 }
 
 resource "google_dataproc_job_iam_binding" "binding" {
@@ -189,7 +189,7 @@ func testAccDataprocJobIamMember(cluster, job, account, role string) string {
 	return fmt.Sprintf(testDataprocIamJobConfig+`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Dataproc Job IAM Testing Account"
 }
 
 resource "google_dataproc_job_iam_member" "member" {
@@ -204,7 +204,7 @@ func testAccDataprocJobIamPolicy(cluster, job, account, role string) string {
 	return fmt.Sprintf(testDataprocIamJobConfig+`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Dataproc IAM Testing Account"
+  display_name = "Dataproc Job IAM Testing Account"
 }
 
 data "google_iam_policy" "policy" {

diff --git a/google-beta/resource_google_billing_account_iam_test.go b/google-beta/resource_google_billing_account_iam_test.go
@@ -128,7 +128,7 @@ func testAccBillingAccountIamBinding_basic(account, billingAccountId, role strin
 	return fmt.Sprintf(`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Billing Account Iam Testing Account"
 }
 
 resource "google_billing_account_iam_binding" "foo" {
@@ -143,12 +143,12 @@ func testAccBillingAccountIamBinding_update(account, billingAccountId, role stri
 	return fmt.Sprintf(`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Billing Account Iam Testing Account"
 }
 
 resource "google_service_account" "test-account-2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Billing Account Iam Testing Account"
 }
 
 resource "google_billing_account_iam_binding" "foo" {
@@ -166,7 +166,7 @@ func testAccBillingAccountIamMember_basic(account, billingAccountId, role string
 	return fmt.Sprintf(`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Billing Account Iam Testing Account"
 }
 
 resource "google_billing_account_iam_member" "foo" {

diff --git a/google-beta/resource_google_organization_iam_test.go b/google-beta/resource_google_organization_iam_test.go
@@ -142,7 +142,7 @@ func testAccOrganizationIamBinding_basic(account, role, org string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Organization Iam Testing Account"
 }
 
 resource "google_organization_iam_custom_role" "test-role" {
@@ -164,7 +164,7 @@ func testAccOrganizationIamBinding_update(account, role, org string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Organization Iam Testing Account"
 }
 
 resource "google_organization_iam_custom_role" "test-role" {
@@ -176,7 +176,7 @@ resource "google_organization_iam_custom_role" "test-role" {
 
 resource "google_service_account" "test-account-2" {
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Organization Iam Testing Account"
 }
 
 resource "google_organization_iam_binding" "foo" {
@@ -194,7 +194,7 @@ func testAccOrganizationIamMember_basic(account, org string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "test-account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Organization Iam Testing Account"
 }
 
 resource "google_organization_iam_member" "foo" {

diff --git a/google-beta/resource_google_service_account_iam_test.go b/google-beta/resource_google_service_account_iam_test.go
@@ -122,7 +122,7 @@ func testAccServiceAccountIamBinding_basic(account string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "test_account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Service Account Iam Testing Account"
 }
 
 resource "google_service_account_iam_binding" "foo" {
@@ -137,7 +137,7 @@ func testAccServiceAccountIamMember_basic(account string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "test_account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Service Account Iam Testing Account"
 }
 
 resource "google_service_account_iam_member" "foo" {
@@ -152,7 +152,7 @@ func testAccServiceAccountIamPolicy_basic(account string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "test_account" {
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Service Account Iam Testing Account"
 }
 
 data "google_iam_policy" "foo" {

diff --git a/google-beta/resource_kms_crypto_key_iam_test.go b/google-beta/resource_kms_crypto_key_iam_test.go
@@ -194,7 +194,7 @@ resource "google_project_services" "test_project" {
 resource "google_service_account" "test_account" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
@@ -238,13 +238,13 @@ resource "google_project_services" "test_project" {
 resource "google_service_account" "test_account" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_service_account" "test_account_2" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
@@ -291,7 +291,7 @@ resource "google_project_services" "test_project" {
 resource "google_service_account" "test_account" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {

diff --git a/google-beta/resource_kms_key_ring_iam_test.go b/google-beta/resource_kms_key_ring_iam_test.go
@@ -186,7 +186,7 @@ resource "google_project_services" "test_project" {
 resource "google_service_account" "test_account" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
@@ -225,13 +225,13 @@ resource "google_project_services" "test_project" {
 resource "google_service_account" "test_account" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_service_account" "test_account_2" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s-2"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
@@ -273,7 +273,7 @@ resource "google_project_services" "test_project" {
 resource "google_service_account" "test_account" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
@@ -312,7 +312,7 @@ resource "google_project_services" "test_project" {
 resource "google_service_account" "test_account" {
   project      = "${google_project_services.test_project.project}"
   account_id   = "%s"
-  display_name = "Iam Testing Account"
+  display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {