Fix apigee instance nat
This commit is contained in:
Julio Castillo
parent
3fdf0dfe99
commit
bff5e46460
|
|
@ -181,13 +181,13 @@ module "apigee" {
|
|||
|
||||
| name | description | type | required | default |
|
||||
|---|---|:---:|:---:|:---:|
|
||||
| [project_id](variables.tf#L91) | Project ID. | <code>string</code> | ✓ | |
|
||||
| [project_id](variables.tf#L95) | Project ID. | <code>string</code> | ✓ | |
|
||||
| [addons_config](variables.tf#L17) | Addons configuration. | <code title="object({ advanced_api_ops = optional(bool, false) api_security = optional(bool, false) connectors_platform = optional(bool, false) integration = optional(bool, false) monetization = optional(bool, false) })">object({…})</code> | | <code>null</code> |
|
||||
| [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | <code title="map(object({ region = string service_attachment = string }))">map(object({…}))</code> | | <code>null</code> |
|
||||
| [envgroups](variables.tf#L38) | Environment groups (NAME => [HOSTNAMES]). | <code>map(list(string))</code> | | <code>null</code> |
|
||||
| [environments](variables.tf#L44) | Environments. | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") deployment_type = optional(string) api_proxy_type = optional(string) node_config = optional(object({ min_node_count = optional(number) max_node_count = optional(number) })) iam = optional(map(list(string))) envgroups = optional(list(string)) regions = optional(list(string)) }))">map(object({…}))</code> | | <code>null</code> |
|
||||
| [instances](variables.tf#L62) | Instances ([REGION] => [INSTANCE]). | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") runtime_ip_cidr_range = string troubleshooting_ip_cidr_range = string disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) nat_required = optional(bool, false) }))">map(object({…}))</code> | | <code>null</code> |
|
||||
| [organization](variables.tf#L76) | Apigee organization. If set to null the organization must already exist. | <code title="object({ display_name = optional(string) description = optional(string, "Terraform-managed") authorized_network = optional(string) runtime_type = optional(string, "CLOUD") billing_type = optional(string) database_encryption_key = optional(string) analytics_region = optional(string, "europe-west1") retention = optional(string) })">object({…})</code> | | <code>null</code> |
|
||||
| [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | <code title="map(object({ region = string service_attachment = string }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [envgroups](variables.tf#L39) | Environment groups (NAME => [HOSTNAMES]). | <code>map(list(string))</code> | | <code>{}</code> |
|
||||
| [environments](variables.tf#L46) | Environments. | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") deployment_type = optional(string) api_proxy_type = optional(string) node_config = optional(object({ min_node_count = optional(number) max_node_count = optional(number) })) iam = optional(map(list(string))) envgroups = optional(list(string)) regions = optional(list(string)) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [instances](variables.tf#L65) | Instances ([REGION] => [INSTANCE]). | <code title="map(object({ display_name = optional(string) description = optional(string, "Terraform-managed") runtime_ip_cidr_range = string troubleshooting_ip_cidr_range = string disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) nat_ips = optional(number, 0) }))">map(object({…}))</code> | | <code>{}</code> |
|
||||
| [organization](variables.tf#L80) | Apigee organization. If set to null the organization must already exist. | <code title="object({ display_name = optional(string) description = optional(string, "Terraform-managed") authorized_network = optional(string) runtime_type = optional(string, "CLOUD") billing_type = optional(string) database_encryption_key = optional(string) analytics_region = optional(string, "europe-west1") retention = optional(string) })">object({…})</code> | | <code>null</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
|
|
@ -196,8 +196,8 @@ module "apigee" {
|
|||
| [endpoint_attachment_hosts](outputs.tf#L17) | Endpoint hosts. | |
|
||||
| [envgroups](outputs.tf#L22) | Environment groups. | |
|
||||
| [environments](outputs.tf#L27) | Environment. | |
|
||||
| [instance_nat_ips](outputs.tf#L32) | NAT IP addresses used in instances. | |
|
||||
| [instances](outputs.tf#L37) | Instances. | |
|
||||
| [nat_ips](outputs.tf#L32) | NAT IP addresses used in instances. | |
|
||||
| [org_id](outputs.tf#L42) | Organization ID. | |
|
||||
| [org_name](outputs.tf#L47) | Organization name. | |
|
||||
| [organization](outputs.tf#L52) | Organization. | |
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
*/
|
||||
|
||||
locals {
|
||||
instance_ips = merge([
|
||||
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)
|
||||
}
|
||||
|
|
@ -98,7 +97,10 @@ resource "google_apigee_instance" "instances" {
|
|||
}
|
||||
|
||||
resource "google_apigee_nat_address" "apigee_nat" {
|
||||
for_each = local.instance_ips
|
||||
for_each = {
|
||||
for k, v in var.instances :
|
||||
k => google_apigee_instance.instances[k].id
|
||||
}
|
||||
name = each.key
|
||||
instance_id = each.value
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ output "environments" {
|
|||
value = try(google_apigee_environment.environments, null)
|
||||
}
|
||||
|
||||
output "instance_nat_ips" {
|
||||
output "nat_ips" {
|
||||
description = "NAT IP addresses used in instances."
|
||||
value = try(google_apigee_nat_address.apigee_nat, null)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ variable "instances" {
|
|||
troubleshooting_ip_cidr_range = string
|
||||
disk_encryption_key = optional(string)
|
||||
consumer_accept_list = optional(list(string))
|
||||
nat_required = optional(bool, false)
|
||||
nat_ips = optional(number, 0)
|
||||
}))
|
||||
default = {}
|
||||
nullable = false
|
||||
|
|
|
|||
Loading…
Reference in New Issue