Skip to content

Commit d678a9e

Browse files
modular-magicianmodular-magician
authored
Added wait after service enablement in tests (#13652) (#22386)
[upstream:c142836be17018a124a9479615d118fce85c00bb] Signed-off-by: Modular Magician <[email protected]>
1 parent 45e4331 commit d678a9e

File tree

34 files changed

+426
-78
lines changed

34 files changed

+426
-78
lines changed

‎google/services/apigee/iam_apigee_environment_generated_test.go

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,16 @@ resource "google_project_service" "compute" {
173173
depends_on = [google_project_service.servicenetworking]
174174
}
175175
176+
resource "time_sleep" "wait_120_seconds" {
177+
create_duration = "120s"
178+
depends_on = [google_project_service.compute]
179+
}
180+
181+
176182
resource "google_compute_network" "apigee_network" {
177183
name = "apigee-network"
178184
project = google_project.project.project_id
179-
depends_on = [google_project_service.compute]
185+
depends_on = [time_sleep.wait_120_seconds]
180186
}
181187
182188
resource "google_compute_global_address" "apigee_range" {
@@ -254,10 +260,16 @@ resource "google_project_service" "compute" {
254260
depends_on = [google_project_service.servicenetworking]
255261
}
256262
263+
resource "time_sleep" "wait_120_seconds" {
264+
create_duration = "120s"
265+
depends_on = [google_project_service.compute]
266+
}
267+
268+
257269
resource "google_compute_network" "apigee_network" {
258270
name = "apigee-network"
259271
project = google_project.project.project_id
260-
depends_on = [google_project_service.compute]
272+
depends_on = [time_sleep.wait_120_seconds]
261273
}
262274
263275
resource "google_compute_global_address" "apigee_range" {
@@ -349,10 +361,16 @@ resource "google_project_service" "compute" {
349361
depends_on = [google_project_service.servicenetworking]
350362
}
351363
364+
resource "time_sleep" "wait_120_seconds" {
365+
create_duration = "120s"
366+
depends_on = [google_project_service.compute]
367+
}
368+
369+
352370
resource "google_compute_network" "apigee_network" {
353371
name = "apigee-network"
354372
project = google_project.project.project_id
355-
depends_on = [google_project_service.compute]
373+
depends_on = [time_sleep.wait_120_seconds]
356374
}
357375
358376
resource "google_compute_global_address" "apigee_range" {
@@ -432,10 +450,16 @@ resource "google_project_service" "compute" {
432450
depends_on = [google_project_service.servicenetworking]
433451
}
434452
453+
resource "time_sleep" "wait_120_seconds" {
454+
create_duration = "120s"
455+
depends_on = [google_project_service.compute]
456+
}
457+
458+
435459
resource "google_compute_network" "apigee_network" {
436460
name = "apigee-network"
437461
project = google_project.project.project_id
438-
depends_on = [google_project_service.compute]
462+
depends_on = [time_sleep.wait_120_seconds]
439463
}
440464
441465
resource "google_compute_global_address" "apigee_range" {
@@ -513,10 +537,16 @@ resource "google_project_service" "compute" {
513537
depends_on = [google_project_service.servicenetworking]
514538
}
515539
540+
resource "time_sleep" "wait_120_seconds" {
541+
create_duration = "120s"
542+
depends_on = [google_project_service.compute]
543+
}
544+
545+
516546
resource "google_compute_network" "apigee_network" {
517547
name = "apigee-network"
518548
project = google_project.project.project_id
519-
depends_on = [google_project_service.compute]
549+
depends_on = [time_sleep.wait_120_seconds]
520550
}
521551
522552
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_api_test.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ func TestAccApigeeApi_apigeeApiTestExample(t *testing.T) {
3131
acctest.VcrTest(t, resource.TestCase{
3232
PreCheck: func() { acctest.AccTestPreCheck(t) },
3333
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
34-
CheckDestroy: testAccCheckApigeeApiDestroyProducer(t),
34+
ExternalProviders: map[string]resource.ExternalProvider{
35+
"time": {},
36+
},
37+
CheckDestroy: testAccCheckApigeeApiDestroyProducer(t),
3538
Steps: []resource.TestStep{
3639
{
3740
Config: testAccApigeeApi_apigeeApiTestExample(context),
@@ -82,10 +85,15 @@ resource "google_project_service" "compute" {
8285
depends_on = [google_project_service.servicenetworking]
8386
}
8487
88+
resource "time_sleep" "wait_120_seconds" {
89+
create_duration = "120s"
90+
depends_on = [google_project_service.compute]
91+
}
92+
8593
resource "google_compute_network" "apigee_network" {
8694
name = "apigee-network"
8795
project = google_project.project.project_id
88-
depends_on = [google_project_service.compute]
96+
depends_on = [time_sleep.wait_120_seconds]
8997
}
9098
9199
resource "google_compute_global_address" "apigee_range" {
@@ -189,10 +197,15 @@ resource "google_project_service" "compute" {
189197
depends_on = [google_project_service.servicenetworking]
190198
}
191199
200+
resource "time_sleep" "wait_120_seconds" {
201+
create_duration = "120s"
202+
depends_on = [google_project_service.compute]
203+
}
204+
192205
resource "google_compute_network" "apigee_network" {
193206
name = "apigee-network"
194207
project = google_project.project.project_id
195-
depends_on = [google_project_service.compute]
208+
depends_on = [time_sleep.wait_120_seconds]
196209
}
197210
198211
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_app_group_generated_test.go

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ func TestAccApigeeAppGroup_apigeeAppGroupBasicTestExample(t *testing.T) {
4444
acctest.VcrTest(t, resource.TestCase{
4545
PreCheck: func() { acctest.AccTestPreCheck(t) },
4646
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
47-
CheckDestroy: testAccCheckApigeeAppGroupDestroyProducer(t),
47+
ExternalProviders: map[string]resource.ExternalProvider{
48+
"time": {},
49+
},
50+
CheckDestroy: testAccCheckApigeeAppGroupDestroyProducer(t),
4851
Steps: []resource.TestStep{
4952
{
5053
Config: testAccApigeeAppGroup_apigeeAppGroupBasicTestExample(context),
@@ -84,10 +87,15 @@ resource "google_project_service" "servicenetworking" {
8487
service = "servicenetworking.googleapis.com"
8588
}
8689
90+
resource "time_sleep" "wait_120_seconds" {
91+
create_duration = "120s"
92+
depends_on = [google_project_service.compute]
93+
}
94+
8795
resource "google_compute_network" "apigee_network" {
8896
name = "apigee-network"
8997
project = google_project.project.project_id
90-
depends_on = [google_project_service.compute]
98+
depends_on = [time_sleep.wait_120_seconds]
9199
}
92100
93101
resource "google_compute_global_address" "apigee_range" {
@@ -150,7 +158,10 @@ func TestAccApigeeAppGroup_apigeeAppGroupWithAttributesTestExample(t *testing.T)
150158
acctest.VcrTest(t, resource.TestCase{
151159
PreCheck: func() { acctest.AccTestPreCheck(t) },
152160
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
153-
CheckDestroy: testAccCheckApigeeAppGroupDestroyProducer(t),
161+
ExternalProviders: map[string]resource.ExternalProvider{
162+
"time": {},
163+
},
164+
CheckDestroy: testAccCheckApigeeAppGroupDestroyProducer(t),
154165
Steps: []resource.TestStep{
155166
{
156167
Config: testAccApigeeAppGroup_apigeeAppGroupWithAttributesTestExample(context),
@@ -190,10 +201,15 @@ resource "google_project_service" "servicenetworking" {
190201
service = "servicenetworking.googleapis.com"
191202
}
192203
204+
resource "time_sleep" "wait_120_seconds" {
205+
create_duration = "120s"
206+
depends_on = [google_project_service.compute]
207+
}
208+
193209
resource "google_compute_network" "apigee_network" {
194210
name = "apigee-network"
195211
project = google_project.project.project_id
196-
depends_on = [google_project_service.compute]
212+
depends_on = [time_sleep.wait_120_seconds]
197213
}
198214
199215
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_developer_generated_test.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,15 @@ resource "google_project_service" "servicenetworking" {
9595
depends_on = [google_project_service.compute]
9696
}
9797
98+
resource "time_sleep" "wait_120_seconds" {
99+
create_duration = "120s"
100+
depends_on = [google_project_service.servicenetworking]
101+
}
102+
98103
resource "google_compute_network" "apigee_network" {
99104
name = "apigee-network"
100105
project = google_project.project.project_id
101-
depends_on = [google_project_service.compute]
106+
depends_on = [time_sleep.wait_120_seconds]
102107
}
103108
104109
resource "google_compute_global_address" "apigee_range" {
@@ -203,10 +208,15 @@ resource "google_project_service" "servicenetworking" {
203208
service = "servicenetworking.googleapis.com"
204209
}
205210
211+
resource "time_sleep" "wait_120_seconds" {
212+
create_duration = "120s"
213+
depends_on = [google_project_service.compute]
214+
}
215+
206216
resource "google_compute_network" "apigee_network" {
207217
name = "apigee-network"
208218
project = google_project.project.project_id
209-
depends_on = [google_project_service.compute]
219+
depends_on = [time_sleep.wait_120_seconds]
210220
}
211221
212222
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_developer_update_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,15 @@ resource "google_project_service" "servicenetworking" {
8383
depends_on = [google_project_service.compute]
8484
}
8585
86+
resource "time_sleep" "wait_120_seconds" {
87+
create_duration = "120s"
88+
depends_on = [google_project_service.servicenetworking]
89+
}
90+
8691
resource "google_compute_network" "apigee_network" {
8792
name = "apigee-network"
8893
project = google_project.project.project_id
89-
depends_on = [google_project_service.compute]
94+
depends_on = [time_sleep.wait_120_seconds]
9095
}
9196
9297
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_endpoint_attachment_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ func TestAccApigeeEndpointAttachment_apigeeEndpointAttachmentBasicTestExample(t
2929
acctest.VcrTest(t, resource.TestCase{
3030
PreCheck: func() { acctest.AccTestPreCheck(t) },
3131
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
32-
CheckDestroy: testAccCheckApigeeEndpointAttachmentDestroyProducer(t),
32+
ExternalProviders: map[string]resource.ExternalProvider{
33+
"time": {},
34+
},
35+
CheckDestroy: testAccCheckApigeeEndpointAttachmentDestroyProducer(t),
3336
Steps: []resource.TestStep{
3437
{
3538
Config: testAccApigeeEndpointAttachment_apigeeEndpointAttachmentBasicTestExample(context),
@@ -69,10 +72,15 @@ resource "google_project_service" "servicenetworking" {
6972
service = "servicenetworking.googleapis.com"
7073
}
7174
75+
resource "time_sleep" "wait_120_seconds" {
76+
create_duration = "120s"
77+
depends_on = [google_project_service.compute]
78+
}
79+
7280
resource "google_compute_network" "apigee_network" {
7381
name = "apigee-network"
7482
project = google_project.project.project_id
75-
depends_on = [google_project_service.compute]
83+
depends_on = [time_sleep.wait_120_seconds]
7684
}
7785
7886
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_env_keystore_generated_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,15 @@ resource "google_project_service" "compute" {
9494
depends_on = [google_project_service.servicenetworking]
9595
}
9696
97+
resource "time_sleep" "wait_120_seconds" {
98+
create_duration = "120s"
99+
depends_on = [google_project_service.compute]
100+
}
101+
97102
resource "google_compute_network" "apigee_network" {
98103
name = "apigee-network"
99104
project = google_project.project.project_id
100-
depends_on = [google_project_service.compute]
105+
depends_on = [time_sleep.wait_120_seconds]
101106
}
102107
103108
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_env_references_generated_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ func TestAccApigeeEnvReferences_apigeeEnvironmentReferenceTestExample(t *testing
4343
acctest.VcrTest(t, resource.TestCase{
4444
PreCheck: func() { acctest.AccTestPreCheck(t) },
4545
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
46-
CheckDestroy: testAccCheckApigeeEnvReferencesDestroyProducer(t),
46+
ExternalProviders: map[string]resource.ExternalProvider{
47+
"time": {},
48+
},
49+
CheckDestroy: testAccCheckApigeeEnvReferencesDestroyProducer(t),
4750
Steps: []resource.TestStep{
4851
{
4952
Config: testAccApigeeEnvReferences_apigeeEnvironmentReferenceTestExample(context),
@@ -85,10 +88,15 @@ resource "google_project_service" "compute" {
8588
depends_on = [google_project_service.servicenetworking]
8689
}
8790
91+
resource "time_sleep" "wait_120_seconds" {
92+
create_duration = "120s"
93+
depends_on = [google_project_service.compute]
94+
}
95+
8896
resource "google_compute_network" "apigee_network" {
8997
name = "apigee-network"
9098
project = google_project.project.project_id
91-
depends_on = [google_project_service.compute]
99+
depends_on = [time_sleep.wait_120_seconds]
92100
}
93101
94102
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_env_references_test.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ func TestAccApigeeEnvReferences_apigeeEnvironmentReferenceTest_Update(t *testing
2323
acctest.VcrTest(t, resource.TestCase{
2424
PreCheck: func() { acctest.AccTestPreCheck(t) },
2525
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
26-
CheckDestroy: testAccCheckApigeeEnvReferencesDestroyProducer(t),
26+
ExternalProviders: map[string]resource.ExternalProvider{
27+
"time": {},
28+
},
29+
CheckDestroy: testAccCheckApigeeEnvReferencesDestroyProducer(t),
2730
Steps: []resource.TestStep{
2831
{
2932
Config: testAccApigeeEnvReferences_apigeeEnvironmentReferenceTest_full(context),
@@ -74,10 +77,15 @@ resource "google_project_service" "compute" {
7477
depends_on = [google_project_service.servicenetworking]
7578
}
7679
80+
resource "time_sleep" "wait_120_seconds" {
81+
create_duration = "120s"
82+
depends_on = [google_project_service.compute]
83+
}
84+
7785
resource "google_compute_network" "apigee_network" {
7886
name = "apigee-network"
7987
project = google_project.project.project_id
80-
depends_on = [google_project_service.compute]
88+
depends_on = [time_sleep.wait_120_seconds]
8189
}
8290
8391
resource "google_compute_global_address" "apigee_range" {
@@ -161,10 +169,15 @@ resource "google_project_service" "compute" {
161169
depends_on = [google_project_service.servicenetworking]
162170
}
163171
172+
resource "time_sleep" "wait_120_seconds" {
173+
create_duration = "120s"
174+
depends_on = [google_project_service.compute]
175+
}
176+
164177
resource "google_compute_network" "apigee_network" {
165178
name = "apigee-network"
166179
project = google_project.project.project_id
167-
depends_on = [google_project_service.compute]
180+
depends_on = [time_sleep.wait_120_seconds]
168181
}
169182
170183
resource "google_compute_global_address" "apigee_range" {

‎google/services/apigee/resource_apigee_envgroup_attachment_generated_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ func TestAccApigeeEnvgroupAttachment_apigeeEnvironmentGroupAttachmentBasicTestEx
4444
acctest.VcrTest(t, resource.TestCase{
4545
PreCheck: func() { acctest.AccTestPreCheck(t) },
4646
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
47-
CheckDestroy: testAccCheckApigeeEnvgroupAttachmentDestroyProducer(t),
47+
ExternalProviders: map[string]resource.ExternalProvider{
48+
"time": {},
49+
},
50+
CheckDestroy: testAccCheckApigeeEnvgroupAttachmentDestroyProducer(t),
4851
Steps: []resource.TestStep{
4952
{
5053
Config: testAccApigeeEnvgroupAttachment_apigeeEnvironmentGroupAttachmentBasicTestExample(context),
@@ -84,10 +87,15 @@ resource "google_project_service" "servicenetworking" {
8487
service = "servicenetworking.googleapis.com"
8588
}
8689
90+
resource "time_sleep" "wait_120_seconds" {
91+
create_duration = "120s"
92+
depends_on = [google_project_service.compute]
93+
}
94+
8795
resource "google_compute_network" "apigee_network" {
8896
name = "apigee-network"
8997
project = google_project.project.project_id
90-
depends_on = [google_project_service.compute]
98+
depends_on = [time_sleep.wait_120_seconds]
9199
}
92100
93101
resource "google_compute_global_address" "apigee_range" {

0 commit comments

Comments
 (0)