Revert "Remove unused ASN numbers from CloudNAT to avoid provider errors" (#1626 )

This reverts commit 311bed8e83.
Cloud SQL activation policy selectable (#1613 )
2023-08-28 09:33:52 +02:00 · 2023-08-25 12:12:08 +02:00 · 2023-08-25 08:43:20 +02:00 · 2023-08-25 08:54:35 +09:00 · 2023-08-24 20:25:54 +02:00 · 2023-08-24 20:09:23 +02:00
23 changed files with 144 additions and 115 deletions
--- 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
 ```
--- 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
 ```
--- 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
 ```
--- a/fast/stages/0-bootstrap/organization.tf
+++ b/fast/stages/0-bootstrap/organization.tf
@ -88,9 +88,8 @@ module "organization" {
  )
  # delegated role grant for resource manager service account
  iam_bindings = {
-    sa_resman_delegated_iam = {
+    (module.organization.custom_role_id[var.custom_role_names.organization_iam_admin]) = {
      members = [module.automation-tf-resman-sa.iam_email]
-      role    = module.organization.custom_role_id[var.custom_role_names.organization_iam_admin]
      condition = {
        expression = format(
          "api.getAttribute('iam.googleapis.com/modifiedGrantsByRole', []).hasOnly([%s])",
--- a/fast/stages/2-networking-a-peering/landing.tf
+++ b/fast/stages/2-networking-a-peering/landing.tf
@ -84,4 +84,5 @@ module "landing-nat-primary" {
  router_create  = true
  router_name    = "prod-nat-${local.region_shortnames[var.regions.primary]}"
  router_network = module.landing-vpc.name
+  router_asn     = 4200001024
 }
--- a/fast/stages/2-networking-a-peering/spoke-dev.tf
+++ b/fast/stages/2-networking-a-peering/spoke-dev.tf
@ -80,6 +80,7 @@ module "dev-spoke-cloudnat" {
  name           = "dev-nat-${local.region_shortnames[each.value]}"
  router_create  = true
  router_network = module.dev-spoke-vpc.name
+  router_asn     = 4200001024
  logging_filter = "ERRORS_ONLY"
 }

--- a/fast/stages/2-networking-a-peering/spoke-prod.tf
+++ b/fast/stages/2-networking-a-peering/spoke-prod.tf
@ -79,6 +79,7 @@ module "prod-spoke-cloudnat" {
  name           = "prod-nat-${local.region_shortnames[each.value]}"
  router_create  = true
  router_network = module.prod-spoke-vpc.name
+  router_asn     = 4200001024
  logging_filter = "ERRORS_ONLY"
 }

--- a/fast/stages/2-networking-b-vpn/landing.tf
+++ b/fast/stages/2-networking-b-vpn/landing.tf
@ -84,4 +84,5 @@ module "landing-nat-primary" {
  router_create  = true
  router_name    = "prod-nat-${local.region_shortnames[var.regions.primary]}"
  router_network = module.landing-vpc.name
+  router_asn     = 4200001024
 }
--- a/fast/stages/2-networking-b-vpn/spoke-dev.tf
+++ b/fast/stages/2-networking-b-vpn/spoke-dev.tf
@ -80,6 +80,7 @@ module "dev-spoke-cloudnat" {
  name           = "dev-nat-${local.region_shortnames[each.value]}"
  router_create  = true
  router_network = module.dev-spoke-vpc.name
+  router_asn     = 4200001024
  logging_filter = "ERRORS_ONLY"
 }

--- a/fast/stages/2-networking-b-vpn/spoke-prod.tf
+++ b/fast/stages/2-networking-b-vpn/spoke-prod.tf
@ -79,6 +79,7 @@ module "prod-spoke-cloudnat" {
  name           = "prod-nat-${local.region_shortnames[each.value]}"
  router_create  = true
  router_network = module.prod-spoke-vpc.name
+  router_asn     = 4200001024
  logging_filter = "ERRORS_ONLY"
 }

--- a/fast/stages/2-networking-c-nva/landing.tf
+++ b/fast/stages/2-networking-c-nva/landing.tf
@ -85,6 +85,7 @@ module "landing-nat-primary" {
  router_create  = true
  router_name    = "prod-nat-${local.region_shortnames[var.regions.primary]}"
  router_network = module.landing-untrusted-vpc.name
+  router_asn     = 4200001024
 }

 moved {
@ -100,6 +101,7 @@ module "landing-nat-secondary" {
  router_create  = true
  router_name    = "prod-nat-${local.region_shortnames[var.regions.secondary]}"
  router_network = module.landing-untrusted-vpc.name
+  router_asn     = 4200001024
 }

 # Trusted VPC
--- a/fast/stages/2-networking-d-separate-envs/spoke-dev.tf
+++ b/fast/stages/2-networking-d-separate-envs/spoke-dev.tf
@ -80,6 +80,7 @@ module "dev-spoke-cloudnat" {
  name           = "dev-nat-${local.region_shortnames[each.value]}"
  router_create  = true
  router_network = module.dev-spoke-vpc.name
+  router_asn     = 4200001024
  logging_filter = "ERRORS_ONLY"
 }

--- a/fast/stages/2-networking-d-separate-envs/spoke-prod.tf
+++ b/fast/stages/2-networking-d-separate-envs/spoke-prod.tf
@ -79,6 +79,7 @@ module "prod-spoke-cloudnat" {
  name           = "prod-nat-${local.region_shortnames[each.value]}"
  router_create  = true
  router_network = module.prod-spoke-vpc.name
+  router_asn     = 4200001024
  logging_filter = "ERRORS_ONLY"
 }

--- a/fast/stages/2-networking-e-nva-bgp/landing.tf
+++ b/fast/stages/2-networking-e-nva-bgp/landing.tf
@ -86,6 +86,7 @@ module "landing-nat-primary" {
  router_create  = true
  router_name    = "prod-nat-${local.region_shortnames[var.regions.primary]}"
  router_network = module.landing-untrusted-vpc.name
+  router_asn     = 4200001024
 }

 moved {
@ -101,6 +102,7 @@ module "landing-nat-secondary" {
  router_create  = true
  router_name    = "prod-nat-${local.region_shortnames[var.regions.secondary]}"
  router_network = module.landing-untrusted-vpc.name
+  router_asn     = 4200001024
 }

 # Trusted VPC
--- a/modules/apigee/README.md
+++ b/modules/apigee/README.md
@ -48,6 +48,7 @@ module "apigee" {
    europe-west3 = {
      runtime_ip_cidr_range         = "10.0.8.0/22"
      troubleshooting_ip_cidr_range = "10.1.16.0/28"
+      enable_nat                    = true
    }
  }
  endpoint_attachments = {
@ -96,7 +97,7 @@ module "apigee" {
    }
  }
 }
-# tftest modules=1 resources=9
+# tftest modules=1 resources=8
 ```

 ### New environment group
@ -109,7 +110,7 @@ module "apigee" {
    test = ["test.example.com"]
  }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=1
 ```

 ### New environment
@ -125,7 +126,7 @@ module "apigee" {
    }
  }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=1
 ```

 ### New instance
@ -141,7 +142,7 @@ module "apigee" {
    }
  }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=1
 ```

 ### New endpoint attachment
@ -159,7 +160,7 @@ module "apigee" {
    }
  }
 }
-# tftest modules=1 resources=2
+# tftest modules=1 resources=1
 ```

 ### Apigee add-ons
@ -179,13 +180,13 @@ module "apigee" {

 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [project_id](variables.tf#L90) | 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&#40;&#123;&#10;  advanced_api_ops    &#61; optional&#40;bool, false&#41;&#10;  api_security        &#61; optional&#40;bool, false&#41;&#10;  connectors_platform &#61; optional&#40;bool, false&#41;&#10;  integration         &#61; optional&#40;bool, false&#41;&#10;  monetization        &#61; optional&#40;bool, false&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
-| [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | <code title="map&#40;object&#40;&#123;&#10;  region             &#61; string&#10;  service_attachment &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>null</code> |
-| [envgroups](variables.tf#L38) | Environment groups (NAME => [HOSTNAMES]). | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>null</code> |
-| [environments](variables.tf#L44) | Environments. | <code title="map&#40;object&#40;&#123;&#10;  display_name    &#61; optional&#40;string&#41;&#10;  description     &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  deployment_type &#61; optional&#40;string&#41;&#10;  api_proxy_type  &#61; optional&#40;string&#41;&#10;  node_config &#61; optional&#40;object&#40;&#123;&#10;    min_node_count &#61; optional&#40;number&#41;&#10;    max_node_count &#61; optional&#40;number&#41;&#10;  &#125;&#41;&#41;&#10;  iam       &#61; optional&#40;map&#40;list&#40;string&#41;&#41;&#41;&#10;  envgroups &#61; optional&#40;list&#40;string&#41;&#41;&#10;  regions   &#61; optional&#40;list&#40;string&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>null</code> |
-| [instances](variables.tf#L62) | Instances ([REGION] => [INSTANCE]). | <code title="map&#40;object&#40;&#123;&#10;  display_name                  &#61; optional&#40;string&#41;&#10;  description                   &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  runtime_ip_cidr_range         &#61; string&#10;  troubleshooting_ip_cidr_range &#61; string&#10;  disk_encryption_key           &#61; optional&#40;string&#41;&#10;  consumer_accept_list          &#61; optional&#40;list&#40;string&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>null</code> |
-| [organization](variables.tf#L75) | Apigee organization. If set to null the organization must already exist. | <code title="object&#40;&#123;&#10;  display_name            &#61; optional&#40;string&#41;&#10;  description             &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  authorized_network      &#61; optional&#40;string&#41;&#10;  runtime_type            &#61; optional&#40;string, &#34;CLOUD&#34;&#41;&#10;  billing_type            &#61; optional&#40;string&#41;&#10;  database_encryption_key &#61; optional&#40;string&#41;&#10;  analytics_region        &#61; optional&#40;string, &#34;europe-west1&#34;&#41;&#10;  retention               &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [endpoint_attachments](variables.tf#L29) | Endpoint attachments. | <code title="map&#40;object&#40;&#123;&#10;  region             &#61; string&#10;  service_attachment &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [envgroups](variables.tf#L39) | Environment groups (NAME => [HOSTNAMES]). | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [environments](variables.tf#L46) | Environments. | <code title="map&#40;object&#40;&#123;&#10;  display_name    &#61; optional&#40;string&#41;&#10;  description     &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  deployment_type &#61; optional&#40;string&#41;&#10;  api_proxy_type  &#61; optional&#40;string&#41;&#10;  node_config &#61; optional&#40;object&#40;&#123;&#10;    min_node_count &#61; optional&#40;number&#41;&#10;    max_node_count &#61; optional&#40;number&#41;&#10;  &#125;&#41;&#41;&#10;  iam       &#61; optional&#40;map&#40;list&#40;string&#41;&#41;&#41;&#10;  envgroups &#61; optional&#40;list&#40;string&#41;&#41;&#10;  regions   &#61; optional&#40;list&#40;string&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [instances](variables.tf#L65) | Instances ([REGION] => [INSTANCE]). | <code title="map&#40;object&#40;&#123;&#10;  display_name                  &#61; optional&#40;string&#41;&#10;  description                   &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  runtime_ip_cidr_range         &#61; string&#10;  troubleshooting_ip_cidr_range &#61; string&#10;  disk_encryption_key           &#61; optional&#40;string&#41;&#10;  consumer_accept_list          &#61; optional&#40;list&#40;string&#41;&#41;&#10;  enable_nat                    &#61; optional&#40;bool, false&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [organization](variables.tf#L80) | Apigee organization. If set to null the organization must already exist. | <code title="object&#40;&#123;&#10;  display_name            &#61; optional&#40;string&#41;&#10;  description             &#61; optional&#40;string, &#34;Terraform-managed&#34;&#41;&#10;  authorized_network      &#61; optional&#40;string&#41;&#10;  runtime_type            &#61; optional&#40;string, &#34;CLOUD&#34;&#41;&#10;  billing_type            &#61; optional&#40;string&#41;&#10;  database_encryption_key &#61; optional&#40;string&#41;&#10;  analytics_region        &#61; optional&#40;string, &#34;europe-west1&#34;&#41;&#10;  retention               &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |

 ## Outputs

@ -195,8 +196,9 @@ module "apigee" {
 | [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. |  |
+| [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. |  |
+| [service_attachments](outputs.tf#L60) | Service attachments. |  |
 <!-- END TFDOC -->
--- 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,8 @@
 */

 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, {})
+  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 +31,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 +60,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 +71,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 +85,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
@ -100,8 +96,18 @@ resource "google_apigee_instance" "instances" {
  consumer_accept_list     = each.value.consumer_accept_list
 }

+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
+}
+
 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
@ -114,7 +120,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
@ -122,39 +128,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
      }
    }
  }
--- 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.
@ -34,6 +34,14 @@ output "instances" {
  value       = try(google_apigee_instance.instances, null)
 }

+output "nat_ips" {
+  description = "NAT IP addresses used in instances."
+  value = {
+    for k, v in google_apigee_nat_address.apigee_nat :
+    k => v.ip_address
+  }
+}
+
 output "org_id" {
  description = "Organization ID."
  value       = local.org_id
--- 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" {
@ -68,8 +71,10 @@ variable "instances" {
    troubleshooting_ip_cidr_range = string
    disk_encryption_key           = optional(string)
    consumer_accept_list          = optional(list(string))
+    enable_nat                    = optional(bool, false)
  }))
-  default = null
+  default  = {}
+  nullable = false
 }

 variable "organization" {
--- a/modules/cloudsql-instance/README.md
+++ b/modules/cloudsql-instance/README.md
@ -183,36 +183,36 @@ module "db" {
 # tftest modules=1 resources=1 inventory=insights.yaml
 ```
 <!-- BEGIN TFDOC -->
-
 ## Variables

 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [database_version](variables.tf#L61) | Database type and version to create. | <code>string</code> | ✓ |  |
-| [name](variables.tf#L125) | Name of primary instance. | <code>string</code> | ✓ |  |
-| [network](variables.tf#L130) | VPC self link where the instances will be deployed. Private Service Networking must be enabled and configured in this VPC. | <code>string</code> | ✓ |  |
-| [project_id](variables.tf#L151) | The ID of the project where this instances will be created. | <code>string</code> | ✓ |  |
-| [region](variables.tf#L156) | Region of the primary instance. | <code>string</code> | ✓ |  |
-| [tier](variables.tf#L182) | The machine type to use for the instances. | <code>string</code> | ✓ |  |
-| [allocated_ip_ranges](variables.tf#L17) | (Optional)The name of the allocated ip range for the private ip CloudSQL instance. For example: \"google-managed-services-default\". If set, the instance ip will be created in the allocated range. The range name must comply with RFC 1035. Specifically, the name must be 1-63 characters long and match the regular expression a-z?. | <code title="object&#40;&#123;&#10;  primary &#61; optional&#40;string&#41;&#10;  replica &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [authorized_networks](variables.tf#L26) | Map of NAME=>CIDR_RANGE to allow to connect to the database(s). | <code>map&#40;string&#41;</code> |  | <code>null</code> |
-| [availability_type](variables.tf#L32) | Availability type for the primary replica. Either `ZONAL` or `REGIONAL`. | <code>string</code> |  | <code>&#34;ZONAL&#34;</code> |
-| [backup_configuration](variables.tf#L38) | Backup settings for primary instance. Will be automatically enabled if using MySQL with one or more replicas. | <code title="object&#40;&#123;&#10;  enabled                        &#61; optional&#40;bool, false&#41;&#10;  binary_log_enabled             &#61; optional&#40;bool, false&#41;&#10;  start_time                     &#61; optional&#40;string, &#34;23:00&#34;&#41;&#10;  location                       &#61; optional&#40;string&#41;&#10;  log_retention_days             &#61; optional&#40;number, 7&#41;&#10;  point_in_time_recovery_enabled &#61; optional&#40;bool&#41;&#10;  retention_count                &#61; optional&#40;number, 7&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code title="&#123;&#10;  enabled                        &#61; false&#10;  binary_log_enabled             &#61; false&#10;  start_time                     &#61; &#34;23:00&#34;&#10;  location                       &#61; null&#10;  log_retention_days             &#61; 7&#10;  point_in_time_recovery_enabled &#61; null&#10;  retention_count                &#61; 7&#10;&#125;">&#123;&#8230;&#125;</code> |
-| [databases](variables.tf#L66) | Databases to create once the primary instance is created. | <code>list&#40;string&#41;</code> |  | <code>null</code> |
-| [deletion_protection](variables.tf#L72) | Allow terraform to delete instances. | <code>bool</code> |  | <code>false</code> |
-| [disk_size](variables.tf#L78) | Disk size in GB. Set to null to enable autoresize. | <code>number</code> |  | <code>null</code> |
-| [disk_type](variables.tf#L84) | The type of data disk: `PD_SSD` or `PD_HDD`. | <code>string</code> |  | <code>&#34;PD_SSD&#34;</code> |
-| [encryption_key_name](variables.tf#L90) | The full path to the encryption key used for the CMEK disk encryption of the primary instance. | <code>string</code> |  | <code>null</code> |
-| [flags](variables.tf#L96) | Map FLAG_NAME=>VALUE for database-specific tuning. | <code>map&#40;string&#41;</code> |  | <code>null</code> |
-| [insights_config](variables.tf#L102) | Query Insights configuration. Defaults to null which disables Query Insights. | <code title="object&#40;&#123;&#10;  query_string_length     &#61; optional&#40;number, 1024&#41;&#10;  record_application_tags &#61; optional&#40;bool, false&#41;&#10;  record_client_address   &#61; optional&#40;bool, false&#41;&#10;  query_plans_per_minute  &#61; optional&#40;number, 5&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
-| [ipv4_enabled](variables.tf#L113) | Add a public IP address to database instance. | <code>bool</code> |  | <code>false</code> |
-| [labels](variables.tf#L119) | Labels to be attached to all instances. | <code>map&#40;string&#41;</code> |  | <code>null</code> |
-| [postgres_client_certificates](variables.tf#L135) | Map of cert keys connect to the application(s) using public IP. | <code>list&#40;string&#41;</code> |  | <code>null</code> |
-| [prefix](variables.tf#L141) | Optional prefix used to generate instance names. | <code>string</code> |  | <code>null</code> |
-| [replicas](variables.tf#L161) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | <code title="map&#40;object&#40;&#123;&#10;  region              &#61; string&#10;  encryption_key_name &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [require_ssl](variables.tf#L170) | Enable SSL connections only. | <code>bool</code> |  | <code>null</code> |
-| [root_password](variables.tf#L176) | Root password of the Cloud SQL instance. Required for MS SQL Server. | <code>string</code> |  | <code>null</code> |
-| [users](variables.tf#L187) | Map of users to create in the primary instance (and replicated to other replicas) in the format USER=>PASSWORD. For MySQL, anything afterr the first `@` (if persent) will be used as the user's host. Set PASSWORD to null if you want to get an autogenerated password. | <code>map&#40;string&#41;</code> |  | <code>null</code> |
+| [database_version](variables.tf#L71) | Database type and version to create. | <code>string</code> | ✓ |  |
+| [name](variables.tf#L135) | Name of primary instance. | <code>string</code> | ✓ |  |
+| [network](variables.tf#L140) | VPC self link where the instances will be deployed. Private Service Networking must be enabled and configured in this VPC. | <code>string</code> | ✓ |  |
+| [project_id](variables.tf#L161) | The ID of the project where this instances will be created. | <code>string</code> | ✓ |  |
+| [region](variables.tf#L166) | Region of the primary instance. | <code>string</code> | ✓ |  |
+| [tier](variables.tf#L192) | The machine type to use for the instances. | <code>string</code> | ✓ |  |
+| [activation_policy](variables.tf#L16) | This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS. | <code>string</code> |  | <code>&#34;ALWAYS&#34;</code> |
+| [allocated_ip_ranges](variables.tf#L27) | (Optional)The name of the allocated ip range for the private ip CloudSQL instance. For example: \"google-managed-services-default\". If set, the instance ip will be created in the allocated range. The range name must comply with RFC 1035. Specifically, the name must be 1-63 characters long and match the regular expression a-z?. | <code title="object&#40;&#123;&#10;  primary &#61; optional&#40;string&#41;&#10;  replica &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [authorized_networks](variables.tf#L36) | Map of NAME=>CIDR_RANGE to allow to connect to the database(s). | <code>map&#40;string&#41;</code> |  | <code>null</code> |
+| [availability_type](variables.tf#L42) | Availability type for the primary replica. Either `ZONAL` or `REGIONAL`. | <code>string</code> |  | <code>&#34;ZONAL&#34;</code> |
+| [backup_configuration](variables.tf#L48) | Backup settings for primary instance. Will be automatically enabled if using MySQL with one or more replicas. | <code title="object&#40;&#123;&#10;  enabled                        &#61; optional&#40;bool, false&#41;&#10;  binary_log_enabled             &#61; optional&#40;bool, false&#41;&#10;  start_time                     &#61; optional&#40;string, &#34;23:00&#34;&#41;&#10;  location                       &#61; optional&#40;string&#41;&#10;  log_retention_days             &#61; optional&#40;number, 7&#41;&#10;  point_in_time_recovery_enabled &#61; optional&#40;bool&#41;&#10;  retention_count                &#61; optional&#40;number, 7&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code title="&#123;&#10;  enabled                        &#61; false&#10;  binary_log_enabled             &#61; false&#10;  start_time                     &#61; &#34;23:00&#34;&#10;  location                       &#61; null&#10;  log_retention_days             &#61; 7&#10;  point_in_time_recovery_enabled &#61; null&#10;  retention_count                &#61; 7&#10;&#125;">&#123;&#8230;&#125;</code> |
+| [databases](variables.tf#L76) | Databases to create once the primary instance is created. | <code>list&#40;string&#41;</code> |  | <code>null</code> |
+| [deletion_protection](variables.tf#L82) | Allow terraform to delete instances. | <code>bool</code> |  | <code>false</code> |
+| [disk_size](variables.tf#L88) | Disk size in GB. Set to null to enable autoresize. | <code>number</code> |  | <code>null</code> |
+| [disk_type](variables.tf#L94) | The type of data disk: `PD_SSD` or `PD_HDD`. | <code>string</code> |  | <code>&#34;PD_SSD&#34;</code> |
+| [encryption_key_name](variables.tf#L100) | The full path to the encryption key used for the CMEK disk encryption of the primary instance. | <code>string</code> |  | <code>null</code> |
+| [flags](variables.tf#L106) | Map FLAG_NAME=>VALUE for database-specific tuning. | <code>map&#40;string&#41;</code> |  | <code>null</code> |
+| [insights_config](variables.tf#L112) | Query Insights configuration. Defaults to null which disables Query Insights. | <code title="object&#40;&#123;&#10;  query_string_length     &#61; optional&#40;number, 1024&#41;&#10;  record_application_tags &#61; optional&#40;bool, false&#41;&#10;  record_client_address   &#61; optional&#40;bool, false&#41;&#10;  query_plans_per_minute  &#61; optional&#40;number, 5&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [ipv4_enabled](variables.tf#L123) | Add a public IP address to database instance. | <code>bool</code> |  | <code>false</code> |
+| [labels](variables.tf#L129) | Labels to be attached to all instances. | <code>map&#40;string&#41;</code> |  | <code>null</code> |
+| [postgres_client_certificates](variables.tf#L145) | Map of cert keys connect to the application(s) using public IP. | <code>list&#40;string&#41;</code> |  | <code>null</code> |
+| [prefix](variables.tf#L151) | Optional prefix used to generate instance names. | <code>string</code> |  | <code>null</code> |
+| [replicas](variables.tf#L171) | Map of NAME=> {REGION, KMS_KEY} for additional read replicas. Set to null to disable replica creation. | <code title="map&#40;object&#40;&#123;&#10;  region              &#61; string&#10;  encryption_key_name &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [require_ssl](variables.tf#L180) | Enable SSL connections only. | <code>bool</code> |  | <code>null</code> |
+| [root_password](variables.tf#L186) | Root password of the Cloud SQL instance. Required for MS SQL Server. | <code>string</code> |  | <code>null</code> |
+| [users](variables.tf#L197) | Map of users to create in the primary instance (and replicated to other replicas) in the format USER=>PASSWORD. For MySQL, anything afterr the first `@` (if persent) will be used as the user's host. Set PASSWORD to null if you want to get an autogenerated password. | <code>map&#40;string&#41;</code> |  | <code>null</code> |

 ## Outputs

@ -231,5 +231,4 @@ module "db" {
 | [self_link](outputs.tf#L88) | Self link of the primary instance. |  |
 | [self_links](outputs.tf#L93) | Self links of all instances. |  |
 | [user_passwords](outputs.tf#L101) | Map of containing the password of all users created through terraform. | ✓ |
-
 <!-- END TFDOC -->
--- a/modules/cloudsql-instance/main.tf
+++ b/modules/cloudsql-instance/main.tf
@ -59,6 +59,7 @@ resource "google_sql_database_instance" "primary" {
    disk_type         = var.disk_type
    availability_type = var.availability_type
    user_labels       = var.labels
+    activation_policy = var.activation_policy

    ip_configuration {
      ipv4_enabled       = var.ipv4_enabled
@ -137,7 +138,8 @@ resource "google_sql_database_instance" "replicas" {
    disk_size       = var.disk_size
    disk_type       = var.disk_type
    # availability_type = var.availability_type
-    user_labels = var.labels
+    user_labels       = var.labels
+    activation_policy = var.activation_policy

    ip_configuration {
      ipv4_enabled       = var.ipv4_enabled
--- a/modules/cloudsql-instance/variables.tf
+++ b/modules/cloudsql-instance/variables.tf
@ -13,6 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+variable "activation_policy" {
+  description = "This variable specifies when the instance should be active. Can be either ALWAYS, NEVER or ON_DEMAND. Default is ALWAYS."
+  type        = string
+  default     = "ALWAYS"
+  validation {
+    condition     = var.activation_policy == "NEVER" || var.activation_policy == "ON_DEMAND" || var.activation_policy == "ALWAYS"
+    error_message = "The variable activation_policy must be ALWAYS, NEVER or ON_DEMAND."
+  }
+  nullable = false
+}

 variable "allocated_ip_ranges" {
  description = "(Optional)The name of the allocated ip range for the private ip CloudSQL instance. For example: \"google-managed-services-default\". If set, the instance ip will be created in the allocated range. The range name must comply with RFC 1035. Specifically, the name must be 1-63 characters long and match the regular expression a-z?."
@ -189,3 +199,4 @@ variable "users" {
  type        = map(string)
  default     = null
 }
+
--- a/modules/net-firewall-policy/README.md
+++ b/modules/net-firewall-policy/README.md
@ -235,14 +235,14 @@ icmp:

 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [name](variables.tf#L113) | Policy name. | <code>string</code> | ✓ |  |
-| [parent_id](variables.tf#L119) | Parent node where the policy will be created, `folders/nnn` or `organizations/nnn` for hierarchical policy, project id for a network policy. | <code>string</code> | ✓ |  |
+| [name](variables.tf#L100) | Policy name. | <code>string</code> | ✓ |  |
+| [parent_id](variables.tf#L106) | Parent node where the policy will be created, `folders/nnn` or `organizations/nnn` for hierarchical policy, project id for a network policy. | <code>string</code> | ✓ |  |
 | [attachments](variables.tf#L17) | Ids of the resources to which this policy will be attached, in descriptive name => self link format. Specify folders or organization for hierarchical policy, VPCs for network policy. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |
 | [description](variables.tf#L24) | Policy description. | <code>string</code> |  | <code>null</code> |
 | [egress_rules](variables.tf#L30) | List of egress rule definitions, action can be 'allow', 'deny', 'goto_next'. The match.layer4configs map is in protocol => optional [ports] format. | <code title="map&#40;object&#40;&#123;&#10;  priority                &#61; number&#10;  action                  &#61; optional&#40;string, &#34;deny&#34;&#41;&#10;  description             &#61; optional&#40;string&#41;&#10;  disabled                &#61; optional&#40;bool, false&#41;&#10;  enable_logging          &#61; optional&#40;bool&#41;&#10;  target_service_accounts &#61; optional&#40;list&#40;string&#41;&#41;&#10;  target_tags             &#61; optional&#40;list&#40;string&#41;&#41;&#10;  match &#61; object&#40;&#123;&#10;    address_groups       &#61; optional&#40;list&#40;string&#41;&#41;&#10;    fqdns                &#61; optional&#40;list&#40;string&#41;&#41;&#10;    region_codes         &#61; optional&#40;list&#40;string&#41;&#41;&#10;    threat_intelligences &#61; optional&#40;list&#40;string&#41;&#41;&#10;    destination_ranges   &#61; optional&#40;list&#40;string&#41;&#41;&#10;    source_ranges        &#61; optional&#40;list&#40;string&#41;&#41;&#10;    source_tags          &#61; optional&#40;list&#40;string&#41;&#41;&#10;    layer4_configs &#61; optional&#40;list&#40;object&#40;&#123;&#10;      protocol &#61; optional&#40;string, &#34;all&#34;&#41;&#10;      ports    &#61; optional&#40;list&#40;string&#41;&#41;&#10;    &#125;&#41;&#41;, &#91;&#123;&#125;&#93;&#41;&#10;  &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [ingress_rules](variables.tf#L71) | List of ingress rule definitions, action can be 'allow', 'deny', 'goto_next'. | <code title="map&#40;object&#40;&#123;&#10;  priority                &#61; number&#10;  action                  &#61; optional&#40;string, &#34;allow&#34;&#41;&#10;  description             &#61; optional&#40;string&#41;&#10;  disabled                &#61; optional&#40;bool, false&#41;&#10;  enable_logging          &#61; optional&#40;bool&#41;&#10;  target_service_accounts &#61; optional&#40;list&#40;string&#41;&#41;&#10;  target_tags             &#61; optional&#40;list&#40;string&#41;&#41;&#10;  match &#61; object&#40;&#123;&#10;    address_groups       &#61; optional&#40;list&#40;string&#41;&#41;&#10;    fqdns                &#61; optional&#40;list&#40;string&#41;&#41;&#10;    region_codes         &#61; optional&#40;list&#40;string&#41;&#41;&#10;    threat_intelligences &#61; optional&#40;list&#40;string&#41;&#41;&#10;    destination_ranges   &#61; optional&#40;list&#40;string&#41;&#41;&#10;    source_ranges        &#61; optional&#40;list&#40;string&#41;&#41;&#10;    source_tags          &#61; optional&#40;list&#40;string&#41;&#41;&#10;    layer4_configs &#61; optional&#40;list&#40;object&#40;&#123;&#10;      protocol &#61; optional&#40;string, &#34;all&#34;&#41;&#10;      ports    &#61; optional&#40;list&#40;string&#41;&#41;&#10;    &#125;&#41;&#41;, &#91;&#123;&#125;&#93;&#41;&#10;  &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [region](variables.tf#L125) | Policy region. Leave null for hierarchical policy, set to 'global' for a global network policy. | <code>string</code> |  | <code>null</code> |
-| [rules_factory_config](variables.tf#L131) | Configuration for the optional rules factory. | <code title="object&#40;&#123;&#10;  cidr_file_path          &#61; optional&#40;string&#41;&#10;  egress_rules_file_path  &#61; optional&#40;string&#41;&#10;  ingress_rules_file_path &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [ingress_rules](variables.tf#L65) | List of ingress rule definitions, action can be 'allow', 'deny', 'goto_next'. | <code title="map&#40;object&#40;&#123;&#10;  priority                &#61; number&#10;  action                  &#61; optional&#40;string, &#34;allow&#34;&#41;&#10;  description             &#61; optional&#40;string&#41;&#10;  disabled                &#61; optional&#40;bool, false&#41;&#10;  enable_logging          &#61; optional&#40;bool&#41;&#10;  target_service_accounts &#61; optional&#40;list&#40;string&#41;&#41;&#10;  target_tags             &#61; optional&#40;list&#40;string&#41;&#41;&#10;  match &#61; object&#40;&#123;&#10;    address_groups       &#61; optional&#40;list&#40;string&#41;&#41;&#10;    fqdns                &#61; optional&#40;list&#40;string&#41;&#41;&#10;    region_codes         &#61; optional&#40;list&#40;string&#41;&#41;&#10;    threat_intelligences &#61; optional&#40;list&#40;string&#41;&#41;&#10;    destination_ranges   &#61; optional&#40;list&#40;string&#41;&#41;&#10;    source_ranges        &#61; optional&#40;list&#40;string&#41;&#41;&#10;    source_tags          &#61; optional&#40;list&#40;string&#41;&#41;&#10;    layer4_configs &#61; optional&#40;list&#40;object&#40;&#123;&#10;      protocol &#61; optional&#40;string, &#34;all&#34;&#41;&#10;      ports    &#61; optional&#40;list&#40;string&#41;&#41;&#10;    &#125;&#41;&#41;, &#91;&#123;&#125;&#93;&#41;&#10;  &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [region](variables.tf#L112) | Policy region. Leave null for hierarchical policy, set to 'global' for a global network policy. | <code>string</code> |  | <code>null</code> |
+| [rules_factory_config](variables.tf#L118) | Configuration for the optional rules factory. | <code title="object&#40;&#123;&#10;  cidr_file_path          &#61; optional&#40;string&#41;&#10;  egress_rules_file_path  &#61; optional&#40;string&#41;&#10;  ingress_rules_file_path &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |

 ## Outputs

--- a/modules/net-firewall-policy/variables.tf
+++ b/modules/net-firewall-policy/variables.tf
@ -53,12 +53,6 @@ variable "egress_rules" {
  }))
  default  = {}
  nullable = false
-  validation {
-    condition = alltrue([
-      for k, v in var.egress_rules : v.match.destination_ranges != null
-    ])
-    error_message = "Engress rules need destination ranges."
-  }
  validation {
    condition = alltrue([
      for k, v in var.egress_rules :
@ -94,13 +88,6 @@ variable "ingress_rules" {
  }))
  default  = {}
  nullable = false
-  validation {
-    condition = alltrue([
-      for k, v in var.ingress_rules :
-      v.match.source_ranges != null || v.match.source_tags != null
-    ])
-    error_message = "Ingress rules need source ranges or tags."
-  }
  validation {
    condition = alltrue([
      for k, v in var.ingress_rules :
Author	SHA1	Message	Date
Luca Prete	4c64c15871	Revert "Remove unused ASN numbers from CloudNAT to avoid provider errors" (#1626 ) This reverts commit `311bed8e83`.	2023-08-28 09:33:52 +02:00
Carlo Maria Valla	befbd190a3	Cloud SQL activation policy selectable (#1613 ) * Update main.tf added activation policy * Update variables.tf added activation_policy variable defaulted as ALWAYS for non regression * corrections requested by @juliocc * Regeneration of README.md on cloudsql-instance mod * terraform fmt changes * bug correctionand activation_policy on replicas * activation_policy description change and README.md * Bug correction	2023-08-25 12:12:08 +02:00
Julio Castillo	e4a33b56e0	Merge pull request #1623 from GoogleCloudPlatform/jccb/fix-fast-bootstrap-iam Fix role name for delegated grants in FAST bootstrap	2023-08-25 08:43:20 +02:00
Ludovico Magnocavallo	44a65f79e5	Merge branch 'master' into jccb/fix-fast-bootstrap-iam	2023-08-25 08:54:35 +09:00
Julio Castillo	5b43ed270d	Merge pull request #1619 from billabongrob/billabongrob/add-nat Adding support for NAT in Apigee	2023-08-24 20:25:54 +02:00
Julio Castillo	44c1cec041	Fix tests	2023-08-24 20:09:23 +02:00
Julio Castillo	25aa29e463	Merge remote-tracking branch 'origin/master' into billabongrob/add-nat	2023-08-24 19:52:06 +02:00
Julio Castillo	9188603365	Update key name	2023-08-24 19:46:39 +02:00
Julio Castillo	2d3dae1aea	Merge pull request #1620 from richard-olson/richard/nfw-policy-remove-match-var-validation Remove net-firewall-policy match variable validation	2023-08-24 19:45:31 +02:00
Julio Castillo	d50355b01a	Only create nat IP when requested	2023-08-24 19:42:20 +02:00
Julio Castillo	67c2597bcc	Fix output order	2023-08-24 19:38:44 +02:00
Julio Castillo	add1ac2dcc	Update README	2023-08-24 19:36:42 +02:00
Julio Castillo	57d5e05d69	Merge branch 'master' into richard/nfw-policy-remove-match-var-validation	2023-08-24 19:29:13 +02:00
Julio Castillo	bff5e46460	Fix apigee instance nat	2023-08-24 19:27:34 +02:00
Julio Castillo	1adfb9fb32	Fix role name for delegated grants in FAST bootstrap Fixes issue behind #1621	2023-08-24 19:13:42 +02:00
Julio Castillo	3fdf0dfe99	Make apigee variables non-nullable	2023-08-24 18:15:15 +02:00
Rob Heckel	6c33d34c28	Adding support for NAT in Apigee	2023-08-24 09:36:15 -05:00
Richard Olson	10aeb6615a	readme update	2023-08-24 20:01:47 +10:00
Richard Olson	35aae372b2	remove existing validation	2023-08-24 19:06:43 +10:00