Skip to content

Commit 4f1f64e

Browse files
Creating dev environment to be used by product (#16022) (#25644)
[upstream:fc825ab9b69d792580ed59b9027805d9fe5c8a3d] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 90d26dc commit 4f1f64e

File tree

3 files changed

+65
-12
lines changed

3 files changed

+65
-12
lines changed

google/services/apigee/resource_apigee_api_product_generated_test.go

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,17 @@ resource "google_apigee_instance" "apigee_instance" {
278278
peering_cidr_range = "SLASH_22"
279279
}
280280
281+
resource "google_apigee_environment" "env_dev" {
282+
name = "dev"
283+
org_id = google_apigee_organization.apigee_org.id
284+
}
285+
286+
resource "google_apigee_api" "test_apigee_api" {
287+
name = "hello-world"
288+
org_id = google_apigee_organization.apigee_org.name
289+
config_bundle = "./test-fixtures/apigee_api_bundle.zip"
290+
}
291+
281292
resource "google_apigee_api_product" "apigee_api_product" {
282293
org_id = google_apigee_organization.apigee_org.id
283294
name = "legacy-operation-api-product"
@@ -292,7 +303,7 @@ resource "google_apigee_api_product" "apigee_api_product" {
292303
value = "private"
293304
}
294305
295-
environments = ["dev", "hom"]
306+
environments = ["dev"]
296307
proxies = ["hello-world"]
297308
api_resources = [
298309
"/",
@@ -309,7 +320,9 @@ resource "google_apigee_api_product" "apigee_api_product" {
309320
quota_counter_scope = "PROXY"
310321
311322
depends_on = [
312-
google_apigee_instance.apigee_instance
323+
google_apigee_instance.apigee_instance,
324+
google_apigee_environment.env_dev,
325+
google_apigee_api.test_apigee_api
313326
]
314327
}
315328
`, context)
@@ -422,6 +435,11 @@ resource "google_apigee_instance" "apigee_instance" {
422435
peering_cidr_range = "SLASH_22"
423436
}
424437
438+
resource "google_apigee_environment" "env_dev" {
439+
name = "dev"
440+
org_id = google_apigee_organization.apigee_org.id
441+
}
442+
425443
resource "google_apigee_api_product" "apigee_api_product" {
426444
org_id = google_apigee_organization.apigee_org.id
427445
name = "full-api-product"
@@ -436,7 +454,7 @@ resource "google_apigee_api_product" "apigee_api_product" {
436454
quota_time_unit = "day"
437455
quota_counter_scope = "PROXY"
438456
439-
environments = ["dev", "hom"]
457+
environments = ["dev"]
440458
scopes = [
441459
"read:weather",
442460
"write:reports"
@@ -578,7 +596,8 @@ resource "google_apigee_api_product" "apigee_api_product" {
578596
}
579597
580598
depends_on = [
581-
google_apigee_instance.apigee_instance
599+
google_apigee_instance.apigee_instance,
600+
google_apigee_environment.env_dev
582601
]
583602
}
584603
`, context)

google/services/apigee/resource_apigee_api_product_update_test.go

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ resource "google_apigee_instance" "apigee_instance" {
134134
org_id = google_apigee_organization.apigee_org.id
135135
peering_cidr_range = "SLASH_22"
136136
}
137+
resource "google_apigee_environment" "env_dev" {
138+
name = "dev"
139+
org_id = google_apigee_organization.apigee_org.id
140+
}
137141
resource "google_apigee_api_product" "apigee_api_product" {
138142
org_id = google_apigee_organization.apigee_org.id
139143
name = "tf-test%{random_suffix}"
@@ -148,7 +152,7 @@ resource "google_apigee_api_product" "apigee_api_product" {
148152
quota_time_unit = "day"
149153
quota_counter_scope = "PROXY"
150154
151-
environments = ["dev", "hom"]
155+
environments = ["dev"]
152156
scopes = [
153157
"read:weather",
154158
"write:reports"
@@ -290,7 +294,8 @@ resource "google_apigee_api_product" "apigee_api_product" {
290294
}
291295
292296
depends_on = [
293-
google_apigee_instance.apigee_instance
297+
google_apigee_instance.apigee_instance,
298+
google_apigee_environment.env_dev
294299
]
295300
}
296301
`, context)
@@ -372,6 +377,14 @@ resource "google_apigee_developer" "apigee_developer" {
372377
google_apigee_instance.apigee_instance
373378
]
374379
}
380+
resource "google_apigee_environment" "env_dev" {
381+
name = "dev"
382+
org_id = google_apigee_organization.apigee_org.id
383+
}
384+
resource "google_apigee_environment" "env_hom" {
385+
name = "hom"
386+
org_id = google_apigee_organization.apigee_org.id
387+
}
375388
resource "google_apigee_api_product" "apigee_api_product" {
376389
org_id = google_apigee_organization.apigee_org.id
377390
name = "tf-test%{random_suffix}"
@@ -386,7 +399,7 @@ resource "google_apigee_api_product" "apigee_api_product" {
386399
quota_time_unit = "day"
387400
quota_counter_scope = "PROXY"
388401
389-
environments = ["dev"]
402+
environments = ["dev", "hom"]
390403
scopes = [
391404
"read:weather"
392405
]
@@ -527,7 +540,9 @@ resource "google_apigee_api_product" "apigee_api_product" {
527540
}
528541
529542
depends_on = [
530-
google_apigee_instance.apigee_instance
543+
google_apigee_instance.apigee_instance,
544+
google_apigee_environment.env_dev,
545+
google_apigee_environment.env_hom
531546
]
532547
}
533548
`, context)

website/docs/r/apigee_api_product.html.markdown

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,17 @@ resource "google_apigee_instance" "apigee_instance" {
118118
peering_cidr_range = "SLASH_22"
119119
}
120120
121+
resource "google_apigee_environment" "env_dev" {
122+
name = "dev"
123+
org_id = google_apigee_organization.apigee_org.id
124+
}
125+
126+
resource "google_apigee_api" "test_apigee_api" {
127+
name = "hello-world"
128+
org_id = google_apigee_organization.apigee_org.name
129+
config_bundle = "apigee_api_bundle.zip"
130+
}
131+
121132
resource "google_apigee_api_product" "full_api_product" {
122133
org_id = google_apigee_organization.apigee_org.id
123134
name = "my-product"
@@ -132,7 +143,7 @@ resource "google_apigee_api_product" "full_api_product" {
132143
value = "private"
133144
}
134145
135-
environments = ["dev", "hom"]
146+
environments = ["dev"]
136147
proxies = ["hello-world"]
137148
api_resources = [
138149
"/",
@@ -149,7 +160,9 @@ resource "google_apigee_api_product" "full_api_product" {
149160
quota_counter_scope = "PROXY"
150161
151162
depends_on = [
152-
google_apigee_instance.apigee_instance
163+
google_apigee_instance.apigee_instance,
164+
google_apigee_environment.env_dev,
165+
google_apigee_api.test_apigee_api
153166
]
154167
}
155168
```
@@ -191,6 +204,11 @@ resource "google_apigee_instance" "apigee_instance" {
191204
peering_cidr_range = "SLASH_22"
192205
}
193206
207+
resource "google_apigee_environment" "env_dev" {
208+
name = "dev"
209+
org_id = google_apigee_organization.apigee_org.id
210+
}
211+
194212
resource "google_apigee_api_product" "full_api_product" {
195213
org_id = google_apigee_organization.apigee_org.id
196214
name = "my-product"
@@ -205,7 +223,7 @@ resource "google_apigee_api_product" "full_api_product" {
205223
quota_time_unit = "day"
206224
quota_counter_scope = "PROXY"
207225
208-
environments = ["dev", "hom"]
226+
environments = ["dev"]
209227
210228
# Set them in reverse order to test set
211229
scopes = [
@@ -349,7 +367,8 @@ resource "google_apigee_api_product" "full_api_product" {
349367
}
350368
351369
depends_on = [
352-
google_apigee_instance.apigee_instance
370+
google_apigee_instance.apigee_instance,
371+
google_apigee_environment.env_dev
353372
]
354373
}
355374
```

0 commit comments

Comments
 (0)