Merge pull request #1650 from GoogleCloudPlatform/jccb/net-vpc-nullables

Make net-vpc variables non-nullable
Make net-vpc variables nullable
2023-09-06 10:52:28 +02:00 · 2023-09-06 09:57:34 +02:00 · 2023-09-05 12:06:19 +02:00 · 2023-09-05 11:28:12 +02:00 · 2023-09-05 09:48:15 +02:00 · 2023-09-04 16:43:59 +01:00
183 changed files with 862 additions and 3109 deletions
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -0,0 +1,13 @@
+<!-- Put a description of what this PR is for here -->
+
+---
+**Checklist**
+<!--
+Replace each [ ] with [X] to check it. These steps will speed up the review process, and we appreciate you spending time on them before sending your code to be reviewed.
+-->
+
+I applicable, I acknowledge that I have:
+- [ ] Read the [contributing guide](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/blob/master/CONTRIBUTING.md)
+- [ ] Ran `terraform fmt` on all modified files
+- [ ] Regenerated the relevant README.md files using [`tools/tfdoc.py`](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/blob/master/CONTRIBUTING.md#fabric-tools)
+- [ ] Made sure all relevant tests pass
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@ -53,17 +53,17 @@ jobs:
      - name: Check documentation
        id: documentation-fabric
        run: |
-          python3 tools/check_documentation.py --show-diffs modules fast blueprints
+          python3 tools/check_documentation.py --show-diffs --no-show-summary modules fast blueprints

      - name: Check documentation links
        id: documentation-links-fabric
        run: |
-          python3 tools/check_links.py .
+          python3 tools/check_links.py --no-show-summary .

      - name: Check name length (fast)
        id: name-length-fast
        run: |
-          python3 tools/check_names.py --prefix-length=10 fast/stages
+          python3 tools/check_names.py --prefix-length=10 --failed-only fast/stages

      - name: Check python formatting
        id: yapf
@ -76,4 +76,4 @@ jobs:
      - name: Check blueprint metadata
        id: metadata
        run: |
-          python tools/validate_metadata.py -v blueprints
+          python tools/validate_metadata.py -v --failed-only blueprints
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1041,7 +1041,7 @@ All notable changes to this project will be documented in this file.
 - **incompatible change** the variable for service identities IAM has changed in the project factory
 - add `data-catalog-policy-tag` module
 - new [workload identity federetion example](blueprints/cloud-operations/workload-identity-federation)
- new `api-gateway` [module](./modules/api-gateway) and [example](blueprints/serverless/api-gateway).
+- new `api-gateway` [module](./modules/api-gateway) and example
 - **incompatible change** the `psn_ranges` variable has been renamed to `psa_ranges` in the `net-vpc` module and its type changed from `list(string)` to `map(string)`
 - **incompatible change** removed `iam` flag for organization and folder level sinks
 - **incompatible change** removed `ingress_settings` configuration option in the `cloud-functions` module.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -669,6 +669,8 @@ Options:
  --help                          Show this message and exit.
 ```

+As a convenience, we provide a script that runs the same set of checks as our GitHub workflow. Before submitting a PR, run `tools/lint.sh` and fix any errors. You can use the tools described above to find out more about the failures.
+
 The test workflow runs test suites in parallel. Refer to the next section for more details on running and writing tests.

 ## Using and writing tests
--- a/blueprints/README.md
+++ b/blueprints/README.md
@ -10,7 +10,7 @@ Currently available blueprints:
 - **factories** - [The why and the how of Resource Factories](./factories), [Google Cloud Identity Group Factory](./factories/cloud-identity-group-factory), [Google Cloud BQ Factory](./factories/bigquery-factory), [Google Cloud VPC Firewall Factory](./factories/net-vpc-firewall-yaml), [Minimal Project Factory](./factories/project-factory)
 - **GKE** - [Binary Authorization Pipeline Blueprint](./gke/binauthz), [Storage API](./gke/binauthz/image), [Multi-cluster mesh on GKE (fleet API)](./gke/multi-cluster-mesh-gke-fleet-api), [GKE Multitenant Blueprint](./gke/multitenant-fleet), [Shared VPC with GKE support](./networking/shared-vpc-gke/), [GKE Autopilot](./gke/autopilot)
 - **networking** - [Calling a private Cloud Function from On-premises](./networking/private-cloud-function-from-onprem), [Decentralized firewall management](./networking/decentralized-firewall), [Decentralized firewall validator](./networking/decentralized-firewall/validator), [Network filtering with Squid](./networking/filtering-proxy), [HA VPN over Interconnect](./networking/ha-vpn-over-interconnect/), [GLB and multi-regional daisy-chaining through hybrid NEGs](./networking/glb-hybrid-neg-internal), [Hybrid connectivity to on-premise services through PSC](./networking/psc-hybrid), [HTTP Load Balancer with Cloud Armor](./networking/glb-and-armor), [Hub and Spoke via VPN](./networking/hub-and-spoke-vpn), [Hub and Spoke via VPC Peering](./networking/hub-and-spoke-peering), [Internal Load Balancer as Next Hop](./networking/ilb-next-hop), [Network filtering with Squid with isolated VPCs using Private Service Connect](./networking/filtering-proxy-psc), On-prem DNS and Google Private Access,  [PSC Producer](./networking/psc-hybrid/psc-producer), [PSC Consumer](./networking/psc-hybrid/psc-consumer), [Shared VPC with optional GKE cluster](./networking/shared-vpc-gke)
- **serverless** - [Creating multi-region deployments for API Gateway](./serverless/api-gateway), [Cloud Run series](./serverless/cloud-run-explore)
+- **serverless** - [Cloud Run series](./serverless/cloud-run-explore)
 - **third party solutions** - [OpenShift on GCP user-provisioned infrastructure](./third-party-solutions/openshift), [Wordpress deployment on Cloud Run](./third-party-solutions/wordpress/cloudrun)

 For more information see the individual README files in each section.
--- a/blueprints/apigee/bigquery-analytics/versions.tf
+++ b/blueprints/apigee/bigquery-analytics/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/versions.tf
+++ b/blueprints/apigee/network-patterns/nb-glb-psc-neg-sb-psc-ilbl7-hybrid-neg/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/adfs/versions.tf
+++ b/blueprints/cloud-operations/adfs/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
+++ b/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
+++ b/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/dns-shared-vpc/versions.tf
+++ b/blueprints/cloud-operations/dns-shared-vpc/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
+++ b/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
+++ b/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/packer-image-builder/versions.tf
+++ b/blueprints/cloud-operations/packer-image-builder/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/quota-monitoring/versions.tf
+++ b/blueprints/cloud-operations/quota-monitoring/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
+++ b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/data-solutions/bq-ml/versions.tf
+++ b/blueprints/data-solutions/bq-ml/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
+++ b/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/data-solutions/data-playground/versions.tf
+++ b/blueprints/data-solutions/data-playground/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
+++ b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/factories/net-vpc-firewall-yaml/versions.tf
+++ b/blueprints/factories/net-vpc-firewall-yaml/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/gke/multitenant-fleet/README.md
+++ b/blueprints/gke/multitenant-fleet/README.md
@ -229,7 +229,6 @@ module "gke" {

 <!-- TFDOC OPTS files:1 -->
 <!-- BEGIN TFDOC -->
-
 ## Files

 | name | description | modules |
@ -246,20 +245,20 @@ module "gke" {
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
 | [billing_account_id](variables.tf#L17) | Billing account id. | <code>string</code> | ✓ |  |
-| [folder_id](variables.tf#L132) | Folder used for the GKE project in folders/nnnnnnnnnnn format. | <code>string</code> | ✓ |  |
-| [prefix](variables.tf#L183) | Prefix used for resource names. | <code>string</code> | ✓ |  |
-| [project_id](variables.tf#L192) | ID of the project that will contain all the clusters. | <code>string</code> | ✓ |  |
-| [vpc_config](variables.tf#L204) | Shared VPC project and VPC details. | <code title="object&#40;&#123;&#10;  host_project_id &#61; string&#10;  vpc_self_link   &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  |
-| [clusters](variables.tf#L22) | Clusters configuration. Refer to the gke-cluster module for type details. | <code title="map&#40;object&#40;&#123;&#10;  cluster_autoscaling &#61; optional&#40;any&#41;&#10;  description         &#61; optional&#40;string&#41;&#10;  enable_addons &#61; optional&#40;any, &#123;&#10;    horizontal_pod_autoscaling &#61; true, http_load_balancing &#61; true&#10;  &#125;&#41;&#10;  enable_features &#61; optional&#40;any, &#123;&#10;    workload_identity &#61; true&#10;  &#125;&#41;&#10;  issue_client_certificate &#61; optional&#40;bool, false&#41;&#10;  labels                   &#61; optional&#40;map&#40;string&#41;&#41;&#10;  location                 &#61; string&#10;  logging_config           &#61; optional&#40;list&#40;string&#41;, &#91;&#34;SYSTEM_COMPONENTS&#34;&#93;&#41;&#10;  maintenance_config &#61; optional&#40;any, &#123;&#10;    daily_window_start_time &#61; &#34;03:00&#34;&#10;    recurring_window        &#61; null&#10;    maintenance_exclusion   &#61; &#91;&#93;&#10;  &#125;&#41;&#10;  max_pods_per_node  &#61; optional&#40;number, 110&#41;&#10;  min_master_version &#61; optional&#40;string&#41;&#10;  monitoring_config &#61; optional&#40;object&#40;&#123;&#10;    enable_components  &#61; optional&#40;list&#40;string&#41;, &#91;&#34;SYSTEM_COMPONENTS&#34;&#93;&#41;&#10;    managed_prometheus &#61; optional&#40;bool&#41;&#10;  &#125;&#41;&#41;&#10;  node_locations         &#61; optional&#40;list&#40;string&#41;&#41;&#10;  private_cluster_config &#61; optional&#40;any&#41;&#10;  release_channel        &#61; optional&#40;string&#41;&#10;  vpc_config &#61; object&#40;&#123;&#10;    subnetwork &#61; string&#10;    network    &#61; optional&#40;string&#41;&#10;    secondary_range_blocks &#61; optional&#40;object&#40;&#123;&#10;      pods     &#61; string&#10;      services &#61; string&#10;    &#125;&#41;&#41;&#10;    secondary_range_names &#61; optional&#40;object&#40;&#123;&#10;      pods     &#61; string&#10;      services &#61; string&#10;    &#125;&#41;, &#123; pods &#61; &#34;pods&#34;, services &#61; &#34;services&#34; &#125;&#41;&#10;    master_authorized_ranges &#61; optional&#40;map&#40;string&#41;&#41;&#10;    master_ipv4_cidr_block   &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [fleet_configmanagement_clusters](variables.tf#L70) | Config management features enabled on specific sets of member clusters, in config name => [cluster name] format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [fleet_configmanagement_templates](variables.tf#L77) | Sets of config management configurations that can be applied to member clusters, in config name => {options} format. | <code title="map&#40;object&#40;&#123;&#10;  binauthz &#61; bool&#10;  config_sync &#61; object&#40;&#123;&#10;    git &#61; object&#40;&#123;&#10;      gcp_service_account_email &#61; string&#10;      https_proxy               &#61; string&#10;      policy_dir                &#61; string&#10;      secret_type               &#61; string&#10;      sync_branch               &#61; string&#10;      sync_repo                 &#61; string&#10;      sync_rev                  &#61; string&#10;      sync_wait_secs            &#61; number&#10;    &#125;&#41;&#10;    prevent_drift &#61; string&#10;    source_format &#61; string&#10;  &#125;&#41;&#10;  hierarchy_controller &#61; object&#40;&#123;&#10;    enable_hierarchical_resource_quota &#61; bool&#10;    enable_pod_tree_labels             &#61; bool&#10;  &#125;&#41;&#10;  policy_controller &#61; object&#40;&#123;&#10;    audit_interval_seconds     &#61; number&#10;    exemptable_namespaces      &#61; list&#40;string&#41;&#10;    log_denies_enabled         &#61; bool&#10;    referential_rules_enabled  &#61; bool&#10;    template_library_installed &#61; bool&#10;  &#125;&#41;&#10;  version &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [fleet_features](variables.tf#L112) | Enable and configure fleet features. Set to null to disable GKE Hub if fleet workload identity is not used. | <code title="object&#40;&#123;&#10;  appdevexperience             &#61; bool&#10;  configmanagement             &#61; bool&#10;  identityservice              &#61; bool&#10;  multiclusteringress          &#61; string&#10;  multiclusterservicediscovery &#61; bool&#10;  servicemesh                  &#61; bool&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
-| [fleet_workload_identity](variables.tf#L125) | Use Fleet Workload Identity for clusters. Enables GKE Hub if set to true. | <code>bool</code> |  | <code>false</code> |
-| [group_iam](variables.tf#L137) | Project-level IAM bindings for groups. Use group emails as keys, list of roles as values. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [iam](variables.tf#L144) | Project-level authoritative IAM bindings for users and service accounts in  {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [labels](variables.tf#L151) | Project-level labels. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |
-| [nodepools](variables.tf#L157) | Nodepools configuration. Refer to the gke-nodepool module for type details. | <code title="map&#40;map&#40;object&#40;&#123;&#10;  gke_version           &#61; optional&#40;string&#41;&#10;  labels                &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  max_pods_per_node     &#61; optional&#40;number&#41;&#10;  name                  &#61; optional&#40;string&#41;&#10;  node_config           &#61; optional&#40;any, &#123; disk_type &#61; &#34;pd-balanced&#34; &#125;&#41;&#10;  node_count            &#61; optional&#40;map&#40;number&#41;, &#123; initial &#61; 1 &#125;&#41;&#10;  node_locations        &#61; optional&#40;list&#40;string&#41;&#41;&#10;  nodepool_config       &#61; optional&#40;any&#41;&#10;  pod_range             &#61; optional&#40;any&#41;&#10;  reservation_affinity  &#61; optional&#40;any&#41;&#10;  service_account       &#61; optional&#40;any&#41;&#10;  sole_tenant_nodegroup &#61; optional&#40;string&#41;&#10;  tags                  &#61; optional&#40;list&#40;string&#41;&#41;&#10;  taints &#61; optional&#40;list&#40;object&#40;&#123;&#10;    key    &#61; string&#10;    value  &#61; string&#10;    effect &#61; string&#10;  &#125;&#41;&#41;&#41;&#10;&#125;&#41;&#41;&#41;">map&#40;map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [project_services](variables.tf#L197) | Additional project services to enable. | <code>list&#40;string&#41;</code> |  | <code>&#91;&#93;</code> |
+| [folder_id](variables.tf#L138) | Folder used for the GKE project in folders/nnnnnnnnnnn format. | <code>string</code> | ✓ |  |
+| [prefix](variables.tf#L189) | Prefix used for resource names. | <code>string</code> | ✓ |  |
+| [project_id](variables.tf#L198) | ID of the project that will contain all the clusters. | <code>string</code> | ✓ |  |
+| [vpc_config](variables.tf#L210) | Shared VPC project and VPC details. | <code title="object&#40;&#123;&#10;  host_project_id &#61; string&#10;  vpc_self_link   &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  |
+| [clusters](variables.tf#L22) | Clusters configuration. Refer to the gke-cluster module for type details. | <code title="map&#40;object&#40;&#123;&#10;  cluster_autoscaling &#61; optional&#40;any&#41;&#10;  description         &#61; optional&#40;string&#41;&#10;  enable_addons &#61; optional&#40;any, &#123;&#10;    horizontal_pod_autoscaling &#61; true, http_load_balancing &#61; true&#10;  &#125;&#41;&#10;  enable_features &#61; optional&#40;any, &#123;&#10;    workload_identity &#61; true&#10;  &#125;&#41;&#10;  issue_client_certificate &#61; optional&#40;bool, false&#41;&#10;  labels                   &#61; optional&#40;map&#40;string&#41;&#41;&#10;  location                 &#61; string&#10;  logging_config &#61; optional&#40;object&#40;&#123;&#10;    enable_system_logs             &#61; optional&#40;bool, true&#41;&#10;    enable_workloads_logs          &#61; optional&#40;bool, true&#41;&#10;    enable_api_server_logs         &#61; optional&#40;bool, false&#41;&#10;    enable_scheduler_logs          &#61; optional&#40;bool, false&#41;&#10;    enable_controller_manager_logs &#61; optional&#40;bool, false&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  maintenance_config &#61; optional&#40;any, &#123;&#10;    daily_window_start_time &#61; &#34;03:00&#34;&#10;    recurring_window        &#61; null&#10;    maintenance_exclusion   &#61; &#91;&#93;&#10;  &#125;&#41;&#10;  max_pods_per_node  &#61; optional&#40;number, 110&#41;&#10;  min_master_version &#61; optional&#40;string&#41;&#10;  monitoring_config &#61; optional&#40;object&#40;&#123;&#10;    enable_components  &#61; optional&#40;list&#40;string&#41;, &#91;&#34;SYSTEM_COMPONENTS&#34;&#93;&#41;&#10;    managed_prometheus &#61; optional&#40;bool&#41;&#10;  &#125;&#41;&#41;&#10;  node_locations         &#61; optional&#40;list&#40;string&#41;&#41;&#10;  private_cluster_config &#61; optional&#40;any&#41;&#10;  release_channel        &#61; optional&#40;string&#41;&#10;  vpc_config &#61; object&#40;&#123;&#10;    subnetwork &#61; string&#10;    network    &#61; optional&#40;string&#41;&#10;    secondary_range_blocks &#61; optional&#40;object&#40;&#123;&#10;      pods     &#61; string&#10;      services &#61; string&#10;    &#125;&#41;&#41;&#10;    secondary_range_names &#61; optional&#40;object&#40;&#123;&#10;      pods     &#61; string&#10;      services &#61; string&#10;    &#125;&#41;, &#123; pods &#61; &#34;pods&#34;, services &#61; &#34;services&#34; &#125;&#41;&#10;    master_authorized_ranges &#61; optional&#40;map&#40;string&#41;&#41;&#10;    master_ipv4_cidr_block   &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [fleet_configmanagement_clusters](variables.tf#L76) | Config management features enabled on specific sets of member clusters, in config name => [cluster name] format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [fleet_configmanagement_templates](variables.tf#L83) | Sets of config management configurations that can be applied to member clusters, in config name => {options} format. | <code title="map&#40;object&#40;&#123;&#10;  binauthz &#61; bool&#10;  config_sync &#61; object&#40;&#123;&#10;    git &#61; object&#40;&#123;&#10;      gcp_service_account_email &#61; string&#10;      https_proxy               &#61; string&#10;      policy_dir                &#61; string&#10;      secret_type               &#61; string&#10;      sync_branch               &#61; string&#10;      sync_repo                 &#61; string&#10;      sync_rev                  &#61; string&#10;      sync_wait_secs            &#61; number&#10;    &#125;&#41;&#10;    prevent_drift &#61; string&#10;    source_format &#61; string&#10;  &#125;&#41;&#10;  hierarchy_controller &#61; object&#40;&#123;&#10;    enable_hierarchical_resource_quota &#61; bool&#10;    enable_pod_tree_labels             &#61; bool&#10;  &#125;&#41;&#10;  policy_controller &#61; object&#40;&#123;&#10;    audit_interval_seconds     &#61; number&#10;    exemptable_namespaces      &#61; list&#40;string&#41;&#10;    log_denies_enabled         &#61; bool&#10;    referential_rules_enabled  &#61; bool&#10;    template_library_installed &#61; bool&#10;  &#125;&#41;&#10;  version &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [fleet_features](variables.tf#L118) | Enable and configure fleet features. Set to null to disable GKE Hub if fleet workload identity is not used. | <code title="object&#40;&#123;&#10;  appdevexperience             &#61; bool&#10;  configmanagement             &#61; bool&#10;  identityservice              &#61; bool&#10;  multiclusteringress          &#61; string&#10;  multiclusterservicediscovery &#61; bool&#10;  servicemesh                  &#61; bool&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [fleet_workload_identity](variables.tf#L131) | Use Fleet Workload Identity for clusters. Enables GKE Hub if set to true. | <code>bool</code> |  | <code>false</code> |
+| [group_iam](variables.tf#L143) | Project-level IAM bindings for groups. Use group emails as keys, list of roles as values. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [iam](variables.tf#L150) | Project-level authoritative IAM bindings for users and service accounts in  {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [labels](variables.tf#L157) | Project-level labels. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |
+| [nodepools](variables.tf#L163) | Nodepools configuration. Refer to the gke-nodepool module for type details. | <code title="map&#40;map&#40;object&#40;&#123;&#10;  gke_version           &#61; optional&#40;string&#41;&#10;  labels                &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  max_pods_per_node     &#61; optional&#40;number&#41;&#10;  name                  &#61; optional&#40;string&#41;&#10;  node_config           &#61; optional&#40;any, &#123; disk_type &#61; &#34;pd-balanced&#34; &#125;&#41;&#10;  node_count            &#61; optional&#40;map&#40;number&#41;, &#123; initial &#61; 1 &#125;&#41;&#10;  node_locations        &#61; optional&#40;list&#40;string&#41;&#41;&#10;  nodepool_config       &#61; optional&#40;any&#41;&#10;  pod_range             &#61; optional&#40;any&#41;&#10;  reservation_affinity  &#61; optional&#40;any&#41;&#10;  service_account       &#61; optional&#40;any&#41;&#10;  sole_tenant_nodegroup &#61; optional&#40;string&#41;&#10;  tags                  &#61; optional&#40;list&#40;string&#41;&#41;&#10;  taints &#61; optional&#40;list&#40;object&#40;&#123;&#10;    key    &#61; string&#10;    value  &#61; string&#10;    effect &#61; string&#10;  &#125;&#41;&#41;&#41;&#10;&#125;&#41;&#41;&#41;">map&#40;map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [project_services](variables.tf#L203) | Additional project services to enable. | <code>list&#40;string&#41;</code> |  | <code>&#91;&#93;</code> |

 ## Outputs

@ -268,5 +267,4 @@ module "gke" {
 | [cluster_ids](outputs.tf#L17) | Cluster ids. |  |
 | [clusters](outputs.tf#L24) | Cluster resources. |  |
 | [project_id](outputs.tf#L29) | GKE project id. |  |
-
 <!-- END TFDOC -->
--- a/blueprints/gke/multitenant-fleet/variables.tf
+++ b/blueprints/gke/multitenant-fleet/variables.tf
@ -33,7 +33,13 @@ variable "clusters" {
    issue_client_certificate = optional(bool, false)
    labels                   = optional(map(string))
    location                 = string
-    logging_config           = optional(list(string), ["SYSTEM_COMPONENTS"])
+    logging_config = optional(object({
+      enable_system_logs             = optional(bool, true)
+      enable_workloads_logs          = optional(bool, true)
+      enable_api_server_logs         = optional(bool, false)
+      enable_scheduler_logs          = optional(bool, false)
+      enable_controller_manager_logs = optional(bool, false)
+    }), {})
    maintenance_config = optional(any, {
      daily_window_start_time = "03:00"
      recurring_window        = null
--- a/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf
+++ b/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf
+++ b/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/decentralized-firewall/versions.tf
+++ b/blueprints/networking/decentralized-firewall/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/filtering-proxy-psc/versions.tf
+++ b/blueprints/networking/filtering-proxy-psc/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/filtering-proxy/versions.tf
+++ b/blueprints/networking/filtering-proxy/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/hub-and-spoke-peering/versions.tf
+++ b/blueprints/networking/hub-and-spoke-peering/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/hub-and-spoke-vpn/versions.tf
+++ b/blueprints/networking/hub-and-spoke-vpn/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/ilb-next-hop/versions.tf
+++ b/blueprints/networking/ilb-next-hop/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/private-cloud-function-from-onprem/versions.tf
+++ b/blueprints/networking/private-cloud-function-from-onprem/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/networking/shared-vpc-gke/versions.tf
+++ b/blueprints/networking/shared-vpc-gke/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/blueprints/serverless/README.md
+++ b/blueprints/serverless/README.md
@ -6,11 +6,6 @@ They are meant to be used as minimal but complete starting points to create actu

 ## Blueprints

-### Multi-region deployments for API Gateway
-
-<a href="./api-gateway/" title="Multi-region deployments for API Gateway"><img src="./api-gateway/diagram.png" align="left" width="280px"></a> This [blueprint](./api-gateway/) shows how to configure a load balancer to enable multi-region deployments for API Gateway. For more details on how this set up work have a look at the article [here](https://cloud.google.com/api-gateway/docs/multi-region-deployment)
-<br clear="left">
-
 ### Cloud Run series

 <a href="./cloud-run-explore/" title="Cloud Run series"><img src="./cloud-run-corporate/images/use-case-4.png" align="left" width="280px"></a> These are a series of [blueprints](./cloud-run-explore/) developing the chapters of the [__Serverless Networking Guide__](https://services.google.com/fh/files/misc/serverless_networking_guide.pdf), focused in Cloud Run.
--- a/blueprints/serverless/api-gateway/README.md
+++ b/blueprints/serverless/api-gateway/README.md
@ -1,60 +0,0 @@
-# Creating multi-region deployments for API Gateway
-
-This tutorial shows you how to configure an HTTP(S) load balancer to enable multi-region deployments for API Gateway. For more details on how this set up work have a look at the article [here](https://cloud.google.com/api-gateway/docs/multi-region-deployment).
-
-The diagram below depicts the architecture that this blueprint sets up.
-
-![Architecture diagram](diagram.png)
-
-# Running the blueprint
-
-Clone this repository or [open it in cloud shell](https://ssh.cloud.google.com/cloudshell/editor?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fcloud-foundation-fabric&cloudshell_print=cloud-shell-readme.txt&cloudshell_working_dir=blueprints%2Fserverless%2Fapi-gateway), then go through the following steps to create resources:
-
-* `terraform init`
-* `terraform apply -var project_id=my-project-id`
-
-## Testing the blueprint
-
-1. Copy the IP address returned as output
-
-2. Execute the following command
-
-        curl -v http://<IP_ADDRESS>/hello
-
-Once done testing, you can clean up resources by running `terraform destroy`.
-
-<!-- BEGIN TFDOC -->
-
-## Variables
-
-| name | description | type | required | default |
-|---|---|:---:|:---:|:---:|
-| [project_id](variables.tf#L26) | Identifier of the project. | <code>string</code> | ✓ |  |
-| [regions](variables.tf#L31) | List of regions to deploy the proxy in. | <code>list&#40;string&#41;</code> | ✓ |  |
-| [project_create](variables.tf#L17) | Parameters for the creation of the new project. | <code title="object&#40;&#123;&#10;  billing_account_id &#61; string&#10;  parent             &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
-
-## Outputs
-
-| name | description | sensitive |
-|---|---|:---:|
-| [ip_address](outputs.tf#L17) | The reserved global IP address. |  |
-
-<!-- END TFDOC -->
-
-## Test
-
-```hcl
-module "test" {
-  source = "./fabric/blueprints/serverless/api-gateway"
-  project_create = {
-    billing_account_id = "123456789"
-    parent             = "organizations/123456789"
-  }
-  project_id = "project-1"
-  regions = [
-    "europe-west1",
-    "europe-west2"
-  ]
-}
-# tftest modules=8 resources=34
-```
--- a/blueprints/serverless/api-gateway/diagram.png
+++ b/blueprints/serverless/api-gateway/diagram.png
--- a/blueprints/serverless/api-gateway/function/index.js
+++ b/blueprints/serverless/api-gateway/function/index.js
@ -1,7 +0,0 @@
-const functions = require('@google-cloud/functions-framework');
-
-// Register an HTTP function with the Functions Framework that will be executed
-// when you make an HTTP request to the deployed function's endpoint.
-functions.http('helloGET', (req, res) => {
-  res.send('Hello World!');
-});
--- a/blueprints/serverless/api-gateway/function/package-lock.json
+++ b/blueprints/serverless/api-gateway/function/package-lock.json
--- a/blueprints/serverless/api-gateway/function/package.json
+++ b/blueprints/serverless/api-gateway/function/package.json
@ -1,18 +0,0 @@
-{
-  "name": "function",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "dependencies": {
-    "@google-cloud/functions-framework": "^3.2.1",
-    "express": "^4.18.2"
-  }
-}
--- a/blueprints/serverless/api-gateway/main.tf
+++ b/blueprints/serverless/api-gateway/main.tf
@ -1,135 +0,0 @@
-/**
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-locals {
-  api_id_prefix        = "api"
-  function_name_prefix = "cf-hello"
-  specs = { for region in var.regions : region =>
-    templatefile("${path.module}/spec.yaml", {
-      api_id        = "${local.api_id_prefix}-${region}"
-      function_name = "${local.function_name_prefix}-${region}"
-      region        = region
-      project_id    = var.project_id
-    })
-  }
-  backends = [for region in var.regions : {
-    group   = google_compute_region_network_endpoint_group.serverless-negs[region].id
-    options = null
-    }
-  ]
-}
-
-module "project" {
-  source = "../../../modules/project"
-  billing_account = (var.project_create != null
-    ? var.project_create.billing_account_id
-    : null
-  )
-  parent = (var.project_create != null
-    ? var.project_create.parent
-    : null
-  )
-  name = var.project_id
-  services = [
-    "apigateway.googleapis.com",
-    "cloudbuild.googleapis.com",
-    "cloudfunctions.googleapis.com",
-    "compute.googleapis.com",
-    "servicemanagement.googleapis.com",
-    "servicecontrol.googleapis.com"
-  ]
-  project_create = var.project_create != null
-}
-
-module "sa" {
-  source     = "../../../modules/iam-service-account"
-  project_id = module.project.project_id
-  name       = "sa-api"
-}
-
-
-module "functions" {
-  source           = "../../../modules/cloud-function-v1"
-  for_each         = toset(var.regions)
-  project_id       = module.project.project_id
-  name             = "${local.function_name_prefix}-${each.value}"
-  bucket_name      = "bkt-${module.project.project_id}-${each.value}"
-  region           = each.value
-  ingress_settings = "ALLOW_ALL"
-  bucket_config = {
-    location                  = null
-    lifecycle_delete_age_days = 1
-  }
-  bundle_config = {
-    source_dir  = "${path.module}/function"
-    output_path = "${path.module}/bundle.zip"
-    excludes    = null
-  }
-  function_config = {
-    entry_point = "helloGET"
-    instances   = null
-    memory      = null
-    runtime     = "nodejs16"
-    timeout     = null
-  }
-  service_account_create = true
-  iam = {
-    "roles/cloudfunctions.invoker" = [module.sa.iam_email]
-  }
-}
-
-module "gateways" {
-  for_each              = toset(var.regions)
-  source                = "../../../modules/api-gateway"
-  project_id            = module.project.project_id
-  api_id                = "${local.api_id_prefix}-${each.value}"
-  region                = each.value
-  spec                  = local.specs[each.value]
-  service_account_email = module.sa.email
-}
-
-module "glb" {
-  source     = "../../../modules/net-lb-app-ext"
-  project_id = module.project.project_id
-  name       = "glb"
-  backend_service_configs = {
-    default = {
-      backends = [
-        for region in var.regions : {
-          backend = google_compute_region_network_endpoint_group.serverless-negs[region].id
-        }
-      ]
-      health_checks = []
-    }
-  }
-}
-
-resource "google_compute_region_network_endpoint_group" "serverless-negs" {
-  for_each              = toset(var.regions)
-  provider              = google-beta
-  name                  = "serverless-neg-${module.gateways[each.value].gateway_id}"
-  project               = module.project.project_id
-  network_endpoint_type = "SERVERLESS"
-  region                = each.value
-  serverless_deployment {
-    platform = "apigateway.googleapis.com"
-    resource = module.gateways[each.value].gateway_id
-    url_mask = ""
-  }
-  lifecycle {
-    create_before_destroy = true
-  }
-}
--- a/blueprints/serverless/api-gateway/outputs.tf
+++ b/blueprints/serverless/api-gateway/outputs.tf
@ -1,20 +0,0 @@
-/**
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-output "ip_address" {
-  description = "The reserved global IP address."
-  value       = module.glb.address
-}
--- a/blueprints/serverless/api-gateway/variables.tf
+++ b/blueprints/serverless/api-gateway/variables.tf
@ -1,34 +0,0 @@
-/**
- * Copyright 2022 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-variable "project_create" {
-  description = "Parameters for the creation of the new project."
-  type = object({
-    billing_account_id = string
-    parent             = string
-  })
-  default = null
-}
-
-variable "project_id" {
-  description = "Identifier of the project."
-  type        = string
-}
-
-variable "regions" {
-  description = "List of regions to deploy the proxy in."
-  type        = list(string)
-}
--- a/blueprints/third-party-solutions/openshift/tf/versions.tf
+++ b/blueprints/third-party-solutions/openshift/tf/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/default-versions.tf
+++ b/default-versions.tf
@ -1,4 +1,4 @@
-# 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.
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/fast/stages/1-resman/README.md
+++ b/fast/stages/1-resman/README.md
@ -145,7 +145,7 @@ The first set of default tags cannot be overridden and defines the following key

 The second set is optional and allows defining a custom tag hierarchy, including IAM bindings that can refer to specific identities, or to the internally defined automation service accounts via their names, like in the following example:

-```hcl
+```tfvars
 tags = {
  my-custom-tag = {
    values = {
@ -258,7 +258,7 @@ classDiagram

 This is an example that shows how to populate the relevant variables.

-```hcl
+```tfvars
 tenants = {
  tn0 = {
    admin_group_email = "tn-0-admins@tenant.example.org"
--- a/fast/stages/2-networking-a-peering/landing.tf
+++ b/fast/stages/2-networking-a-peering/landing.tf
@ -84,5 +84,4 @@ 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/main.tf
+++ b/fast/stages/2-networking-a-peering/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.
@ -45,8 +45,9 @@ module "folder" {
  name          = "Networking"
  folder_create = var.folder_ids.networking == null
  id            = var.folder_ids.networking
-  firewall_policy_associations = {
-    default = module.firewall-policy-default.id
+  firewall_policy = {
+    name   = "default"
+    policy = module.firewall-policy-default.id
  }
 }

--- a/fast/stages/2-networking-a-peering/spoke-dev.tf
+++ b/fast/stages/2-networking-a-peering/spoke-dev.tf
@ -80,7 +80,6 @@ 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,7 +79,6 @@ 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,5 +84,4 @@ 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/main.tf
+++ b/fast/stages/2-networking-b-vpn/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.
@ -45,8 +45,9 @@ module "folder" {
  name          = "Networking"
  folder_create = var.folder_ids.networking == null
  id            = var.folder_ids.networking
-  firewall_policy_associations = {
-    default = module.firewall-policy-default.id
+  firewall_policy = {
+    name   = "default"
+    policy = module.firewall-policy-default.id
  }
 }

--- a/fast/stages/2-networking-b-vpn/spoke-dev.tf
+++ b/fast/stages/2-networking-b-vpn/spoke-dev.tf
@ -80,7 +80,6 @@ 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,7 +79,6 @@ 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,7 +85,6 @@ 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,7 +100,6 @@ 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-c-nva/main.tf
+++ b/fast/stages/2-networking-c-nva/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.
@ -46,8 +46,9 @@ module "folder" {
  name          = "Networking"
  folder_create = var.folder_ids.networking == null
  id            = var.folder_ids.networking
-  firewall_policy_associations = {
-    default = module.firewall-policy-default.id
+  firewall_policy = {
+    name   = "default"
+    policy = module.firewall-policy-default.id
  }
 }

--- a/fast/stages/2-networking-d-separate-envs/main.tf
+++ b/fast/stages/2-networking-d-separate-envs/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.
@ -41,8 +41,9 @@ module "folder" {
  name          = "Networking"
  folder_create = var.folder_ids.networking == null
  id            = var.folder_ids.networking
-  firewall_policy_associations = {
-    default = module.firewall-policy-default.id
+  firewall_policy = {
+    name   = "default"
+    policy = module.firewall-policy-default.id
  }
 }

--- a/fast/stages/2-networking-d-separate-envs/spoke-dev.tf
+++ b/fast/stages/2-networking-d-separate-envs/spoke-dev.tf
@ -80,7 +80,6 @@ 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,7 +79,6 @@ 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,7 +86,6 @@ 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 {
@ -102,7 +101,6 @@ 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-e-nva-bgp/main.tf
+++ b/fast/stages/2-networking-e-nva-bgp/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.
@ -46,8 +46,9 @@ module "folder" {
  name          = "Networking"
  folder_create = var.folder_ids.networking == null
  id            = var.folder_ids.networking
-  firewall_policy_associations = {
-    default = module.firewall-policy-default.id
+  firewall_policy = {
+    name   = "default"
+    policy = module.firewall-policy-default.id
  }
 }

--- a/fast/stages/3-gke-multitenant/dev/README.md
+++ b/fast/stages/3-gke-multitenant/dev/README.md
@ -149,7 +149,6 @@ Leave all these variables unset (or set to `null`) to disable fleet management.

 <!-- TFDOC OPTS files:1 show_extra:1 -->
 <!-- BEGIN TFDOC -->
-
 ## Files

 | name | description | modules | resources |
@ -164,21 +163,21 @@ Leave all these variables unset (or set to `null`) to disable fleet management.
 |---|---|:---:|:---:|:---:|:---:|
 | [automation](variables.tf#L21) | Automation resources created by the bootstrap stage. | <code title="object&#40;&#123;&#10;  outputs_bucket &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>0-bootstrap</code> |
 | [billing_account](variables.tf#L29) | Billing account id. If billing account is not part of the same org set `is_org_level` to false. | <code title="object&#40;&#123;&#10;  id           &#61; string&#10;  is_org_level &#61; optional&#40;bool, true&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>0-bootstrap</code> |
-| [folder_ids](variables.tf#L153) | Folders to be used for the networking resources in folders/nnnnnnnnnnn format. If null, folder will be created. | <code title="object&#40;&#123;&#10;  gke-dev &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>1-resman</code> |
-| [host_project_ids](variables.tf#L168) | Host project for the shared VPC. | <code title="object&#40;&#123;&#10;  dev-spoke-0 &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>2-networking</code> |
-| [prefix](variables.tf#L221) | Prefix used for resources that need unique names. | <code>string</code> | ✓ |  |  |
-| [vpc_self_links](variables.tf#L237) | Self link for the shared VPC. | <code title="object&#40;&#123;&#10;  dev-spoke-0 &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>2-networking</code> |
-| [clusters](variables.tf#L42) | Clusters configuration. Refer to the gke-cluster module for type details. | <code title="map&#40;object&#40;&#123;&#10;  cluster_autoscaling &#61; optional&#40;any&#41;&#10;  description         &#61; optional&#40;string&#41;&#10;  enable_addons &#61; optional&#40;any, &#123;&#10;    horizontal_pod_autoscaling &#61; true, http_load_balancing &#61; true&#10;  &#125;&#41;&#10;  enable_features &#61; optional&#40;any, &#123;&#10;    workload_identity &#61; true&#10;  &#125;&#41;&#10;  issue_client_certificate &#61; optional&#40;bool, false&#41;&#10;  labels                   &#61; optional&#40;map&#40;string&#41;&#41;&#10;  location                 &#61; string&#10;  logging_config           &#61; optional&#40;list&#40;string&#41;, &#91;&#34;SYSTEM_COMPONENTS&#34;&#93;&#41;&#10;  maintenance_config &#61; optional&#40;any, &#123;&#10;    daily_window_start_time &#61; &#34;03:00&#34;&#10;    recurring_window        &#61; null&#10;    maintenance_exclusion   &#61; &#91;&#93;&#10;  &#125;&#41;&#10;  max_pods_per_node  &#61; optional&#40;number, 110&#41;&#10;  min_master_version &#61; optional&#40;string&#41;&#10;  monitoring_config &#61; optional&#40;object&#40;&#123;&#10;    enable_components  &#61; optional&#40;list&#40;string&#41;, &#91;&#34;SYSTEM_COMPONENTS&#34;&#93;&#41;&#10;    managed_prometheus &#61; optional&#40;bool&#41;&#10;  &#125;&#41;&#41;&#10;  node_locations         &#61; optional&#40;list&#40;string&#41;&#41;&#10;  private_cluster_config &#61; optional&#40;any&#41;&#10;  release_channel        &#61; optional&#40;string&#41;&#10;  vpc_config &#61; object&#40;&#123;&#10;    subnetwork &#61; string&#10;    network    &#61; optional&#40;string&#41;&#10;    secondary_range_blocks &#61; optional&#40;object&#40;&#123;&#10;      pods     &#61; string&#10;      services &#61; string&#10;    &#125;&#41;&#41;&#10;    secondary_range_names &#61; optional&#40;object&#40;&#123;&#10;      pods     &#61; string&#10;      services &#61; string&#10;    &#125;&#41;, &#123; pods &#61; &#34;pods&#34;, services &#61; &#34;services&#34; &#125;&#41;&#10;    master_authorized_ranges &#61; optional&#40;map&#40;string&#41;&#41;&#10;    master_ipv4_cidr_block   &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [fleet_configmanagement_clusters](variables.tf#L90) | Config management features enabled on specific sets of member clusters, in config name => [cluster name] format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [fleet_configmanagement_templates](variables.tf#L98) | Sets of config management configurations that can be applied to member clusters, in config name => {options} format. | <code title="map&#40;object&#40;&#123;&#10;  binauthz &#61; bool&#10;  config_sync &#61; object&#40;&#123;&#10;    git &#61; object&#40;&#123;&#10;      gcp_service_account_email &#61; string&#10;      https_proxy               &#61; string&#10;      policy_dir                &#61; string&#10;      secret_type               &#61; string&#10;      sync_branch               &#61; string&#10;      sync_repo                 &#61; string&#10;      sync_rev                  &#61; string&#10;      sync_wait_secs            &#61; number&#10;    &#125;&#41;&#10;    prevent_drift &#61; string&#10;    source_format &#61; string&#10;  &#125;&#41;&#10;  hierarchy_controller &#61; object&#40;&#123;&#10;    enable_hierarchical_resource_quota &#61; bool&#10;    enable_pod_tree_labels             &#61; bool&#10;  &#125;&#41;&#10;  policy_controller &#61; object&#40;&#123;&#10;    audit_interval_seconds     &#61; number&#10;    exemptable_namespaces      &#61; list&#40;string&#41;&#10;    log_denies_enabled         &#61; bool&#10;    referential_rules_enabled  &#61; bool&#10;    template_library_installed &#61; bool&#10;  &#125;&#41;&#10;  version &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [fleet_features](variables.tf#L133) | Enable and configure fleet features. Set to null to disable GKE Hub if fleet workload identity is not used. | <code title="object&#40;&#123;&#10;  appdevexperience             &#61; bool&#10;  configmanagement             &#61; bool&#10;  identityservice              &#61; bool&#10;  multiclusteringress          &#61; string&#10;  multiclusterservicediscovery &#61; bool&#10;  servicemesh                  &#61; bool&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |  |
-| [fleet_workload_identity](variables.tf#L146) | Use Fleet Workload Identity for clusters. Enables GKE Hub if set to true. | <code>bool</code> |  | <code>false</code> |  |
-| [group_iam](variables.tf#L161) | Project-level authoritative IAM bindings for groups in {GROUP_EMAIL => [ROLES]} format. Use group emails as keys, list of roles as values. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [iam](variables.tf#L176) | Project-level authoritative IAM bindings for users and service accounts in  {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [labels](variables.tf#L183) | Project-level labels. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [nodepools](variables.tf#L189) | Nodepools configuration. Refer to the gke-nodepool module for type details. | <code title="map&#40;map&#40;object&#40;&#123;&#10;  gke_version           &#61; optional&#40;string&#41;&#10;  labels                &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  max_pods_per_node     &#61; optional&#40;number&#41;&#10;  name                  &#61; optional&#40;string&#41;&#10;  node_config           &#61; optional&#40;any, &#123; disk_type &#61; &#34;pd-balanced&#34; &#125;&#41;&#10;  node_count            &#61; optional&#40;map&#40;number&#41;, &#123; initial &#61; 1 &#125;&#41;&#10;  node_locations        &#61; optional&#40;list&#40;string&#41;&#41;&#10;  nodepool_config       &#61; optional&#40;any&#41;&#10;  pod_range             &#61; optional&#40;any&#41;&#10;  reservation_affinity  &#61; optional&#40;any&#41;&#10;  service_account       &#61; optional&#40;any&#41;&#10;  sole_tenant_nodegroup &#61; optional&#40;string&#41;&#10;  tags                  &#61; optional&#40;list&#40;string&#41;&#41;&#10;  taints &#61; optional&#40;list&#40;object&#40;&#123;&#10;    key    &#61; string&#10;    value  &#61; string&#10;    effect &#61; string&#10;  &#125;&#41;&#41;&#41;&#10;&#125;&#41;&#41;&#41;">map&#40;map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
-| [outputs_location](variables.tf#L215) | Path where providers, tfvars files, and lists for the following stages are written. Leave empty to disable. | <code>string</code> |  | <code>null</code> |  |
-| [project_services](variables.tf#L230) | Additional project services to enable. | <code>list&#40;string&#41;</code> |  | <code>&#91;&#93;</code> |  |
+| [folder_ids](variables.tf#L159) | Folders to be used for the networking resources in folders/nnnnnnnnnnn format. If null, folder will be created. | <code title="object&#40;&#123;&#10;  gke-dev &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>1-resman</code> |
+| [host_project_ids](variables.tf#L174) | Host project for the shared VPC. | <code title="object&#40;&#123;&#10;  dev-spoke-0 &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>2-networking</code> |
+| [prefix](variables.tf#L227) | Prefix used for resources that need unique names. | <code>string</code> | ✓ |  |  |
+| [vpc_self_links](variables.tf#L243) | Self link for the shared VPC. | <code title="object&#40;&#123;&#10;  dev-spoke-0 &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> | ✓ |  | <code>2-networking</code> |
+| [clusters](variables.tf#L42) | Clusters configuration. Refer to the gke-cluster module for type details. | <code title="map&#40;object&#40;&#123;&#10;  cluster_autoscaling &#61; optional&#40;any&#41;&#10;  description         &#61; optional&#40;string&#41;&#10;  enable_addons &#61; optional&#40;any, &#123;&#10;    horizontal_pod_autoscaling &#61; true, http_load_balancing &#61; true&#10;  &#125;&#41;&#10;  enable_features &#61; optional&#40;any, &#123;&#10;    workload_identity &#61; true&#10;  &#125;&#41;&#10;  issue_client_certificate &#61; optional&#40;bool, false&#41;&#10;  labels                   &#61; optional&#40;map&#40;string&#41;&#41;&#10;  location                 &#61; string&#10;  logging_config &#61; optional&#40;object&#40;&#123;&#10;    enable_system_logs             &#61; optional&#40;bool, true&#41;&#10;    enable_workloads_logs          &#61; optional&#40;bool, true&#41;&#10;    enable_api_server_logs         &#61; optional&#40;bool, false&#41;&#10;    enable_scheduler_logs          &#61; optional&#40;bool, false&#41;&#10;    enable_controller_manager_logs &#61; optional&#40;bool, false&#41;&#10;  &#125;&#41;, &#123;&#125;&#41;&#10;  maintenance_config &#61; optional&#40;any, &#123;&#10;    daily_window_start_time &#61; &#34;03:00&#34;&#10;    recurring_window        &#61; null&#10;    maintenance_exclusion   &#61; &#91;&#93;&#10;  &#125;&#41;&#10;  max_pods_per_node  &#61; optional&#40;number, 110&#41;&#10;  min_master_version &#61; optional&#40;string&#41;&#10;  monitoring_config &#61; optional&#40;object&#40;&#123;&#10;    enable_components  &#61; optional&#40;list&#40;string&#41;, &#91;&#34;SYSTEM_COMPONENTS&#34;&#93;&#41;&#10;    managed_prometheus &#61; optional&#40;bool&#41;&#10;  &#125;&#41;&#41;&#10;  node_locations         &#61; optional&#40;list&#40;string&#41;&#41;&#10;  private_cluster_config &#61; optional&#40;any&#41;&#10;  release_channel        &#61; optional&#40;string&#41;&#10;  vpc_config &#61; object&#40;&#123;&#10;    subnetwork &#61; string&#10;    network    &#61; optional&#40;string&#41;&#10;    secondary_range_blocks &#61; optional&#40;object&#40;&#123;&#10;      pods     &#61; string&#10;      services &#61; string&#10;    &#125;&#41;&#41;&#10;    secondary_range_names &#61; optional&#40;object&#40;&#123;&#10;      pods     &#61; string&#10;      services &#61; string&#10;    &#125;&#41;, &#123; pods &#61; &#34;pods&#34;, services &#61; &#34;services&#34; &#125;&#41;&#10;    master_authorized_ranges &#61; optional&#40;map&#40;string&#41;&#41;&#10;    master_ipv4_cidr_block   &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [fleet_configmanagement_clusters](variables.tf#L96) | Config management features enabled on specific sets of member clusters, in config name => [cluster name] format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [fleet_configmanagement_templates](variables.tf#L104) | Sets of config management configurations that can be applied to member clusters, in config name => {options} format. | <code title="map&#40;object&#40;&#123;&#10;  binauthz &#61; bool&#10;  config_sync &#61; object&#40;&#123;&#10;    git &#61; object&#40;&#123;&#10;      gcp_service_account_email &#61; string&#10;      https_proxy               &#61; string&#10;      policy_dir                &#61; string&#10;      secret_type               &#61; string&#10;      sync_branch               &#61; string&#10;      sync_repo                 &#61; string&#10;      sync_rev                  &#61; string&#10;      sync_wait_secs            &#61; number&#10;    &#125;&#41;&#10;    prevent_drift &#61; string&#10;    source_format &#61; string&#10;  &#125;&#41;&#10;  hierarchy_controller &#61; object&#40;&#123;&#10;    enable_hierarchical_resource_quota &#61; bool&#10;    enable_pod_tree_labels             &#61; bool&#10;  &#125;&#41;&#10;  policy_controller &#61; object&#40;&#123;&#10;    audit_interval_seconds     &#61; number&#10;    exemptable_namespaces      &#61; list&#40;string&#41;&#10;    log_denies_enabled         &#61; bool&#10;    referential_rules_enabled  &#61; bool&#10;    template_library_installed &#61; bool&#10;  &#125;&#41;&#10;  version &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [fleet_features](variables.tf#L139) | Enable and configure fleet features. Set to null to disable GKE Hub if fleet workload identity is not used. | <code title="object&#40;&#123;&#10;  appdevexperience             &#61; bool&#10;  configmanagement             &#61; bool&#10;  identityservice              &#61; bool&#10;  multiclusteringress          &#61; string&#10;  multiclusterservicediscovery &#61; bool&#10;  servicemesh                  &#61; bool&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |  |
+| [fleet_workload_identity](variables.tf#L152) | Use Fleet Workload Identity for clusters. Enables GKE Hub if set to true. | <code>bool</code> |  | <code>false</code> |  |
+| [group_iam](variables.tf#L167) | Project-level authoritative IAM bindings for groups in {GROUP_EMAIL => [ROLES]} format. Use group emails as keys, list of roles as values. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [iam](variables.tf#L182) | Project-level authoritative IAM bindings for users and service accounts in  {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [labels](variables.tf#L189) | Project-level labels. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [nodepools](variables.tf#L195) | Nodepools configuration. Refer to the gke-nodepool module for type details. | <code title="map&#40;map&#40;object&#40;&#123;&#10;  gke_version           &#61; optional&#40;string&#41;&#10;  labels                &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  max_pods_per_node     &#61; optional&#40;number&#41;&#10;  name                  &#61; optional&#40;string&#41;&#10;  node_config           &#61; optional&#40;any, &#123; disk_type &#61; &#34;pd-balanced&#34; &#125;&#41;&#10;  node_count            &#61; optional&#40;map&#40;number&#41;, &#123; initial &#61; 1 &#125;&#41;&#10;  node_locations        &#61; optional&#40;list&#40;string&#41;&#41;&#10;  nodepool_config       &#61; optional&#40;any&#41;&#10;  pod_range             &#61; optional&#40;any&#41;&#10;  reservation_affinity  &#61; optional&#40;any&#41;&#10;  service_account       &#61; optional&#40;any&#41;&#10;  sole_tenant_nodegroup &#61; optional&#40;string&#41;&#10;  tags                  &#61; optional&#40;list&#40;string&#41;&#41;&#10;  taints &#61; optional&#40;list&#40;object&#40;&#123;&#10;    key    &#61; string&#10;    value  &#61; string&#10;    effect &#61; string&#10;  &#125;&#41;&#41;&#41;&#10;&#125;&#41;&#41;&#41;">map&#40;map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |  |
+| [outputs_location](variables.tf#L221) | Path where providers, tfvars files, and lists for the following stages are written. Leave empty to disable. | <code>string</code> |  | <code>null</code> |  |
+| [project_services](variables.tf#L236) | Additional project services to enable. | <code>list&#40;string&#41;</code> |  | <code>&#91;&#93;</code> |  |

 ## Outputs

@ -187,5 +186,4 @@ Leave all these variables unset (or set to `null`) to disable fleet management.
 | [cluster_ids](outputs.tf#L57) | Cluster ids. |  |  |
 | [clusters](outputs.tf#L62) | Cluster resources. | ✓ |  |
 | [project_id](outputs.tf#L68) | GKE project id. |  |  |
-
 <!-- END TFDOC -->
--- a/fast/stages/3-gke-multitenant/dev/variables.tf
+++ b/fast/stages/3-gke-multitenant/dev/variables.tf
@ -53,7 +53,13 @@ variable "clusters" {
    issue_client_certificate = optional(bool, false)
    labels                   = optional(map(string))
    location                 = string
-    logging_config           = optional(list(string), ["SYSTEM_COMPONENTS"])
+    logging_config = optional(object({
+      enable_system_logs             = optional(bool, true)
+      enable_workloads_logs          = optional(bool, true)
+      enable_api_server_logs         = optional(bool, false)
+      enable_scheduler_logs          = optional(bool, false)
+      enable_controller_manager_logs = optional(bool, false)
+    }), {})
    maintenance_config = optional(any, {
      daily_window_start_time = "03:00"
      recurring_window        = null
--- a/modules/__experimental/net-neg/versions.tf
+++ b/modules/__experimental/net-neg/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/alloydb-instance/versions.tf
+++ b/modules/alloydb-instance/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/api-gateway/versions.tf
+++ b/modules/api-gateway/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/apigee/versions.tf
+++ b/modules/apigee/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/artifact-registry/versions.tf
+++ b/modules/artifact-registry/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/bigquery-dataset/versions.tf
+++ b/modules/bigquery-dataset/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/bigtable-instance/versions.tf
+++ b/modules/bigtable-instance/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/billing-budget/versions.tf
+++ b/modules/billing-budget/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/binauthz/versions.tf
+++ b/modules/binauthz/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/__need_fixing/onprem/versions.tf
+++ b/modules/cloud-config-container/__need_fixing/onprem/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/coredns/versions.tf
+++ b/modules/cloud-config-container/coredns/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/cos-generic-metadata/versions.tf
+++ b/modules/cloud-config-container/cos-generic-metadata/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/envoy-traffic-director/versions.tf
+++ b/modules/cloud-config-container/envoy-traffic-director/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/mysql/versions.tf
+++ b/modules/cloud-config-container/mysql/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/nginx-tls/versions.tf
+++ b/modules/cloud-config-container/nginx-tls/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/nginx/versions.tf
+++ b/modules/cloud-config-container/nginx/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/simple-nva/versions.tf
+++ b/modules/cloud-config-container/simple-nva/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-config-container/squid/versions.tf
+++ b/modules/cloud-config-container/squid/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-function-v1/versions.tf
+++ b/modules/cloud-function-v1/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-function-v2/versions.tf
+++ b/modules/cloud-function-v2/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-identity-group/versions.tf
+++ b/modules/cloud-identity-group/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloud-run/README.md
+++ b/modules/cloud-run/README.md
@ -341,7 +341,7 @@ module "cloud_run" {
 | [name](variables.tf#L136) | Name used for cloud run service. | <code>string</code> | ✓ |  |
 | [project_id](variables.tf#L151) | Project id used for all resources. | <code>string</code> | ✓ |  |
 | [container_concurrency](variables.tf#L18) | Maximum allowed in-flight (concurrent) requests per container of the revision. | <code>string</code> |  | <code>null</code> |
-| [containers](variables.tf#L24) | Containers in arbitrary key => attributes format. | <code title="map&#40;object&#40;&#123;&#10;  image   &#61; string&#10;  args    &#61; optional&#40;list&#40;string&#41;&#41;&#10;  command &#61; optional&#40;list&#40;string&#41;&#41;&#10;  env     &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  env_from_key &#61; optional&#40;map&#40;object&#40;&#123;&#10;    key  &#61; string&#10;    name &#61; string&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;  liveness_probe &#61; optional&#40;object&#40;&#123;&#10;    action &#61; object&#40;&#123;&#10;      grcp &#61; optional&#40;object&#40;&#123;&#10;        port    &#61; optional&#40;number&#41;&#10;        service &#61; optional&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;      http_get &#61; optional&#40;object&#40;&#123;&#10;        http_headers &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;        path         &#61; optional&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;    &#125;&#41;&#10;    failure_threshold     &#61; optional&#40;number&#41;&#10;    initial_delay_seconds &#61; optional&#40;number&#41;&#10;    period_seconds        &#61; optional&#40;number&#41;&#10;    timeout_seconds       &#61; optional&#40;number&#41;&#10;  &#125;&#41;&#41;&#10;  ports &#61; optional&#40;map&#40;object&#40;&#123;&#10;    container_port &#61; optional&#40;number&#41;&#10;    name           &#61; optional&#40;string&#41;&#10;    protocol       &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;  resources &#61; optional&#40;object&#40;&#123;&#10;    limits &#61; optional&#40;object&#40;&#123;&#10;      cpu    &#61; string&#10;      memory &#61; string&#10;    &#125;&#41;&#41;&#10;    requests &#61; optional&#40;object&#40;&#123;&#10;      cpu    &#61; string&#10;      memory &#61; string&#10;    &#125;&#41;&#41;&#10;  &#125;&#41;&#41;&#10;  startup_probe &#61; optional&#40;object&#40;&#123;&#10;    action &#61; object&#40;&#123;&#10;      grcp &#61; optional&#40;object&#40;&#123;&#10;        port    &#61; optional&#40;number&#41;&#10;        service &#61; optional&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;      http_get &#61; optional&#40;object&#40;&#123;&#10;        http_headers &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;        path         &#61; optional&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;      tcp_socket &#61; optional&#40;object&#40;&#123;&#10;        port &#61; optional&#40;number&#41;&#10;      &#125;&#41;&#41;&#10;    &#125;&#41;&#10;    failure_threshold     &#61; optional&#40;number&#41;&#10;    initial_delay_seconds &#61; optional&#40;number&#41;&#10;    period_seconds        &#61; optional&#40;number&#41;&#10;    timeout_seconds       &#61; optional&#40;number&#41;&#10;  &#125;&#41;&#41;&#10;  volume_mounts &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [containers](variables.tf#L24) | Containers in arbitrary key => attributes format. | <code title="map&#40;object&#40;&#123;&#10;  image   &#61; string&#10;  args    &#61; optional&#40;list&#40;string&#41;&#41;&#10;  command &#61; optional&#40;list&#40;string&#41;&#41;&#10;  env     &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  env_from_key &#61; optional&#40;map&#40;object&#40;&#123;&#10;    key  &#61; string&#10;    name &#61; string&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;  liveness_probe &#61; optional&#40;object&#40;&#123;&#10;    action &#61; object&#40;&#123;&#10;      grpc &#61; optional&#40;object&#40;&#123;&#10;        port    &#61; optional&#40;number&#41;&#10;        service &#61; optional&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;      http_get &#61; optional&#40;object&#40;&#123;&#10;        http_headers &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;        path         &#61; optional&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;    &#125;&#41;&#10;    failure_threshold     &#61; optional&#40;number&#41;&#10;    initial_delay_seconds &#61; optional&#40;number&#41;&#10;    period_seconds        &#61; optional&#40;number&#41;&#10;    timeout_seconds       &#61; optional&#40;number&#41;&#10;  &#125;&#41;&#41;&#10;  ports &#61; optional&#40;map&#40;object&#40;&#123;&#10;    container_port &#61; optional&#40;number&#41;&#10;    name           &#61; optional&#40;string&#41;&#10;    protocol       &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;  resources &#61; optional&#40;object&#40;&#123;&#10;    limits &#61; optional&#40;object&#40;&#123;&#10;      cpu    &#61; string&#10;      memory &#61; string&#10;    &#125;&#41;&#41;&#10;    requests &#61; optional&#40;object&#40;&#123;&#10;      cpu    &#61; string&#10;      memory &#61; string&#10;    &#125;&#41;&#41;&#10;  &#125;&#41;&#41;&#10;  startup_probe &#61; optional&#40;object&#40;&#123;&#10;    action &#61; object&#40;&#123;&#10;      grpc &#61; optional&#40;object&#40;&#123;&#10;        port    &#61; optional&#40;number&#41;&#10;        service &#61; optional&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;      http_get &#61; optional&#40;object&#40;&#123;&#10;        http_headers &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;        path         &#61; optional&#40;string&#41;&#10;      &#125;&#41;&#41;&#10;      tcp_socket &#61; optional&#40;object&#40;&#123;&#10;        port &#61; optional&#40;number&#41;&#10;      &#125;&#41;&#41;&#10;    &#125;&#41;&#10;    failure_threshold     &#61; optional&#40;number&#41;&#10;    initial_delay_seconds &#61; optional&#40;number&#41;&#10;    period_seconds        &#61; optional&#40;number&#41;&#10;    timeout_seconds       &#61; optional&#40;number&#41;&#10;  &#125;&#41;&#41;&#10;  volume_mounts &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
 | [eventarc_triggers](variables.tf#L91) | Event arc triggers for different sources. | <code title="object&#40;&#123;&#10;  audit_log &#61; optional&#40;map&#40;object&#40;&#123;&#10;    method  &#61; string&#10;    service &#61; string&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;  pubsub                 &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  service_account_email  &#61; optional&#40;string&#41;&#10;  service_account_create &#61; optional&#40;bool, false&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>&#123;&#125;</code> |
 | [gen2_execution_environment](variables.tf#L105) | Use second generation execution environment. | <code>bool</code> |  | <code>false</code> |
 | [iam](variables.tf#L111) | IAM bindings for Cloud Run service in {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
--- a/modules/cloud-run/variables.tf
+++ b/modules/cloud-run/variables.tf
@ -34,7 +34,7 @@ variable "containers" {
    })), {})
    liveness_probe = optional(object({
      action = object({
-        grcp = optional(object({
+        grpc = optional(object({
          port    = optional(number)
          service = optional(string)
        }))
@ -65,7 +65,7 @@ variable "containers" {
    }))
    startup_probe = optional(object({
      action = object({
-        grcp = optional(object({
+        grpc = optional(object({
          port    = optional(number)
          service = optional(string)
        }))
--- a/modules/cloud-run/versions.tf
+++ b/modules/cloud-run/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/cloudsql-instance/versions.tf
+++ b/modules/cloudsql-instance/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/compute-mig/versions.tf
+++ b/modules/compute-mig/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/compute-vm/versions.tf
+++ b/modules/compute-vm/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/container-registry/versions.tf
+++ b/modules/container-registry/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/data-catalog-policy-tag/versions.tf
+++ b/modules/data-catalog-policy-tag/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/datafusion/versions.tf
+++ b/modules/datafusion/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/dataplex-datascan/versions.tf
+++ b/modules/dataplex-datascan/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/dataplex/versions.tf
+++ b/modules/dataplex/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/dataproc/versions.tf
+++ b/modules/dataproc/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/dns-response-policy/versions.tf
+++ b/modules/dns-response-policy/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/dns/versions.tf
+++ b/modules/dns/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/endpoints/versions.tf
+++ b/modules/endpoints/versions.tf
@ -17,11 +17,11 @@ terraform {
  required_providers {
    google = {
      source  = "hashicorp/google"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
    google-beta = {
      source  = "hashicorp/google-beta"
-      version = ">= 4.76.0" # tftest
+      version = ">= 4.80.0" # tftest
    }
  }
 }
--- a/modules/folder/README.md
+++ b/modules/folder/README.md
@ -136,8 +136,9 @@ module "folder" {
  parent = "organizations/1234567890"
  name   = "Folder name"
  # attachment via the organization module
-  firewall_policy_associations = {
-    test-1 = module.firewall-policy.id
+  firewall_policy = {
+    name   = "test-1"
+    policy = module.firewall-policy.id
  }
 }
 # tftest modules=2 resources=3
@ -285,21 +286,21 @@ module "folder" {
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
 | [contacts](variables.tf#L17) | List of essential contacts for this resource. Must be in the form EMAIL -> [NOTIFICATION_TYPES]. Valid notification types are ALL, SUSPENSION, SECURITY, TECHNICAL, BILLING, LEGAL, PRODUCT_UPDATES. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [firewall_policy_associations](variables.tf#L24) | Hierarchical firewall policies to associate to this folder, in association name => policy id format. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |
-| [folder_create](variables.tf#L31) | Create folder. When set to false, uses id to reference an existing folder. | <code>bool</code> |  | <code>true</code> |
-| [group_iam](variables.tf#L37) | Authoritative IAM binding for organization groups, in {GROUP_EMAIL => [ROLES]} format. Group emails need to be static. Can be used in combination with the `iam` variable. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [iam](variables.tf#L44) | IAM bindings in {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [iam_bindings](variables.tf#L51) | Authoritative IAM bindings in {ROLE => {members = [], condition = {}}}. | <code title="map&#40;object&#40;&#123;&#10;  members &#61; list&#40;string&#41;&#10;  condition &#61; optional&#40;object&#40;&#123;&#10;    expression  &#61; string&#10;    title       &#61; string&#10;    description &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [iam_bindings_additive](variables.tf#L65) | Individual additive IAM bindings. Keys are arbitrary. | <code title="map&#40;object&#40;&#123;&#10;  member &#61; string&#10;  role   &#61; string&#10;  condition &#61; optional&#40;object&#40;&#123;&#10;    expression  &#61; string&#10;    title       &#61; string&#10;    description &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [id](variables.tf#L80) | Folder ID in case you use folder_create=false. | <code>string</code> |  | <code>null</code> |
-| [logging_data_access](variables.tf#L86) | Control activation of data access logs. Format is service => { log type => [exempted members]}. The special 'allServices' key denotes configuration for all services. | <code>map&#40;map&#40;list&#40;string&#41;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [logging_exclusions](variables.tf#L101) | Logging exclusions for this folder in the form {NAME -> FILTER}. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |
-| [logging_sinks](variables.tf#L108) | Logging sinks to create for the organization. | <code title="map&#40;object&#40;&#123;&#10;  bq_partitioned_table &#61; optional&#40;bool&#41;&#10;  description          &#61; optional&#40;string&#41;&#10;  destination          &#61; string&#10;  disabled             &#61; optional&#40;bool, false&#41;&#10;  exclusions           &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  filter               &#61; string&#10;  include_children     &#61; optional&#40;bool, true&#41;&#10;  type                 &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [name](variables.tf#L138) | Folder name. | <code>string</code> |  | <code>null</code> |
-| [org_policies](variables.tf#L144) | Organization policies applied to this folder keyed by policy name. | <code title="map&#40;object&#40;&#123;&#10;  inherit_from_parent &#61; optional&#40;bool&#41; &#35; for list policies only.&#10;  reset               &#61; optional&#40;bool&#41;&#10;  rules &#61; optional&#40;list&#40;object&#40;&#123;&#10;    allow &#61; optional&#40;object&#40;&#123;&#10;      all    &#61; optional&#40;bool&#41;&#10;      values &#61; optional&#40;list&#40;string&#41;&#41;&#10;    &#125;&#41;&#41;&#10;    deny &#61; optional&#40;object&#40;&#123;&#10;      all    &#61; optional&#40;bool&#41;&#10;      values &#61; optional&#40;list&#40;string&#41;&#41;&#10;    &#125;&#41;&#41;&#10;    enforce &#61; optional&#40;bool&#41; &#35; for boolean policies only.&#10;    condition &#61; optional&#40;object&#40;&#123;&#10;      description &#61; optional&#40;string&#41;&#10;      expression  &#61; optional&#40;string&#41;&#10;      location    &#61; optional&#40;string&#41;&#10;      title       &#61; optional&#40;string&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;&#41;, &#91;&#93;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [org_policies_data_path](variables.tf#L171) | Path containing org policies in YAML format. | <code>string</code> |  | <code>null</code> |
-| [parent](variables.tf#L177) | Parent in folders/folder_id or organizations/org_id format. | <code>string</code> |  | <code>null</code> |
-| [tag_bindings](variables.tf#L187) | Tag bindings for this folder, in key => tag value id format. | <code>map&#40;string&#41;</code> |  | <code>null</code> |
+| [firewall_policy](variables.tf#L24) | Hierarchical firewall policy to associate to this folder. | <code title="object&#40;&#123;&#10;  name   &#61; string&#10;  policy &#61; string&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [folder_create](variables.tf#L33) | Create folder. When set to false, uses id to reference an existing folder. | <code>bool</code> |  | <code>true</code> |
+| [group_iam](variables.tf#L39) | Authoritative IAM binding for organization groups, in {GROUP_EMAIL => [ROLES]} format. Group emails need to be static. Can be used in combination with the `iam` variable. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [iam](variables.tf#L46) | IAM bindings in {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [iam_bindings](variables.tf#L53) | Authoritative IAM bindings in {ROLE => {members = [], condition = {}}}. | <code title="map&#40;object&#40;&#123;&#10;  members &#61; list&#40;string&#41;&#10;  condition &#61; optional&#40;object&#40;&#123;&#10;    expression  &#61; string&#10;    title       &#61; string&#10;    description &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [iam_bindings_additive](variables.tf#L67) | Individual additive IAM bindings. Keys are arbitrary. | <code title="map&#40;object&#40;&#123;&#10;  member &#61; string&#10;  role   &#61; string&#10;  condition &#61; optional&#40;object&#40;&#123;&#10;    expression  &#61; string&#10;    title       &#61; string&#10;    description &#61; optional&#40;string&#41;&#10;  &#125;&#41;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [id](variables.tf#L82) | Folder ID in case you use folder_create=false. | <code>string</code> |  | <code>null</code> |
+| [logging_data_access](variables.tf#L88) | Control activation of data access logs. Format is service => { log type => [exempted members]}. The special 'allServices' key denotes configuration for all services. | <code>map&#40;map&#40;list&#40;string&#41;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [logging_exclusions](variables.tf#L103) | Logging exclusions for this folder in the form {NAME -> FILTER}. | <code>map&#40;string&#41;</code> |  | <code>&#123;&#125;</code> |
+| [logging_sinks](variables.tf#L110) | Logging sinks to create for the organization. | <code title="map&#40;object&#40;&#123;&#10;  bq_partitioned_table &#61; optional&#40;bool&#41;&#10;  description          &#61; optional&#40;string&#41;&#10;  destination          &#61; string&#10;  disabled             &#61; optional&#40;bool, false&#41;&#10;  exclusions           &#61; optional&#40;map&#40;string&#41;, &#123;&#125;&#41;&#10;  filter               &#61; string&#10;  include_children     &#61; optional&#40;bool, true&#41;&#10;  type                 &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [name](variables.tf#L140) | Folder name. | <code>string</code> |  | <code>null</code> |
+| [org_policies](variables.tf#L146) | Organization policies applied to this folder keyed by policy name. | <code title="map&#40;object&#40;&#123;&#10;  inherit_from_parent &#61; optional&#40;bool&#41; &#35; for list policies only.&#10;  reset               &#61; optional&#40;bool&#41;&#10;  rules &#61; optional&#40;list&#40;object&#40;&#123;&#10;    allow &#61; optional&#40;object&#40;&#123;&#10;      all    &#61; optional&#40;bool&#41;&#10;      values &#61; optional&#40;list&#40;string&#41;&#41;&#10;    &#125;&#41;&#41;&#10;    deny &#61; optional&#40;object&#40;&#123;&#10;      all    &#61; optional&#40;bool&#41;&#10;      values &#61; optional&#40;list&#40;string&#41;&#41;&#10;    &#125;&#41;&#41;&#10;    enforce &#61; optional&#40;bool&#41; &#35; for boolean policies only.&#10;    condition &#61; optional&#40;object&#40;&#123;&#10;      description &#61; optional&#40;string&#41;&#10;      expression  &#61; optional&#40;string&#41;&#10;      location    &#61; optional&#40;string&#41;&#10;      title       &#61; optional&#40;string&#41;&#10;    &#125;&#41;, &#123;&#125;&#41;&#10;  &#125;&#41;&#41;, &#91;&#93;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [org_policies_data_path](variables.tf#L173) | Path containing org policies in YAML format. | <code>string</code> |  | <code>null</code> |
+| [parent](variables.tf#L179) | Parent in folders/folder_id or organizations/org_id format. | <code>string</code> |  | <code>null</code> |
+| [tag_bindings](variables.tf#L189) | Tag bindings for this folder, in key => tag value id format. | <code>map&#40;string&#41;</code> |  | <code>null</code> |

 ## Outputs

--- a/modules/folder/main.tf
+++ b/modules/folder/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.
@ -43,8 +43,8 @@ resource "google_essential_contacts_contact" "contact" {
 }

 resource "google_compute_firewall_policy_association" "default" {
-  for_each          = var.firewall_policy_associations
+  count             = var.firewall_policy == null ? 0 : 1
  attachment_target = local.folder.id
-  name              = each.key
-  firewall_policy   = each.value
+  name              = var.firewall_policy.name
+  firewall_policy   = var.firewall_policy.policy
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julio Castillo	c301fd6a17	Merge pull request #1650 from GoogleCloudPlatform/jccb/net-vpc-nullables Make net-vpc variables non-nullable	2023-09-06 10:52:28 +02:00
Julio Castillo	a6640e5959	Make net-vpc variables nullable	2023-09-06 09:57:34 +02:00
Julio Castillo	012801189a	Merge pull request #1647 from GoogleCloudPlatform/jccb/bump-provider-4.80.0 Bump provider version to 4.80.0	2023-09-05 12:06:19 +02:00
Julio Castillo	24e591f85a	Fix tests using provider 4.80	2023-09-05 11:28:12 +02:00
Julio Castillo	3d4cc7164a	Bump provider version to 4.80.0	2023-09-05 09:48:15 +02:00
Oliver Frolovs	9f23d504ec	gke-cluster-autopilot: add monitoring configuration (#1646 ) * gke-cluster-autopilot: add monitoring configuration block (monitoring_config)	2023-09-04 16:43:59 +01:00
Oliver Frolovs	42ebbccad9	gke-cluster-autopilot: validation for release_channel (#1645 )	2023-09-03 00:37:49 +00:00
Oliver Frolovs	988fd2ee05	gke-cluster-standard: change logging configuration (#1638 ) * Update logging configuration of this module to use object interface in harmony with `gke-cluster-autopilot` module. * Update blueprints that use this module. * Add "WORKLOADS" log source to logging configuration of the blueprints where the README files say so. * Update FAST stage 3 because it uses this module.	2023-08-31 12:49:15 +01:00
Oliver Frolovs	80e85ad343	gke-cluster-autopilot: add logging configuration (#1625 ) Although one cannot disable Cloud Logging and Cloud Monitoring integration in GKE Autopilot clusters, one has some flexibility over which control plane components' logs should be ingested. This commit adds a new variable and a block to the cluster resource to facilitate that. * gke-cluster-autopilot: update logging configuration and add an example to module README	2023-08-31 12:06:57 +01:00
Julio Castillo	9fa30b5e9c	Merge pull request #1641 from GoogleCloudPlatform/jccb/nicer-lint Lint script	2023-08-31 11:38:09 +02:00
Julio Castillo	5591dabdc5	Remove print	2023-08-31 11:20:25 +02:00
Julio Castillo	1285ac099d	Merge branch 'master' into jccb/nicer-lint	2023-08-31 11:19:49 +02:00
Julio Castillo	8a667ff35b	Forgot to add the script	2023-08-31 11:17:39 +02:00
Julio Castillo	f9dc60547e	Merge pull request #1640 from GoogleCloudPlatform/jccb/nicer-lint Simplify linting output in workflow	2023-08-31 11:16:37 +02:00
Julio Castillo	5bbb7bdd09	Simplify linting output in workflow	2023-08-31 10:15:12 +02:00
Julio Castillo	2e0474dc71	Update pull_request_template.md	2023-08-30 17:49:49 +02:00
Julio Castillo	d717712657	Create pull_request_template.md	2023-08-30 17:46:56 +02:00
Julio Castillo	9feb9da9d0	Merge pull request #1637 from zacharysmithdatatonic/zacharysmithdatatonic/fix-grpc-typo GRPC variable is misnamed "GRCP" in `modules/cloud-run/variables.tf`, causing liveness probe and startup probe to fail	2023-08-30 13:47:04 +02:00
Zachary	b784e85c60	Regenerated cloud run README tables with tfdoc.py Updated documentation with tfdoc.py	2023-08-30 12:16:21 +01:00
Zachary	a4dfd7f201	fixed grcp to grpc typo in cloud run module	2023-08-30 11:04:10 +01:00
Julio Diez	cae3a8bec7	Merge pull request #1636 from GoogleCloudPlatform/delete-api-gateway Delete api gateway blueprint	2023-08-29 13:32:39 +02:00
Julio Diez	65c730b518	Update CHANGELOG.md Remove link to API Gateway blueprint	2023-08-29 13:02:20 +02:00
Julio Diez	b3e1e8e1ba	Delete blueprints/serverless/api-gateway directory	2023-08-29 11:48:13 +02:00
Julio Diez	a7ec00acba	Delete API Gateway from serverless' README	2023-08-29 11:45:15 +02:00
Julio Diez	6ce8fd6942	Delete API Gateway from blueprint's README	2023-08-29 11:40:31 +02:00
Julio Castillo	264ee31fe6	Merge pull request #1635 from GoogleCloudPlatform/jccb/fast-tests Silence FAST tests warnings	2023-08-29 07:26:58 +02:00
Julio Castillo	3d487c89c3	Merge branch 'master' into jccb/fast-tests	2023-08-29 07:26:43 +02:00
LudovicEmo	c558d9b753	Vpc sc allow null for identity type (#1632 ) * vpc-sc : allow null for identity_type * cloudsql-instance : fmt * vpc-sc: tfdoc * modules/vpc-sc: update the test result for the identity_type field * cloudsql-instance: remove empty line	2023-08-29 04:28:57 +02:00
Julio Castillo	804e7c961e	Silence FAST tests warnings - Fix pytest PytestUnraisableExceptionWarning - Remove incorrect print - Use tfvars for some examples in READMEs	2023-08-28 18:40:41 +02:00
Luca Prete	c63884d52e	Remove unused ASN numbers in CloudNAT to avoid FAST provider errors	2023-08-28 15:32:30 +00:00
Luca Prete	9d0fd744a8	Do not set default ASN number (#1633 )	2023-08-28 15:06:31 +00:00
Julio Castillo	6459e7caa8	Merge pull request #1631 from GoogleCloudPlatform/jccb/hfw-policy-fix Allow single hfw policy association in folder and organization modules	2023-08-28 16:46:05 +02:00
Julio Castillo	b88e4c6f6e	Fix syntax error in FAST nva	2023-08-28 16:28:01 +02:00
Julio Castillo	b701d55b1f	Fix tests	2023-08-28 16:00:48 +02:00
Julio Castillo	9eb768357e	Switch to count	2023-08-28 16:00:48 +02:00
Julio Castillo	5e9829373c	Fix FAST hfw policies	2023-08-28 16:00:48 +02:00
Julio Castillo	04721a35ef	Allow single hfw policy association in folder and organization modules	2023-08-28 16:00:48 +02:00
Luca Prete	ce96ac31e7	[Fix] Add explicit dependency between CR peers and NCC RA spoke creation (#1630 )	2023-08-28 15:50:46 +02:00