From 6c33d34c287f1f8a932dd5b872b2d1a316fc13e1 Mon Sep 17 00:00:00 2001 From: Rob Heckel Date: Wed, 23 Aug 2023 15:49:56 -0500 Subject: [PATCH 1/8] Adding support for NAT in Apigee --- modules/apigee/README.md | 19 +++++++++++-------- modules/apigee/main.tf | 10 ++++++++++ modules/apigee/outputs.tf | 7 ++++++- modules/apigee/variables.tf | 1 + 4 files changed, 28 insertions(+), 9 deletions(-) diff --git a/modules/apigee/README.md b/modules/apigee/README.md index 353fb528..319f6bb8 100644 --- a/modules/apigee/README.md +++ b/modules/apigee/README.md @@ -42,10 +42,12 @@ module "apigee" { } instances = { europe-west1 = { + nat_required = true runtime_ip_cidr_range = "10.0.4.0/22" troubleshooting_ip_cidr_range = "10.1.1.0.0/28" } europe-west3 = { + nat_required = false runtime_ip_cidr_range = "10.0.8.0/22" troubleshooting_ip_cidr_range = "10.1.16.0/28" } @@ -179,13 +181,13 @@ module "apigee" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [project_id](variables.tf#L90) | Project ID. | string | ✓ | | +| [project_id](variables.tf#L91) | Project ID. | string | ✓ | | | [addons_config](variables.tf#L17) | Addons configuration. | object({…}) | | null | | [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | map(object({…})) | | null | | [envgroups](variables.tf#L38) | Environment groups (NAME => [HOSTNAMES]). | map(list(string)) | | null | | [environments](variables.tf#L44) | Environments. | map(object({…})) | | null | -| [instances](variables.tf#L62) | Instances ([REGION] => [INSTANCE]). | map(object({…})) | | null | -| [organization](variables.tf#L75) | Apigee organization. If set to null the organization must already exist. | object({…}) | | null | +| [instances](variables.tf#L62) | Instances ([REGION] => [INSTANCE]). | map(object({…})) | | null | +| [organization](variables.tf#L76) | Apigee organization. If set to null the organization must already exist. | object({…}) | | null | ## Outputs @@ -194,9 +196,10 @@ module "apigee" { | [endpoint_attachment_hosts](outputs.tf#L17) | Endpoint hosts. | | | [envgroups](outputs.tf#L22) | Environment groups. | | | [environments](outputs.tf#L27) | Environment. | | -| [instances](outputs.tf#L32) | Instances. | | -| [org_id](outputs.tf#L37) | Organization ID. | | -| [org_name](outputs.tf#L42) | Organization name. | | -| [organization](outputs.tf#L47) | Organization. | | -| [service_attachments](outputs.tf#L52) | Service attachments. | | +| [instance_nat_ips](outputs.tf#L32) | NAT IP addresses used in instances. | | +| [instances](outputs.tf#L37) | Instances. | | +| [org_id](outputs.tf#L42) | Organization ID. | | +| [org_name](outputs.tf#L47) | Organization name. | | +| [organization](outputs.tf#L52) | Organization. | | +| [service_attachments](outputs.tf#L57) | Service attachments. | | diff --git a/modules/apigee/main.tf b/modules/apigee/main.tf index e68c5f90..74246056 100644 --- a/modules/apigee/main.tf +++ b/modules/apigee/main.tf @@ -100,6 +100,16 @@ resource "google_apigee_instance" "instances" { consumer_accept_list = each.value.consumer_accept_list } +resource "google_apigee_nat_address" "apigee_nat" { + for_each = { + for instance_name, instance_config in local.instances : + instance_name => instance_config.nat_required ? instance_config : null + } + + name = "nat-${each.key}" + instance_id = google_apigee_instance.instances[each.key].id +} + resource "google_apigee_instance_attachment" "instance_attachments" { for_each = merge(concat([for k1, v1 in local.environments : { for v2 in coalesce(v1.regions, []) : diff --git a/modules/apigee/outputs.tf b/modules/apigee/outputs.tf index 74ad9f18..473fbea8 100644 --- a/modules/apigee/outputs.tf +++ b/modules/apigee/outputs.tf @@ -29,6 +29,11 @@ output "environments" { value = try(google_apigee_environment.environments, null) } +output "instance_nat_ips" { + description = "NAT IP addresses used in instances." + value = try(google_apigee_nat_address.apigee_nat, null) +} + output "instances" { description = "Instances." value = try(google_apigee_instance.instances, null) @@ -52,4 +57,4 @@ output "organization" { output "service_attachments" { description = "Service attachments." value = { for k, v in google_apigee_instance.instances : k => v.service_attachment } -} +} \ No newline at end of file diff --git a/modules/apigee/variables.tf b/modules/apigee/variables.tf index 4c2f0308..cae48e99 100644 --- a/modules/apigee/variables.tf +++ b/modules/apigee/variables.tf @@ -68,6 +68,7 @@ variable "instances" { troubleshooting_ip_cidr_range = string disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) + nat_required = optional(bool, false) })) default = null } From 3fdf0dfe9999a65e145a2554b2a1d8ec282ed8c6 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Thu, 24 Aug 2023 18:15:15 +0200 Subject: [PATCH 2/8] Make apigee variables non-nullable --- modules/apigee/main.tf | 91 +++++++++++++++++-------------------- modules/apigee/outputs.tf | 4 +- modules/apigee/variables.tf | 14 ++++-- 3 files changed, 52 insertions(+), 57 deletions(-) diff --git a/modules/apigee/main.tf b/modules/apigee/main.tf index 74246056..202ac267 100644 --- a/modules/apigee/main.tf +++ b/modules/apigee/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2023 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,9 @@ */ 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) - envgroups = coalesce(var.envgroups, {}) - environments = coalesce(var.environments, {}) - instances = coalesce(var.instances, {}) - endpoint_attachments = coalesce(var.endpoint_attachments, {}) + 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) } resource "google_apigee_organization" "organization" { @@ -35,14 +32,14 @@ resource "google_apigee_organization" "organization" { } resource "google_apigee_envgroup" "envgroups" { - for_each = local.envgroups + for_each = var.envgroups name = each.key hostnames = each.value org_id = local.org_id } resource "google_apigee_environment" "environments" { - for_each = local.environments + for_each = var.environments name = each.key display_name = each.value.display_name description = each.value.description @@ -64,7 +61,7 @@ resource "google_apigee_environment" "environments" { } resource "google_apigee_envgroup_attachment" "envgroup_attachments" { - for_each = merge(concat([for k1, v1 in local.environments : { + for_each = merge(concat([for k1, v1 in var.environments : { for v2 in coalesce(v1.envgroups, []) : "${k1}-${v2}" => { environment = k1 envgroup = v2 @@ -75,7 +72,7 @@ resource "google_apigee_envgroup_attachment" "envgroup_attachments" { } resource "google_apigee_environment_iam_binding" "binding" { - for_each = merge(concat([for k1, v1 in local.environments : { + for_each = merge(concat([for k1, v1 in var.environments : { for k2, v2 in coalesce(v1.iam, {}) : "${k1}-${k2}" => { environment = "${k1}" role = k2 @@ -89,7 +86,7 @@ resource "google_apigee_environment_iam_binding" "binding" { } resource "google_apigee_instance" "instances" { - for_each = local.instances + for_each = var.instances name = "instance-${each.key}" display_name = each.value.display_name description = each.value.description @@ -101,17 +98,13 @@ resource "google_apigee_instance" "instances" { } resource "google_apigee_nat_address" "apigee_nat" { - for_each = { - for instance_name, instance_config in local.instances : - instance_name => instance_config.nat_required ? instance_config : null - } - - name = "nat-${each.key}" - instance_id = google_apigee_instance.instances[each.key].id + for_each = local.instance_ips + name = each.key + instance_id = each.value } resource "google_apigee_instance_attachment" "instance_attachments" { - for_each = merge(concat([for k1, v1 in local.environments : { + for_each = merge(concat([for k1, v1 in var.environments : { for v2 in coalesce(v1.regions, []) : "${k1}-${v2}" => { environment = k1 @@ -124,7 +117,7 @@ resource "google_apigee_instance_attachment" "instance_attachments" { } resource "google_apigee_endpoint_attachment" "endpoint_attachments" { - for_each = local.endpoint_attachments + for_each = var.endpoint_attachments org_id = local.org_id endpoint_attachment_id = each.key location = each.value.region @@ -132,39 +125,37 @@ resource "google_apigee_endpoint_attachment" "endpoint_attachments" { } resource "google_apigee_addons_config" "test_organization" { - org = local.org_name - dynamic "addons_config" { - for_each = var.addons_config == null ? [] : [""] - content { - dynamic "advanced_api_ops_config" { - for_each = var.addons_config.advanced_api_ops ? [] : [""] - content { - enabled = true - } + for_each = toset(var.addons_config == null ? [] : [""]) + org = local.org_name + addons_config { + dynamic "advanced_api_ops_config" { + for_each = var.addons_config.advanced_api_ops ? [] : [""] + content { + enabled = true } - dynamic "api_security_config" { - for_each = var.addons_config.api_security ? [] : [""] - content { - enabled = true - } + } + dynamic "api_security_config" { + for_each = var.addons_config.api_security ? [] : [""] + content { + enabled = true } - dynamic "connectors_platform_config" { - for_each = var.addons_config.connectors_platform ? [] : [""] - content { - enabled = true - } + } + dynamic "connectors_platform_config" { + for_each = var.addons_config.connectors_platform ? [] : [""] + content { + enabled = true } - dynamic "integration_config" { - for_each = var.addons_config.integration ? [] : [""] - content { - enabled = true - } + } + dynamic "integration_config" { + for_each = var.addons_config.integration ? [] : [""] + content { + enabled = true } - dynamic "monetization_config" { - for_each = var.addons_config.monetization ? [] : [""] - content { - enabled = true - } + } + dynamic "monetization_config" { + for_each = var.addons_config.monetization ? [] : [""] + content { + enabled = true } } } diff --git a/modules/apigee/outputs.tf b/modules/apigee/outputs.tf index 473fbea8..62e843ac 100644 --- a/modules/apigee/outputs.tf +++ b/modules/apigee/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2023 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,4 +57,4 @@ output "organization" { output "service_attachments" { description = "Service attachments." value = { for k, v in google_apigee_instance.instances : k => v.service_attachment } -} \ No newline at end of file +} diff --git a/modules/apigee/variables.tf b/modules/apigee/variables.tf index cae48e99..9f356dea 100644 --- a/modules/apigee/variables.tf +++ b/modules/apigee/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2023 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,13 +32,15 @@ variable "endpoint_attachments" { region = string service_attachment = string })) - default = null + default = {} + nullable = false } variable "envgroups" { description = "Environment groups (NAME => [HOSTNAMES])." type = map(list(string)) - default = null + default = {} + nullable = false } variable "environments" { @@ -56,7 +58,8 @@ variable "environments" { envgroups = optional(list(string)) regions = optional(list(string)) })) - default = null + default = {} + nullable = false } variable "instances" { @@ -70,7 +73,8 @@ variable "instances" { consumer_accept_list = optional(list(string)) nat_required = optional(bool, false) })) - default = null + default = {} + nullable = false } variable "organization" { From bff5e464600e4e14de2f0693b4fdbf669dbfb9fd Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Thu, 24 Aug 2023 18:19:59 +0200 Subject: [PATCH 3/8] Fix apigee instance nat --- modules/apigee/README.md | 14 +++++++------- modules/apigee/main.tf | 6 ++++-- modules/apigee/outputs.tf | 2 +- modules/apigee/variables.tf | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/modules/apigee/README.md b/modules/apigee/README.md index 319f6bb8..9d3c32e4 100644 --- a/modules/apigee/README.md +++ b/modules/apigee/README.md @@ -181,13 +181,13 @@ module "apigee" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [project_id](variables.tf#L91) | Project ID. | string | ✓ | | +| [project_id](variables.tf#L95) | Project ID. | string | ✓ | | | [addons_config](variables.tf#L17) | Addons configuration. | object({…}) | | null | -| [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | map(object({…})) | | null | -| [envgroups](variables.tf#L38) | Environment groups (NAME => [HOSTNAMES]). | map(list(string)) | | null | -| [environments](variables.tf#L44) | Environments. | map(object({…})) | | null | -| [instances](variables.tf#L62) | Instances ([REGION] => [INSTANCE]). | map(object({…})) | | null | -| [organization](variables.tf#L76) | Apigee organization. If set to null the organization must already exist. | object({…}) | | null | +| [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | map(object({…})) | | {} | +| [envgroups](variables.tf#L39) | Environment groups (NAME => [HOSTNAMES]). | map(list(string)) | | {} | +| [environments](variables.tf#L46) | Environments. | map(object({…})) | | {} | +| [instances](variables.tf#L65) | Instances ([REGION] => [INSTANCE]). | map(object({…})) | | {} | +| [organization](variables.tf#L80) | Apigee organization. If set to null the organization must already exist. | object({…}) | | null | ## 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. | | diff --git a/modules/apigee/main.tf b/modules/apigee/main.tf index 202ac267..2e5db90c 100644 --- a/modules/apigee/main.tf +++ b/modules/apigee/main.tf @@ -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 } diff --git a/modules/apigee/outputs.tf b/modules/apigee/outputs.tf index 62e843ac..be30ef22 100644 --- a/modules/apigee/outputs.tf +++ b/modules/apigee/outputs.tf @@ -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) } diff --git a/modules/apigee/variables.tf b/modules/apigee/variables.tf index 9f356dea..3fa5f4e2 100644 --- a/modules/apigee/variables.tf +++ b/modules/apigee/variables.tf @@ -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 From add1ac2dccc6cc2a4de90ee1d3cf46292eb6be24 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Thu, 24 Aug 2023 19:32:31 +0200 Subject: [PATCH 4/8] Update README --- modules/apigee/README.md | 15 +++++++-------- modules/apigee/outputs.tf | 5 ++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/apigee/README.md b/modules/apigee/README.md index 9d3c32e4..d6f1bfdf 100644 --- a/modules/apigee/README.md +++ b/modules/apigee/README.md @@ -42,14 +42,13 @@ module "apigee" { } instances = { europe-west1 = { - nat_required = true runtime_ip_cidr_range = "10.0.4.0/22" troubleshooting_ip_cidr_range = "10.1.1.0.0/28" } europe-west3 = { - nat_required = false runtime_ip_cidr_range = "10.0.8.0/22" troubleshooting_ip_cidr_range = "10.1.16.0/28" + enable_nat = true } } endpoint_attachments = { @@ -63,7 +62,7 @@ module "apigee" { } } } -# tftest modules=1 resources=15 +# tftest modules=1 resources=16 ``` ### All resources (HYBRID control plane) @@ -196,10 +195,10 @@ module "apigee" { | [endpoint_attachment_hosts](outputs.tf#L17) | Endpoint hosts. | | | [envgroups](outputs.tf#L22) | Environment groups. | | | [environments](outputs.tf#L27) | Environment. | | -| [instances](outputs.tf#L37) | Instances. | | +| [instances](outputs.tf#L40) | 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. | | -| [service_attachments](outputs.tf#L57) | Service attachments. | | +| [org_id](outputs.tf#L45) | Organization ID. | | +| [org_name](outputs.tf#L50) | Organization name. | | +| [organization](outputs.tf#L55) | Organization. | | +| [service_attachments](outputs.tf#L60) | Service attachments. | | diff --git a/modules/apigee/outputs.tf b/modules/apigee/outputs.tf index be30ef22..90858fa9 100644 --- a/modules/apigee/outputs.tf +++ b/modules/apigee/outputs.tf @@ -31,7 +31,10 @@ output "environments" { output "nat_ips" { description = "NAT IP addresses used in instances." - value = try(google_apigee_nat_address.apigee_nat, null) + value = { + for k, v in google_apigee_nat_address.apigee_nat : + k => v.ip_address + } } output "instances" { From 67c2597bcc89cafa40207d8d3050923d5e34edda Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Thu, 24 Aug 2023 19:38:44 +0200 Subject: [PATCH 5/8] Fix output order --- modules/apigee/README.md | 4 ++-- modules/apigee/outputs.tf | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/apigee/README.md b/modules/apigee/README.md index d6f1bfdf..3123bfb6 100644 --- a/modules/apigee/README.md +++ b/modules/apigee/README.md @@ -195,8 +195,8 @@ module "apigee" { | [endpoint_attachment_hosts](outputs.tf#L17) | Endpoint hosts. | | | [envgroups](outputs.tf#L22) | Environment groups. | | | [environments](outputs.tf#L27) | Environment. | | -| [instances](outputs.tf#L40) | Instances. | | -| [nat_ips](outputs.tf#L32) | NAT IP addresses used in instances. | | +| [instances](outputs.tf#L32) | Instances. | | +| [nat_ips](outputs.tf#L37) | NAT IP addresses used in instances. | | | [org_id](outputs.tf#L45) | Organization ID. | | | [org_name](outputs.tf#L50) | Organization name. | | | [organization](outputs.tf#L55) | Organization. | | diff --git a/modules/apigee/outputs.tf b/modules/apigee/outputs.tf index 90858fa9..eb3ab2cc 100644 --- a/modules/apigee/outputs.tf +++ b/modules/apigee/outputs.tf @@ -29,6 +29,11 @@ output "environments" { value = try(google_apigee_environment.environments, null) } +output "instances" { + description = "Instances." + value = try(google_apigee_instance.instances, null) +} + output "nat_ips" { description = "NAT IP addresses used in instances." value = { @@ -37,11 +42,6 @@ output "nat_ips" { } } -output "instances" { - description = "Instances." - value = try(google_apigee_instance.instances, null) -} - output "org_id" { description = "Organization ID." value = local.org_id From d50355b01ae21e8445809b27dc1738ef948ee9ad Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Thu, 24 Aug 2023 19:42:20 +0200 Subject: [PATCH 6/8] Only create nat IP when requested --- modules/apigee/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/apigee/main.tf b/modules/apigee/main.tf index 2e5db90c..4a2e3d25 100644 --- a/modules/apigee/main.tf +++ b/modules/apigee/main.tf @@ -100,6 +100,7 @@ resource "google_apigee_nat_address" "apigee_nat" { for_each = { for k, v in var.instances : k => google_apigee_instance.instances[k].id + if v.enable_nat } name = each.key instance_id = each.value From 9188603365f72903d01fc03b617310b164e574a8 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Thu, 24 Aug 2023 19:46:39 +0200 Subject: [PATCH 7/8] Update key name --- modules/apigee/README.md | 4 ++-- modules/apigee/variables.tf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/apigee/README.md b/modules/apigee/README.md index 3123bfb6..2165526f 100644 --- a/modules/apigee/README.md +++ b/modules/apigee/README.md @@ -62,7 +62,7 @@ module "apigee" { } } } -# tftest modules=1 resources=16 +# tftest modules=1 resources=15 ``` ### All resources (HYBRID control plane) @@ -185,7 +185,7 @@ module "apigee" { | [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | map(object({…})) | | {} | | [envgroups](variables.tf#L39) | Environment groups (NAME => [HOSTNAMES]). | map(list(string)) | | {} | | [environments](variables.tf#L46) | Environments. | map(object({…})) | | {} | -| [instances](variables.tf#L65) | Instances ([REGION] => [INSTANCE]). | map(object({…})) | | {} | +| [instances](variables.tf#L65) | Instances ([REGION] => [INSTANCE]). | map(object({…})) | | {} | | [organization](variables.tf#L80) | Apigee organization. If set to null the organization must already exist. | object({…}) | | null | ## Outputs diff --git a/modules/apigee/variables.tf b/modules/apigee/variables.tf index 3fa5f4e2..c5832e33 100644 --- a/modules/apigee/variables.tf +++ b/modules/apigee/variables.tf @@ -71,7 +71,7 @@ variable "instances" { troubleshooting_ip_cidr_range = string disk_encryption_key = optional(string) consumer_accept_list = optional(list(string)) - nat_ips = optional(number, 0) + enable_nat = optional(bool, false) })) default = {} nullable = false From 44c1cec0415493ce91caec33e383aa77248b6b29 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Thu, 24 Aug 2023 20:09:23 +0200 Subject: [PATCH 8/8] Fix tests --- blueprints/apigee/bigquery-analytics/README.md | 2 +- blueprints/apigee/hybrid-gke/README.md | 2 +- .../nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md | 2 +- modules/apigee/README.md | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/blueprints/apigee/bigquery-analytics/README.md b/blueprints/apigee/bigquery-analytics/README.md index d674a841..5261f72e 100644 --- a/blueprints/apigee/bigquery-analytics/README.md +++ b/blueprints/apigee/bigquery-analytics/README.md @@ -105,5 +105,5 @@ module "test" { europe-west1 = "10.0.0.0/28" } } -# tftest modules=10 resources=65 +# tftest modules=10 resources=64 ``` diff --git a/blueprints/apigee/hybrid-gke/README.md b/blueprints/apigee/hybrid-gke/README.md index e2151d47..5d79f1f8 100644 --- a/blueprints/apigee/hybrid-gke/README.md +++ b/blueprints/apigee/hybrid-gke/README.md @@ -80,5 +80,5 @@ module "test" { project_id = "my-project" hostname = "test.myorg.org" } -# tftest modules=18 resources=62 +# tftest modules=18 resources=61 ``` diff --git a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md index 8abca3c3..51534dda 100644 --- a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md +++ b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/README.md @@ -79,5 +79,5 @@ module "test" { onprem_project_id = "my-onprem-project" hostname = "test.myorg.org" } -# tftest modules=14 resources=78 +# tftest modules=14 resources=77 ``` diff --git a/modules/apigee/README.md b/modules/apigee/README.md index 2165526f..5a8eb525 100644 --- a/modules/apigee/README.md +++ b/modules/apigee/README.md @@ -97,7 +97,7 @@ module "apigee" { } } } -# tftest modules=1 resources=9 +# tftest modules=1 resources=8 ``` ### New environment group @@ -110,7 +110,7 @@ module "apigee" { test = ["test.example.com"] } } -# tftest modules=1 resources=2 +# tftest modules=1 resources=1 ``` ### New environment @@ -126,7 +126,7 @@ module "apigee" { } } } -# tftest modules=1 resources=2 +# tftest modules=1 resources=1 ``` ### New instance @@ -142,7 +142,7 @@ module "apigee" { } } } -# tftest modules=1 resources=2 +# tftest modules=1 resources=1 ``` ### New endpoint attachment @@ -160,7 +160,7 @@ module "apigee" { } } } -# tftest modules=1 resources=2 +# tftest modules=1 resources=1 ``` ### Apigee add-ons