Skip to content

Commit 3c174a6

Browse files
test: wait for IAM permission propagation in customer-managed CAS CA … (#13776) (#22513)
[upstream:a0080b0f13817f07e7fafcf511ed8274085fc232] Signed-off-by: Modular Magician <[email protected]>
1 parent 5687a58 commit 3c174a6

File tree

1 file changed

+29
-10
lines changed

1 file changed

+29
-10
lines changed

google/services/sql/resource_sql_database_instance_test.go

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2921,7 +2921,10 @@ func TestAccSqlDatabaseInstance_useCustomSubjectAlternateName(t *testing.T) {
29212921
acctest.VcrTest(t, resource.TestCase{
29222922
PreCheck: func() { acctest.AccTestPreCheck(t) },
29232923
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2924-
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
2924+
ExternalProviders: map[string]resource.ExternalProvider{
2925+
"time": {},
2926+
},
2927+
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
29252928

29262929
Steps: []resource.TestStep{
29272930
{
@@ -2955,7 +2958,10 @@ func TestAccSqlDatabaseInstance_useCustomerManagedServerCa(t *testing.T) {
29552958
acctest.VcrTest(t, resource.TestCase{
29562959
PreCheck: func() { acctest.AccTestPreCheck(t) },
29572960
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2958-
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
2961+
ExternalProviders: map[string]resource.ExternalProvider{
2962+
"time": {},
2963+
},
2964+
CheckDestroy: testAccSqlDatabaseInstanceDestroyProducer(t),
29592965

29602966
Steps: []resource.TestStep{
29612967
{
@@ -3035,6 +3041,15 @@ resource "google_privateca_ca_pool_iam_member" "granting" {
30353041
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-cloud-sql.iam.gserviceaccount.com"
30363042
}
30373043
3044+
resource "time_sleep" "wait_2_mins" {
3045+
depends_on = [
3046+
google_privateca_certificate_authority.customer_ca,
3047+
google_privateca_ca_pool_iam_member.granting
3048+
]
3049+
3050+
create_duration = "120s"
3051+
}
3052+
30383053
resource "google_sql_database_instance" "instance" {
30393054
name = "%{databaseName}"
30403055
region = "us-central1"
@@ -3050,10 +3065,7 @@ resource "google_sql_database_instance" "instance" {
30503065
}
30513066
}
30523067
3053-
depends_on = [
3054-
google_privateca_certificate_authority.customer_ca,
3055-
google_privateca_ca_pool_iam_member.granting
3056-
]
3068+
depends_on = [time_sleep.wait_2_mins]
30573069
}
30583070
`, context)
30593071
}
@@ -3119,6 +3131,16 @@ resource "google_privateca_ca_pool_iam_member" "granting" {
31193131
member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-cloud-sql.iam.gserviceaccount.com"
31203132
}
31213133
3134+
3135+
resource "time_sleep" "wait_2_mins" {
3136+
depends_on = [
3137+
google_privateca_certificate_authority.customer_ca,
3138+
google_privateca_ca_pool_iam_member.granting
3139+
]
3140+
3141+
create_duration = "120s"
3142+
}
3143+
31223144
resource "google_sql_database_instance" "instance" {
31233145
name = "%{databaseName}"
31243146
region = "us-central1"
@@ -3133,10 +3155,7 @@ resource "google_sql_database_instance" "instance" {
31333155
}
31343156
}
31353157
3136-
depends_on = [
3137-
google_privateca_certificate_authority.customer_ca,
3138-
google_privateca_ca_pool_iam_member.granting
3139-
]
3158+
depends_on = [time_sleep.wait_2_mins]
31403159
}
31413160
`, context)
31423161
}

0 commit comments

Comments
 (0)