Add missing depends_on arguments in various acceptance tests (#9654) (#…

…16890) * Add missing IAM resources dependencies in `TestAccComputeRegionInstanceTemplate_sourceImageEncryptionKey` * Add missing dependencies * Add missing IAM resources dependencies in `google_sql_database_instance` tests * Add missing IAM resources dependencies in `google_vertex_ai_endpoint` tests * Update mmv1/third_party/terraform/services/alloydb/resource_alloydb_backup_test.go * Update mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go * Update mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_test.go [upstream:aeb1f5faa1cb210fefe8ad2f7a3b492fd6b1dd40] Signed-off-by: Modular Magician <magic-modules@google.com>
hashicorp · Jan 2, 2024 · badc26b · badc26b
1 parent cfb5307
commit badc26b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 7 deletions.
diff --git a/.changelog/9654.txt b/.changelog/9654.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google/services/alloydb/resource_alloydb_backup_test.go b/google/services/alloydb/resource_alloydb_backup_test.go
@@ -202,7 +202,10 @@ resource "google_alloydb_backup" "default" {
 	encryption_config {
 		kms_key_name = google_kms_crypto_key.key.id
 	}
-	depends_on = [google_alloydb_instance.default]
+	depends_on = [
+		google_alloydb_instance.default,
+		google_kms_crypto_key_iam_member.crypto_key
+	]
 }
 	  
 resource "google_alloydb_cluster" "default" {

diff --git a/google/services/alloydb/resource_alloydb_secondary_cluster_test.go b/google/services/alloydb/resource_alloydb_secondary_cluster_test.go
@@ -521,7 +521,10 @@ resource "google_alloydb_cluster" "secondary" {
     kms_key_name = google_kms_crypto_key.key.id
   }
 
-  depends_on = [google_alloydb_instance.primary, google_kms_crypto_key_iam_member.crypto_key]
+  depends_on = [
+    google_alloydb_instance.primary,
+    google_kms_crypto_key_iam_member.crypto_key
+  ]
 }
 
 data "google_project" "project" {}

diff --git a/google/services/bigquery/resource_bigquery_dataset_test.go b/google/services/bigquery/resource_bigquery_dataset_test.go
@@ -584,8 +584,8 @@ data "google_project" "project" {
   project_id = "%s"
 }
 
-resource "google_project_iam_member" "kms-project-binding" {
-  project = data.google_project.project.project_id
+resource "google_kms_crypto_key_iam_member" "kms-member" {
+  crypto_key_id = "%s"
   role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
   member  = "serviceAccount:bq-${data.google_project.project.number}@bigquery-encryption.iam.gserviceaccount.com"
 }
@@ -601,9 +601,9 @@ resource "google_bigquery_dataset" "test" {
     kms_key_name = "%s"
   }
 
-  project = google_project_iam_member.kms-project-binding.project
+  depends_on = [google_kms_crypto_key_iam_member.kms-member]
 }
-`, pid, datasetID, kmsKey)
+`, pid, kmsKey, datasetID, kmsKey)
 }
 
 func testAccBigQueryDatasetStorageBillingModel(datasetID string) string {

diff --git a/google/services/bigquery/resource_bigquery_table_test.go b/google/services/bigquery/resource_bigquery_table_test.go
@@ -2721,6 +2721,7 @@ resource "google_bigquery_table" "test" {
     ]
   }
   max_staleness = "%s"
+  depends_on = [google_project_iam_member.test]
 }
 `, connectionID, datasetID, bucketName, objectName, tableID, maxStaleness)
 }
@@ -2775,6 +2776,7 @@ resource "google_bigquery_table" "test" {
       "gs://${google_storage_bucket.test.name}/${google_storage_bucket_object.test.name}",
     ]
   }
+  depends_on = [google_project_iam_member.test]
 }
 `, datasetID, bucketName, objectName, content, connectionID, projectID, tableID, schema)
 }
@@ -2828,6 +2830,7 @@ resource "google_bigquery_table" "test" {
       "gs://${google_storage_bucket.test.name}/${google_storage_bucket_object.test.name}",
     ]
   }
+  depends_on = [google_project_iam_member.test]
 }
 `, datasetID, bucketName, objectName, content, connectionID, projectID, tableID, schema)
 }

diff --git a/google/services/sql/resource_sql_database_instance_test.go b/google/services/sql/resource_sql_database_instance_test.go
@@ -3739,6 +3739,7 @@ resource "google_sql_database_instance" "master" {
       binary_log_enabled = true
     }
   }
+  depends_on = [google_kms_crypto_key_iam_member.crypto_key]
 }
 
 resource "google_sql_database_instance" "replica" {
@@ -3796,6 +3797,8 @@ resource "google_sql_database_instance" "master" {
       binary_log_enabled = true
     }
   }
+
+  depends_on = [google_kms_crypto_key_iam_member.crypto_key]
 }
 
 resource "google_kms_key_ring" "keyring-rep" {
@@ -3829,7 +3832,10 @@ resource "google_sql_database_instance" "replica" {
     tier = "db-n1-standard-1"
   }
 
-  depends_on = [google_sql_database_instance.master]
+  depends_on = [
+    google_sql_database_instance.master,
+    google_kms_crypto_key_iam_member.crypto_key_rep
+  ]
 }
 `
 

diff --git a/google/services/vertexai/resource_vertex_ai_endpoint_test.go b/google/services/vertexai/resource_vertex_ai_endpoint_test.go
@@ -66,6 +66,8 @@ resource "google_vertex_ai_endpoint" "endpoint" {
   encryption_spec {
     kms_key_name = "%{kms_key_name}"
   }
+
+  depends_on = [google_kms_crypto_key_iam_member.crypto_key]
 }
 
 data "google_compute_network" "vertex_network" {
@@ -97,6 +99,8 @@ resource "google_vertex_ai_endpoint" "endpoint" {
   encryption_spec {
     kms_key_name = "%{kms_key_name}"
   }
+
+  depends_on = [google_kms_crypto_key_iam_member.crypto_key]
 }
 
 data "google_compute_network" "vertex_network" {