diff --git a/blueprints/README.md b/blueprints/README.md index 60055b18..aad7cb08 100644 --- a/blueprints/README.md +++ b/blueprints/README.md @@ -5,7 +5,7 @@ This section **[networking blueprints](./networking/)** that implement core patt Currently available blueprints: - **cloud operations** - [Resource tracking and remediation via Cloud Asset feeds](./cloud-operations/asset-inventory-feed-remediation), [Granular Cloud DNS IAM via Service Directory](./cloud-operations/dns-fine-grained-iam), [Granular Cloud DNS IAM for Shared VPC](./cloud-operations/dns-shared-vpc), [Compute Engine quota monitoring](./cloud-operations/quota-monitoring), [Scheduled Cloud Asset Inventory Export to Bigquery](./cloud-operations/scheduled-asset-inventory-export-bq), [Packer image builder](./cloud-operations/packer-image-builder), [On-prem SA key management](./cloud-operations/onprem-sa-key-management), [TCP healthcheck for unmanaged GCE instances](./cloud-operations/unmanaged-instances-healthcheck), [HTTP Load Balancer with Cloud Armor](./cloud-operations/glb_and_armor) -- **data solutions** - [GCE/GCS CMEK via centralized Cloud KMS](./data-solutions/gcs-to-bq-with-least-privileges/), [Cloud Storage to Bigquery with Cloud Dataflow with least privileges](./data-solutions/gcs-to-bq-with-least-privileges/), [Data Platform Foundations](./data-solutions/data-platform-foundations/), [SQL Server AlwaysOn availability groups blueprint](./data-solutions/sqlserver-alwayson), [Cloud SQL instance with multi-region read replicas](./data-solutions/cloudsql-multiregion/), [Cloud Composer version 2 private instance, supporting Shared VPC and external CMEK key](./data-solutions/composer-2/) +- **data solutions** - [GCE/GCS CMEK via centralized Cloud KMS](./data-solutions/cmek-via-centralized-kms/), [Cloud Storage to Bigquery with Cloud Dataflow with least privileges](./data-solutions/gcs-to-bq-with-least-privileges/), [Data Platform Foundations](./data-solutions/data-platform-foundations/), [SQL Server AlwaysOn availability groups blueprint](./data-solutions/sqlserver-alwayson), [Cloud SQL instance with multi-region read replicas](./data-solutions/cloudsql-multiregion/), [Cloud Composer version 2 private instance, supporting Shared VPC and external CMEK key](./data-solutions/composer-2/) - **factories** - [The why and the how of resource factories](./factories/README.md) - **GKE** - [GKE multitenant fleet](./gke/multitenant-fleet/), [Shared VPC with GKE support](./networking/shared-vpc-gke/), [Binary Authorization Pipeline](./gke/binauthz/), [Multi-cluster mesh on GKE (fleet API)](./gke/multi-cluster-mesh-gke-fleet-api/) - **networking** - [hub and spoke via peering](./networking/hub-and-spoke-peering/), [hub and spoke via VPN](./networking/hub-and-spoke-vpn/), [DNS and Google Private Access for on-premises](./networking/onprem-google-access-dns/), [Shared VPC with GKE support](./networking/shared-vpc-gke/), [ILB as next hop](./networking/ilb-next-hop), [Connecting to on-premise services leveraging PSC and hybrid NEGs](./networking/psc-hybrid/), [decentralized firewall](./networking/decentralized-firewall) diff --git a/blueprints/cloud-operations/adfs/versions.tf b/blueprints/cloud-operations/adfs/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/adfs/versions.tf +++ b/blueprints/cloud-operations/adfs/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf b/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf +++ b/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf b/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf +++ b/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/cloud-operations/dns-shared-vpc/versions.tf b/blueprints/cloud-operations/dns-shared-vpc/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/dns-shared-vpc/versions.tf +++ b/blueprints/cloud-operations/dns-shared-vpc/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf b/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf +++ b/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/cloud-operations/network-dashboard/README.md b/blueprints/cloud-operations/network-dashboard/README.md index cc7b28ff..4d62ed5f 100644 --- a/blueprints/cloud-operations/network-dashboard/README.md +++ b/blueprints/cloud-operations/network-dashboard/README.md @@ -60,7 +60,7 @@ Note that metrics are created in the cloud-function/metrics.yaml file. You can a ## Assumptions and limitations - The CF assumes that all VPCs in peering groups are within the same organization, except for PSA peerings -- PSA peerings record only subnets data +- The CF will only fetch subnet utilization data from the PSA peerings (not the VMs, ILB or routes usage) - The CF assumes global routing is ON, this impacts dynamic routes usage calculation - The CF assumes custom routes importing/exporting is ON, this impacts static and dynamic routes usage calculation - The CF assumes all networks in peering groups have the same global routing and custom routes sharing configuration diff --git a/blueprints/cloud-operations/onprem-sa-key-management/versions.tf b/blueprints/cloud-operations/onprem-sa-key-management/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/onprem-sa-key-management/versions.tf +++ b/blueprints/cloud-operations/onprem-sa-key-management/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/cloud-operations/packer-image-builder/versions.tf b/blueprints/cloud-operations/packer-image-builder/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/packer-image-builder/versions.tf +++ b/blueprints/cloud-operations/packer-image-builder/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/cloud-operations/quota-monitoring/versions.tf b/blueprints/cloud-operations/quota-monitoring/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/quota-monitoring/versions.tf +++ b/blueprints/cloud-operations/quota-monitoring/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf +++ b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/data-solutions/README.md b/blueprints/data-solutions/README.md index 819861eb..968d7b9c 100644 --- a/blueprints/data-solutions/README.md +++ b/blueprints/data-solutions/README.md @@ -13,7 +13,7 @@ They are meant to be used as minimal but complete starting points to create actu ### Cloud Storage to Bigquery with Cloud Dataflow with least privileges - This [blueprint](./gcs-to-bq-with-least-privileges/) implements resources required to run GCS to BigQuery Dataflow pipelines. The solution rely on a set of Services account created with the least privileges principle. + This [blueprint](./gcs-to-bq-with-least-privileges/) implements resources required to run GCS to BigQuery Dataflow pipelines. The solution rely on a set of Services account created with the least privileges principle.
### Data Platform Foundations diff --git a/blueprints/data-solutions/cloudsql-multiregion/cloudsql.tf b/blueprints/data-solutions/cloudsql-multiregion/cloudsql.tf index b33dc980..796cc1b6 100644 --- a/blueprints/data-solutions/cloudsql-multiregion/cloudsql.tf +++ b/blueprints/data-solutions/cloudsql-multiregion/cloudsql.tf @@ -50,7 +50,7 @@ resource "google_sql_user" "service-account" { for_each = toset(var.data_eng_principals) project = module.project.project_id # Omit the .gserviceaccount.com suffix in the email - name = regex("(.+)(gserviceaccount)", module.service-account-sql.email)[0] + name = regex("(.+)(.gserviceaccount)", module.service-account-sql.email)[0] instance = module.db.name type = "CLOUD_IAM_SERVICE_ACCOUNT" } diff --git a/blueprints/data-solutions/cloudsql-multiregion/outputs.tf b/blueprints/data-solutions/cloudsql-multiregion/outputs.tf index 6d6d5178..69840195 100644 --- a/blueprints/data-solutions/cloudsql-multiregion/outputs.tf +++ b/blueprints/data-solutions/cloudsql-multiregion/outputs.tf @@ -38,8 +38,8 @@ output "demo_commands" { description = "Demo commands." value = { "01_ssh" = "gcloud compute ssh ${module.test-vm.instance.name} --project ${module.project.name} --zone ${var.regions.primary}-b" - "02_cloud_sql_proxy" = "cloud_sql_proxy -instances=${module.db.connection_name}=tcp:5432 &" - "03_psql" = "psql 'host=127.0.0.1 port=5432 sslmode=disable dbname=${var.postgres_database} user=postgres'" + "02_cloud_sql_proxy" = "cloud_sql_proxy -enable_iam_login -instances=${module.db.connection_name}=tcp:5432 &" + "03_psql" = "psql 'host=127.0.0.1 port=5432 sslmode=disable dbname=${var.postgres_database} user=postgres password=PASSWORD'" } } diff --git a/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf b/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf +++ b/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/data-solutions/data-playground/versions.tf b/blueprints/data-solutions/data-playground/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/data-solutions/data-playground/versions.tf +++ b/blueprints/data-solutions/data-playground/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/README.md b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/README.md index 1aef209f..6025ad7f 100644 --- a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/README.md +++ b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/README.md @@ -23,7 +23,7 @@ Whether you’re transferring from another Cloud Service Provider or you’re ta ## Architecture -![GCS to BigQuery High-level diagram](diagram.png "GCS to BigQuery High-level diagram") +![GCS to BigQuery High-level diagram](images/diagram.png "GCS to BigQuery High-level diagram") The main components that we would be setting up are (to learn more about these products, click on the hyperlinks): @@ -61,11 +61,11 @@ __Note__: To grant a user a role, take a look at the [Granting and Revoking Acce Click on the button below, sign in if required and when the prompt appears, click on “confirm”. -[![Open Cloudshell](shell_button.png)](https://goo.gle/GoDataPipe) +[![Open Cloudshell](images/shell_button.png)](https://goo.gle/GoDataPipe) This will clone the repository to your cloud shell and a screen like this one will appear: -![cloud_shell](cloud_shell.png) +![cloud_shell](images/cloud_shell.png) Before you deploy the architecture, make sure you run the following command to move your cloudshell session into your service project: @@ -87,7 +87,7 @@ Before we deploy the architecture, you will need the following information: 2. In the editor, edit the terraform.tfvars.sample file with the variables you gathered in the step above. -![editor](editor.png) +![editor](images/editor.png) * a. Fill in __data_eng_principals__ with the list of Users or Groups to impersonate service accounts. @@ -105,7 +105,7 @@ Before we deploy the architecture, you will need the following information: The resource creation will take a few minutes, at the end this is the output you should expect for successful completion along with a list of the created resources: -![output](output.png) +![output](images/output.png) __Congratulations!__ You have successfully deployed the foundation for running your first ETL pipeline on Google Cloud. @@ -168,16 +168,16 @@ This command will start a dataflow job called test_batch_01 that uses a Dataflow The expected output is the following: -![second_output](second_output.png) +![second_output](images/second_output.png) Then, if you navigate to Dataflow on the console, you will see the following: -![dataflow_console](dataflow_console.png) +![dataflow_console](images/dataflow_console.png) This shows the job you started from the cloudshell is currently running in Dataflow. If you click on the job name, you can see the job graph created and how every step of the Dataflow pipeline is moving along: -![dataflow_execution](dataflow_execution.png) +![dataflow_execution](images/dataflow_execution.png) Once the job completes, you can navigate to BigQuery in the console and under __SERVICE_PROJECT_ID__ → datalake → person, you can see the data that was successfully imported into BigQuery through the Dataflow job. diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/cloud_shell.png b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/cloud_shell.png similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/cloud_shell.png rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/cloud_shell.png diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/dataflow_console.png b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/dataflow_console.png similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/dataflow_console.png rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/dataflow_console.png diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/dataflow_execution.png b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/dataflow_execution.png similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/dataflow_execution.png rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/dataflow_execution.png diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/diagram.png b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/diagram.png similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/diagram.png rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/diagram.png diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/editor.png b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/editor.png similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/editor.png rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/editor.png diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/output.png b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/output.png similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/output.png rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/output.png diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/second_output.png b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/second_output.png similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/second_output.png rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/second_output.png diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/shell_button.png b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/shell_button.png similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/shell_button.png rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/images/shell_button.png diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/outputs.tf b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/outputs.tf index 141e424b..eed3052b 100644 --- a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/outputs.tf +++ b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/outputs.tf @@ -47,7 +47,7 @@ output "command_01_gcs" { output "command_02_dataflow" { description = "Command to run Dataflow template impersonating the service account." - value = templatefile("${path.module}/dataflow.tftpl", { + value = templatefile("${path.module}/templates/dataflow.tftpl", { sa_orch_email = module.service-account-orch.email project_id = module.project.project_id region = var.region @@ -68,7 +68,7 @@ output "command_02_dataflow" { output "command_03_bq" { description = "BigQuery command to query imported data." - value = templatefile("${path.module}/bigquery.tftpl", { + value = templatefile("${path.module}/templates/bigquery.tftpl", { project_id = module.project.project_id bigquery_dataset = module.bigquery-dataset.dataset_id bigquery_table = module.bigquery-dataset.tables["person"].table_id diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/bigquery.tftpl b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/templates/bigquery.tftpl similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/bigquery.tftpl rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/templates/bigquery.tftpl diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/dataflow.tftpl b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/templates/dataflow.tftpl similarity index 100% rename from blueprints/data-solutions/gcs-to-bq-with-least-privileges/dataflow.tftpl rename to blueprints/data-solutions/gcs-to-bq-with-least-privileges/templates/dataflow.tftpl diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf +++ b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/factories/net-vpc-firewall-yaml/versions.tf b/blueprints/factories/net-vpc-firewall-yaml/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/factories/net-vpc-firewall-yaml/versions.tf +++ b/blueprints/factories/net-vpc-firewall-yaml/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/decentralized-firewall/main.tf b/blueprints/networking/decentralized-firewall/main.tf index ab42b649..a05a104f 100644 --- a/blueprints/networking/decentralized-firewall/main.tf +++ b/blueprints/networking/decentralized-firewall/main.tf @@ -84,7 +84,7 @@ module "dns-api-prod" { domain = "googleapis.com." client_networks = [module.vpc-prod.self_link] recordsets = { - "CNAME *" = { ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } @@ -96,7 +96,7 @@ module "dns-api-dev" { domain = "googleapis.com." client_networks = [module.vpc-dev.self_link] recordsets = { - "CNAME *" = { ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/blueprints/networking/decentralized-firewall/versions.tf b/blueprints/networking/decentralized-firewall/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/decentralized-firewall/versions.tf +++ b/blueprints/networking/decentralized-firewall/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/filtering-proxy/versions.tf b/blueprints/networking/filtering-proxy/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/filtering-proxy/versions.tf +++ b/blueprints/networking/filtering-proxy/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/hub-and-spoke-peering/versions.tf b/blueprints/networking/hub-and-spoke-peering/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/hub-and-spoke-peering/versions.tf +++ b/blueprints/networking/hub-and-spoke-peering/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/hub-and-spoke-vpn/net-dev.tf b/blueprints/networking/hub-and-spoke-vpn/net-dev.tf index 5fe08acc..7d1c0835 100644 --- a/blueprints/networking/hub-and-spoke-vpn/net-dev.tf +++ b/blueprints/networking/hub-and-spoke-vpn/net-dev.tf @@ -63,7 +63,7 @@ module "dev-dns-zone" { domain = "dev.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A test-r2" = { ttl = 300, records = [module.dev-r2-vm.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A test-r2" = { records = [module.dev-r2-vm.internal_ip] } } } diff --git a/blueprints/networking/hub-and-spoke-vpn/net-landing.tf b/blueprints/networking/hub-and-spoke-vpn/net-landing.tf index 24d17ef4..c70e2295 100644 --- a/blueprints/networking/hub-and-spoke-vpn/net-landing.tf +++ b/blueprints/networking/hub-and-spoke-vpn/net-landing.tf @@ -53,7 +53,7 @@ module "landing-dns-zone" { domain = "example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A test-r1" = { ttl = 300, records = [module.landing-r1-vm.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A test-r1" = { records = [module.landing-r1-vm.internal_ip] } } } diff --git a/blueprints/networking/hub-and-spoke-vpn/net-prod.tf b/blueprints/networking/hub-and-spoke-vpn/net-prod.tf index a7700aeb..aeb62019 100644 --- a/blueprints/networking/hub-and-spoke-vpn/net-prod.tf +++ b/blueprints/networking/hub-and-spoke-vpn/net-prod.tf @@ -63,7 +63,7 @@ module "prod-dns-zone" { domain = "prd.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A test-r1" = { ttl = 300, records = [module.prod-r1-vm.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A test-r1" = { records = [module.prod-r1-vm.internal_ip] } } } diff --git a/blueprints/networking/hub-and-spoke-vpn/versions.tf b/blueprints/networking/hub-and-spoke-vpn/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/hub-and-spoke-vpn/versions.tf +++ b/blueprints/networking/hub-and-spoke-vpn/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/ilb-next-hop/versions.tf b/blueprints/networking/ilb-next-hop/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/ilb-next-hop/versions.tf +++ b/blueprints/networking/ilb-next-hop/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/nginx-reverse-proxy-cluster/versions.tf b/blueprints/networking/nginx-reverse-proxy-cluster/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/nginx-reverse-proxy-cluster/versions.tf +++ b/blueprints/networking/nginx-reverse-proxy-cluster/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/onprem-google-access-dns/main.tf b/blueprints/networking/onprem-google-access-dns/main.tf index 18159080..4a78f2ca 100644 --- a/blueprints/networking/onprem-google-access-dns/main.tf +++ b/blueprints/networking/onprem-google-access-dns/main.tf @@ -169,9 +169,9 @@ module "dns-gcp" { domain = "gcp.example.org." client_networks = [module.vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A test-1" = { ttl = 300, records = [module.vm-test1.internal_ip] } - "A test-2" = { ttl = 300, records = [module.vm-test2.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A test-1" = { records = [module.vm-test1.internal_ip] } + "A test-2" = { records = [module.vm-test2.internal_ip] } } } @@ -183,9 +183,9 @@ module "dns-api" { domain = "googleapis.com." client_networks = [module.vpc.self_link] recordsets = { - "CNAME *" = { ttl = 300, records = ["private.googleapis.com."] } - "A private" = { ttl = 300, records = local.vips.private } - "A restricted" = { ttl = 300, records = local.vips.restricted } + "CNAME *" = { records = ["private.googleapis.com."] } + "A private" = { records = local.vips.private } + "A restricted" = { records = local.vips.restricted } } } diff --git a/blueprints/networking/onprem-google-access-dns/versions.tf b/blueprints/networking/onprem-google-access-dns/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/onprem-google-access-dns/versions.tf +++ b/blueprints/networking/onprem-google-access-dns/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/private-cloud-function-from-onprem/main.tf b/blueprints/networking/private-cloud-function-from-onprem/main.tf index 528cabe0..e2f23f1f 100644 --- a/blueprints/networking/private-cloud-function-from-onprem/main.tf +++ b/blueprints/networking/private-cloud-function-from-onprem/main.tf @@ -218,7 +218,7 @@ module "private-dns-onprem" { domain = "${var.region}-${module.project.project_id}.cloudfunctions.net." client_networks = [module.vpc-onprem.self_link] recordsets = { - "A " = { ttl = 300, records = [module.addresses.psc_addresses[local.psc_name].address] } + "A " = { records = [module.addresses.psc_addresses[local.psc_name].address] } } } diff --git a/blueprints/networking/private-cloud-function-from-onprem/versions.tf b/blueprints/networking/private-cloud-function-from-onprem/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/private-cloud-function-from-onprem/versions.tf +++ b/blueprints/networking/private-cloud-function-from-onprem/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/networking/shared-vpc-gke/main.tf b/blueprints/networking/shared-vpc-gke/main.tf index 47b2b533..9d141acc 100644 --- a/blueprints/networking/shared-vpc-gke/main.tf +++ b/blueprints/networking/shared-vpc-gke/main.tf @@ -157,8 +157,8 @@ module "host-dns" { domain = "example.com." client_networks = [module.vpc-shared.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } - "A bastion" = { ttl = 300, records = [module.vm-bastion.internal_ip] } + "A localhost" = { records = ["127.0.0.1"] } + "A bastion" = { records = [module.vm-bastion.internal_ip] } } } diff --git a/blueprints/networking/shared-vpc-gke/versions.tf b/blueprints/networking/shared-vpc-gke/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/networking/shared-vpc-gke/versions.tf +++ b/blueprints/networking/shared-vpc-gke/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/blueprints/third-party-solutions/openshift/tf/versions.tf b/blueprints/third-party-solutions/openshift/tf/versions.tf index b1c8c910..286536a6 100644 --- a/blueprints/third-party-solutions/openshift/tf/versions.tf +++ b/blueprints/third-party-solutions/openshift/tf/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/default-versions.tf b/default-versions.tf index 6862241d..286536a6 100644 --- a/default-versions.tf +++ b/default-versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" + version = ">= 4.40.0" # tftest } } } diff --git a/fast/stages/02-networking-nva/dns-dev.tf b/fast/stages/02-networking-nva/dns-dev.tf index 08c99486..4eb472a1 100644 --- a/fast/stages/02-networking-nva/dns-dev.tf +++ b/fast/stages/02-networking-nva/dns-dev.tf @@ -26,7 +26,7 @@ module "dev-dns-private-zone" { domain = "dev.gcp.example.com." client_networks = [module.landing-trusted-vpc.self_link, module.landing-untrusted-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-nva/dns-landing.tf b/fast/stages/02-networking-nva/dns-landing.tf index f177dcda..e7834405 100644 --- a/fast/stages/02-networking-nva/dns-landing.tf +++ b/fast/stages/02-networking-nva/dns-landing.tf @@ -55,7 +55,7 @@ module "gcp-example-dns-private-zone" { module.landing-trusted-vpc.self_link ] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -72,12 +72,12 @@ module "googleapis-private-zone" { module.landing-trusted-vpc.self_link ] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-nva/dns-prod.tf b/fast/stages/02-networking-nva/dns-prod.tf index 335f1508..b54609df 100644 --- a/fast/stages/02-networking-nva/dns-prod.tf +++ b/fast/stages/02-networking-nva/dns-prod.tf @@ -26,7 +26,7 @@ module "prod-dns-private-zone" { domain = "prod.gcp.example.com." client_networks = [module.landing-trusted-vpc.self_link, module.landing-untrusted-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-peering/dns-dev.tf b/fast/stages/02-networking-peering/dns-dev.tf index aad50afc..03ae0122 100644 --- a/fast/stages/02-networking-peering/dns-dev.tf +++ b/fast/stages/02-networking-peering/dns-dev.tf @@ -26,7 +26,7 @@ module "dev-dns-private-zone" { domain = "dev.gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-peering/dns-landing.tf b/fast/stages/02-networking-peering/dns-landing.tf index b1d766ab..e9a5da33 100644 --- a/fast/stages/02-networking-peering/dns-landing.tf +++ b/fast/stages/02-networking-peering/dns-landing.tf @@ -46,7 +46,7 @@ module "gcp-example-dns-private-zone" { domain = "gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -60,12 +60,12 @@ module "googleapis-private-zone" { domain = "googleapis.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-peering/dns-prod.tf b/fast/stages/02-networking-peering/dns-prod.tf index a4a916b4..5bb695fd 100644 --- a/fast/stages/02-networking-peering/dns-prod.tf +++ b/fast/stages/02-networking-peering/dns-prod.tf @@ -26,7 +26,7 @@ module "prod-dns-private-zone" { domain = "prod.gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-separate-envs/dns-dev.tf b/fast/stages/02-networking-separate-envs/dns-dev.tf index 355938b2..5811c255 100644 --- a/fast/stages/02-networking-separate-envs/dns-dev.tf +++ b/fast/stages/02-networking-separate-envs/dns-dev.tf @@ -26,7 +26,7 @@ module "dev-dns-private-zone" { domain = "dev.gcp.example.com." client_networks = [module.dev-spoke-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -58,12 +58,12 @@ module "dev-googleapis-private-zone" { domain = "googleapis.com." client_networks = [module.dev-spoke-vpc.self_link] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-separate-envs/dns-prod.tf b/fast/stages/02-networking-separate-envs/dns-prod.tf index 3dc7ff43..db38064e 100644 --- a/fast/stages/02-networking-separate-envs/dns-prod.tf +++ b/fast/stages/02-networking-separate-envs/dns-prod.tf @@ -26,7 +26,7 @@ module "prod-dns-private-zone" { domain = "prod.gcp.example.com." client_networks = [module.prod-spoke-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -59,12 +59,12 @@ module "prod-googleapis-private-zone" { domain = "googleapis.com." client_networks = [module.prod-spoke-vpc.self_link] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-vpn/dns-dev.tf b/fast/stages/02-networking-vpn/dns-dev.tf index aad50afc..03ae0122 100644 --- a/fast/stages/02-networking-vpn/dns-dev.tf +++ b/fast/stages/02-networking-vpn/dns-dev.tf @@ -26,7 +26,7 @@ module "dev-dns-private-zone" { domain = "dev.gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/fast/stages/02-networking-vpn/dns-landing.tf b/fast/stages/02-networking-vpn/dns-landing.tf index b1d766ab..e9a5da33 100644 --- a/fast/stages/02-networking-vpn/dns-landing.tf +++ b/fast/stages/02-networking-vpn/dns-landing.tf @@ -46,7 +46,7 @@ module "gcp-example-dns-private-zone" { domain = "gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } @@ -60,12 +60,12 @@ module "googleapis-private-zone" { domain = "googleapis.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A private" = { type = "A", ttl = 300, records = [ + "A private" = { records = [ "199.36.153.8", "199.36.153.9", "199.36.153.10", "199.36.153.11" ] } - "A restricted" = { type = "A", ttl = 300, records = [ + "A restricted" = { records = [ "199.36.153.4", "199.36.153.5", "199.36.153.6", "199.36.153.7" ] } - "CNAME *" = { type = "CNAME", ttl = 300, records = ["private.googleapis.com."] } + "CNAME *" = { records = ["private.googleapis.com."] } } } diff --git a/fast/stages/02-networking-vpn/dns-prod.tf b/fast/stages/02-networking-vpn/dns-prod.tf index a4a916b4..5bb695fd 100644 --- a/fast/stages/02-networking-vpn/dns-prod.tf +++ b/fast/stages/02-networking-vpn/dns-prod.tf @@ -26,7 +26,7 @@ module "prod-dns-private-zone" { domain = "prod.gcp.example.com." client_networks = [module.landing-vpc.self_link] recordsets = { - "A localhost" = { type = "A", ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } } } diff --git a/modules/__experimental/net-neg/versions.tf b/modules/__experimental/net-neg/versions.tf index b1c8c910..286536a6 100644 --- a/modules/__experimental/net-neg/versions.tf +++ b/modules/__experimental/net-neg/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/apigee-organization/versions.tf b/modules/apigee-organization/versions.tf index b1c8c910..286536a6 100644 --- a/modules/apigee-organization/versions.tf +++ b/modules/apigee-organization/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/apigee-x-instance/versions.tf b/modules/apigee-x-instance/versions.tf index b1c8c910..286536a6 100644 --- a/modules/apigee-x-instance/versions.tf +++ b/modules/apigee-x-instance/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/billing-budget/versions.tf b/modules/billing-budget/versions.tf index b1c8c910..286536a6 100644 --- a/modules/billing-budget/versions.tf +++ b/modules/billing-budget/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf index b1c8c910..286536a6 100644 --- a/modules/binauthz/versions.tf +++ b/modules/binauthz/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.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 b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.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 b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-config-container/onprem/versions.tf b/modules/cloud-config-container/onprem/versions.tf index b1c8c910..286536a6 100644 --- a/modules/cloud-config-container/onprem/versions.tf +++ b/modules/cloud-config-container/onprem/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-config-container/squid/versions.tf b/modules/cloud-config-container/squid/versions.tf index b1c8c910..286536a6 100644 --- a/modules/cloud-config-container/squid/versions.tf +++ b/modules/cloud-config-container/squid/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-function/versions.tf b/modules/cloud-function/versions.tf index b1c8c910..286536a6 100644 --- a/modules/cloud-function/versions.tf +++ b/modules/cloud-function/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf index b1c8c910..286536a6 100644 --- a/modules/datafusion/versions.tf +++ b/modules/datafusion/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/dns/README.md b/modules/dns/README.md index cfb8844f..ebd200ab 100644 --- a/modules/dns/README.md +++ b/modules/dns/README.md @@ -17,10 +17,11 @@ module "private-dns" { domain = "test.example." client_networks = [var.vpc.self_link] recordsets = { - "A localhost" = { ttl = 300, records = ["127.0.0.1"] } + "A localhost" = { records = ["127.0.0.1"] } + "A myhost" = { ttl = 600, records = ["10.0.0.120"] } } } -# tftest modules=1 resources=2 +# tftest modules=1 resources=3 ``` ### Forwarding Zone @@ -59,19 +60,18 @@ module "private-dns" { | name | description | type | required | default | |---|---|:---:|:---:|:---:| | [domain](variables.tf#L51) | Zone domain, must end with a period. | string | ✓ | | -| [name](variables.tf#L62) | Zone name, must be unique within the project. | string | ✓ | | -| [project_id](variables.tf#L73) | Project id for the zone. | string | ✓ | | +| [name](variables.tf#L69) | Zone name, must be unique within the project. | string | ✓ | | +| [project_id](variables.tf#L80) | Project id for the zone. | string | ✓ | | | [client_networks](variables.tf#L21) | List of VPC self links that can see this zone. | list(string) | | [] | -| [default_key_specs_key](variables.tf#L27) | DNSSEC default key signing specifications: algorithm, key_length, key_type, kind. | any | | {} | -| [default_key_specs_zone](variables.tf#L33) | DNSSEC default zone signing specifications: algorithm, key_length, key_type, kind. | any | | {} | -| [description](variables.tf#L39) | Domain description. | string | | "Terraform managed." | -| [dnssec_config](variables.tf#L45) | DNSSEC configuration: kind, non_existence, state. | any | | {} | +| [description](variables.tf#L28) | Domain description. | string | | "Terraform managed." | +| [dnssec_config](variables.tf#L34) | DNSSEC configuration for this zone. | object({…}) | | null | +| [enable_logging](variables.tf#L62) | Enable query logging for this zone. Only valid for public zones. | bool | | false | | [forwarders](variables.tf#L56) | Map of {IPV4_ADDRESS => FORWARDING_PATH} for 'forwarding' zone types. Path can be 'default', 'private', or null for provider default. | map(string) | | {} | -| [peer_network](variables.tf#L67) | Peering network self link, only valid for 'peering' zone types. | string | | null | -| [recordsets](variables.tf#L78) | Map of DNS recordsets in \"type name\" => {ttl, [records]} format. | map(object({…})) | | {} | -| [service_directory_namespace](variables.tf#L94) | Service directory namespace id (URL), only valid for 'service-directory' zone types. | string | | null | -| [type](variables.tf#L100) | Type of zone to create, valid values are 'public', 'private', 'forwarding', 'peering', 'service-directory'. | string | | "private" | -| [zone_create](variables.tf#L110) | Create zone. When set to false, uses a data source to reference existing zone. | bool | | true | +| [peer_network](variables.tf#L74) | Peering network self link, only valid for 'peering' zone types. | string | | null | +| [recordsets](variables.tf#L85) | Map of DNS recordsets in \"type name\" => {ttl, [records]} format. | map(object({…})) | | {} | +| [service_directory_namespace](variables.tf#L102) | Service directory namespace id (URL), only valid for 'service-directory' zone types. | string | | null | +| [type](variables.tf#L108) | Type of zone to create, valid values are 'public', 'private', 'forwarding', 'peering', 'service-directory'. | string | | "private" | +| [zone_create](variables.tf#L118) | Create zone. When set to false, uses a data source to reference existing zone. | bool | | true | ## Outputs diff --git a/modules/dns/main.tf b/modules/dns/main.tf index 3eec6036..ed687d97 100644 --- a/modules/dns/main.tf +++ b/modules/dns/main.tf @@ -15,9 +15,8 @@ */ locals { - _recordsets = var.recordsets == null ? {} : var.recordsets recordsets = { - for key, attrs in local._recordsets : + for key, attrs in var.recordsets : key => merge(attrs, zipmap(["type", "name"], split(" ", key))) } zone = ( @@ -117,24 +116,25 @@ resource "google_dns_managed_zone" "public" { visibility = "public" dynamic "dnssec_config" { - for_each = var.dnssec_config == {} ? [] : tolist([var.dnssec_config]) + for_each = var.dnssec_config == null ? [] : [1] iterator = config content { - kind = lookup(config.value, "kind", "dns#managedZoneDnsSecConfig") - non_existence = lookup(config.value, "non_existence", "nsec3") - state = lookup(config.value, "state", "off") + kind = "dns#managedZoneDnsSecConfig" + non_existence = var.dnssec_config.non_existence + state = var.dnssec_config.state default_key_specs { - algorithm = lookup(var.default_key_specs_key, "algorithm", "rsasha256") - key_length = lookup(var.default_key_specs_key, "key_length", 2048) - key_type = lookup(var.default_key_specs_key, "key_type", "keySigning") - kind = lookup(var.default_key_specs_key, "kind", "dns#dnsKeySpec") + algorithm = var.dnssec_config.key_signing_key.algorithm + key_length = var.dnssec_config.key_signing_key.key_length + key_type = "keySigning" + kind = "dns#dnsKeySpec" } + default_key_specs { - algorithm = lookup(var.default_key_specs_zone, "algorithm", "rsasha256") - key_length = lookup(var.default_key_specs_zone, "key_length", 1024) - key_type = lookup(var.default_key_specs_zone, "key_type", "zoneSigning") - kind = lookup(var.default_key_specs_zone, "kind", "dns#dnsKeySpec") + algorithm = var.dnssec_config.zone_signing_key.algorithm + key_length = var.dnssec_config.zone_signing_key.key_length + key_type = "zoneSigning" + kind = "dns#dnsKeySpec" } } } diff --git a/modules/dns/variables.tf b/modules/dns/variables.tf index ba44c7d8..749bbdd5 100644 --- a/modules/dns/variables.tf +++ b/modules/dns/variables.tf @@ -22,18 +22,7 @@ variable "client_networks" { description = "List of VPC self links that can see this zone." type = list(string) default = [] -} - -variable "default_key_specs_key" { - description = "DNSSEC default key signing specifications: algorithm, key_length, key_type, kind." - type = any - default = {} -} - -variable "default_key_specs_zone" { - description = "DNSSEC default zone signing specifications: algorithm, key_length, key_type, kind." - type = any - default = {} + nullable = false } variable "description" { @@ -43,9 +32,20 @@ variable "description" { } variable "dnssec_config" { - description = "DNSSEC configuration: kind, non_existence, state." - type = any - default = {} + description = "DNSSEC configuration for this zone." + type = object({ + non_existence = optional(string, "nsec3") + state = string + key_signing_key = optional(object( + { algorithm = string, key_length = number }), + { algorithm = "rsasha256", key_length = 2048 } + ) + zone_signing_key = optional(object( + { algorithm = string, key_length = number }), + { algorithm = "rsasha256", key_length = 1024 } + ) + }) + default = null } variable "domain" { @@ -59,6 +59,13 @@ variable "forwarders" { default = {} } +variable "enable_logging" { + description = "Enable query logging for this zone. Only valid for public zones." + type = bool + default = false + nullable = false +} + variable "name" { description = "Zone name, must be unique within the project." type = string @@ -78,10 +85,11 @@ variable "project_id" { variable "recordsets" { description = "Map of DNS recordsets in \"type name\" => {ttl, [records]} format." type = map(object({ - ttl = number + ttl = optional(number, 300) records = list(string) })) - default = {} + default = {} + nullable = false validation { condition = alltrue([ for k, v in var.recordsets == null ? {} : var.recordsets : diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf index b1c8c910..286536a6 100644 --- a/modules/dns/versions.tf +++ b/modules/dns/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf index b1c8c910..286536a6 100644 --- a/modules/endpoints/versions.tf +++ b/modules/endpoints/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf index b1c8c910..286536a6 100644 --- a/modules/folder/versions.tf +++ b/modules/folder/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf index b1c8c910..286536a6 100644 --- a/modules/gcs/versions.tf +++ b/modules/gcs/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/gke-cluster/versions.tf b/modules/gke-cluster/versions.tf index b1c8c910..286536a6 100644 --- a/modules/gke-cluster/versions.tf +++ b/modules/gke-cluster/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf index b1c8c910..286536a6 100644 --- a/modules/kms/versions.tf +++ b/modules/kms/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-glb/versions.tf b/modules/net-glb/versions.tf index b1c8c910..286536a6 100644 --- a/modules/net-glb/versions.tf +++ b/modules/net-glb/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-ilb-l7/versions.tf b/modules/net-ilb-l7/versions.tf index b1c8c910..286536a6 100644 --- a/modules/net-ilb-l7/versions.tf +++ b/modules/net-ilb-l7/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-ilb/versions.tf b/modules/net-ilb/versions.tf index b1c8c910..286536a6 100644 --- a/modules/net-ilb/versions.tf +++ b/modules/net-ilb/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-interconnect-attachment-direct/versions.tf b/modules/net-interconnect-attachment-direct/versions.tf index b1c8c910..286536a6 100644 --- a/modules/net-interconnect-attachment-direct/versions.tf +++ b/modules/net-interconnect-attachment-direct/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/organization-policy/versions.tf b/modules/organization-policy/versions.tf index b1c8c910..286536a6 100644 --- a/modules/organization-policy/versions.tf +++ b/modules/organization-policy/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf index b1c8c910..286536a6 100644 --- a/modules/organization/versions.tf +++ b/modules/organization/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/project/versions.tf b/modules/project/versions.tf index b1c8c910..286536a6 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index b1c8c910..286536a6 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -17,11 +17,11 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } } diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf index b1c8c910..286536a6 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 = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } google-beta = { source = "hashicorp/google-beta" - version = ">= 4.36.0" # tftest + version = ">= 4.40.0" # tftest } } }