Skip to content

Commit f16b544

Browse files
Add missing depends_on arguments in various acceptance tests (#9654) (#6799)
* 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 <[email protected]>
1 parent 125d068 commit f16b544

File tree

7 files changed

+29
-7
lines changed

7 files changed

+29
-7
lines changed

.changelog/9654.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/services/alloydb/resource_alloydb_backup_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,10 @@ resource "google_alloydb_backup" "default" {
202202
encryption_config {
203203
kms_key_name = google_kms_crypto_key.key.id
204204
}
205-
depends_on = [google_alloydb_instance.default]
205+
depends_on = [
206+
google_alloydb_instance.default,
207+
google_kms_crypto_key_iam_member.crypto_key
208+
]
206209
}
207210
208211
resource "google_alloydb_cluster" "default" {

google-beta/services/alloydb/resource_alloydb_secondary_cluster_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,10 @@ resource "google_alloydb_cluster" "secondary" {
521521
kms_key_name = google_kms_crypto_key.key.id
522522
}
523523
524-
depends_on = [google_alloydb_instance.primary, google_kms_crypto_key_iam_member.crypto_key]
524+
depends_on = [
525+
google_alloydb_instance.primary,
526+
google_kms_crypto_key_iam_member.crypto_key
527+
]
525528
}
526529
527530
data "google_project" "project" {}

google-beta/services/bigquery/resource_bigquery_dataset_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,8 +584,8 @@ data "google_project" "project" {
584584
project_id = "%s"
585585
}
586586
587-
resource "google_project_iam_member" "kms-project-binding" {
588-
project = data.google_project.project.project_id
587+
resource "google_kms_crypto_key_iam_member" "kms-member" {
588+
crypto_key_id = "%s"
589589
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
590590
member = "serviceAccount:bq-${data.google_project.project.number}@bigquery-encryption.iam.gserviceaccount.com"
591591
}
@@ -601,9 +601,9 @@ resource "google_bigquery_dataset" "test" {
601601
kms_key_name = "%s"
602602
}
603603
604-
project = google_project_iam_member.kms-project-binding.project
604+
depends_on = [google_kms_crypto_key_iam_member.kms-member]
605605
}
606-
`, pid, datasetID, kmsKey)
606+
`, pid, kmsKey, datasetID, kmsKey)
607607
}
608608

609609
func testAccBigQueryDatasetStorageBillingModel(datasetID string) string {

google-beta/services/bigquery/resource_bigquery_table_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2721,6 +2721,7 @@ resource "google_bigquery_table" "test" {
27212721
]
27222722
}
27232723
max_staleness = "%s"
2724+
depends_on = [google_project_iam_member.test]
27242725
}
27252726
`, connectionID, datasetID, bucketName, objectName, tableID, maxStaleness)
27262727
}
@@ -2775,6 +2776,7 @@ resource "google_bigquery_table" "test" {
27752776
"gs://${google_storage_bucket.test.name}/${google_storage_bucket_object.test.name}",
27762777
]
27772778
}
2779+
depends_on = [google_project_iam_member.test]
27782780
}
27792781
`, datasetID, bucketName, objectName, content, connectionID, projectID, tableID, schema)
27802782
}
@@ -2828,6 +2830,7 @@ resource "google_bigquery_table" "test" {
28282830
"gs://${google_storage_bucket.test.name}/${google_storage_bucket_object.test.name}",
28292831
]
28302832
}
2833+
depends_on = [google_project_iam_member.test]
28312834
}
28322835
`, datasetID, bucketName, objectName, content, connectionID, projectID, tableID, schema)
28332836
}

google-beta/services/sql/resource_sql_database_instance_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3739,6 +3739,7 @@ resource "google_sql_database_instance" "master" {
37393739
binary_log_enabled = true
37403740
}
37413741
}
3742+
depends_on = [google_kms_crypto_key_iam_member.crypto_key]
37423743
}
37433744
37443745
resource "google_sql_database_instance" "replica" {
@@ -3796,6 +3797,8 @@ resource "google_sql_database_instance" "master" {
37963797
binary_log_enabled = true
37973798
}
37983799
}
3800+
3801+
depends_on = [google_kms_crypto_key_iam_member.crypto_key]
37993802
}
38003803
38013804
resource "google_kms_key_ring" "keyring-rep" {
@@ -3829,7 +3832,10 @@ resource "google_sql_database_instance" "replica" {
38293832
tier = "db-n1-standard-1"
38303833
}
38313834
3832-
depends_on = [google_sql_database_instance.master]
3835+
depends_on = [
3836+
google_sql_database_instance.master,
3837+
google_kms_crypto_key_iam_member.crypto_key_rep
3838+
]
38333839
}
38343840
`
38353841

google-beta/services/vertexai/resource_vertex_ai_endpoint_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ resource "google_vertex_ai_endpoint" "endpoint" {
6666
encryption_spec {
6767
kms_key_name = "%{kms_key_name}"
6868
}
69+
70+
depends_on = [google_kms_crypto_key_iam_member.crypto_key]
6971
}
7072
7173
data "google_compute_network" "vertex_network" {
@@ -97,6 +99,8 @@ resource "google_vertex_ai_endpoint" "endpoint" {
9799
encryption_spec {
98100
kms_key_name = "%{kms_key_name}"
99101
}
102+
103+
depends_on = [google_kms_crypto_key_iam_member.crypto_key]
100104
}
101105
102106
data "google_compute_network" "vertex_network" {

0 commit comments

Comments
 (0)