Skip to content

Commit c3b9a03

Browse files
modular-magicianmodular-magician
authored
Fix flaky apigee tests (#12387) (#8786)
[upstream:c2554dcaca427a9c1add9af885298c264e850209] Signed-off-by: Modular Magician <[email protected]>
1 parent dbe92f6 commit c3b9a03

11 files changed

+263
-20
lines changed

‎.changelog/12387.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google-beta/services/apigee/iam_apigee_environment_generated_test.go

+39
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ func TestAccApigeeEnvironmentIamBindingGenerated(t *testing.T) {
4040
acctest.VcrTest(t, resource.TestCase{
4141
PreCheck: func() { acctest.AccTestPreCheck(t) },
4242
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
43+
ExternalProviders: map[string]resource.ExternalProvider{
44+
"time": {},
45+
},
4346
Steps: []resource.TestStep{
4447
{
4548
Config: testAccApigeeEnvironmentIamBinding_basicGenerated(context),
@@ -77,6 +80,9 @@ func TestAccApigeeEnvironmentIamMemberGenerated(t *testing.T) {
7780
acctest.VcrTest(t, resource.TestCase{
7881
PreCheck: func() { acctest.AccTestPreCheck(t) },
7982
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
83+
ExternalProviders: map[string]resource.ExternalProvider{
84+
"time": {},
85+
},
8086
Steps: []resource.TestStep{
8187
{
8288
// Test Iam Member creation (no update for member, no need to test)
@@ -105,6 +111,9 @@ func TestAccApigeeEnvironmentIamPolicyGenerated(t *testing.T) {
105111
acctest.VcrTest(t, resource.TestCase{
106112
PreCheck: func() { acctest.AccTestPreCheck(t) },
107113
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
114+
ExternalProviders: map[string]resource.ExternalProvider{
115+
"time": {},
116+
},
108117
Steps: []resource.TestStep{
109118
{
110119
Config: testAccApigeeEnvironmentIamPolicy_basicGenerated(context),
@@ -139,9 +148,15 @@ resource "google_project" "project" {
139148
deletion_policy = "DELETE"
140149
}
141150
151+
resource "time_sleep" "wait_60_seconds" {
152+
create_duration = "60s"
153+
depends_on = [google_project.project]
154+
}
155+
142156
resource "google_project_service" "apigee" {
143157
project = google_project.project.project_id
144158
service = "apigee.googleapis.com"
159+
depends_on = [time_sleep.wait_60_seconds]
145160
}
146161
147162
resource "google_project_service" "servicenetworking" {
@@ -214,9 +229,15 @@ resource "google_project" "project" {
214229
deletion_policy = "DELETE"
215230
}
216231
232+
resource "time_sleep" "wait_60_seconds" {
233+
create_duration = "60s"
234+
depends_on = [google_project.project]
235+
}
236+
217237
resource "google_project_service" "apigee" {
218238
project = google_project.project.project_id
219239
service = "apigee.googleapis.com"
240+
depends_on = [time_sleep.wait_60_seconds]
220241
}
221242
222243
resource "google_project_service" "servicenetworking" {
@@ -303,9 +324,15 @@ resource "google_project" "project" {
303324
deletion_policy = "DELETE"
304325
}
305326
327+
resource "time_sleep" "wait_60_seconds" {
328+
create_duration = "60s"
329+
depends_on = [google_project.project]
330+
}
331+
306332
resource "google_project_service" "apigee" {
307333
project = google_project.project.project_id
308334
service = "apigee.googleapis.com"
335+
depends_on = [time_sleep.wait_60_seconds]
309336
}
310337
311338
resource "google_project_service" "servicenetworking" {
@@ -380,9 +407,15 @@ resource "google_project" "project" {
380407
deletion_policy = "DELETE"
381408
}
382409
410+
resource "time_sleep" "wait_60_seconds" {
411+
create_duration = "60s"
412+
depends_on = [google_project.project]
413+
}
414+
383415
resource "google_project_service" "apigee" {
384416
project = google_project.project.project_id
385417
service = "apigee.googleapis.com"
418+
depends_on = [time_sleep.wait_60_seconds]
386419
}
387420
388421
resource "google_project_service" "servicenetworking" {
@@ -455,9 +488,15 @@ resource "google_project" "project" {
455488
deletion_policy = "DELETE"
456489
}
457490
491+
resource "time_sleep" "wait_60_seconds" {
492+
create_duration = "60s"
493+
depends_on = [google_project.project]
494+
}
495+
458496
resource "google_project_service" "apigee" {
459497
project = google_project.project.project_id
460498
service = "apigee.googleapis.com"
499+
depends_on = [time_sleep.wait_60_seconds]
461500
}
462501
463502
resource "google_project_service" "servicenetworking" {

‎google-beta/services/apigee/resource_apigee_developer_generated_test.go

+16-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ func TestAccApigeeDeveloper_apigeeDeveloperBasicTestExample(t *testing.T) {
4444
acctest.VcrTest(t, resource.TestCase{
4545
PreCheck: func() { acctest.AccTestPreCheck(t) },
4646
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
47-
CheckDestroy: testAccCheckApigeeDeveloperDestroyProducer(t),
47+
ExternalProviders: map[string]resource.ExternalProvider{
48+
"time": {},
49+
},
50+
CheckDestroy: testAccCheckApigeeDeveloperDestroyProducer(t),
4851
Steps: []resource.TestStep{
4952
{
5053
Config: testAccApigeeDeveloper_apigeeDeveloperBasicTestExample(context),
@@ -69,19 +72,27 @@ resource "google_project" "project" {
6972
deletion_policy = "DELETE"
7073
}
7174
75+
resource "time_sleep" "wait_60_seconds" {
76+
create_duration = "60s"
77+
depends_on = [google_project.project]
78+
}
79+
7280
resource "google_project_service" "apigee" {
7381
project = google_project.project.project_id
7482
service = "apigee.googleapis.com"
83+
depends_on = [time_sleep.wait_60_seconds]
7584
}
7685
7786
resource "google_project_service" "compute" {
7887
project = google_project.project.project_id
7988
service = "compute.googleapis.com"
89+
depends_on = [google_project_service.apigee]
8090
}
8191
8292
resource "google_project_service" "servicenetworking" {
8393
project = google_project.project.project_id
8494
service = "servicenetworking.googleapis.com"
95+
depends_on = [google_project_service.compute]
8596
}
8697
8798
resource "google_compute_network" "apigee_network" {
@@ -149,7 +160,10 @@ func TestAccApigeeDeveloper_apigeeDeveloperWithAttributesTestExample(t *testing.
149160
acctest.VcrTest(t, resource.TestCase{
150161
PreCheck: func() { acctest.AccTestPreCheck(t) },
151162
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
152-
CheckDestroy: testAccCheckApigeeDeveloperDestroyProducer(t),
163+
ExternalProviders: map[string]resource.ExternalProvider{
164+
"time": {},
165+
},
166+
CheckDestroy: testAccCheckApigeeDeveloperDestroyProducer(t),
153167
Steps: []resource.TestStep{
154168
{
155169
Config: testAccApigeeDeveloper_apigeeDeveloperWithAttributesTestExample(context),

‎google-beta/services/apigee/resource_apigee_developer_update_test.go

+12-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ func TestAccApigeeDeveloper_apigeeDeveloperUpdateTest(t *testing.T) {
2323
acctest.VcrTest(t, resource.TestCase{
2424
PreCheck: func() { acctest.AccTestPreCheck(t) },
2525
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
26-
CheckDestroy: testAccCheckApigeeDeveloperDestroyProducer(t),
26+
ExternalProviders: map[string]resource.ExternalProvider{
27+
"time": {},
28+
},
29+
CheckDestroy: testAccCheckApigeeDeveloperDestroyProducer(t),
2730
Steps: []resource.TestStep{
2831
{
2932
Config: testAccApigeeDeveloper_apigeeDeveloperBasicTestExample(context),
@@ -57,19 +60,27 @@ resource "google_project" "project" {
5760
deletion_policy = "DELETE"
5861
}
5962
63+
resource "time_sleep" "wait_60_seconds" {
64+
create_duration = "60s"
65+
depends_on = [google_project.project]
66+
}
67+
6068
resource "google_project_service" "apigee" {
6169
project = google_project.project.project_id
6270
service = "apigee.googleapis.com"
71+
depends_on = [time_sleep.wait_60_seconds]
6372
}
6473
6574
resource "google_project_service" "compute" {
6675
project = google_project.project.project_id
6776
service = "compute.googleapis.com"
77+
depends_on = [google_project_service.apigee]
6878
}
6979
7080
resource "google_project_service" "servicenetworking" {
7181
project = google_project.project.project_id
7282
service = "servicenetworking.googleapis.com"
83+
depends_on = [google_project_service.compute]
7384
}
7485
7586
resource "google_compute_network" "apigee_network" {

‎google-beta/services/apigee/resource_apigee_env_keystore_generated_test.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ func TestAccApigeeEnvKeystore_apigeeEnvironmentKeystoreTestExample(t *testing.T)
4343
acctest.VcrTest(t, resource.TestCase{
4444
PreCheck: func() { acctest.AccTestPreCheck(t) },
4545
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
46-
CheckDestroy: testAccCheckApigeeEnvKeystoreDestroyProducer(t),
46+
ExternalProviders: map[string]resource.ExternalProvider{
47+
"time": {},
48+
},
49+
CheckDestroy: testAccCheckApigeeEnvKeystoreDestroyProducer(t),
4750
Steps: []resource.TestStep{
4851
{
4952
Config: testAccApigeeEnvKeystore_apigeeEnvironmentKeystoreTestExample(context),
@@ -68,9 +71,15 @@ resource "google_project" "project" {
6871
deletion_policy = "DELETE"
6972
}
7073
74+
resource "time_sleep" "wait_60_seconds" {
75+
create_duration = "60s"
76+
depends_on = [google_project.project]
77+
}
78+
7179
resource "google_project_service" "apigee" {
7280
project = google_project.project.project_id
7381
service = "apigee.googleapis.com"
82+
depends_on = [time_sleep.wait_60_seconds]
7483
}
7584
7685
resource "google_project_service" "servicenetworking" {

‎google-beta/services/apigee/resource_apigee_environment_generated_test.go

+33-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ func TestAccApigeeEnvironment_apigeeEnvironmentBasicTestExample(t *testing.T) {
4444
acctest.VcrTest(t, resource.TestCase{
4545
PreCheck: func() { acctest.AccTestPreCheck(t) },
4646
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
47-
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
47+
ExternalProviders: map[string]resource.ExternalProvider{
48+
"time": {},
49+
},
50+
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
4851
Steps: []resource.TestStep{
4952
{
5053
Config: testAccApigeeEnvironment_apigeeEnvironmentBasicTestExample(context),
@@ -69,9 +72,15 @@ resource "google_project" "project" {
6972
deletion_policy = "DELETE"
7073
}
7174
75+
resource "time_sleep" "wait_60_seconds" {
76+
create_duration = "60s"
77+
depends_on = [google_project.project]
78+
}
79+
7280
resource "google_project_service" "apigee" {
7381
project = google_project.project.project_id
7482
service = "apigee.googleapis.com"
83+
depends_on = [time_sleep.wait_60_seconds]
7584
}
7685
7786
resource "google_project_service" "servicenetworking" {
@@ -140,7 +149,10 @@ func TestAccApigeeEnvironment_apigeeEnvironmentBasicDeploymentApiproxyTypeTestEx
140149
acctest.VcrTest(t, resource.TestCase{
141150
PreCheck: func() { acctest.AccTestPreCheck(t) },
142151
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
143-
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
152+
ExternalProviders: map[string]resource.ExternalProvider{
153+
"time": {},
154+
},
155+
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
144156
Steps: []resource.TestStep{
145157
{
146158
Config: testAccApigeeEnvironment_apigeeEnvironmentBasicDeploymentApiproxyTypeTestExample(context),
@@ -165,9 +177,15 @@ resource "google_project" "project" {
165177
deletion_policy = "DELETE"
166178
}
167179
180+
resource "time_sleep" "wait_60_seconds" {
181+
create_duration = "60s"
182+
depends_on = [google_project.project]
183+
}
184+
168185
resource "google_project_service" "apigee" {
169186
project = google_project.project.project_id
170187
service = "apigee.googleapis.com"
188+
depends_on = [time_sleep.wait_60_seconds]
171189
}
172190
173191
resource "google_project_service" "servicenetworking" {
@@ -238,7 +256,10 @@ func TestAccApigeeEnvironment_apigeeEnvironmentPatchUpdateTestExample(t *testing
238256
acctest.VcrTest(t, resource.TestCase{
239257
PreCheck: func() { acctest.AccTestPreCheck(t) },
240258
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
241-
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
259+
ExternalProviders: map[string]resource.ExternalProvider{
260+
"time": {},
261+
},
262+
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
242263
Steps: []resource.TestStep{
243264
{
244265
Config: testAccApigeeEnvironment_apigeeEnvironmentPatchUpdateTestExample(context),
@@ -265,32 +286,41 @@ resource "google_project" "project" {
265286
deletion_policy = "DELETE"
266287
}
267288
289+
resource "time_sleep" "wait_60_seconds" {
290+
create_duration = "60s"
291+
depends_on = [google_project.project]
292+
}
293+
268294
resource "google_project_service" "apigee" {
269295
provider = google-beta
270296
271297
project = google_project.project.project_id
272298
service = "apigee.googleapis.com"
299+
depends_on = [time_sleep.wait_60_seconds]
273300
}
274301
275302
resource "google_project_service" "compute" {
276303
provider = google-beta
277304
278305
project = google_project.project.project_id
279306
service = "compute.googleapis.com"
307+
depends_on = [google_project_service.apigee]
280308
}
281309
282310
resource "google_project_service" "servicenetworking" {
283311
provider = google-beta
284312
285313
project = google_project.project.project_id
286314
service = "servicenetworking.googleapis.com"
315+
depends_on = [google_project_service.compute]
287316
}
288317
289318
resource "google_project_service" "kms" {
290319
provider = google-beta
291320
292321
project = google_project.project.project_id
293322
service = "cloudkms.googleapis.com"
323+
depends_on = [google_project_service.servicenetworking]
294324
}
295325
296326
resource "google_compute_network" "apigee_network" {

‎google-beta/services/apigee/resource_apigee_environment_type_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ func TestAccApigeeEnvironment_apigeeEnvironmentPatchUpdateTestExampleUpdate(t *t
2323
acctest.VcrTest(t, resource.TestCase{
2424
PreCheck: func() { acctest.AccTestPreCheck(t) },
2525
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
26-
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
26+
ExternalProviders: map[string]resource.ExternalProvider{
27+
"time": {},
28+
},
29+
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
2730
Steps: []resource.TestStep{
2831
{
2932
Config: testAccApigeeEnvironment_apigeeEnvironmentPatchUpdateTestExample(context),

‎google-beta/services/apigee/resource_apigee_environment_update_test.go

+10-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ func TestAccApigeeEnvironment_apigeeEnvironmentUpdateTest(t *testing.T) {
2323
acctest.VcrTest(t, resource.TestCase{
2424
PreCheck: func() { acctest.AccTestPreCheck(t) },
2525
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
26-
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
26+
ExternalProviders: map[string]resource.ExternalProvider{
27+
"time": {},
28+
},
29+
CheckDestroy: testAccCheckApigeeEnvironmentDestroyProducer(t),
2730
Steps: []resource.TestStep{
2831
{
2932
Config: testAccApigeeEnvironment_apigeeEnvironmentBasicTestExample(context),
@@ -57,9 +60,15 @@ resource "google_project" "project" {
5760
deletion_policy = "DELETE"
5861
}
5962
63+
resource "time_sleep" "wait_60_seconds" {
64+
create_duration = "60s"
65+
depends_on = [google_project.project]
66+
}
67+
6068
resource "google_project_service" "apigee" {
6169
project = google_project.project.project_id
6270
service = "apigee.googleapis.com"
71+
depends_on = [time_sleep.wait_60_seconds]
6372
}
6473
6574
resource "google_project_service" "servicenetworking" {

0 commit comments

Comments
 (0)