kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Putting it back how it was and flipping the attachment name

Browse Source
This commit is contained in:
John Inama
2023-09-15 16:48:13 -04:00
parent 3e069ea16a
commit b285deca96
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/apigee/main.tf
View File

@@ -17,20 +17,6 @@
locals {
org_id = try(google_apigee_organization.organization[0].id, "organizations/${var.project_id}")
org_name = try(google_apigee_organization.organization[0].name, var.project_id)
instance_environment_list = merge(concat([for k1, v1 in var.instances : {
for v2 in coalesce(v1.environments, []) :
"${k1}-${v2}" => {
environment = v2
region = k1
}
}])...)
environment_region_list = merge(concat([for k1, v1 in var.environments : {
for v2 in coalesce(v1.regions, []) :
"${k1}-${v2}" => {
environment = k1
region = v2
}
}])...)
}
resource "google_apigee_organization" "organization" {
@@ -121,7 +107,13 @@ resource "google_apigee_nat_address" "apigee_nat" {
}
resource "google_apigee_instance_attachment" "instance_attachments" {
for_each = length(local.environment_region_list) == 0 ? local.instance_environment_list : local.environment_region_list
for_each = merge(concat([for k1, v1 in var.instances : {
for v2 in coalesce(v1.environments, []) :
"${k1}-${v2}" => {
instance = k1
environment = v2
}
}])...)
instance_id = google_apigee_instance.instances[each.value.region].id
environment = try(google_apigee_environment.environments[each.value.environment].name,
"${local.org_id}/environments/${each.value.environment}")