Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing depends_on arguments in various acceptance tests #9654

Merged
merged 8 commits into from
Jan 2, 2024
Merged

Add missing depends_on arguments in various acceptance tests #9654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d98cfef
Add missing IAM resources dependencies in `TestAccComputeRegionInstan…
SarahFrench Dec 14, 2023
834da02
Add missing dependencies
SarahFrench Dec 14, 2023
ac214bc
Add missing IAM resources dependencies in `google_sql_database_instan…
SarahFrench Dec 15, 2023
df3fe20
Add missing IAM resources dependencies in `google_vertex_ai_endpoint`…
SarahFrench Dec 15, 2023
a0f2df7
Update mmv1/third_party/terraform/services/alloydb/resource_alloydb_b…
SarahFrench Dec 15, 2023
14254b7
Update mmv1/third_party/terraform/services/sql/resource_sql_database_…
SarahFrench Dec 15, 2023
589183e
Update mmv1/third_party/terraform/services/bigquery/resource_bigquery…
SarahFrench Dec 15, 2023
2c87b88
Merge branch 'main' into add-missing-depends_on-acctests
SarahFrench Jan 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion mmv1/third_party/terraform/services/alloydb/resource_alloydb_backup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,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" {
Expand Down
5 changes: 4 additions & 1 deletion mmv1/third_party/terraform/services/alloydb/resource_alloydb_secondary_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,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" {}
Expand Down
8 changes: 4 additions & 4 deletions mmv1/third_party/terraform/services/bigquery/resource_bigquery_dataset_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,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"
}
Expand All @@ -599,9 +599,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 {
Expand Down
3 changes: 3 additions & 0 deletions mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2719,6 +2719,7 @@ resource "google_bigquery_table" "test" {
]
}
max_staleness = "%s"
depends_on = [google_project_iam_member.test]
}
`, connectionID, datasetID, bucketName, objectName, tableID, maxStaleness)
}
Expand Down Expand Up @@ -2773,6 +2774,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)
}
Expand Down Expand Up @@ -2826,6 +2828,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)
}
Expand Down
8 changes: 7 additions & 1 deletion mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3737,6 +3737,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" {
Expand Down Expand Up @@ -3794,6 +3795,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" {
Expand Down Expand Up @@ -3827,7 +3830,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
]
}
`

Expand Down
4 changes: 4 additions & 0 deletions mmv1/third_party/terraform/services/vertexai/resource_vertex_ai_endpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,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" {
Expand Down Expand Up @@ -95,6 +97,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" {
Expand Down