Fix TestAccStorageTransferJob_posixSink

GoogleCloudPlatform · Feb 14, 2025 · c13fa03 · c13fa03
1 parent f47a75e
commit c13fa03
Showing 1 changed file with 24 additions and 36 deletions.
diff --git a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go
@@ -187,6 +187,13 @@ func TestAccStorageTransferJob_omitScheduleEndDate(t *testing.T) {
 func TestAccStorageTransferJob_posixSource(t *testing.T) {
 	t.Parallel()
 
+	acctest.BootstrapIamMembers(t, []acctest.IamMember{
+		{
+			Member: "serviceAccount:project-{project_number}@storage-transfer-service.iam.gserviceaccount.com",
+			Role:   "roles/pubsub.admin",
+		},
+	})
+
 	testDataSinkName := acctest.RandString(t, 10)
 	testTransferJobDescription := acctest.RandString(t, 10)
 	testSourceAgentPoolName := fmt.Sprintf("tf-test-source-agent-pool-%s", acctest.RandString(t, 10))
@@ -210,6 +217,13 @@ func TestAccStorageTransferJob_posixSource(t *testing.T) {
 func TestAccStorageTransferJob_posixSink(t *testing.T) {
 	t.Parallel()
 
+	acctest.BootstrapIamMembers(t, []acctest.IamMember{
+		{
+			Member: "serviceAccount:project-{project_number}@storage-transfer-service.iam.gserviceaccount.com",
+			Role:   "roles/pubsub.admin",
+		},
+	})
+
 	testDataSourceName := acctest.RandString(t, 10)
 	testTransferJobDescription := acctest.RandString(t, 10)
 	testSinkAgentPoolName := fmt.Sprintf("tf-test-sink-agent-pool-%s", acctest.RandString(t, 10))
@@ -429,6 +443,13 @@ func TestAccStorageTransferJob_notificationConfig(t *testing.T) {
 func TestAccStorageTransferJob_hdfsSource(t *testing.T) {
 	t.Parallel()
 
+	acctest.BootstrapIamMembers(t, []acctest.IamMember{
+		{
+			Member: "serviceAccount:project-{project_number}@storage-transfer-service.iam.gserviceaccount.com",
+			Role:   "roles/pubsub.admin",
+		},
+	})
+
 	testDataSinkName := acctest.RandString(t, 10)
 	otherDataSinkName := acctest.RandString(t, 10)
 	testTransferJobDescription := acctest.RandString(t, 10)
@@ -983,19 +1004,11 @@ resource "google_storage_bucket_iam_member" "data_sink" {
   member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
 }
 
-resource "google_project_iam_member" "pubsub" {
-	project = data.google_storage_transfer_project_service_account.default.project
-  role    = "roles/pubsub.admin"
-  member  = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
-}
-
 resource "google_storage_transfer_agent_pool" "foo" {
   name         = "%s"
   bandwidth_limit {
     limit_mbps = "120"
   }
-
-  depends_on = [google_project_iam_member.pubsub]
 }
 
 resource "google_storage_transfer_job" "transfer_job" {
@@ -1032,10 +1045,7 @@ resource "google_storage_transfer_job" "transfer_job" {
     }
   }
 
-  depends_on = [
-    google_storage_bucket_iam_member.data_sink,
-    google_project_iam_member.pubsub
-  ]
+  depends_on = [google_storage_bucket_iam_member.data_sink]
 }
 `, project, dataSinkBucketName, project, sourceAgentPoolName, transferJobDescription, project)
 }
@@ -1060,19 +1070,11 @@ resource "google_storage_bucket_iam_member" "data_sink" {
   member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
 }
 
-resource "google_project_iam_member" "pubsub" {
-	project = data.google_storage_transfer_project_service_account.default.project
-  role    = "roles/pubsub.admin"
-  member  = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
-}
-
 resource "google_storage_transfer_agent_pool" "foo" {
   name         = "%s"
   bandwidth_limit {
     limit_mbps = "120"
   }
-
-  depends_on = [google_project_iam_member.pubsub]
 }
 
 resource "google_storage_transfer_job" "transfer_job" {
@@ -1109,10 +1111,7 @@ resource "google_storage_transfer_job" "transfer_job" {
     }
   }
 
-  depends_on = [
-    google_storage_bucket_iam_member.data_sink,
-    google_project_iam_member.pubsub
-  ]
+  depends_on = [google_storage_bucket_iam_member.data_sink]
 }
 `, project, dataSinkBucketName, project, sourceAgentPoolName, transferJobDescription, project, hdfsPath, gcsPath)
 }
@@ -1137,19 +1136,11 @@ resource "google_storage_bucket_iam_member" "data_source" {
   member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
 }
 
-resource "google_project_iam_member" "pubsub" {
-	project = data.google_storage_transfer_project_service_account.default.project
-  role    = "roles/pubsub.admin"
-  member  = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
-}
-
 resource "google_storage_transfer_agent_pool" "foo" {
   name         = "%s"
   bandwidth_limit {
     limit_mbps = "120"
   }
-
-  depends_on = [google_project_iam_member.pubsub]
 }
 
 resource "google_storage_transfer_job" "transfer_job" {
@@ -1185,10 +1176,7 @@ resource "google_storage_transfer_job" "transfer_job" {
     }
   }
 
-  depends_on = [
-    google_storage_bucket_iam_member.data_source,
-    google_project_iam_member.pubsub
-  ]
+  depends_on = [google_storage_bucket_iam_member.data_source]
 }
 `, project, dataSourceBucketName, project, sinkAgentPoolName, transferJobDescription, project)
 }