Skip to content

Commit 400b365

Browse files
Fix recurring VCR failures (#5730) (#4067)
Signed-off-by: Modular Magician <[email protected]>
1 parent 07a0290 commit 400b365

File tree

3 files changed

+39
-24
lines changed

3 files changed

+39
-24
lines changed

.changelog/5730.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

google-beta/iam_apigee_environment_generated_test.go

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,16 @@ resource "google_project_service" "apigee" {
136136
service = "apigee.googleapis.com"
137137
}
138138
139-
resource "google_project_service" "compute" {
139+
resource "google_project_service" "servicenetworking" {
140140
project = google_project.project.project_id
141-
service = "compute.googleapis.com"
141+
service = "servicenetworking.googleapis.com"
142+
depends_on = [google_project_service.apigee]
142143
}
143144
144-
resource "google_project_service" "servicenetworking" {
145+
resource "google_project_service" "compute" {
145146
project = google_project.project.project_id
146-
service = "servicenetworking.googleapis.com"
147+
service = "compute.googleapis.com"
148+
depends_on = [google_project_service.servicenetworking]
147149
}
148150
149151
resource "google_compute_network" "apigee_network" {
@@ -208,14 +210,16 @@ resource "google_project_service" "apigee" {
208210
service = "apigee.googleapis.com"
209211
}
210212
211-
resource "google_project_service" "compute" {
213+
resource "google_project_service" "servicenetworking" {
212214
project = google_project.project.project_id
213-
service = "compute.googleapis.com"
215+
service = "servicenetworking.googleapis.com"
216+
depends_on = [google_project_service.apigee]
214217
}
215218
216-
resource "google_project_service" "servicenetworking" {
219+
resource "google_project_service" "compute" {
217220
project = google_project.project.project_id
218-
service = "servicenetworking.googleapis.com"
221+
service = "compute.googleapis.com"
222+
depends_on = [google_project_service.servicenetworking]
219223
}
220224
221225
resource "google_compute_network" "apigee_network" {
@@ -286,14 +290,16 @@ resource "google_project_service" "apigee" {
286290
service = "apigee.googleapis.com"
287291
}
288292
289-
resource "google_project_service" "compute" {
293+
resource "google_project_service" "servicenetworking" {
290294
project = google_project.project.project_id
291-
service = "compute.googleapis.com"
295+
service = "servicenetworking.googleapis.com"
296+
depends_on = [google_project_service.apigee]
292297
}
293298
294-
resource "google_project_service" "servicenetworking" {
299+
resource "google_project_service" "compute" {
295300
project = google_project.project.project_id
296-
service = "servicenetworking.googleapis.com"
301+
service = "compute.googleapis.com"
302+
depends_on = [google_project_service.servicenetworking]
297303
}
298304
299305
resource "google_compute_network" "apigee_network" {
@@ -360,14 +366,16 @@ resource "google_project_service" "apigee" {
360366
service = "apigee.googleapis.com"
361367
}
362368
363-
resource "google_project_service" "compute" {
369+
resource "google_project_service" "servicenetworking" {
364370
project = google_project.project.project_id
365-
service = "compute.googleapis.com"
371+
service = "servicenetworking.googleapis.com"
372+
depends_on = [google_project_service.apigee]
366373
}
367374
368-
resource "google_project_service" "servicenetworking" {
375+
resource "google_project_service" "compute" {
369376
project = google_project.project.project_id
370-
service = "servicenetworking.googleapis.com"
377+
service = "compute.googleapis.com"
378+
depends_on = [google_project_service.servicenetworking]
371379
}
372380
373381
resource "google_compute_network" "apigee_network" {
@@ -432,14 +440,16 @@ resource "google_project_service" "apigee" {
432440
service = "apigee.googleapis.com"
433441
}
434442
435-
resource "google_project_service" "compute" {
443+
resource "google_project_service" "servicenetworking" {
436444
project = google_project.project.project_id
437-
service = "compute.googleapis.com"
445+
service = "servicenetworking.googleapis.com"
446+
depends_on = [google_project_service.apigee]
438447
}
439448
440-
resource "google_project_service" "servicenetworking" {
449+
resource "google_project_service" "compute" {
441450
project = google_project.project.project_id
442-
service = "servicenetworking.googleapis.com"
451+
service = "compute.googleapis.com"
452+
depends_on = [google_project_service.servicenetworking]
443453
}
444454
445455
resource "google_compute_network" "apigee_network" {

google-beta/resource_apigee_environment_generated_test.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,16 @@ resource "google_project_service" "apigee" {
6565
service = "apigee.googleapis.com"
6666
}
6767
68-
resource "google_project_service" "compute" {
68+
resource "google_project_service" "servicenetworking" {
6969
project = google_project.project.project_id
70-
service = "compute.googleapis.com"
70+
service = "servicenetworking.googleapis.com"
71+
depends_on = [google_project_service.apigee]
7172
}
7273
73-
resource "google_project_service" "servicenetworking" {
74+
resource "google_project_service" "compute" {
7475
project = google_project.project.project_id
75-
service = "servicenetworking.googleapis.com"
76+
service = "compute.googleapis.com"
77+
depends_on = [google_project_service.servicenetworking]
7678
}
7779
7880
resource "google_compute_network" "apigee_network" {

0 commit comments

Comments
 (0)