Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
3409300f35
|
@ -67,7 +67,7 @@ resource "google_apigee_envgroup_attachment" "envgroup_attachments" {
|
||||||
envgroup = v2
|
envgroup = v2
|
||||||
}
|
}
|
||||||
}])...)
|
}])...)
|
||||||
envgroup_id = each.value.envgroup
|
envgroup_id = "${local.org_id}/envgroups/${each.value.envgroup}"
|
||||||
environment = google_apigee_environment.environments[each.value.environment].name
|
environment = google_apigee_environment.environments[each.value.environment].name
|
||||||
depends_on = [google_apigee_envgroup.envgroups]
|
depends_on = [google_apigee_envgroup.envgroups]
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
values:
|
values:
|
||||||
google_apigee_envgroup_attachment.envgroup_attachments["apis-test-test"]:
|
google_apigee_envgroup_attachment.envgroup_attachments["apis-test-test"]:
|
||||||
envgroup_id: test
|
envgroup_id: organizations/my-project/envgroups/test
|
||||||
environment: apis-test
|
environment: apis-test
|
||||||
timeouts: null
|
timeouts: null
|
||||||
google_apigee_environment.environments["apis-test"]:
|
google_apigee_environment.environments["apis-test"]:
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
values:
|
values:
|
||||||
google_apigee_envgroup_attachment.envgroup_attachments["apis-test-test"]:
|
google_apigee_envgroup_attachment.envgroup_attachments["apis-test-test"]:
|
||||||
envgroup_id: test
|
envgroup_id: organizations/my-project/envgroups/test
|
||||||
environment: apis-test
|
environment: apis-test
|
||||||
google_apigee_environment.environments["apis-test"]:
|
google_apigee_environment.environments["apis-test"]:
|
||||||
api_proxy_type: PROGRAMMABLE
|
api_proxy_type: PROGRAMMABLE
|
||||||
|
@ -22,8 +22,8 @@ values:
|
||||||
display_name: APIs test
|
display_name: APIs test
|
||||||
name: apis-test
|
name: apis-test
|
||||||
node_config:
|
node_config:
|
||||||
- max_node_count: '5'
|
- max_node_count: "5"
|
||||||
min_node_count: '2'
|
min_node_count: "2"
|
||||||
org_id: organizations/my-project
|
org_id: organizations/my-project
|
||||||
|
|
||||||
counts:
|
counts:
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
values:
|
values:
|
||||||
google_apigee_envgroup_attachment.envgroup_attachments["apis-test-test"]:
|
google_apigee_envgroup_attachment.envgroup_attachments["apis-test-test"]:
|
||||||
envgroup_id: test
|
envgroup_id: organizations/my-project/envgroups/test
|
||||||
environment: apis-test
|
environment: apis-test
|
||||||
timeouts: null
|
timeouts: null
|
||||||
google_apigee_environment.environments["apis-test"]:
|
google_apigee_environment.environments["apis-test"]:
|
||||||
|
@ -23,12 +23,11 @@ values:
|
||||||
display_name: APIs test
|
display_name: APIs test
|
||||||
name: apis-test
|
name: apis-test
|
||||||
node_config:
|
node_config:
|
||||||
- max_node_count: '5'
|
- max_node_count: "5"
|
||||||
min_node_count: '2'
|
min_node_count: "2"
|
||||||
org_id: organizations/my-project
|
org_id: organizations/my-project
|
||||||
timeouts: null
|
timeouts: null
|
||||||
|
|
||||||
counts:
|
counts:
|
||||||
google_apigee_envgroup_attachment: 1
|
google_apigee_envgroup_attachment: 1
|
||||||
google_apigee_environment: 1
|
google_apigee_environment: 1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue