diff --git a/blueprints/apigee/apigee-x-foundations/README.md b/blueprints/apigee/apigee-x-foundations/README.md index f6584e285..abdcd27fd 100644 --- a/blueprints/apigee/apigee-x-foundations/README.md +++ b/blueprints/apigee/apigee-x-foundations/README.md @@ -469,7 +469,7 @@ module "apigee-x-foundations" { | name | description | type | required | default | producer | |---|---|:---:|:---:|:---:|:---:| | [apigee_config](variables.tf#L17) | Apigee configuration. | object({…}) | ✓ | | | -| [project_config](variables.tf#L300) | Project configuration. | object({…}) | ✓ | | | +| [project_config](variables.tf#L300) | Project configuration. | object({…}) | ✓ | | | | [enable_monitoring](variables.tf#L116) | Boolean flag indicating whether an custom metric to monitor instances should be created in Cloud monitoring. | bool | | false | | | [ext_lb_config](variables.tf#L122) | External application load balancer configuration. | object({…}) | | null | | | [int_cross_region_lb_config](variables.tf#L193) | Internal application load balancer configuration. | object({…}) | | null | | diff --git a/blueprints/apigee/apigee-x-foundations/main.tf b/blueprints/apigee/apigee-x-foundations/main.tf index d25c1c11b..442541870 100644 --- a/blueprints/apigee/apigee-x-foundations/main.tf +++ b/blueprints/apigee/apigee-x-foundations/main.tf @@ -20,6 +20,7 @@ module "project" { compute_metadata = var.project_config.compute_metadata custom_roles = var.project_config.custom_roles default_service_account = var.project_config.default_service_account + deletion_policy = var.project_config.deletion_policy iam = var.project_config.iam iam_bindings = var.project_config.iam_bindings iam_bindings_additive = var.project_config.iam_bindings_additive @@ -51,7 +52,6 @@ module "project" { ] : [])) shared_vpc_service_config = var.project_config.shared_vpc_service_config - skip_delete = var.project_config.skip_delete tag_bindings = var.project_config.tag_bindings } diff --git a/blueprints/apigee/apigee-x-foundations/variables.tf b/blueprints/apigee/apigee-x-foundations/variables.tf index d255f6d99..f1f694c42 100644 --- a/blueprints/apigee/apigee-x-foundations/variables.tf +++ b/blueprints/apigee/apigee-x-foundations/variables.tf @@ -305,6 +305,7 @@ variable "project_config" { contacts = optional(map(list(string)), {}) custom_roles = optional(map(list(string)), {}) default_service_account = optional(string, "keep") + deletion_policy = optional(string) descriptive_name = optional(string) iam = optional(map(list(string)), {}) group_iam = optional(map(list(string)), {}) @@ -382,7 +383,6 @@ variable "project_config" { service_agent_iam = optional(map(list(string)), {}) service_iam_grants = optional(list(string), []) })) - skip_delete = optional(bool, false) tag_bindings = optional(map(string)) }) } diff --git a/blueprints/gke/patterns/autopilot-cluster/versions.tf b/blueprints/gke/patterns/autopilot-cluster/versions.tf index 3342119e4..437c75b0a 100644 --- a/blueprints/gke/patterns/autopilot-cluster/versions.tf +++ b/blueprints/gke/patterns/autopilot-cluster/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/batch/versions.tf b/blueprints/gke/patterns/batch/versions.tf index 3342119e4..437c75b0a 100644 --- a/blueprints/gke/patterns/batch/versions.tf +++ b/blueprints/gke/patterns/batch/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/kafka/versions.tf b/blueprints/gke/patterns/kafka/versions.tf index 3342119e4..437c75b0a 100644 --- a/blueprints/gke/patterns/kafka/versions.tf +++ b/blueprints/gke/patterns/kafka/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/kong-cloudrun/main.tf b/blueprints/gke/patterns/kong-cloudrun/main.tf index 9eeae7f05..f4eb7cfd5 100644 --- a/blueprints/gke/patterns/kong-cloudrun/main.tf +++ b/blueprints/gke/patterns/kong-cloudrun/main.tf @@ -28,5 +28,4 @@ module "service-project" { shared_vpc_service_config = { host_project = var.project_id } - skip_delete = true -} \ No newline at end of file +} diff --git a/blueprints/gke/patterns/kong-cloudrun/versions.tf b/blueprints/gke/patterns/kong-cloudrun/versions.tf index 3342119e4..437c75b0a 100644 --- a/blueprints/gke/patterns/kong-cloudrun/versions.tf +++ b/blueprints/gke/patterns/kong-cloudrun/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/mysql/versions.tf b/blueprints/gke/patterns/mysql/versions.tf index 3342119e4..437c75b0a 100644 --- a/blueprints/gke/patterns/mysql/versions.tf +++ b/blueprints/gke/patterns/mysql/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/blueprints/gke/patterns/redis-cluster/versions.tf b/blueprints/gke/patterns/redis-cluster/versions.tf index 3342119e4..437c75b0a 100644 --- a/blueprints/gke/patterns/redis-cluster/versions.tf +++ b/blueprints/gke/patterns/redis-cluster/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/blueprints/serverless/cloud-run-corporate/main.tf b/blueprints/serverless/cloud-run-corporate/main.tf index 9b4c748f0..ce6e8bb10 100644 --- a/blueprints/serverless/cloud-run-corporate/main.tf +++ b/blueprints/serverless/cloud-run-corporate/main.tf @@ -60,7 +60,6 @@ module "project_main" { "cloudresourcemanager.googleapis.com", "accesscontextmanager.googleapis.com" ] - skip_delete = true } # Simulated onprem environment @@ -75,7 +74,6 @@ module "project_onprem" { "compute.googleapis.com", "dns.googleapis.com" ] - skip_delete = true } # Project 1 @@ -90,7 +88,6 @@ module "project_prj1" { "compute.googleapis.com", "dns.googleapis.com" ] - skip_delete = true } # Service Project 1 @@ -118,7 +115,6 @@ module "project_svc1" { "run.googleapis.com", "vpcaccess.googleapis.com" ] - skip_delete = true } ############################################################################### diff --git a/blueprints/serverless/cloud-run-microservices/main.tf b/blueprints/serverless/cloud-run-microservices/main.tf index 3c3acb3eb..0da49b778 100644 --- a/blueprints/serverless/cloud-run-microservices/main.tf +++ b/blueprints/serverless/cloud-run-microservices/main.tf @@ -1,5 +1,5 @@ /** - * 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. @@ -42,7 +42,6 @@ module "main-project" { "dns.googleapis.com", "vpcaccess.googleapis.com" ] - skip_delete = true } module "service-project" { @@ -60,5 +59,4 @@ module "service-project" { "compute.googleapis.com", "run.googleapis.com", ] - skip_delete = true } diff --git a/default-versions.tf b/default-versions.tf index 3342119e4..437c75b0a 100644 --- a/default-versions.tf +++ b/default-versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tf b/modules/__experimental_deprecated/alloydb-instance/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/__experimental_deprecated/alloydb-instance/versions.tf +++ b/modules/__experimental_deprecated/alloydb-instance/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/net-neg/versions.tf b/modules/__experimental_deprecated/net-neg/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/__experimental_deprecated/net-neg/versions.tf +++ b/modules/__experimental_deprecated/net-neg/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tf b/modules/__experimental_deprecated/project-iam-magic/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/__experimental_deprecated/project-iam-magic/versions.tf +++ b/modules/__experimental_deprecated/project-iam-magic/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/alloydb/versions.tf b/modules/alloydb/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/alloydb/versions.tf +++ b/modules/alloydb/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/analytics-hub/versions.tf b/modules/analytics-hub/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/analytics-hub/versions.tf +++ b/modules/analytics-hub/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/api-gateway/versions.tf +++ b/modules/api-gateway/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/apigee/versions.tf +++ b/modules/apigee/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/artifact-registry/versions.tf +++ b/modules/artifact-registry/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/bigquery-dataset/versions.tf +++ b/modules/bigquery-dataset/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/bigtable-instance/versions.tf +++ b/modules/bigtable-instance/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/billing-account/versions.tf b/modules/billing-account/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/billing-account/versions.tf +++ b/modules/billing-account/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/binauthz/versions.tf +++ b/modules/binauthz/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/certificate-authority-service/versions.tf b/modules/certificate-authority-service/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/certificate-authority-service/versions.tf +++ b/modules/certificate-authority-service/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/certificate-manager/versions.tf b/modules/certificate-manager/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/certificate-manager/versions.tf +++ b/modules/certificate-manager/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.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 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.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 3342119e4..437c75b0a 100644 --- a/modules/cloud-config-container/__need_fixing/squid/versions.tf +++ b/modules/cloud-config-container/__need_fixing/squid/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-config-container/bindplane/versions.tf b/modules/cloud-config-container/bindplane/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/cloud-config-container/bindplane/versions.tf +++ b/modules/cloud-config-container/bindplane/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.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 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.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 3342119e4..437c75b0a 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 @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.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 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-function-v1/versions.tf b/modules/cloud-function-v1/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-function-v2/versions.tf b/modules/cloud-function-v2/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-run-v2/versions.tf b/modules/cloud-run-v2/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/cloud-run-v2/versions.tf +++ b/modules/cloud-run-v2/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/cloud-run/versions.tf +++ b/modules/cloud-run/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/cloudsql-instance/versions.tf +++ b/modules/cloudsql-instance/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/compute-mig/versions.tf +++ b/modules/compute-mig/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/compute-vm/versions.tf +++ b/modules/compute-vm/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/container-registry/versions.tf +++ b/modules/container-registry/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/data-catalog-tag-template/versions.tf b/modules/data-catalog-tag-template/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/data-catalog-tag-template/versions.tf +++ b/modules/data-catalog-tag-template/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/data-catalog-tag/versions.tf b/modules/data-catalog-tag/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/data-catalog-tag/versions.tf +++ b/modules/data-catalog-tag/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/dataform-repository/versions.tf b/modules/dataform-repository/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/dataform-repository/versions.tf +++ b/modules/dataform-repository/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/datafusion/versions.tf +++ b/modules/datafusion/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/dataplex-datascan/versions.tf b/modules/dataplex-datascan/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/dataplex-datascan/versions.tf +++ b/modules/dataplex-datascan/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/dataplex/versions.tf b/modules/dataplex/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/dataplex/versions.tf +++ b/modules/dataplex/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/dataproc/versions.tf b/modules/dataproc/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/dataproc/versions.tf +++ b/modules/dataproc/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/dns-response-policy/versions.tf b/modules/dns-response-policy/versions.tf index 3342119e4..437c75b0a 100644 --- 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 = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/dns/versions.tf +++ b/modules/dns/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/endpoints/versions.tf +++ b/modules/endpoints/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/firestore/versions.tf b/modules/firestore/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/firestore/versions.tf +++ b/modules/firestore/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/folder/versions.tf +++ b/modules/folder/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/gcs/versions.tf +++ b/modules/gcs/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/gcve-private-cloud/versions.tf b/modules/gcve-private-cloud/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/gcve-private-cloud/versions.tf +++ b/modules/gcve-private-cloud/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/gke-cluster-autopilot/versions.tf b/modules/gke-cluster-autopilot/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/gke-cluster-autopilot/versions.tf +++ b/modules/gke-cluster-autopilot/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/gke-cluster-standard/versions.tf b/modules/gke-cluster-standard/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/gke-cluster-standard/versions.tf +++ b/modules/gke-cluster-standard/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/gke-hub/versions.tf +++ b/modules/gke-hub/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/gke-nodepool/versions.tf +++ b/modules/gke-nodepool/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/iam-service-account/versions.tf +++ b/modules/iam-service-account/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/kms/versions.tf +++ b/modules/kms/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/logging-bucket/versions.tf +++ b/modules/logging-bucket/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/ncc-spoke-ra/versions.tf b/modules/ncc-spoke-ra/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/ncc-spoke-ra/versions.tf +++ b/modules/ncc-spoke-ra/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-address/versions.tf +++ b/modules/net-address/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-cloudnat/versions.tf +++ b/modules/net-cloudnat/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-firewall-policy/versions.tf b/modules/net-firewall-policy/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-firewall-policy/versions.tf +++ b/modules/net-firewall-policy/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-ipsec-over-interconnect/versions.tf b/modules/net-ipsec-over-interconnect/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-ipsec-over-interconnect/versions.tf +++ b/modules/net-ipsec-over-interconnect/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-lb-app-ext-regional/versions.tf b/modules/net-lb-app-ext-regional/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-lb-app-ext-regional/versions.tf +++ b/modules/net-lb-app-ext-regional/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-lb-app-ext/versions.tf b/modules/net-lb-app-ext/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-lb-app-ext/versions.tf +++ b/modules/net-lb-app-ext/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.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 3342119e4..437c75b0a 100644 --- a/modules/net-lb-app-int-cross-region/versions.tf +++ b/modules/net-lb-app-int-cross-region/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-lb-app-int/versions.tf b/modules/net-lb-app-int/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-lb-app-int/versions.tf +++ b/modules/net-lb-app-int/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-lb-ext/versions.tf b/modules/net-lb-ext/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-lb-ext/versions.tf +++ b/modules/net-lb-ext/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-lb-int/versions.tf b/modules/net-lb-int/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-lb-int/versions.tf +++ b/modules/net-lb-int/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-lb-proxy-int/versions.tf b/modules/net-lb-proxy-int/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-lb-proxy-int/versions.tf +++ b/modules/net-lb-proxy-int/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-swp/versions.tf b/modules/net-swp/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-swp/versions.tf +++ b/modules/net-swp/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-vlan-attachment/versions.tf b/modules/net-vlan-attachment/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-vlan-attachment/versions.tf +++ b/modules/net-vlan-attachment/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-vpc-firewall/versions.tf +++ b/modules/net-vpc-firewall/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-vpc-peering/versions.tf +++ b/modules/net-vpc-peering/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-vpc/versions.tf +++ b/modules/net-vpc/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-vpn-dynamic/versions.tf +++ b/modules/net-vpn-dynamic/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-vpn-ha/versions.tf +++ b/modules/net-vpn-ha/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/net-vpn-static/versions.tf +++ b/modules/net-vpn-static/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/organization/versions.tf +++ b/modules/organization/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/project/README.md b/modules/project/README.md index 8e4a4297e..260480627 100644 --- a/modules/project/README.md +++ b/modules/project/README.md @@ -1348,41 +1348,42 @@ module "bucket" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| -| [name](variables.tf#L153) | Project name and id suffix. | string | ✓ | | +| [name](variables.tf#L165) | Project name and id suffix. | string | ✓ | | | [auto_create_network](variables.tf#L17) | Whether to create the default network for the project. | bool | | false | | [billing_account](variables.tf#L23) | Billing account id. | string | | null | | [compute_metadata](variables.tf#L29) | Optional compute metadata key/values. Only usable if compute API has been enabled. | map(string) | | {} | | [contacts](variables.tf#L36) | 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. | map(list(string)) | | {} | | [custom_roles](variables.tf#L43) | Map of role name => list of permissions to create in this project. | map(list(string)) | | {} | | [default_service_account](variables.tf#L50) | Project default service account setting: can be one of `delete`, `deprivilege`, `disable`, or `keep`. | string | | "keep" | -| [descriptive_name](variables.tf#L63) | Name of the project name. Used for project name instead of `name` variable. | string | | null | -| [factories_config](variables.tf#L69) | Paths to data files and folders that enable factory functionality. | object({…}) | | {} | +| [deletion_policy](variables.tf#L64) | Deletion policy setting for this project. | string | | "DELETE" | +| [descriptive_name](variables.tf#L75) | Name of the project name. Used for project name instead of `name` variable. | string | | null | +| [factories_config](variables.tf#L81) | Paths to data files and folders that enable factory functionality. | object({…}) | | {} | | [iam](variables-iam.tf#L17) | Authoritative IAM bindings in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | | [iam_bindings](variables-iam.tf#L24) | Authoritative IAM bindings in {KEY => {role = ROLE, members = [], condition = {}}}. Keys are arbitrary. | map(object({…})) | | {} | | [iam_bindings_additive](variables-iam.tf#L39) | Individual additive IAM bindings. Keys are arbitrary. | map(object({…})) | | {} | | [iam_by_principals](variables-iam.tf#L54) | 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#L80) | Resource labels. | map(string) | | {} | -| [lien_reason](variables.tf#L87) | If non-empty, creates a project lien with this description. | string | | null | -| [logging_data_access](variables.tf#L93) | Control activation of data access logs. Format is service => { log type => [exempted members]}. The special 'allServices' key denotes configuration for all services. | map(map(list(string))) | | {} | -| [logging_exclusions](variables.tf#L108) | Logging exclusions for this project in the form {NAME -> FILTER}. | map(string) | | {} | -| [logging_sinks](variables.tf#L115) | Logging sinks to create for this project. | map(object({…})) | | {} | -| [metric_scopes](variables.tf#L146) | List of projects that will act as metric scopes for this project. | list(string) | | [] | +| [labels](variables.tf#L92) | Resource labels. | map(string) | | {} | +| [lien_reason](variables.tf#L99) | If non-empty, creates a project lien with this description. | string | | null | +| [logging_data_access](variables.tf#L105) | Control activation of data access logs. Format is service => { log type => [exempted members]}. The special 'allServices' key denotes configuration for all services. | map(map(list(string))) | | {} | +| [logging_exclusions](variables.tf#L120) | Logging exclusions for this project in the form {NAME -> FILTER}. | map(string) | | {} | +| [logging_sinks](variables.tf#L127) | Logging sinks to create for this project. | map(object({…})) | | {} | +| [metric_scopes](variables.tf#L158) | List of projects that will act as metric scopes for this project. | list(string) | | [] | | [network_tags](variables-tags.tf#L17) | Network tags by key name. If `id` is provided, key creation is skipped. The `iam` attribute behaves like the similarly named one at module level. | map(object({…})) | | {} | -| [org_policies](variables.tf#L158) | Organization policies applied to this project keyed by policy name. | map(object({…})) | | {} | -| [parent](variables.tf#L185) | Parent folder or organization in 'folders/folder_id' or 'organizations/org_id' format. | string | | null | -| [prefix](variables.tf#L195) | Optional prefix used to generate project id and name. | string | | null | -| [project_create](variables.tf#L205) | Create project. When set to false, uses a data source to reference existing project. | bool | | true | +| [org_policies](variables.tf#L170) | Organization policies applied to this project keyed by policy name. | map(object({…})) | | {} | +| [parent](variables.tf#L197) | Parent folder or organization in 'folders/folder_id' or 'organizations/org_id' format. | string | | null | +| [prefix](variables.tf#L207) | Optional prefix used to generate project id and name. | string | | null | +| [project_create](variables.tf#L217) | Create project. When set to false, uses a data source to reference existing project. | bool | | true | | [quotas](variables-quotas.tf#L17) | Service quota configuration. | map(object({…})) | | {} | -| [service_agents_config](variables.tf#L211) | Automatic service agent configuration options. | object({…}) | | {} | -| [service_config](variables.tf#L222) | Configure service API activation. | object({…}) | | {…} | -| [service_encryption_key_ids](variables.tf#L234) | Service Agents to be granted encryption/decryption permissions over Cloud KMS encryption keys. Format {SERVICE_AGENT => [KEY_ID]}. | map(list(string)) | | {} | -| [services](variables.tf#L241) | Service APIs to enable. | list(string) | | [] | -| [shared_vpc_host_config](variables.tf#L247) | Configures this project as a Shared VPC host project (mutually exclusive with shared_vpc_service_project). | object({…}) | | null | -| [shared_vpc_service_config](variables.tf#L256) | Configures this project as a Shared VPC service project (mutually exclusive with shared_vpc_host_config). | object({…}) | | {…} | -| [skip_delete](variables.tf#L284) | Allows the underlying resources to be destroyed without destroying the project itself. | bool | | false | +| [service_agents_config](variables.tf#L223) | Automatic service agent configuration options. | object({…}) | | {} | +| [service_config](variables.tf#L234) | Configure service API activation. | object({…}) | | {…} | +| [service_encryption_key_ids](variables.tf#L246) | Service Agents to be granted encryption/decryption permissions over Cloud KMS encryption keys. Format {SERVICE_AGENT => [KEY_ID]}. | map(list(string)) | | {} | +| [services](variables.tf#L253) | Service APIs to enable. | list(string) | | [] | +| [shared_vpc_host_config](variables.tf#L259) | Configures this project as a Shared VPC host project (mutually exclusive with shared_vpc_service_project). | object({…}) | | null | +| [shared_vpc_service_config](variables.tf#L268) | Configures this project as a Shared VPC service project (mutually exclusive with shared_vpc_host_config). | object({…}) | | {…} | +| [skip_delete](variables.tf#L296) | Deprecated. Use deletion_policy. | bool | | null | | [tag_bindings](variables-tags.tf#L81) | Tag bindings for this project, in key => tag value id format. | map(string) | | null | | [tags](variables-tags.tf#L88) | Tags by key name. If `id` is provided, key or value creation is skipped. The `iam` attribute behaves like the similarly named one at module level. | map(object({…})) | | {} | -| [vpc_sc](variables.tf#L290) | VPC-SC configuration for the project, use when `ignore_changes` for resources is set in the VPC-SC module. | object({…}) | | null | +| [vpc_sc](variables.tf#L308) | VPC-SC configuration for the project, use when `ignore_changes` for resources is set in the VPC-SC module. | object({…}) | | null | ## Outputs diff --git a/modules/project/main.tf b/modules/project/main.tf index 90eee38b8..a90361d1e 100644 --- a/modules/project/main.tf +++ b/modules/project/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 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. @@ -50,7 +50,14 @@ resource "google_project" "project" { billing_account = var.billing_account auto_create_network = var.auto_create_network labels = var.labels - skip_delete = var.skip_delete + deletion_policy = var.deletion_policy + + lifecycle { + precondition { + condition = var.skip_delete == null + error_message = "skip_delete is deprecated. Use deletion_policy." + } + } } resource "google_project_service" "project_services" { diff --git a/modules/project/variables.tf b/modules/project/variables.tf index a9cb65699..88f59763a 100644 --- a/modules/project/variables.tf +++ b/modules/project/variables.tf @@ -60,6 +60,18 @@ variable "default_service_account" { } } + +variable "deletion_policy" { + description = "Deletion policy setting for this project." + default = "DELETE" + type = string + nullable = false + validation { + condition = contains(["ABANDON", "DELETE", "PREVENT"], var.deletion_policy) + error_message = "deletion_policy must be one of 'ABANDON', 'DELETE', 'PREVENT'." + } +} + variable "descriptive_name" { description = "Name of the project name. Used for project name instead of `name` variable." type = string @@ -282,9 +294,15 @@ variable "shared_vpc_service_config" { } variable "skip_delete" { - description = "Allows the underlying resources to be destroyed without destroying the project itself." + description = "Deprecated. Use deletion_policy." type = bool - default = false + default = null + # Validation fails on existing infrastructure. Implemented as a + # precondition in main.tf + # validation { + # condition = var.skip_delete != null + # error_message = "skip_delete is deprecated. Use deletion_policy." + # } } variable "vpc_sc" { diff --git a/modules/project/versions.tf b/modules/project/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/projects-data-source/versions.tf +++ b/modules/projects-data-source/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/secret-manager/versions.tf +++ b/modules/secret-manager/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/service-directory/versions.tf +++ b/modules/service-directory/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/source-repository/versions.tf +++ b/modules/source-repository/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/spanner-instance/versions.tf b/modules/spanner-instance/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/spanner-instance/versions.tf +++ b/modules/spanner-instance/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/vpc-sc/versions.tf +++ b/modules/vpc-sc/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/modules/workstation-cluster/versions.tf b/modules/workstation-cluster/versions.tf index 3342119e4..437c75b0a 100644 --- a/modules/workstation-cluster/versions.tf +++ b/modules/workstation-cluster/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/tests/blueprints/data_solutions/shielded_folder/examples/simple.yaml b/tests/blueprints/data_solutions/shielded_folder/examples/simple.yaml index 661dd97fc..1e2c26acc 100644 --- a/tests/blueprints/data_solutions/shielded_folder/examples/simple.yaml +++ b/tests/blueprints/data_solutions/shielded_folder/examples/simple.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. @@ -317,10 +317,10 @@ values: module.test.module.log-export-project[0].google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' labels: null name: prefix-audit-logs project_id: prefix-audit-logs - skip_delete: false timeouts: null module.test.module.log-export-project[0].google_project_iam_binding.authoritative["roles/editor"]: condition: [] diff --git a/tests/examples_e2e/setup_module/versions.tf b/tests/examples_e2e/setup_module/versions.tf index 3342119e4..437c75b0a 100644 --- a/tests/examples_e2e/setup_module/versions.tf +++ b/tests/examples_e2e/setup_module/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 5.40.0, < 6.0.0" # tftest + version = ">= 5.41.0, < 6.0.0" # tftest } } } diff --git a/tests/modules/alloydb/examples/simple.yaml b/tests/modules/alloydb/examples/simple.yaml index a47a47759..b40e7081d 100644 --- a/tests/modules/alloydb/examples/simple.yaml +++ b/tests/modules/alloydb/examples/simple.yaml @@ -63,12 +63,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-alloydb org_id: null project_id: test-alloydb - skip_delete: false timeouts: null module.project.google_project_iam_member.service_agents["alloydb"]: condition: [] diff --git a/tests/modules/cloudsql_instance/examples/simple.yaml b/tests/modules/cloudsql_instance/examples/simple.yaml index 064461710..3bbb5524c 100644 --- a/tests/modules/cloudsql_instance/examples/simple.yaml +++ b/tests/modules/cloudsql_instance/examples/simple.yaml @@ -55,11 +55,11 @@ values: auto_create_network: false billing_account: 123456-123456-123456 folder_id: '1122334455' + deletion_policy: 'DELETE' labels: null name: test-db-prj org_id: null project_id: test-db-prj - skip_delete: false timeouts: null module.project.google_project_iam_member.service_agents["cloud-sql"]: condition: [] diff --git a/tests/modules/folder/examples/logging.yaml b/tests/modules/folder/examples/logging.yaml index 0994641ca..267bcedb4 100644 --- a/tests/modules/folder/examples/logging.yaml +++ b/tests/modules/folder/examples/logging.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. @@ -37,12 +37,12 @@ values: module.destination-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-dest-prj org_id: null project_id: test-dest-prj - skip_delete: false module.destination-project.google_project_service.project_services["logging.googleapis.com"]: disable_dependent_services: false disable_on_destroy: false diff --git a/tests/modules/gke_hub/examples/full.yaml b/tests/modules/gke_hub/examples/full.yaml index 6e26e39cd..bc56280e0 100644 --- a/tests/modules/gke_hub/examples/full.yaml +++ b/tests/modules/gke_hub/examples/full.yaml @@ -190,13 +190,13 @@ values: timeouts: null module.project.google_project.project[0]: auto_create_network: false + deletion_policy: 'DELETE' billing_account: 123456-123456-123456 folder_id: '12345' labels: null name: gkehub-test org_id: null project_id: gkehub-test - skip_delete: false timeouts: null module.project.google_project_iam_member.service_agents["anthosconfigmanagement"]: condition: [] diff --git a/tests/modules/organization/examples/logging.yaml b/tests/modules/organization/examples/logging.yaml index 24f163a30..de050845b 100644 --- a/tests/modules/organization/examples/logging.yaml +++ b/tests/modules/organization/examples/logging.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. @@ -37,12 +37,12 @@ values: module.destination-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-dest-prj org_id: null project_id: test-dest-prj - skip_delete: false module.destination-project.google_project_service.project_services["logging.googleapis.com"]: disable_dependent_services: false disable_on_destroy: false diff --git a/tests/modules/project/examples/basic.yaml b/tests/modules/project/examples/basic.yaml index ff9b8e193..66dd716c2 100644 --- a/tests/modules/project/examples/basic.yaml +++ b/tests/modules/project/examples/basic.yaml @@ -16,12 +16,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_member.service_agents["container-engine-robot"]: condition: [] diff --git a/tests/modules/project/examples/data.yaml b/tests/modules/project/examples/data.yaml index 2f6375c1d..ea22dcee2 100644 --- a/tests/modules/project/examples/data.yaml +++ b/tests/modules/project/examples/data.yaml @@ -25,12 +25,12 @@ values: module.create-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.dataset.google_bigquery_dataset.default: dataset_id: bq_sink @@ -74,12 +74,12 @@ values: module.host-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-host org_id: null project_id: test-host - skip_delete: false timeouts: null module.project.data.google_bigquery_default_service_account.bq_sa[0]: project: test-project diff --git a/tests/modules/project/examples/iam-authoritative.yaml b/tests/modules/project/examples/iam-authoritative.yaml index 7a40f7196..bcbcb230a 100644 --- a/tests/modules/project/examples/iam-authoritative.yaml +++ b/tests/modules/project/examples/iam-authoritative.yaml @@ -16,12 +16,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_binding.authoritative["roles/container.hostServiceAgentUser"]: condition: [] diff --git a/tests/modules/project/examples/iam-bindings-additive.yaml b/tests/modules/project/examples/iam-bindings-additive.yaml index a9e463ae8..08140a107 100644 --- a/tests/modules/project/examples/iam-bindings-additive.yaml +++ b/tests/modules/project/examples/iam-bindings-additive.yaml @@ -16,12 +16,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_member.bindings["group-owner"]: condition: [] diff --git a/tests/modules/project/examples/iam-bindings.yaml b/tests/modules/project/examples/iam-bindings.yaml index 2739512e9..89e8d86ae 100644 --- a/tests/modules/project/examples/iam-bindings.yaml +++ b/tests/modules/project/examples/iam-bindings.yaml @@ -16,12 +16,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_binding.bindings["iam_admin_conditional"]: condition: diff --git a/tests/modules/project/examples/logging-data-access.yaml b/tests/modules/project/examples/logging-data-access.yaml index 50d388645..8c7310865 100644 --- a/tests/modules/project/examples/logging-data-access.yaml +++ b/tests/modules/project/examples/logging-data-access.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. @@ -16,12 +16,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_audit_config.default["allServices"]: audit_log_config: diff --git a/tests/modules/project/examples/logging.yaml b/tests/modules/project/examples/logging.yaml index 5eeac3e2b..f992623f4 100644 --- a/tests/modules/project/examples/logging.yaml +++ b/tests/modules/project/examples/logging.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. @@ -37,12 +37,12 @@ values: module.destination-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-dest-prj org_id: null project_id: test-dest-prj - skip_delete: false module.destination-project.google_project_service.project_services["logging.googleapis.com"]: disable_dependent_services: false disable_on_destroy: false @@ -135,12 +135,12 @@ values: module.project-host.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false module.project-host.google_project_iam_member.bucket-sinks-binding["debug"]: condition: - title: debug bucket writer diff --git a/tests/modules/project/examples/org-policies-dry-run.yaml b/tests/modules/project/examples/org-policies-dry-run.yaml index 3804c0bbe..e87e5d0da 100644 --- a/tests/modules/project/examples/org-policies-dry-run.yaml +++ b/tests/modules/project/examples/org-policies-dry-run.yaml @@ -45,12 +45,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: null + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: project org_id: null project_id: project - skip_delete: false timeouts: null counts: diff --git a/tests/modules/project/examples/outputs.yaml b/tests/modules/project/examples/outputs.yaml index c11ea5ac6..0dc33e947 100644 --- a/tests/modules/project/examples/outputs.yaml +++ b/tests/modules/project/examples/outputs.yaml @@ -16,12 +16,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_member.service_agents["compute-system"]: condition: [] diff --git a/tests/modules/project/examples/quotas.yaml b/tests/modules/project/examples/quotas.yaml index 84ff0a769..b82dff3a4 100644 --- a/tests/modules/project/examples/quotas.yaml +++ b/tests/modules/project/examples/quotas.yaml @@ -30,12 +30,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_member.service_agents["compute-system"]: condition: [] diff --git a/tests/modules/project/examples/shared-vpc-auto-grants.yaml b/tests/modules/project/examples/shared-vpc-auto-grants.yaml index 61e5ef711..1fe0e1437 100644 --- a/tests/modules/project/examples/shared-vpc-auto-grants.yaml +++ b/tests/modules/project/examples/shared-vpc-auto-grants.yaml @@ -19,12 +19,12 @@ values: module.host-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-host org_id: null project_id: test-host - skip_delete: false timeouts: null module.service-project.google_compute_shared_vpc_service_project.shared_vpc_service[0]: deletion_policy: null @@ -34,12 +34,12 @@ values: module.service-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-service org_id: null project_id: test-service - skip_delete: false timeouts: null module.service-project.google_project_iam_member.service_agents["container-engine-robot"]: condition: [] diff --git a/tests/modules/project/examples/shared-vpc-host-project-iam.yaml b/tests/modules/project/examples/shared-vpc-host-project-iam.yaml index d39d58cf7..9b69e3ea1 100644 --- a/tests/modules/project/examples/shared-vpc-host-project-iam.yaml +++ b/tests/modules/project/examples/shared-vpc-host-project-iam.yaml @@ -19,12 +19,12 @@ values: module.host-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-host org_id: null project_id: test-host - skip_delete: false timeouts: null module.service-project.google_compute_shared_vpc_service_project.shared_vpc_service[0]: deletion_policy: null @@ -51,12 +51,12 @@ values: module.service-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-service org_id: null project_id: test-service - skip_delete: false timeouts: null module.service-project.google_project_iam_member.service_agents["container-engine-robot"]: condition: [] diff --git a/tests/modules/project/examples/shared-vpc-subnet-grants.yaml b/tests/modules/project/examples/shared-vpc-subnet-grants.yaml index 5538baf90..49680ea47 100644 --- a/tests/modules/project/examples/shared-vpc-subnet-grants.yaml +++ b/tests/modules/project/examples/shared-vpc-subnet-grants.yaml @@ -19,12 +19,12 @@ values: module.host-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-host org_id: null project_id: test-host - skip_delete: false timeouts: null module.service-project.google_compute_shared_vpc_service_project.shared_vpc_service[0]: deletion_policy: null @@ -47,12 +47,12 @@ values: module.service-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-service org_id: null project_id: test-service - skip_delete: false timeouts: null module.service-project.google_project_iam_member.service_agents["compute-system"]: condition: [] diff --git a/tests/modules/project/examples/shared-vpc.yaml b/tests/modules/project/examples/shared-vpc.yaml index 6447bce8d..30768a0ba 100644 --- a/tests/modules/project/examples/shared-vpc.yaml +++ b/tests/modules/project/examples/shared-vpc.yaml @@ -19,12 +19,12 @@ values: module.host-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-host org_id: null project_id: test-host - skip_delete: false timeouts: null module.service-project.google_compute_shared_vpc_service_project.shared_vpc_service[0]: deletion_policy: null @@ -34,12 +34,12 @@ values: module.service-project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-service org_id: null project_id: test-service - skip_delete: false timeouts: null module.service-project.google_project_iam_member.service_agents["container-engine-robot"]: condition: [] diff --git a/tests/modules/project/examples/tags-network.yaml b/tests/modules/project/examples/tags-network.yaml index d5e3e500e..ef433e3b0 100644 --- a/tests/modules/project/examples/tags-network.yaml +++ b/tests/modules/project/examples/tags-network.yaml @@ -16,12 +16,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_member.service_agents["compute-system"]: condition: [] diff --git a/tests/modules/project/examples/tags.yaml b/tests/modules/project/examples/tags.yaml index f78bc65fb..da3f6911b 100644 --- a/tests/modules/project/examples/tags.yaml +++ b/tests/modules/project/examples/tags.yaml @@ -16,12 +16,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_iam_member.service_agents["compute-system"]: condition: [] diff --git a/tests/modules/project/examples/vpc-sc.yaml b/tests/modules/project/examples/vpc-sc.yaml index 887ac23e4..6e8d40c16 100644 --- a/tests/modules/project/examples/vpc-sc.yaml +++ b/tests/modules/project/examples/vpc-sc.yaml @@ -19,12 +19,12 @@ values: module.project.google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' folder_id: '1122334455' labels: null name: test-project org_id: null project_id: test-project - skip_delete: false timeouts: null module.project.google_project_service.project_services["stackdriver.googleapis.com"]: disable_dependent_services: false diff --git a/tests/modules/project/service_encryption_keys.yaml b/tests/modules/project/service_encryption_keys.yaml index 37c078529..5d3b274ab 100644 --- a/tests/modules/project/service_encryption_keys.yaml +++ b/tests/modules/project/service_encryption_keys.yaml @@ -31,12 +31,12 @@ values: google_project.project[0]: auto_create_network: false billing_account: null + deletion_policy: 'DELETE' folder_id: null labels: null name: my-project org_id: null project_id: my-project - skip_delete: false timeouts: null google_project_iam_member.service_agents["compute-system"]: condition: [] diff --git a/tests/modules/project_factory/examples/example.yaml b/tests/modules/project_factory/examples/example.yaml index dd9ba6b0f..266cda152 100644 --- a/tests/modules/project_factory/examples/example.yaml +++ b/tests/modules/project_factory/examples/example.yaml @@ -135,13 +135,13 @@ values: module.project-factory.module.projects["bar-baz-iac-0"].google_project.project[0]: auto_create_network: false billing_account: 012345-67890A-BCDEF0 + deletion_policy: 'DELETE' effective_labels: environment: test labels: environment: test name: test-pf-bar-baz-iac-0 project_id: test-pf-bar-baz-iac-0 - skip_delete: false terraform_labels: environment: test timeouts: null @@ -192,6 +192,7 @@ values: module.project-factory.module.projects["prj-app-1"].google_project.project[0]: auto_create_network: false billing_account: 012345-67890A-BCDEF0 + deletion_policy: 'DELETE' effective_labels: app: app-1 environment: test @@ -204,7 +205,6 @@ values: name: test-pf-prj-app-1 org_id: null project_id: test-pf-prj-app-1 - skip_delete: false terraform_labels: app: app-1 environment: test @@ -294,6 +294,7 @@ values: module.project-factory.module.projects["prj-app-2"].google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' effective_labels: app: app-2 environment: test @@ -306,7 +307,6 @@ values: name: test-pf-prj-app-2 org_id: null project_id: test-pf-prj-app-2 - skip_delete: false terraform_labels: app: app-2 environment: test @@ -390,13 +390,13 @@ values: module.project-factory.module.projects["prj-app-3"].google_project.project[0]: auto_create_network: false billing_account: 123456-123456-123456 + deletion_policy: 'DELETE' effective_labels: environment: test labels: environment: test name: test-pf-prj-app-3 project_id: test-pf-prj-app-3 - skip_delete: false terraform_labels: environment: test timeouts: null