From f1accdd4241fa90d3648d4467e6d6a3a2f5d9bda Mon Sep 17 00:00:00 2001 From: apichick Date: Mon, 18 Nov 2024 08:36:49 +0100 Subject: [PATCH 1/3] Added outputs to apigee-x-foundations blueprint (PSC NEGs) (#2705) Co-authored-by: Ludovico Magnocavallo --- blueprints/apigee/apigee-x-foundations/README.md | 1 + blueprints/apigee/apigee-x-foundations/outputs.tf | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/blueprints/apigee/apigee-x-foundations/README.md b/blueprints/apigee/apigee-x-foundations/README.md index 885f7fe568..7c8019f313 100644 --- a/blueprints/apigee/apigee-x-foundations/README.md +++ b/blueprints/apigee/apigee-x-foundations/README.md @@ -501,4 +501,5 @@ module "apigee-x-foundations" { | [int_lbs](outputs.tf#L71) | Internal LBs. | | | | [project](outputs.tf#L76) | Project. | | | | [project_id](outputs.tf#L81) | Project id. | | | +| [psc_negs](outputs.tf#L86) | PSC NEGs. | | | diff --git a/blueprints/apigee/apigee-x-foundations/outputs.tf b/blueprints/apigee/apigee-x-foundations/outputs.tf index 52b0942e63..8353c6f702 100644 --- a/blueprints/apigee/apigee-x-foundations/outputs.tf +++ b/blueprints/apigee/apigee-x-foundations/outputs.tf @@ -82,3 +82,8 @@ output "project_id" { description = "Project id." value = module.project.project_id } + +output "psc_negs" { + description = "PSC NEGs." + value = google_compute_region_network_endpoint_group.psc_negs +} From 9f7505d0616313a77b3d28d940ec861e89fb0d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20Niesiob=C4=99dzki?= Date: Mon, 18 Nov 2024 08:57:44 +0000 Subject: [PATCH 2/3] Allow providing network for Direct VPC access --- modules/cloud-run-v2/README.md | 10 +++++----- modules/cloud-run-v2/job.tf | 3 ++- modules/cloud-run-v2/service.tf | 3 ++- modules/cloud-run-v2/variables.tf | 9 ++++++++- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/modules/cloud-run-v2/README.md b/modules/cloud-run-v2/README.md index 07e405b107..45423e443d 100644 --- a/modules/cloud-run-v2/README.md +++ b/modules/cloud-run-v2/README.md @@ -556,11 +556,11 @@ module "cloud_run" { | [labels](variables.tf#L142) | Resource labels. | map(string) | | {} | | [launch_stage](variables.tf#L148) | The launch stage as defined by Google Cloud Platform Launch Stages. | string | | null | | [prefix](variables.tf#L170) | Optional prefix used for resource names. | string | | null | -| [revision](variables.tf#L190) | Revision template configurations. | object({…}) | | {} | -| [service_account](variables.tf#L221) | Service account email. Unused if service account is auto-created. | string | | null | -| [service_account_create](variables.tf#L227) | Auto-create service account. | bool | | false | -| [tag_bindings](variables.tf#L233) | Tag bindings for this service, in key => tag value id format. | map(string) | | {} | -| [volumes](variables.tf#L240) | Named volumes in containers in name => attributes format. | map(object({…})) | | {} | +| [revision](variables.tf#L190) | Revision template configurations. | object({…}) | | {} | +| [service_account](variables.tf#L228) | Service account email. Unused if service account is auto-created. | string | | null | +| [service_account_create](variables.tf#L234) | Auto-create service account. | bool | | false | +| [tag_bindings](variables.tf#L240) | Tag bindings for this service, in key => tag value id format. | map(string) | | {} | +| [volumes](variables.tf#L247) | Named volumes in containers in name => attributes format. | map(object({…})) | | {} | | [vpc_connector_create](variables-vpcconnector.tf#L17) | Populate this to create a Serverless VPC Access connector. | object({…}) | | null | ## Outputs diff --git a/modules/cloud-run-v2/job.tf b/modules/cloud-run-v2/job.tf index 74b170408b..bd2584f157 100644 --- a/modules/cloud-run-v2/job.tf +++ b/modules/cloud-run-v2/job.tf @@ -35,11 +35,12 @@ resource "google_cloud_run_v2_job" "job" { } } dynamic "vpc_access" { - for_each = try(var.revision.vpc_access.subnet, null) == null ? [] : [""] + for_each = var.revision.vpc_access.subnet == null && var.revision.vpc_access.network == null ? [] : [""] content { egress = var.revision.vpc_access.egress network_interfaces { subnetwork = var.revision.vpc_access.subnet + network = var.revision.vpc_access.network tags = var.revision.vpc_access.tags } } diff --git a/modules/cloud-run-v2/service.tf b/modules/cloud-run-v2/service.tf index 0e35be1707..8df793740f 100644 --- a/modules/cloud-run-v2/service.tf +++ b/modules/cloud-run-v2/service.tf @@ -48,11 +48,12 @@ resource "google_cloud_run_v2_service" "service" { } } dynamic "vpc_access" { - for_each = try(var.revision.vpc_access.subnet, null) == null ? [] : [""] + for_each = var.revision.vpc_access.subnet == null && var.revision.vpc_access.network == null ? [] : [""] content { egress = var.revision.vpc_access.egress network_interfaces { subnetwork = var.revision.vpc_access.subnet + network = var.revision.vpc_access.network tags = var.revision.vpc_access.tags } } diff --git a/modules/cloud-run-v2/variables.tf b/modules/cloud-run-v2/variables.tf index 472b2f8e04..951ad84c18 100644 --- a/modules/cloud-run-v2/variables.tf +++ b/modules/cloud-run-v2/variables.tf @@ -202,9 +202,10 @@ variable "revision" { vpc_access = optional(object({ connector = optional(string) egress = optional(string) + network = optional(string) subnet = optional(string) tags = optional(list(string)) - })) + }), {}) timeout = optional(string) }) default = {} @@ -216,6 +217,12 @@ variable "revision" { ) error_message = "Egress should be one of ALL_TRAFFIC, PRIVATE_RANGES_ONLY." } + validation { + condition = ( + var.revision.vpc_access.network == null || (var.revision.vpc_access.network != null && var.revision.vpc_access.subnet != null) + ) + error_message = "When providing vpc_access.network provide also vpc_access.subnet." + } } variable "service_account" { From c60d152f4a9f0718275de0062a63821480b40267 Mon Sep 17 00:00:00 2001 From: Julio Castillo Date: Mon, 18 Nov 2024 12:41:49 +0100 Subject: [PATCH 3/3] Add hierarchical namespace support to GCS module (#2712) * Add hierarchical namespace support to GCS module * remove empty iap block from inventories * Fix tests * Add new hns inventory --------- Co-authored-by: Ludo --- .../patterns/autopilot-cluster/versions.tf | 4 +- blueprints/gke/patterns/batch/versions.tf | 4 +- blueprints/gke/patterns/kafka/versions.tf | 4 +- .../gke/patterns/kong-cloudrun/versions.tf | 4 +- blueprints/gke/patterns/mysql/versions.tf | 4 +- .../gke/patterns/redis-cluster/versions.tf | 4 +- .../secops/secops-gke-forwarder/versions.tf | 4 +- default-versions.tf | 4 +- .../alloydb-instance/versions.tf | 4 +- .../net-neg/versions.tf | 4 +- .../project-iam-magic/versions.tf | 4 +- modules/alloydb/versions.tf | 4 +- modules/analytics-hub/versions.tf | 4 +- modules/api-gateway/versions.tf | 4 +- modules/apigee/versions.tf | 4 +- modules/artifact-registry/versions.tf | 4 +- modules/bigquery-dataset/versions.tf | 4 +- modules/bigtable-instance/versions.tf | 4 +- modules/billing-account/versions.tf | 4 +- modules/binauthz/versions.tf | 4 +- .../certificate-authority-service/versions.tf | 4 +- modules/certificate-manager/versions.tf | 4 +- .../__need_fixing/onprem/versions.tf | 4 +- .../__need_fixing/squid/versions.tf | 4 +- .../bindplane/versions.tf | 4 +- .../coredns/versions.tf | 4 +- .../cos-generic-metadata/versions.tf | 4 +- .../envoy-sni-dyn-fwd-proxy/versions.tf | 4 +- .../envoy-traffic-director/versions.tf | 4 +- .../cloud-config-container/mysql/versions.tf | 4 +- .../nginx-tls/versions.tf | 4 +- .../cloud-config-container/nginx/versions.tf | 4 +- .../simple-nva/versions.tf | 4 +- modules/cloud-function-v1/versions.tf | 4 +- modules/cloud-function-v2/versions.tf | 4 +- modules/cloud-identity-group/versions.tf | 4 +- modules/cloud-run-v2/versions.tf | 4 +- modules/cloud-run/versions.tf | 4 +- modules/cloudsql-instance/versions.tf | 4 +- modules/compute-mig/versions.tf | 4 +- modules/compute-vm/versions.tf | 4 +- modules/container-registry/versions.tf | 4 +- modules/data-catalog-policy-tag/versions.tf | 4 +- modules/data-catalog-tag-template/versions.tf | 4 +- modules/data-catalog-tag/versions.tf | 4 +- modules/dataform-repository/versions.tf | 4 +- modules/datafusion/versions.tf | 4 +- modules/dataplex-datascan/versions.tf | 4 +- modules/dataplex/versions.tf | 4 +- modules/dataproc/versions.tf | 4 +- modules/dns-response-policy/versions.tf | 4 +- modules/dns/versions.tf | 4 +- modules/endpoints/versions.tf | 4 +- modules/firestore/versions.tf | 4 +- modules/folder/versions.tf | 4 +- modules/gcs/README.md | 70 ++++++++++++------- modules/gcs/main.tf | 8 +++ modules/gcs/variables.tf | 6 ++ modules/gcs/versions.tf | 6 +- modules/gcve-private-cloud/versions.tf | 4 +- modules/gke-cluster-autopilot/versions.tf | 4 +- modules/gke-cluster-standard/versions.tf | 4 +- modules/gke-hub/versions.tf | 4 +- modules/gke-nodepool/versions.tf | 4 +- modules/iam-service-account/versions.tf | 4 +- modules/kms/versions.tf | 4 +- modules/logging-bucket/versions.tf | 4 +- modules/looker-core/versions.tf | 4 +- modules/ncc-spoke-ra/versions.tf | 4 +- modules/net-address/versions.tf | 4 +- modules/net-cloudnat/versions.tf | 4 +- modules/net-firewall-policy/versions.tf | 4 +- .../net-ipsec-over-interconnect/versions.tf | 4 +- modules/net-lb-app-ext-regional/versions.tf | 4 +- modules/net-lb-app-ext/versions.tf | 4 +- .../net-lb-app-int-cross-region/versions.tf | 4 +- modules/net-lb-app-int/versions.tf | 4 +- modules/net-lb-ext/versions.tf | 4 +- modules/net-lb-int/versions.tf | 4 +- modules/net-lb-proxy-int/versions.tf | 4 +- modules/net-swp/versions.tf | 4 +- modules/net-vlan-attachment/versions.tf | 4 +- modules/net-vpc-firewall/versions.tf | 4 +- modules/net-vpc-peering/versions.tf | 4 +- modules/net-vpc/versions.tf | 4 +- modules/net-vpn-dynamic/versions.tf | 4 +- modules/net-vpn-ha/versions.tf | 4 +- modules/net-vpn-static/versions.tf | 4 +- modules/organization/versions.tf | 4 +- modules/project/versions.tf | 4 +- modules/projects-data-source/versions.tf | 4 +- modules/pubsub/versions.tf | 4 +- modules/secret-manager/versions.tf | 4 +- .../versions.tf | 4 +- modules/service-directory/versions.tf | 4 +- modules/source-repository/versions.tf | 4 +- modules/spanner-instance/versions.tf | 4 +- modules/vpc-sc/versions.tf | 4 +- modules/workstation-cluster/versions.tf | 4 +- .../examples/multiple-fw-rules.yaml | 5 +- tests/examples_e2e/setup_module/versions.tf | 4 +- .../cloudsql_instance/examples/simple.yaml | 1 - tests/modules/dns/examples/peering-zone.yaml | 5 +- .../dns/examples/routing-policies.yaml | 5 +- tests/modules/gcs/examples/hns.yaml | 28 ++++++++ tests/modules/gke_hub/examples/full.yaml | 2 - .../modules/net_cloudnat/examples/hybrid.yaml | 2 - .../examples/classic-vs-non-classic.yaml | 1 - .../examples/complex-example.yaml | 3 - .../examples/health-check-1.yaml | 1 - .../examples/health-check-2.yaml | 1 - .../examples/http-backends.yaml | 1 - .../examples/http-https-redirect.yaml | 1 - .../examples/https-backends.yaml | 1 - .../net_lb_app_ext/examples/hybrid-neg.yaml | 1 - .../examples/instance-groups.yaml | 1 - .../net_lb_app_ext/examples/internet-neg.yaml | 1 - .../examples/managed-instance-groups.yaml | 1 - .../net_lb_app_ext/examples/minimal-http.yaml | 1 - .../examples/network-endpoint-groups.yaml | 1 - .../examples/serverless-neg.yaml | 1 - .../examples/ssl-certificates.yaml | 1 - .../net_lb_app_ext/examples/url-map.yaml | 2 - .../examples/zonal-neg-creation.yaml | 1 - .../net_lb_app_int/examples/internet-neg.yaml | 3 +- .../net_lb_app_int/examples/zonal-neg.yaml | 1 - .../examples/zonal-neg.yaml | 1 - .../net_lb_ext/examples/dual_stack.yaml | 1 - tests/modules/net_lb_ext/examples/e2e.yaml | 1 - .../modules/net_lb_ext/examples/ext_migs.yaml | 1 - .../net_lb_ext/examples/fwd_rules.yaml | 1 - tests/modules/net_lb_ext/examples/migs.yaml | 1 - .../net_lb_proxy_int/examples/zonal-neg.yaml | 1 - tools/lockfile/versions.tf | 4 +- 134 files changed, 289 insertions(+), 268 deletions(-) create mode 100644 tests/modules/gcs/examples/hns.yaml diff --git a/blueprints/gke/patterns/autopilot-cluster/versions.tf b/blueprints/gke/patterns/autopilot-cluster/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/blueprints/gke/patterns/autopilot-cluster/versions.tf +++ b/blueprints/gke/patterns/autopilot-cluster/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/batch/versions.tf b/blueprints/gke/patterns/batch/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/blueprints/gke/patterns/batch/versions.tf +++ b/blueprints/gke/patterns/batch/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/kafka/versions.tf b/blueprints/gke/patterns/kafka/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/blueprints/gke/patterns/kafka/versions.tf +++ b/blueprints/gke/patterns/kafka/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/kong-cloudrun/versions.tf b/blueprints/gke/patterns/kong-cloudrun/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/blueprints/gke/patterns/kong-cloudrun/versions.tf +++ b/blueprints/gke/patterns/kong-cloudrun/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/mysql/versions.tf b/blueprints/gke/patterns/mysql/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/blueprints/gke/patterns/mysql/versions.tf +++ b/blueprints/gke/patterns/mysql/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/redis-cluster/versions.tf b/blueprints/gke/patterns/redis-cluster/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/blueprints/gke/patterns/redis-cluster/versions.tf +++ b/blueprints/gke/patterns/redis-cluster/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/blueprints/secops/secops-gke-forwarder/versions.tf b/blueprints/secops/secops-gke-forwarder/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/blueprints/secops/secops-gke-forwarder/versions.tf +++ b/blueprints/secops/secops-gke-forwarder/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/default-versions.tf b/default-versions.tf index f569ce5af2..0d64211e9a 100644 --- a/default-versions.tf +++ b/default-versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tf b/modules/__experimental_deprecated/alloydb-instance/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/__experimental_deprecated/alloydb-instance/versions.tf +++ b/modules/__experimental_deprecated/alloydb-instance/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/net-neg/versions.tf b/modules/__experimental_deprecated/net-neg/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/__experimental_deprecated/net-neg/versions.tf +++ b/modules/__experimental_deprecated/net-neg/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tf b/modules/__experimental_deprecated/project-iam-magic/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/__experimental_deprecated/project-iam-magic/versions.tf +++ b/modules/__experimental_deprecated/project-iam-magic/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/alloydb/versions.tf b/modules/alloydb/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/alloydb/versions.tf +++ b/modules/alloydb/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/analytics-hub/versions.tf b/modules/analytics-hub/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/analytics-hub/versions.tf +++ b/modules/analytics-hub/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/api-gateway/versions.tf +++ b/modules/api-gateway/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/apigee/versions.tf +++ b/modules/apigee/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/artifact-registry/versions.tf +++ b/modules/artifact-registry/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/bigquery-dataset/versions.tf +++ b/modules/bigquery-dataset/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/bigtable-instance/versions.tf +++ b/modules/bigtable-instance/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/billing-account/versions.tf b/modules/billing-account/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/billing-account/versions.tf +++ b/modules/billing-account/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/binauthz/versions.tf +++ b/modules/binauthz/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/certificate-authority-service/versions.tf b/modules/certificate-authority-service/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/certificate-authority-service/versions.tf +++ b/modules/certificate-authority-service/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/certificate-manager/versions.tf b/modules/certificate-manager/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/certificate-manager/versions.tf +++ b/modules/certificate-manager/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tf b/modules/cloud-config-container/__need_fixing/onprem/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/__need_fixing/onprem/versions.tf +++ b/modules/cloud-config-container/__need_fixing/onprem/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/__need_fixing/squid/versions.tf b/modules/cloud-config-container/__need_fixing/squid/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/__need_fixing/squid/versions.tf +++ b/modules/cloud-config-container/__need_fixing/squid/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/bindplane/versions.tf b/modules/cloud-config-container/bindplane/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/bindplane/versions.tf +++ b/modules/cloud-config-container/bindplane/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/coredns/versions.tf +++ b/modules/cloud-config-container/coredns/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/cos-generic-metadata/versions.tf +++ b/modules/cloud-config-container/cos-generic-metadata/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf b/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf +++ b/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tf b/modules/cloud-config-container/envoy-traffic-director/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/envoy-traffic-director/versions.tf +++ b/modules/cloud-config-container/envoy-traffic-director/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/mysql/versions.tf +++ b/modules/cloud-config-container/mysql/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/nginx-tls/versions.tf +++ b/modules/cloud-config-container/nginx-tls/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/nginx/versions.tf +++ b/modules/cloud-config-container/nginx/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-config-container/simple-nva/versions.tf +++ b/modules/cloud-config-container/simple-nva/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-function-v1/versions.tf b/modules/cloud-function-v1/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-function-v1/versions.tf +++ b/modules/cloud-function-v1/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-function-v2/versions.tf b/modules/cloud-function-v2/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-function-v2/versions.tf +++ b/modules/cloud-function-v2/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-identity-group/versions.tf +++ b/modules/cloud-identity-group/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-run-v2/versions.tf b/modules/cloud-run-v2/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-run-v2/versions.tf +++ b/modules/cloud-run-v2/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloud-run/versions.tf +++ b/modules/cloud-run/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/cloudsql-instance/versions.tf +++ b/modules/cloudsql-instance/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/compute-mig/versions.tf +++ b/modules/compute-mig/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/compute-vm/versions.tf +++ b/modules/compute-vm/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/container-registry/versions.tf +++ b/modules/container-registry/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/data-catalog-policy-tag/versions.tf +++ b/modules/data-catalog-policy-tag/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/data-catalog-tag-template/versions.tf b/modules/data-catalog-tag-template/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/data-catalog-tag-template/versions.tf +++ b/modules/data-catalog-tag-template/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/data-catalog-tag/versions.tf b/modules/data-catalog-tag/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/data-catalog-tag/versions.tf +++ b/modules/data-catalog-tag/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/dataform-repository/versions.tf b/modules/dataform-repository/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/dataform-repository/versions.tf +++ b/modules/dataform-repository/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/datafusion/versions.tf +++ b/modules/datafusion/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/dataplex-datascan/versions.tf b/modules/dataplex-datascan/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/dataplex-datascan/versions.tf +++ b/modules/dataplex-datascan/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/dataplex/versions.tf b/modules/dataplex/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/dataplex/versions.tf +++ b/modules/dataplex/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/dataproc/versions.tf b/modules/dataproc/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/dataproc/versions.tf +++ b/modules/dataproc/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/dns-response-policy/versions.tf b/modules/dns-response-policy/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/dns-response-policy/versions.tf +++ b/modules/dns-response-policy/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/dns/versions.tf +++ b/modules/dns/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/endpoints/versions.tf +++ b/modules/endpoints/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/firestore/versions.tf b/modules/firestore/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/firestore/versions.tf +++ b/modules/firestore/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/folder/versions.tf +++ b/modules/folder/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/gcs/README.md b/modules/gcs/README.md index 100ee8269b..3ead1cfb1e 100644 --- a/modules/gcs/README.md +++ b/modules/gcs/README.md @@ -10,6 +10,7 @@ - [IAM](#iam) - [Tag Bindings](#tag-bindings) - [Managed Folders](#managed-folders) +- [Hierarchical Namespace](#hierarchical-namespace) - [Variables](#variables) - [Outputs](#outputs) @@ -304,42 +305,57 @@ module "bucket" { } # tftest inventory=managed-folders.yaml ``` + +## Hierarchical Namespace +```hcl +module "bucket" { + source = "./fabric/modules/gcs" + project_id = var.project_id + prefix = var.prefix + name = "my-bucket" + location = "EU" + enable_hierarchical_namespace = true + uniform_bucket_level_access = true +} +# tftest inventory=hns.yaml +``` ## Variables | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [location](variables.tf#L162) | Bucket location. | string | ✓ | | -| [name](variables.tf#L205) | Bucket name suffix. | string | ✓ | | -| [project_id](variables.tf#L263) | Bucket project id. | string | ✓ | | +| [location](variables.tf#L168) | Bucket location. | string | ✓ | | +| [name](variables.tf#L211) | Bucket name suffix. | string | ✓ | | +| [project_id](variables.tf#L269) | Bucket project id. | string | ✓ | | | [autoclass](variables.tf#L17) | Enable autoclass to automatically transition objects to appropriate storage classes based on their access pattern. If set to true, storage_class must be set to STANDARD. Defaults to false. | bool | | null | | [cors](variables.tf#L23) | CORS configuration for the bucket. Defaults to null. | object({…}) | | null | | [custom_placement_config](variables.tf#L34) | The bucket's custom location configuration, which specifies the individual regions that comprise a dual-region bucket. If the bucket is designated as REGIONAL or MULTI_REGIONAL, the parameters are empty. | list(string) | | null | | [default_event_based_hold](variables.tf#L40) | Enable event based hold to new objects added to specific bucket, defaults to false. | bool | | null | -| [enable_object_retention](variables.tf#L46) | Enables object retention on a storage bucket. | bool | | null | -| [encryption_key](variables.tf#L52) | KMS key that will be used for encryption. | string | | null | -| [force_destroy](variables.tf#L58) | Optional map to set force destroy keyed by name, defaults to false. | bool | | false | -| [iam](variables.tf#L64) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | -| [iam_bindings](variables.tf#L70) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | map(object({…})) | | {} | -| [iam_bindings_additive](variables.tf#L85) | Individual additive IAM bindings. Keys are arbitrary. | map(object({…})) | | {} | -| [iam_by_principals](variables.tf#L100) | Authoritative IAM binding in {PRINCIPAL => [ROLES]} format. Principals need to be statically defined to avoid cycle errors. Merged internally with the `iam` variable. | map(list(string)) | | {} | -| [labels](variables.tf#L107) | Labels to be attached to all buckets. | map(string) | | {} | -| [lifecycle_rules](variables.tf#L113) | Bucket lifecycle rule. | map(object({…})) | | {} | -| [logging_config](variables.tf#L168) | Bucket logging configuration. | object({…}) | | null | -| [managed_folders](variables.tf#L177) | Managed folders to create within the bucket in {PATH => CONFIG} format. | map(object({…})) | | {} | -| [notification_config](variables.tf#L210) | GCS Notification configuration. | object({…}) | | null | -| [objects_to_upload](variables.tf#L227) | Objects to be uploaded to bucket. | map(object({…})) | | {} | -| [prefix](variables.tf#L253) | Optional prefix used to generate the bucket name. | string | | null | -| [public_access_prevention](variables.tf#L268) | Prevents public access to the bucket. | string | | null | -| [requester_pays](variables.tf#L278) | Enables Requester Pays on a storage bucket. | bool | | null | -| [retention_policy](variables.tf#L284) | Bucket retention policy. | object({…}) | | null | -| [rpo](variables.tf#L293) | Bucket recovery point objective. | string | | null | -| [soft_delete_retention](variables.tf#L303) | The duration in seconds that soft-deleted objects in the bucket will be retained and cannot be permanently deleted. Set to 0 to override the default and disable. | number | | null | -| [storage_class](variables.tf#L309) | Bucket storage class. | string | | "STANDARD" | -| [tag_bindings](variables.tf#L319) | Tag bindings for this folder, in key => tag value id format. | map(string) | | {} | -| [uniform_bucket_level_access](variables.tf#L326) | Allow using object ACLs (false) or not (true, this is the recommended behavior) , defaults to true (which is the recommended practice, but not the behavior of storage API). | bool | | true | -| [versioning](variables.tf#L332) | Enable versioning, defaults to false. | bool | | null | -| [website](variables.tf#L338) | Bucket website. | object({…}) | | null | +| [enable_hierarchical_namespace](variables.tf#L46) | Enables hierarchical namespace. | bool | | null | +| [enable_object_retention](variables.tf#L52) | Enables object retention on a storage bucket. | bool | | null | +| [encryption_key](variables.tf#L58) | KMS key that will be used for encryption. | string | | null | +| [force_destroy](variables.tf#L64) | Optional map to set force destroy keyed by name, defaults to false. | bool | | false | +| [iam](variables.tf#L70) | IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | +| [iam_bindings](variables.tf#L76) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | map(object({…})) | | {} | +| [iam_bindings_additive](variables.tf#L91) | Individual additive IAM bindings. Keys are arbitrary. | map(object({…})) | | {} | +| [iam_by_principals](variables.tf#L106) | Authoritative IAM binding in {PRINCIPAL => [ROLES]} format. Principals need to be statically defined to avoid cycle errors. Merged internally with the `iam` variable. | map(list(string)) | | {} | +| [labels](variables.tf#L113) | Labels to be attached to all buckets. | map(string) | | {} | +| [lifecycle_rules](variables.tf#L119) | Bucket lifecycle rule. | map(object({…})) | | {} | +| [logging_config](variables.tf#L174) | Bucket logging configuration. | object({…}) | | null | +| [managed_folders](variables.tf#L183) | Managed folders to create within the bucket in {PATH => CONFIG} format. | map(object({…})) | | {} | +| [notification_config](variables.tf#L216) | GCS Notification configuration. | object({…}) | | null | +| [objects_to_upload](variables.tf#L233) | Objects to be uploaded to bucket. | map(object({…})) | | {} | +| [prefix](variables.tf#L259) | Optional prefix used to generate the bucket name. | string | | null | +| [public_access_prevention](variables.tf#L274) | Prevents public access to the bucket. | string | | null | +| [requester_pays](variables.tf#L284) | Enables Requester Pays on a storage bucket. | bool | | null | +| [retention_policy](variables.tf#L290) | Bucket retention policy. | object({…}) | | null | +| [rpo](variables.tf#L299) | Bucket recovery point objective. | string | | null | +| [soft_delete_retention](variables.tf#L309) | The duration in seconds that soft-deleted objects in the bucket will be retained and cannot be permanently deleted. Set to 0 to override the default and disable. | number | | null | +| [storage_class](variables.tf#L315) | Bucket storage class. | string | | "STANDARD" | +| [tag_bindings](variables.tf#L325) | Tag bindings for this folder, in key => tag value id format. | map(string) | | {} | +| [uniform_bucket_level_access](variables.tf#L332) | Allow using object ACLs (false) or not (true, this is the recommended behavior) , defaults to true (which is the recommended practice, but not the behavior of storage API). | bool | | true | +| [versioning](variables.tf#L338) | Enable versioning, defaults to false. | bool | | null | +| [website](variables.tf#L344) | Bucket website. | object({…}) | | null | ## Outputs diff --git a/modules/gcs/main.tf b/modules/gcs/main.tf index b8293b2a8a..077a2730a1 100644 --- a/modules/gcs/main.tf +++ b/modules/gcs/main.tf @@ -74,6 +74,14 @@ resource "google_storage_bucket" "bucket" { } } + dynamic "hierarchical_namespace" { + for_each = var.enable_hierarchical_namespace == null ? [] : [""] + + content { + enabled = var.enable_hierarchical_namespace + } + } + dynamic "logging" { for_each = var.logging_config == null ? [] : [""] content { diff --git a/modules/gcs/variables.tf b/modules/gcs/variables.tf index 3610fb721d..5c66d2e515 100644 --- a/modules/gcs/variables.tf +++ b/modules/gcs/variables.tf @@ -43,6 +43,12 @@ variable "default_event_based_hold" { default = null } +variable "enable_hierarchical_namespace" { + description = "Enables hierarchical namespace." + type = bool + default = null +} + variable "enable_object_retention" { description = "Enables object retention on a storage bucket." type = bool diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf index a8bbbe4026..0d64211e9a 100644 --- a/modules/gcs/versions.tf +++ b/modules/gcs/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } -} \ No newline at end of file +} diff --git a/modules/gcve-private-cloud/versions.tf b/modules/gcve-private-cloud/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/gcve-private-cloud/versions.tf +++ b/modules/gcve-private-cloud/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/gke-cluster-autopilot/versions.tf b/modules/gke-cluster-autopilot/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/gke-cluster-autopilot/versions.tf +++ b/modules/gke-cluster-autopilot/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/gke-cluster-standard/versions.tf b/modules/gke-cluster-standard/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/gke-cluster-standard/versions.tf +++ b/modules/gke-cluster-standard/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/gke-hub/versions.tf +++ b/modules/gke-hub/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/gke-nodepool/versions.tf +++ b/modules/gke-nodepool/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/iam-service-account/versions.tf +++ b/modules/iam-service-account/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/kms/versions.tf +++ b/modules/kms/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/logging-bucket/versions.tf +++ b/modules/logging-bucket/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/looker-core/versions.tf b/modules/looker-core/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/looker-core/versions.tf +++ b/modules/looker-core/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/ncc-spoke-ra/versions.tf b/modules/ncc-spoke-ra/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/ncc-spoke-ra/versions.tf +++ b/modules/ncc-spoke-ra/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-address/versions.tf +++ b/modules/net-address/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-cloudnat/versions.tf +++ b/modules/net-cloudnat/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-firewall-policy/versions.tf b/modules/net-firewall-policy/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-firewall-policy/versions.tf +++ b/modules/net-firewall-policy/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-ipsec-over-interconnect/versions.tf b/modules/net-ipsec-over-interconnect/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-ipsec-over-interconnect/versions.tf +++ b/modules/net-ipsec-over-interconnect/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-app-ext-regional/versions.tf b/modules/net-lb-app-ext-regional/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-lb-app-ext-regional/versions.tf +++ b/modules/net-lb-app-ext-regional/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-app-ext/versions.tf b/modules/net-lb-app-ext/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-lb-app-ext/versions.tf +++ b/modules/net-lb-app-ext/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-app-int-cross-region/versions.tf b/modules/net-lb-app-int-cross-region/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-lb-app-int-cross-region/versions.tf +++ b/modules/net-lb-app-int-cross-region/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-app-int/versions.tf b/modules/net-lb-app-int/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-lb-app-int/versions.tf +++ b/modules/net-lb-app-int/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-ext/versions.tf b/modules/net-lb-ext/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-lb-ext/versions.tf +++ b/modules/net-lb-ext/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-int/versions.tf b/modules/net-lb-int/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-lb-int/versions.tf +++ b/modules/net-lb-int/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-lb-proxy-int/versions.tf b/modules/net-lb-proxy-int/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-lb-proxy-int/versions.tf +++ b/modules/net-lb-proxy-int/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-swp/versions.tf b/modules/net-swp/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-swp/versions.tf +++ b/modules/net-swp/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-vlan-attachment/versions.tf b/modules/net-vlan-attachment/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-vlan-attachment/versions.tf +++ b/modules/net-vlan-attachment/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-vpc-firewall/versions.tf +++ b/modules/net-vpc-firewall/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-vpc-peering/versions.tf +++ b/modules/net-vpc-peering/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-vpc/versions.tf +++ b/modules/net-vpc/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-vpn-dynamic/versions.tf +++ b/modules/net-vpn-dynamic/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-vpn-ha/versions.tf +++ b/modules/net-vpn-ha/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/net-vpn-static/versions.tf +++ b/modules/net-vpn-static/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/organization/versions.tf +++ b/modules/organization/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/project/versions.tf b/modules/project/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/projects-data-source/versions.tf +++ b/modules/projects-data-source/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/secret-manager/versions.tf +++ b/modules/secret-manager/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/secure-source-manager-instance/versions.tf b/modules/secure-source-manager-instance/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/secure-source-manager-instance/versions.tf +++ b/modules/secure-source-manager-instance/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/service-directory/versions.tf +++ b/modules/service-directory/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/source-repository/versions.tf +++ b/modules/source-repository/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/spanner-instance/versions.tf b/modules/spanner-instance/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/spanner-instance/versions.tf +++ b/modules/spanner-instance/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/vpc-sc/versions.tf +++ b/modules/vpc-sc/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/modules/workstation-cluster/versions.tf b/modules/workstation-cluster/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/modules/workstation-cluster/versions.tf +++ b/modules/workstation-cluster/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml b/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml index 324e1878cc..c823adfe8f 100644 --- a/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml +++ b/tests/blueprints/third_party_solutions/f5_bigip/f5_bigip_ha_active/examples/multiple-fw-rules.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -383,7 +383,6 @@ values: description: Terraform managed. enable_cdn: null failover_policy: [] - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policy: null name: test-nlb @@ -491,4 +490,4 @@ counts: google_compute_region_backend_service: 2 google_compute_region_health_check: 1 modules: 8 - resources: 20 \ No newline at end of file + resources: 20 diff --git a/tests/examples_e2e/setup_module/versions.tf b/tests/examples_e2e/setup_module/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/tests/examples_e2e/setup_module/versions.tf +++ b/tests/examples_e2e/setup_module/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } } diff --git a/tests/modules/cloudsql_instance/examples/simple.yaml b/tests/modules/cloudsql_instance/examples/simple.yaml index 96885a3c84..b9e813b7f7 100644 --- a/tests/modules/cloudsql_instance/examples/simple.yaml +++ b/tests/modules/cloudsql_instance/examples/simple.yaml @@ -28,7 +28,6 @@ values: advanced_machine_features: [] availability_type: ZONAL collation: null - data_cache_config: [] database_flags: [] deletion_protection_enabled: false deny_maintenance_period: [] diff --git a/tests/modules/dns/examples/peering-zone.yaml b/tests/modules/dns/examples/peering-zone.yaml index 3832df7af6..3c78961ded 100644 --- a/tests/modules/dns/examples/peering-zone.yaml +++ b/tests/modules/dns/examples/peering-zone.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ values: - enable_logging: false description: Terraform managed. dns_name: . - dnssec_config: [] force_destroy: false forwarding_config: [] labels: null @@ -39,4 +38,4 @@ values: counts: google_dns_managed_zone: 1 modules: 1 - resources: 1 \ No newline at end of file + resources: 1 diff --git a/tests/modules/dns/examples/routing-policies.yaml b/tests/modules/dns/examples/routing-policies.yaml index 22757475a5..7fd5b8bd5a 100644 --- a/tests/modules/dns/examples/routing-policies.yaml +++ b/tests/modules/dns/examples/routing-policies.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ values: - enable_logging: false description: Terraform managed. dns_name: test.example. - dnssec_config: [] force_destroy: false forwarding_config: [] labels: null @@ -109,4 +108,4 @@ counts: google_dns_managed_zone: 1 google_dns_record_set: 4 modules: 4 - resources: 12 \ No newline at end of file + resources: 12 diff --git a/tests/modules/gcs/examples/hns.yaml b/tests/modules/gcs/examples/hns.yaml new file mode 100644 index 0000000000..7c2abd5d68 --- /dev/null +++ b/tests/modules/gcs/examples/hns.yaml @@ -0,0 +1,28 @@ +# Copyright 2024 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. + +values: + module.bucket.google_storage_bucket.bucket: + location: EU + name: test-my-bucket + project: project-id + storage_class: STANDARD + uniform_bucket_level_access: true + +counts: + google_storage_bucket: 1 + modules: 1 + resources: 1 + +outputs: {} diff --git a/tests/modules/gke_hub/examples/full.yaml b/tests/modules/gke_hub/examples/full.yaml index bc56280e02..fa2e0192b9 100644 --- a/tests/modules/gke_hub/examples/full.yaml +++ b/tests/modules/gke_hub/examples/full.yaml @@ -95,10 +95,8 @@ values: ephemeral_storage_config: [] ephemeral_storage_local_ssd_config: [] fast_socket: [] - gcfs_config: [] gvnic: [] host_maintenance_policy: [] - kubelet_config: [] linux_node_config: [] local_nvme_ssd_block_config: [] node_group: null diff --git a/tests/modules/net_cloudnat/examples/hybrid.yaml b/tests/modules/net_cloudnat/examples/hybrid.yaml index 8b00b509d6..6bbbdd7a53 100644 --- a/tests/modules/net_cloudnat/examples/hybrid.yaml +++ b/tests/modules/net_cloudnat/examples/hybrid.yaml @@ -21,7 +21,6 @@ values: project: project-id region: europe-west8 module.vpc1-nat.google_compute_router_nat.nat: - drain_nat_ips: null enable_dynamic_port_allocation: true enable_endpoint_independent_mapping: false icmp_idle_timeout_sec: 30 @@ -30,7 +29,6 @@ values: filter: ALL name: vpc1-nat nat_ip_allocate_option: null - nat_ips: null project: project-id region: europe-west8 router: vpc1-nat-nat diff --git a/tests/modules/net_lb_app_ext/examples/classic-vs-non-classic.yaml b/tests/modules/net_lb_app_ext/examples/classic-vs-non-classic.yaml index 038f4d8994..738f590573 100644 --- a/tests/modules/net_lb_app_ext/examples/classic-vs-non-classic.yaml +++ b/tests/modules/net_lb_app_ext/examples/classic-vs-non-classic.yaml @@ -24,7 +24,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL_MANAGED locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/complex-example.yaml b/tests/modules/net_lb_app_ext/examples/complex-example.yaml index 4ab33a9749..9c32ede3e0 100644 --- a/tests/modules/net_lb_app_ext/examples/complex-example.yaml +++ b/tests/modules/net_lb_app_ext/examples/complex-example.yaml @@ -41,7 +41,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null @@ -69,7 +68,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null @@ -97,7 +95,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/health-check-1.yaml b/tests/modules/net_lb_app_ext/examples/health-check-1.yaml index 32484b3cc1..5bf1b0637a 100644 --- a/tests/modules/net_lb_app_ext/examples/health-check-1.yaml +++ b/tests/modules/net_lb_app_ext/examples/health-check-1.yaml @@ -24,7 +24,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/health-check-2.yaml b/tests/modules/net_lb_app_ext/examples/health-check-2.yaml index c263956b07..9c36b31227 100644 --- a/tests/modules/net_lb_app_ext/examples/health-check-2.yaml +++ b/tests/modules/net_lb_app_ext/examples/health-check-2.yaml @@ -26,7 +26,6 @@ values: enable_cdn: null health_checks: - projects/project-id/global/healthChecks/custom - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/http-backends.yaml b/tests/modules/net_lb_app_ext/examples/http-backends.yaml index 7375d3b387..404bb07904 100644 --- a/tests/modules/net_lb_app_ext/examples/http-backends.yaml +++ b/tests/modules/net_lb_app_ext/examples/http-backends.yaml @@ -24,7 +24,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml b/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml index 1ee6aa92bf..11b09c02f1 100644 --- a/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml +++ b/tests/modules/net_lb_app_ext/examples/http-https-redirect.yaml @@ -71,7 +71,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL_MANAGED locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/https-backends.yaml b/tests/modules/net_lb_app_ext/examples/https-backends.yaml index b370e1236c..47fad001f5 100644 --- a/tests/modules/net_lb_app_ext/examples/https-backends.yaml +++ b/tests/modules/net_lb_app_ext/examples/https-backends.yaml @@ -24,7 +24,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/hybrid-neg.yaml b/tests/modules/net_lb_app_ext/examples/hybrid-neg.yaml index 83bc38eb0d..4a57006b7b 100644 --- a/tests/modules/net_lb_app_ext/examples/hybrid-neg.yaml +++ b/tests/modules/net_lb_app_ext/examples/hybrid-neg.yaml @@ -29,7 +29,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/instance-groups.yaml b/tests/modules/net_lb_app_ext/examples/instance-groups.yaml index 7693ddb95b..b3c82a3a4e 100644 --- a/tests/modules/net_lb_app_ext/examples/instance-groups.yaml +++ b/tests/modules/net_lb_app_ext/examples/instance-groups.yaml @@ -28,7 +28,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/internet-neg.yaml b/tests/modules/net_lb_app_ext/examples/internet-neg.yaml index fa9e45e241..c865d7e6b3 100644 --- a/tests/modules/net_lb_app_ext/examples/internet-neg.yaml +++ b/tests/modules/net_lb_app_ext/examples/internet-neg.yaml @@ -29,7 +29,6 @@ values: edge_security_policy: null enable_cdn: null health_checks: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/managed-instance-groups.yaml b/tests/modules/net_lb_app_ext/examples/managed-instance-groups.yaml index e4fd360d4e..a9e40e8c21 100644 --- a/tests/modules/net_lb_app_ext/examples/managed-instance-groups.yaml +++ b/tests/modules/net_lb_app_ext/examples/managed-instance-groups.yaml @@ -24,7 +24,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/minimal-http.yaml b/tests/modules/net_lb_app_ext/examples/minimal-http.yaml index 770eaa5e51..79fa462352 100644 --- a/tests/modules/net_lb_app_ext/examples/minimal-http.yaml +++ b/tests/modules/net_lb_app_ext/examples/minimal-http.yaml @@ -24,7 +24,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/network-endpoint-groups.yaml b/tests/modules/net_lb_app_ext/examples/network-endpoint-groups.yaml index 9900a57f0e..0cecea4212 100644 --- a/tests/modules/net_lb_app_ext/examples/network-endpoint-groups.yaml +++ b/tests/modules/net_lb_app_ext/examples/network-endpoint-groups.yaml @@ -29,7 +29,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/serverless-neg.yaml b/tests/modules/net_lb_app_ext/examples/serverless-neg.yaml index 8fc37a363b..b0cbab166f 100644 --- a/tests/modules/net_lb_app_ext/examples/serverless-neg.yaml +++ b/tests/modules/net_lb_app_ext/examples/serverless-neg.yaml @@ -29,7 +29,6 @@ values: edge_security_policy: null enable_cdn: null health_checks: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/ssl-certificates.yaml b/tests/modules/net_lb_app_ext/examples/ssl-certificates.yaml index 111ca9a646..302a16e8b5 100644 --- a/tests/modules/net_lb_app_ext/examples/ssl-certificates.yaml +++ b/tests/modules/net_lb_app_ext/examples/ssl-certificates.yaml @@ -24,7 +24,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/url-map.yaml b/tests/modules/net_lb_app_ext/examples/url-map.yaml index bf61105e69..8d83c671f1 100644 --- a/tests/modules/net_lb_app_ext/examples/url-map.yaml +++ b/tests/modules/net_lb_app_ext/examples/url-map.yaml @@ -24,7 +24,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null @@ -47,7 +46,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_ext/examples/zonal-neg-creation.yaml b/tests/modules/net_lb_app_ext/examples/zonal-neg-creation.yaml index 04c1807d85..d4542f7025 100644 --- a/tests/modules/net_lb_app_ext/examples/zonal-neg-creation.yaml +++ b/tests/modules/net_lb_app_ext/examples/zonal-neg-creation.yaml @@ -29,7 +29,6 @@ values: description: Terraform managed. edge_security_policy: null enable_cdn: null - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policies: [] locality_lb_policy: null diff --git a/tests/modules/net_lb_app_int/examples/internet-neg.yaml b/tests/modules/net_lb_app_int/examples/internet-neg.yaml index 38cb7aea19..0f94a0bfe8 100644 --- a/tests/modules/net_lb_app_int/examples/internet-neg.yaml +++ b/tests/modules/net_lb_app_int/examples/internet-neg.yaml @@ -13,7 +13,7 @@ # limitations under the License. values: - module.ilb-l7.google_compute_forwarding_rule.default: + module.ilb-l7.google_compute_forwarding_rule.default: description: Terraform managed. ip_protocol: TCP load_balancing_scheme: INTERNAL_MANAGED @@ -31,7 +31,6 @@ values: description: Terraform managed. failover_policy: [] health_checks: null - iap: [] load_balancing_scheme: INTERNAL_MANAGED name: ilb-test-default network: null diff --git a/tests/modules/net_lb_app_int/examples/zonal-neg.yaml b/tests/modules/net_lb_app_int/examples/zonal-neg.yaml index 5063b7fb4f..7371d1d202 100644 --- a/tests/modules/net_lb_app_int/examples/zonal-neg.yaml +++ b/tests/modules/net_lb_app_int/examples/zonal-neg.yaml @@ -75,7 +75,6 @@ values: description: Terraform managed. max_rate_per_endpoint: 1 description: Terraform managed. - iap: [] load_balancing_scheme: INTERNAL_MANAGED name: ilb-test-default project: project-id diff --git a/tests/modules/net_lb_app_int_cross_region/examples/zonal-neg.yaml b/tests/modules/net_lb_app_int_cross_region/examples/zonal-neg.yaml index 1244a5636d..7a1ba5987f 100644 --- a/tests/modules/net_lb_app_int_cross_region/examples/zonal-neg.yaml +++ b/tests/modules/net_lb_app_int_cross_region/examples/zonal-neg.yaml @@ -41,7 +41,6 @@ values: connection_draining_timeout_sec: 300 consistent_hash: [] description: Terraform managed. - iap: [] load_balancing_scheme: INTERNAL_MANAGED locality_lb_policies: [] name: ilb-test-default diff --git a/tests/modules/net_lb_ext/examples/dual_stack.yaml b/tests/modules/net_lb_ext/examples/dual_stack.yaml index 5687e51ef2..dfa2774126 100644 --- a/tests/modules/net_lb_ext/examples/dual_stack.yaml +++ b/tests/modules/net_lb_ext/examples/dual_stack.yaml @@ -215,7 +215,6 @@ values: description: Terraform managed. enable_cdn: null failover_policy: [] - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policy: null name: nlb-test diff --git a/tests/modules/net_lb_ext/examples/e2e.yaml b/tests/modules/net_lb_ext/examples/e2e.yaml index 79b91c6f44..768ec8a15e 100644 --- a/tests/modules/net_lb_ext/examples/e2e.yaml +++ b/tests/modules/net_lb_ext/examples/e2e.yaml @@ -242,7 +242,6 @@ values: description: Terraform managed. enable_cdn: null failover_policy: [] - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policy: null name: nlb-test diff --git a/tests/modules/net_lb_ext/examples/ext_migs.yaml b/tests/modules/net_lb_ext/examples/ext_migs.yaml index adf8e1b9e2..26471e5d54 100644 --- a/tests/modules/net_lb_ext/examples/ext_migs.yaml +++ b/tests/modules/net_lb_ext/examples/ext_migs.yaml @@ -196,7 +196,6 @@ values: description: Terraform managed. enable_cdn: null failover_policy: [] - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policy: null name: nlb-test diff --git a/tests/modules/net_lb_ext/examples/fwd_rules.yaml b/tests/modules/net_lb_ext/examples/fwd_rules.yaml index 43a77fa360..69d4cc89f1 100644 --- a/tests/modules/net_lb_ext/examples/fwd_rules.yaml +++ b/tests/modules/net_lb_ext/examples/fwd_rules.yaml @@ -216,7 +216,6 @@ values: description: Terraform managed. enable_cdn: null failover_policy: [] - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policy: null name: nlb-test diff --git a/tests/modules/net_lb_ext/examples/migs.yaml b/tests/modules/net_lb_ext/examples/migs.yaml index 8807dc1b9b..ca639465fd 100644 --- a/tests/modules/net_lb_ext/examples/migs.yaml +++ b/tests/modules/net_lb_ext/examples/migs.yaml @@ -132,7 +132,6 @@ values: description: Terraform managed. enable_cdn: null failover_policy: [] - iap: [] load_balancing_scheme: EXTERNAL locality_lb_policy: null name: nlb-test diff --git a/tests/modules/net_lb_proxy_int/examples/zonal-neg.yaml b/tests/modules/net_lb_proxy_int/examples/zonal-neg.yaml index e470319176..8538740ab2 100644 --- a/tests/modules/net_lb_proxy_int/examples/zonal-neg.yaml +++ b/tests/modules/net_lb_proxy_int/examples/zonal-neg.yaml @@ -91,7 +91,6 @@ values: description: Terraform managed. enable_cdn: null failover_policy: [] - iap: [] load_balancing_scheme: INTERNAL_MANAGED locality_lb_policy: null name: int-tcp-proxy diff --git a/tools/lockfile/versions.tf b/tools/lockfile/versions.tf index f569ce5af2..0d64211e9a 100644 --- a/tools/lockfile/versions.tf +++ b/tools/lockfile/versions.tf @@ -19,11 +19,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 6.1.0, < 7.0.0" # tftest + version = ">= 6.11.2, < 7.0.0" # tftest } } }