Skip to content

Commit 643ecdd

Browse files
test: wait for IAM permission propagation in customer-managed CAS CA … (#13776) (#9889)
[upstream:a0080b0f13817f07e7fafcf511ed8274085fc232] Signed-off-by: Modular Magician <[email protected]>
1 parent 0cd4d98 commit 643ecdd

File tree

1 file changed

+29
-10
lines changed

1 file changed

+29
-10
lines changed

google-beta/services/sql/resource_sql_database_instance_test.go

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2956,7 +2956,10 @@ func TestAccSqlDatabaseInstance_useCustomSubjectAlternateName(t *testing.T) {
29562956
acctest.VcrTest(t, resource.TestCase{
29572957
PreCheck: func() { acctest.AccTestPreCheck(t) },
29582958
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2959-
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
2959+
ExternalProviders: map[string]resource.ExternalProvider{
2960+
"time": {},
2961+
},
2962+
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
29602963

29612964
Steps: []resource.TestStep{
29622965
{
@@ -2990,7 +2993,10 @@ func TestAccSqlDatabaseInstance_useCustomerManagedServerCa(t *testing.T) {
29902993
acctest.VcrTest(t, resource.TestCase{
29912994
PreCheck: func() { acctest.AccTestPreCheck(t) },
29922995
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2993-
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
2996+
ExternalProviders: map[string]resource.ExternalProvider{
2997+
"time": {},
2998+
},
2999+
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
29943000

29953001
Steps: []resource.TestStep{
29963002
{
@@ -3070,6 +3076,15 @@ resource "google_privateca_ca_pool_iam_member" "granting" {
30703076
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-cloud-sql.iam.gserviceaccount.com"
30713077
}
30723078
3079+
resource "time_sleep" "wait_2_mins" {
3080+
depends_on = [
3081+
google_privateca_certificate_authority.customer_ca,
3082+
google_privateca_ca_pool_iam_member.granting
3083+
]
3084+
3085+
create_duration = "120s"
3086+
}
3087+
30733088
resource "google_sql_database_instance" "instance" {
30743089
name = "%{databaseName}"
30753090
region = "us-central1"
@@ -3085,10 +3100,7 @@ resource "google_sql_database_instance" "instance" {
30853100
}
30863101
}
30873102
3088-
depends_on = [
3089-
google_privateca_certificate_authority.customer_ca,
3090-
google_privateca_ca_pool_iam_member.granting
3091-
]
3103+
depends_on = [time_sleep.wait_2_mins]
30923104
}
30933105
`, context)
30943106
}
@@ -3154,6 +3166,16 @@ resource "google_privateca_ca_pool_iam_member" "granting" {
31543166
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-cloud-sql.iam.gserviceaccount.com"
31553167
}
31563168
3169+
3170+
resource "time_sleep" "wait_2_mins" {
3171+
depends_on = [
3172+
google_privateca_certificate_authority.customer_ca,
3173+
google_privateca_ca_pool_iam_member.granting
3174+
]
3175+
3176+
create_duration = "120s"
3177+
}
3178+
31573179
resource "google_sql_database_instance" "instance" {
31583180
name = "%{databaseName}"
31593181
region = "us-central1"
@@ -3168,10 +3190,7 @@ resource "google_sql_database_instance" "instance" {
31683190
}
31693191
}
31703192
3171-
depends_on = [
3172-
google_privateca_certificate_authority.customer_ca,
3173-
google_privateca_ca_pool_iam_member.granting
3174-
]
3193+
depends_on = [time_sleep.wait_2_mins]
31753194
}
31763195
`, context)
31773196
}

0 commit comments

Comments
 (0)