From 8de08a6903411456fca57c43e8640e1a3e56abb0 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Thu, 9 Jan 2025 04:20:19 +0000 Subject: [PATCH] Update terraform --- .../tfengine/generated/devops/cicd/main.tf | 2 +- .../tfengine/generated/devops/devops/main.tf | 4 +-- .../tfengine/generated/devops/groups/main.tf | 2 +- .../generated/folder_foundation/audit/main.tf | 14 ++++---- .../generated/folder_foundation/cicd/main.tf | 2 +- .../folder_foundation/devops/main.tf | 4 +-- .../example-prod-networks/main.tf | 6 ++-- .../folder_foundation/groups/main.tf | 2 +- .../gke_cluster/gke_cluster/cluster/main.tf | 4 +-- .../gke_cluster/kubernetes/main.tf | 4 +-- .../gke_cluster/gke_cluster/networks/main.tf | 4 +-- .../generated/iam_members/iam_members/main.tf | 10 +++--- .../generated/multi_envs/audit/main.tf | 10 +++--- .../generated/multi_envs/cicd/main.tf | 2 +- .../generated/multi_envs/dev/data/main.tf | 4 +-- .../generated/multi_envs/devops/main.tf | 4 +-- .../generated/multi_envs/groups/main.tf | 2 +- .../generated/multi_envs/prod/data/main.tf | 4 +-- .../generated/org_foundation/audit/main.tf | 10 +++--- .../generated/org_foundation/cicd/main.tf | 2 +- .../generated/org_foundation/devops/main.tf | 4 +-- .../example-prod-networks/main.tf | 6 ++-- .../generated/org_foundation/groups/main.tf | 2 +- .../org_foundation/org_policies/main.tf | 28 +++++++-------- .../org_policies/org_policies/main.tf | 34 +++++++++---------- .../resources_only/resources/main.tf | 6 ++-- .../team/additional_iam_members/main.tf | 10 +++--- examples/tfengine/generated/team/cicd/main.tf | 6 ++-- .../tfengine/generated/team/devops/main.tf | 8 ++--- .../tfengine/generated/team/groups/main.tf | 2 +- .../generated/team/kubernetes/main.tf | 4 +-- .../generated/team/project_apps/main.tf | 12 +++---- .../generated/team/project_data/main.tf | 12 +++---- .../generated/team/project_networks/main.tf | 14 ++++---- .../generated/team/project_secrets/main.tf | 6 ++-- templates/tfengine/components/audit/main.tf | 8 ++--- templates/tfengine/components/cicd/main.tf | 2 +- templates/tfengine/components/devops/main.tf | 4 +-- .../tfengine/components/iam_members/main.tf | 10 +++--- .../tfengine/components/org_policies/main.tf | 34 +++++++++---------- templates/tfengine/components/project/main.tf | 4 +-- .../resources/bastion_hosts/main.tf | 2 +- .../resources/bigquery_datasets/main.tf | 2 +- .../resources/cloud_sql_instances/main.tf | 2 +- .../compute_instance_templates/main.tf | 4 +-- .../resources/compute_networks/main.tf | 4 +-- .../resources/compute_routers/main.tf | 2 +- .../components/resources/dns_zones/main.tf | 2 +- .../components/resources/gke_clusters/main.tf | 2 +- .../resources/project_iam_members/main.tf | 2 +- .../resources/pubsub_topics/main.tf | 2 +- .../resources/storage_buckets/main.tf | 2 +- .../resources/workload_identity/main.tf | 2 +- 53 files changed, 170 insertions(+), 170 deletions(-) diff --git a/examples/tfengine/generated/devops/cicd/main.tf b/examples/tfengine/generated/devops/cicd/main.tf index 71c27afe7..17e85856a 100644 --- a/examples/tfengine/generated/devops/cicd/main.tf +++ b/examples/tfengine/generated/devops/cicd/main.tf @@ -179,7 +179,7 @@ resource "google_project_iam_member" "cloudbuild_scheduler_sa_project_iam" { # Cloud Build - Storage Bucket to store Cloud Build logs. module "logs_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = var.logs_bucket project_id = var.project_id diff --git a/examples/tfengine/generated/devops/devops/main.tf b/examples/tfengine/generated/devops/devops/main.tf index d73ef9092..05e3f0bba 100644 --- a/examples/tfengine/generated/devops/devops/main.tf +++ b/examples/tfengine/generated/devops/devops/main.tf @@ -33,7 +33,7 @@ terraform { # Create the project, enable APIs, and create the deletion lien, if specified. module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-devops" org_id = "12345678" @@ -52,7 +52,7 @@ module "project" { # Terraform state bucket, hosted in the devops project. module "state_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-terraform-state" project_id = module.project.project_id diff --git a/examples/tfengine/generated/devops/groups/main.tf b/examples/tfengine/generated/devops/groups/main.tf index 72e7c678c..29cae2150 100644 --- a/examples/tfengine/generated/devops/groups/main.tf +++ b/examples/tfengine/generated/devops/groups/main.tf @@ -28,7 +28,7 @@ terraform { module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "example-devops" activate_apis = [] diff --git a/examples/tfengine/generated/folder_foundation/audit/main.tf b/examples/tfengine/generated/folder_foundation/audit/main.tf index 6f9afcbca..85bc21715 100644 --- a/examples/tfengine/generated/folder_foundation/audit/main.tf +++ b/examples/tfengine/generated/folder_foundation/audit/main.tf @@ -15,8 +15,8 @@ terraform { required_version = ">=0.14" required_providers { - google = ">=3.0, <= 3.71" - google-beta = "~>3.50" + google = "<= 6.15" + google-beta = "~> 6.0" kubernetes = "~> 2.10" } backend "gcs" { @@ -30,7 +30,7 @@ terraform { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-audit" org_id = "" @@ -70,7 +70,7 @@ resource "google_folder_iam_audit_config" "config" { module "bigquery_export" { source = "terraform-google-modules/log-export/google" - version = "~> 7.3.0" + version = "~> 10.0.0" log_sink_name = "example-bigquery-audit-logs-sink" destination_uri = module.bigquery_destination.destination_uri @@ -83,7 +83,7 @@ module "bigquery_export" { module "bigquery_destination" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "~> 7.3.0" + version = "~> 10.0.0" dataset_name = "1yr_folder_audit_logs" project_id = module.project.project_id @@ -94,7 +94,7 @@ module "bigquery_destination" { module "storage_export" { source = "terraform-google-modules/log-export/google" - version = "~> 7.3.0" + version = "~> 10.0.0" log_sink_name = "example-storage-audit-logs-sink" destination_uri = module.storage_destination.destination_uri @@ -110,7 +110,7 @@ module "storage_export" { // and set the actual expiry to be greater than this amount (7 years). module "storage_destination" { source = "terraform-google-modules/log-export/google//modules/storage" - version = "~> 7.3.0" + version = "~> 10.0.0" storage_bucket_name = "7yr-folder-audit-logs" project_id = module.project.project_id diff --git a/examples/tfengine/generated/folder_foundation/cicd/main.tf b/examples/tfengine/generated/folder_foundation/cicd/main.tf index ccb0cea6b..a6b3fb52b 100644 --- a/examples/tfengine/generated/folder_foundation/cicd/main.tf +++ b/examples/tfengine/generated/folder_foundation/cicd/main.tf @@ -184,7 +184,7 @@ resource "google_service_account" "cloudbuild_sa" { # Cloud Build - Storage Bucket to store Cloud Build logs. module "logs_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = var.logs_bucket project_id = var.project_id diff --git a/examples/tfengine/generated/folder_foundation/devops/main.tf b/examples/tfengine/generated/folder_foundation/devops/main.tf index 8cc4f5d4d..05e5cfc12 100644 --- a/examples/tfengine/generated/folder_foundation/devops/main.tf +++ b/examples/tfengine/generated/folder_foundation/devops/main.tf @@ -33,7 +33,7 @@ terraform { # Create the project, enable APIs, and create the deletion lien, if specified. module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-devops" org_id = "" @@ -53,7 +53,7 @@ module "project" { # Terraform state bucket, hosted in the devops project. module "state_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-terraform-state" project_id = module.project.project_id diff --git a/examples/tfengine/generated/folder_foundation/example-prod-networks/main.tf b/examples/tfengine/generated/folder_foundation/example-prod-networks/main.tf index 7888d0b58..4f7f0612b 100644 --- a/examples/tfengine/generated/folder_foundation/example-prod-networks/main.tf +++ b/examples/tfengine/generated/folder_foundation/example-prod-networks/main.tf @@ -30,7 +30,7 @@ terraform { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-prod-networks" org_id = "" @@ -51,7 +51,7 @@ module "project" { module "example_network" { source = "terraform-google-modules/network/google" - version = "~> 4.0.1" + version = "~> 10.0.0" network_name = "example-network" project_id = module.project.project_id @@ -69,7 +69,7 @@ module "example_network" { module "example_router" { source = "terraform-google-modules/cloud-router/google" - version = "~> 1.2.0" + version = "~> 6.2.0" name = "example-router" project = module.project.project_id diff --git a/examples/tfengine/generated/folder_foundation/groups/main.tf b/examples/tfengine/generated/folder_foundation/groups/main.tf index 7bd9efc9f..c3c1a956b 100644 --- a/examples/tfengine/generated/folder_foundation/groups/main.tf +++ b/examples/tfengine/generated/folder_foundation/groups/main.tf @@ -28,7 +28,7 @@ terraform { module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "example-devops" activate_apis = [] diff --git a/examples/tfengine/generated/gke_cluster/gke_cluster/cluster/main.tf b/examples/tfengine/generated/gke_cluster/gke_cluster/cluster/main.tf index 1aec8c7a9..2d1c8cf99 100644 --- a/examples/tfengine/generated/gke_cluster/gke_cluster/cluster/main.tf +++ b/examples/tfengine/generated/gke_cluster/gke_cluster/cluster/main.tf @@ -30,7 +30,7 @@ terraform { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-apps" org_id = "12345678" @@ -63,7 +63,7 @@ provider "kubernetes" { module "example_cluster" { source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster-update-variant" - version = "~> 21.2" + version = "~> 35.0" providers = { kubernetes = kubernetes.example_cluster diff --git a/examples/tfengine/generated/gke_cluster/gke_cluster/kubernetes/main.tf b/examples/tfengine/generated/gke_cluster/gke_cluster/kubernetes/main.tf index ecff2cb8f..65db8385a 100644 --- a/examples/tfengine/generated/gke_cluster/gke_cluster/kubernetes/main.tf +++ b/examples/tfengine/generated/gke_cluster/gke_cluster/kubernetes/main.tf @@ -44,7 +44,7 @@ provider "kubernetes" { module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "example-apps" activate_apis = [] @@ -71,7 +71,7 @@ resource "kubernetes_namespace" "example_namespace" { module "workload_identity_example_namespace" { source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - version = "16.1.0" + version = "35.0.1" project_id = module.project.project_id name = "example-sa" diff --git a/examples/tfengine/generated/gke_cluster/gke_cluster/networks/main.tf b/examples/tfengine/generated/gke_cluster/gke_cluster/networks/main.tf index 0b13b3f8b..7b81f36f3 100644 --- a/examples/tfengine/generated/gke_cluster/gke_cluster/networks/main.tf +++ b/examples/tfengine/generated/gke_cluster/gke_cluster/networks/main.tf @@ -30,7 +30,7 @@ terraform { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-networks" org_id = "12345678" @@ -50,7 +50,7 @@ module "project" { module "network" { source = "terraform-google-modules/network/google" - version = "~> 4.0.1" + version = "~> 10.0.0" network_name = "network" project_id = module.project.project_id diff --git a/examples/tfengine/generated/iam_members/iam_members/main.tf b/examples/tfengine/generated/iam_members/iam_members/main.tf index b664ee8dd..e7dc68ee6 100644 --- a/examples/tfengine/generated/iam_members/iam_members/main.tf +++ b/examples/tfengine/generated/iam_members/iam_members/main.tf @@ -27,7 +27,7 @@ terraform { module "storage_bucket_iam_members" { source = "terraform-google-modules/iam/google//modules/storage_buckets_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.storage_bucket_iam_members : @@ -39,7 +39,7 @@ module "storage_bucket_iam_members" { module "project_iam_members" { source = "terraform-google-modules/iam/google//modules/projects_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.project_iam_members : @@ -51,7 +51,7 @@ module "project_iam_members" { module "folder_iam_members" { source = "terraform-google-modules/iam/google//modules/folders_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.folder_iam_members : @@ -63,7 +63,7 @@ module "folder_iam_members" { module "organization_iam_members" { source = "terraform-google-modules/iam/google//modules/organizations_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.organization_iam_members : @@ -75,7 +75,7 @@ module "organization_iam_members" { module "service_account_iam_members" { source = "terraform-google-modules/iam/google//modules/service_accounts_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.service_account_iam_members : diff --git a/examples/tfengine/generated/multi_envs/audit/main.tf b/examples/tfengine/generated/multi_envs/audit/main.tf index ad530f08c..4e69ee614 100644 --- a/examples/tfengine/generated/multi_envs/audit/main.tf +++ b/examples/tfengine/generated/multi_envs/audit/main.tf @@ -30,7 +30,7 @@ terraform { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-audit" org_id = "" @@ -70,7 +70,7 @@ resource "google_folder_iam_audit_config" "config" { module "bigquery_export" { source = "terraform-google-modules/log-export/google" - version = "~> 7.3.0" + version = "~> 10.0.0" log_sink_name = "example-bigquery-audit-logs-sink" destination_uri = module.bigquery_destination.destination_uri @@ -83,7 +83,7 @@ module "bigquery_export" { module "bigquery_destination" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "~> 7.3.0" + version = "~> 10.0.0" dataset_name = "1yr_folder_audit_logs" project_id = module.project.project_id @@ -94,7 +94,7 @@ module "bigquery_destination" { module "storage_export" { source = "terraform-google-modules/log-export/google" - version = "~> 7.3.0" + version = "~> 10.0.0" log_sink_name = "example-storage-audit-logs-sink" destination_uri = module.storage_destination.destination_uri @@ -110,7 +110,7 @@ module "storage_export" { // and set the actual expiry to be greater than this amount (7 years). module "storage_destination" { source = "terraform-google-modules/log-export/google//modules/storage" - version = "~> 7.3.0" + version = "~> 10.0.0" storage_bucket_name = "7yr-folder-audit-logs" project_id = module.project.project_id diff --git a/examples/tfengine/generated/multi_envs/cicd/main.tf b/examples/tfengine/generated/multi_envs/cicd/main.tf index e26f3d9e3..fc4e6a7d6 100644 --- a/examples/tfengine/generated/multi_envs/cicd/main.tf +++ b/examples/tfengine/generated/multi_envs/cicd/main.tf @@ -193,7 +193,7 @@ resource "google_service_account" "cloudbuild_sa" { # Cloud Build - Storage Bucket to store Cloud Build logs. module "logs_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = var.logs_bucket project_id = var.project_id diff --git a/examples/tfengine/generated/multi_envs/dev/data/main.tf b/examples/tfengine/generated/multi_envs/dev/data/main.tf index a9ff2bd07..bf3e88718 100644 --- a/examples/tfengine/generated/multi_envs/dev/data/main.tf +++ b/examples/tfengine/generated/multi_envs/dev/data/main.tf @@ -37,7 +37,7 @@ data "terraform_remote_state" "folders" { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-data-dev" org_id = "" @@ -57,7 +57,7 @@ module "project" { module "example_bucket_dev" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-bucket-dev" project_id = module.project.project_id diff --git a/examples/tfengine/generated/multi_envs/devops/main.tf b/examples/tfengine/generated/multi_envs/devops/main.tf index afca5d3c9..17339e634 100644 --- a/examples/tfengine/generated/multi_envs/devops/main.tf +++ b/examples/tfengine/generated/multi_envs/devops/main.tf @@ -39,7 +39,7 @@ provider "google-beta" { # Create the project, enable APIs, and create the deletion lien, if specified. module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-devops" org_id = "" @@ -59,7 +59,7 @@ module "project" { # Terraform state bucket, hosted in the devops project. module "state_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-terraform-state" project_id = module.project.project_id diff --git a/examples/tfengine/generated/multi_envs/groups/main.tf b/examples/tfengine/generated/multi_envs/groups/main.tf index e20efbbf6..2a3db4c23 100644 --- a/examples/tfengine/generated/multi_envs/groups/main.tf +++ b/examples/tfengine/generated/multi_envs/groups/main.tf @@ -28,7 +28,7 @@ terraform { module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "example-devops" activate_apis = [] diff --git a/examples/tfengine/generated/multi_envs/prod/data/main.tf b/examples/tfengine/generated/multi_envs/prod/data/main.tf index 3c4012db6..575fd0685 100644 --- a/examples/tfengine/generated/multi_envs/prod/data/main.tf +++ b/examples/tfengine/generated/multi_envs/prod/data/main.tf @@ -37,7 +37,7 @@ data "terraform_remote_state" "folders" { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-data-prod" org_id = "" @@ -58,7 +58,7 @@ module "project" { module "example_bucket_prod" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-bucket-prod" project_id = module.project.project_id diff --git a/examples/tfengine/generated/org_foundation/audit/main.tf b/examples/tfengine/generated/org_foundation/audit/main.tf index 9be4e6ff1..4317f1e29 100644 --- a/examples/tfengine/generated/org_foundation/audit/main.tf +++ b/examples/tfengine/generated/org_foundation/audit/main.tf @@ -30,7 +30,7 @@ terraform { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-audit" org_id = "12345678" @@ -69,7 +69,7 @@ resource "google_organization_iam_audit_config" "config" { module "bigquery_export" { source = "terraform-google-modules/log-export/google" - version = "~> 7.3.0" + version = "~> 10.0.0" log_sink_name = "bigquery-audit-logs-sink" destination_uri = module.bigquery_destination.destination_uri @@ -82,7 +82,7 @@ module "bigquery_export" { module "bigquery_destination" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "~> 7.3.0" + version = "~> 10.0.0" dataset_name = "1yr_org_audit_logs" project_id = module.project.project_id @@ -93,7 +93,7 @@ module "bigquery_destination" { module "storage_export" { source = "terraform-google-modules/log-export/google" - version = "~> 7.3.0" + version = "~> 10.0.0" log_sink_name = "storage-audit-logs-sink" destination_uri = module.storage_destination.destination_uri @@ -109,7 +109,7 @@ module "storage_export" { // and set the actual expiry to be greater than this amount (7 years). module "storage_destination" { source = "terraform-google-modules/log-export/google//modules/storage" - version = "~> 7.3.0" + version = "~> 10.0.0" storage_bucket_name = "7yr-org-audit-logs" project_id = module.project.project_id diff --git a/examples/tfengine/generated/org_foundation/cicd/main.tf b/examples/tfengine/generated/org_foundation/cicd/main.tf index 347621d93..dd91a256a 100644 --- a/examples/tfengine/generated/org_foundation/cicd/main.tf +++ b/examples/tfengine/generated/org_foundation/cicd/main.tf @@ -165,7 +165,7 @@ resource "google_service_account" "cloudbuild_sa" { # Cloud Build - Storage Bucket to store Cloud Build logs. module "logs_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = var.logs_bucket project_id = var.project_id diff --git a/examples/tfengine/generated/org_foundation/devops/main.tf b/examples/tfengine/generated/org_foundation/devops/main.tf index d73ef9092..05e3f0bba 100644 --- a/examples/tfengine/generated/org_foundation/devops/main.tf +++ b/examples/tfengine/generated/org_foundation/devops/main.tf @@ -33,7 +33,7 @@ terraform { # Create the project, enable APIs, and create the deletion lien, if specified. module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-devops" org_id = "12345678" @@ -52,7 +52,7 @@ module "project" { # Terraform state bucket, hosted in the devops project. module "state_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-terraform-state" project_id = module.project.project_id diff --git a/examples/tfengine/generated/org_foundation/example-prod-networks/main.tf b/examples/tfengine/generated/org_foundation/example-prod-networks/main.tf index 3dc7c56c8..c4fda8421 100644 --- a/examples/tfengine/generated/org_foundation/example-prod-networks/main.tf +++ b/examples/tfengine/generated/org_foundation/example-prod-networks/main.tf @@ -30,7 +30,7 @@ terraform { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-prod-networks" org_id = "12345678" @@ -50,7 +50,7 @@ module "project" { module "example_network" { source = "terraform-google-modules/network/google" - version = "~> 4.0.1" + version = "~> 10.0.0" network_name = "example-network" project_id = module.project.project_id @@ -68,7 +68,7 @@ module "example_network" { module "example_router" { source = "terraform-google-modules/cloud-router/google" - version = "~> 1.2.0" + version = "~> 6.2.0" name = "example-router" project = module.project.project_id diff --git a/examples/tfengine/generated/org_foundation/groups/main.tf b/examples/tfengine/generated/org_foundation/groups/main.tf index 7bd9efc9f..c3c1a956b 100644 --- a/examples/tfengine/generated/org_foundation/groups/main.tf +++ b/examples/tfengine/generated/org_foundation/groups/main.tf @@ -28,7 +28,7 @@ terraform { module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "example-devops" activate_apis = [] diff --git a/examples/tfengine/generated/org_foundation/org_policies/main.tf b/examples/tfengine/generated/org_foundation/org_policies/main.tf index 3fcd224bf..a17bc6c9b 100644 --- a/examples/tfengine/generated/org_foundation/org_policies/main.tf +++ b/examples/tfengine/generated/org_foundation/org_policies/main.tf @@ -32,7 +32,7 @@ terraform { # App Engine module "orgpolicy_appengine_disable_code_download" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -45,7 +45,7 @@ module "orgpolicy_appengine_disable_code_download" { # Cloud SQL module "orgpolicy_sql_restrict_authorized_networks" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -57,7 +57,7 @@ module "orgpolicy_sql_restrict_authorized_networks" { module "orgpolicy_sql_restrict_public_ip" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -70,7 +70,7 @@ module "orgpolicy_sql_restrict_public_ip" { # Compute Engine module "orgpolicy_compute_disable_nested_virtualization" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -82,7 +82,7 @@ module "orgpolicy_compute_disable_nested_virtualization" { module "orgpolicy_compute_disable_serial_port_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -94,7 +94,7 @@ module "orgpolicy_compute_disable_serial_port_access" { module "orgpolicy_compute_skip_default_network_creation" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -106,7 +106,7 @@ module "orgpolicy_compute_skip_default_network_creation" { module "orgpolicy_compute_vm_external_ip_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -119,7 +119,7 @@ module "orgpolicy_compute_vm_external_ip_access" { module "orgpolicy_compute_restrict_xpn_project_lien_removal" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -132,7 +132,7 @@ module "orgpolicy_compute_restrict_xpn_project_lien_removal" { # Cloud Identity and Access Management module "orgpolicy_iam_allowed_policy_member_domains" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -146,7 +146,7 @@ module "orgpolicy_iam_allowed_policy_member_domains" { # https://medium.com/@jryancanty/stop-downloading-google-cloud-service-account-keys-1811d44a97d9 module "orgpolicy_disable_service_account_key_creation" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -158,7 +158,7 @@ module "orgpolicy_disable_service_account_key_creation" { module "orgpolicy_disable_service_account_key_upload" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -170,7 +170,7 @@ module "orgpolicy_disable_service_account_key_upload" { module "orgpolicy_disable_automatic_iam_grants_for_default_service_accounts" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -183,7 +183,7 @@ module "orgpolicy_disable_automatic_iam_grants_for_default_service_accounts" { # Google Cloud Platform - Resource Locations module "orgpolicy_gcp_resource_locations" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -197,7 +197,7 @@ module "orgpolicy_gcp_resource_locations" { # Cloud Storage module "orgpolicy_storage_uniform_bucket_level_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" diff --git a/examples/tfengine/generated/org_policies/org_policies/main.tf b/examples/tfengine/generated/org_policies/org_policies/main.tf index 4f84d52d3..a2e462992 100644 --- a/examples/tfengine/generated/org_policies/org_policies/main.tf +++ b/examples/tfengine/generated/org_policies/org_policies/main.tf @@ -32,7 +32,7 @@ terraform { # App Engine module "orgpolicy_appengine_disable_code_download" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -45,7 +45,7 @@ module "orgpolicy_appengine_disable_code_download" { # Cloud SQL module "orgpolicy_sql_restrict_authorized_networks" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -57,7 +57,7 @@ module "orgpolicy_sql_restrict_authorized_networks" { module "orgpolicy_sql_restrict_public_ip" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -70,7 +70,7 @@ module "orgpolicy_sql_restrict_public_ip" { # Compute Engine module "orgpolicy_compute_disable_nested_virtualization" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -82,7 +82,7 @@ module "orgpolicy_compute_disable_nested_virtualization" { module "orgpolicy_compute_disable_serial_port_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -93,7 +93,7 @@ module "orgpolicy_compute_disable_serial_port_access" { } module "orgpolicy_compute_restrict_shared_vpc_host_projects" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -106,7 +106,7 @@ module "orgpolicy_compute_restrict_shared_vpc_host_projects" { module "orgpolicy_compute_skip_default_network_creation" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -117,7 +117,7 @@ module "orgpolicy_compute_skip_default_network_creation" { } module "orgpolicy_compute_trusted_image_projects" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -129,7 +129,7 @@ module "orgpolicy_compute_trusted_image_projects" { } module "orgpolicy_compute_vm_can_ip_forward" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -142,7 +142,7 @@ module "orgpolicy_compute_vm_can_ip_forward" { module "orgpolicy_compute_vm_external_ip_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -155,7 +155,7 @@ module "orgpolicy_compute_vm_external_ip_access" { module "orgpolicy_compute_restrict_xpn_project_lien_removal" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -168,7 +168,7 @@ module "orgpolicy_compute_restrict_xpn_project_lien_removal" { # Cloud Identity and Access Management module "orgpolicy_iam_allowed_policy_member_domains" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -182,7 +182,7 @@ module "orgpolicy_iam_allowed_policy_member_domains" { # https://medium.com/@jryancanty/stop-downloading-google-cloud-service-account-keys-1811d44a97d9 module "orgpolicy_disable_service_account_key_creation" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -194,7 +194,7 @@ module "orgpolicy_disable_service_account_key_creation" { module "orgpolicy_disable_service_account_key_upload" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -206,7 +206,7 @@ module "orgpolicy_disable_service_account_key_upload" { module "orgpolicy_disable_automatic_iam_grants_for_default_service_accounts" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -219,7 +219,7 @@ module "orgpolicy_disable_automatic_iam_grants_for_default_service_accounts" { # Google Cloud Platform - Resource Locations module "orgpolicy_gcp_resource_locations" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" @@ -233,7 +233,7 @@ module "orgpolicy_gcp_resource_locations" { # Cloud Storage module "orgpolicy_storage_uniform_bucket_level_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "organization" organization_id = "12345678" diff --git a/examples/tfengine/generated/resources_only/resources/main.tf b/examples/tfengine/generated/resources_only/resources/main.tf index d541f7faa..b3125e1ef 100644 --- a/examples/tfengine/generated/resources_only/resources/main.tf +++ b/examples/tfengine/generated/resources_only/resources/main.tf @@ -28,7 +28,7 @@ terraform { module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "example-prod-project" activate_apis = [] @@ -36,7 +36,7 @@ module "project" { module "one_billion_ms_example_dataset" { source = "terraform-google-modules/bigquery/google" - version = "~> 5.3.0" + version = "~> 9.0.0" dataset_id = "1billion_ms_example_dataset" project_id = module.project.project_id @@ -123,7 +123,7 @@ resource "google_service_account" "example_sa" { module "example_prod_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-prod-bucket" project_id = module.project.project_id diff --git a/examples/tfengine/generated/team/additional_iam_members/main.tf b/examples/tfengine/generated/team/additional_iam_members/main.tf index 474cee38a..dfea3c1a6 100644 --- a/examples/tfengine/generated/team/additional_iam_members/main.tf +++ b/examples/tfengine/generated/team/additional_iam_members/main.tf @@ -27,7 +27,7 @@ terraform { module "storage_bucket_iam_members" { source = "terraform-google-modules/iam/google//modules/storage_buckets_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.storage_bucket_iam_members : @@ -39,7 +39,7 @@ module "storage_bucket_iam_members" { module "project_iam_members" { source = "terraform-google-modules/iam/google//modules/projects_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.project_iam_members : @@ -51,7 +51,7 @@ module "project_iam_members" { module "folder_iam_members" { source = "terraform-google-modules/iam/google//modules/folders_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.folder_iam_members : @@ -63,7 +63,7 @@ module "folder_iam_members" { module "organization_iam_members" { source = "terraform-google-modules/iam/google//modules/organizations_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.organization_iam_members : @@ -75,7 +75,7 @@ module "organization_iam_members" { module "service_account_iam_members" { source = "terraform-google-modules/iam/google//modules/service_accounts_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.service_account_iam_members : diff --git a/examples/tfengine/generated/team/cicd/main.tf b/examples/tfengine/generated/team/cicd/main.tf index ff46811f1..f050620be 100644 --- a/examples/tfengine/generated/team/cicd/main.tf +++ b/examples/tfengine/generated/team/cicd/main.tf @@ -15,8 +15,8 @@ terraform { required_version = ">=0.14" required_providers { - google = ">=3.87, < 4.0.0" - google-beta = "~>3.50" + google = "< 7.0.0" + google-beta = "~> 6.0" kubernetes = "~> 2.10" } backend "gcs" { @@ -173,7 +173,7 @@ resource "google_service_account" "cloudbuild_sa" { # Cloud Build - Storage Bucket to store Cloud Build logs. module "logs_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = var.logs_bucket project_id = var.project_id diff --git a/examples/tfengine/generated/team/devops/main.tf b/examples/tfengine/generated/team/devops/main.tf index dca0f1d6d..9b08fb331 100644 --- a/examples/tfengine/generated/team/devops/main.tf +++ b/examples/tfengine/generated/team/devops/main.tf @@ -15,8 +15,8 @@ terraform { required_version = ">=0.14" required_providers { - google = ">=3.0, <= 3.71" - google-beta = "~>3.50" + google = "<= 6.15" + google-beta = "~> 6.0" kubernetes = "~> 2.10" } } @@ -39,7 +39,7 @@ provider "google-beta" { # Create the project, enable APIs, and create the deletion lien, if specified. module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-prod-devops" org_id = "" @@ -68,7 +68,7 @@ module "project" { # Terraform state bucket, hosted in the devops project. module "state_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-terraform-state" project_id = module.project.project_id diff --git a/examples/tfengine/generated/team/groups/main.tf b/examples/tfengine/generated/team/groups/main.tf index 6b27ffc50..5b571d0ee 100644 --- a/examples/tfengine/generated/team/groups/main.tf +++ b/examples/tfengine/generated/team/groups/main.tf @@ -28,7 +28,7 @@ terraform { module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "example-prod-devops" activate_apis = [] diff --git a/examples/tfengine/generated/team/kubernetes/main.tf b/examples/tfengine/generated/team/kubernetes/main.tf index 04b7d2764..1c3c90ae2 100644 --- a/examples/tfengine/generated/team/kubernetes/main.tf +++ b/examples/tfengine/generated/team/kubernetes/main.tf @@ -44,7 +44,7 @@ provider "kubernetes" { module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "example-prod-apps" activate_apis = [] @@ -74,7 +74,7 @@ resource "kubernetes_namespace" "namespace" { module "workload_identity_namespace" { source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - version = "16.1.0" + version = "35.0.1" project_id = module.project.project_id name = "runner" diff --git a/examples/tfengine/generated/team/project_apps/main.tf b/examples/tfengine/generated/team/project_apps/main.tf index cba237a3c..c6ffa1f86 100644 --- a/examples/tfengine/generated/team/project_apps/main.tf +++ b/examples/tfengine/generated/team/project_apps/main.tf @@ -36,7 +36,7 @@ resource "google_compute_address" "static" { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-prod-apps" org_id = "" @@ -111,7 +111,7 @@ resource "google_binary_authorization_policy" "policy" { module "instance_template" { source = "terraform-google-modules/vm/google//modules/instance_template" - version = "~> 6.6.0" + version = "~> 13.0.0" name_prefix = "instance-template" project_id = module.project.project_id @@ -147,7 +147,7 @@ module "instance_template" { module "instance" { source = "terraform-google-modules/vm/google//modules/compute_instance" - version = "~> 6.6.0" + version = "~> 13.0.0" hostname = "instance" instance_template = module.instance_template.self_link @@ -166,7 +166,7 @@ module "instance" { module "domain" { source = "terraform-google-modules/cloud-dns/google" - version = "~> 3.1.0" + version = "~> 5.3.0" name = "domain" project_id = module.project.project_id @@ -194,7 +194,7 @@ provider "kubernetes" { module "gke_cluster" { source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster-update-variant" - version = "~> 21.2" + version = "~> 35.0" providers = { kubernetes = kubernetes.gke_cluster @@ -233,7 +233,7 @@ module "gke_cluster" { module "project_iam_members" { source = "terraform-google-modules/iam/google//modules/projects_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" projects = [module.project.project_id] mode = "additive" diff --git a/examples/tfengine/generated/team/project_data/main.tf b/examples/tfengine/generated/team/project_data/main.tf index 4f944b54a..a2564817f 100644 --- a/examples/tfengine/generated/team/project_data/main.tf +++ b/examples/tfengine/generated/team/project_data/main.tf @@ -38,7 +38,7 @@ data "google_secret_manager_secret_version" "db_password" { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-prod-data" org_id = "" @@ -81,7 +81,7 @@ module "project" { module "one_billion_ms_dataset" { source = "terraform-google-modules/bigquery/google" - version = "~> 5.3.0" + version = "~> 9.0.0" dataset_id = "1billion_ms_dataset" project_id = module.project.project_id @@ -95,7 +95,7 @@ module "one_billion_ms_dataset" { module "sql_instance" { source = "GoogleCloudPlatform/sql-db/google//modules/safer_mysql" - version = "~> 9.0.0" + version = "~> 25.0.0" name = "sql-instance" project_id = module.project.project_id @@ -220,7 +220,7 @@ module "healthcare_dataset" { module "project_iam_members" { source = "terraform-google-modules/iam/google//modules/projects_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" projects = [module.project.project_id] mode = "additive" @@ -234,7 +234,7 @@ module "project_iam_members" { module "topic" { source = "terraform-google-modules/pubsub/google" - version = "~> 4.0.0" + version = "~> 7.0.0" topic = "topic" project_id = module.project.project_id @@ -262,7 +262,7 @@ module "topic" { module "example_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "example-bucket" project_id = module.project.project_id diff --git a/examples/tfengine/generated/team/project_networks/main.tf b/examples/tfengine/generated/team/project_networks/main.tf index e70589307..dde11f901 100644 --- a/examples/tfengine/generated/team/project_networks/main.tf +++ b/examples/tfengine/generated/team/project_networks/main.tf @@ -30,7 +30,7 @@ terraform { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-prod-networks" org_id = "" @@ -61,7 +61,7 @@ module "project" { module "bastion_vm" { source = "terraform-google-modules/bastion-host/google" - version = "~> 3.2.0" + version = "~> 8.0.0" name = "bastion-vm" project = module.project.project_id @@ -91,7 +91,7 @@ EOF module "network" { source = "terraform-google-modules/network/google" - version = "~> 4.0.1" + version = "~> 10.0.0" network_name = "network" project_id = module.project.project_id @@ -134,7 +134,7 @@ module "network" { } module "cloud_sql_private_service_access_network" { source = "GoogleCloudPlatform/sql-db/google//modules/private_service_access" - version = "~> 9.0.0" + version = "~> 25.0.0" project_id = module.project.project_id vpc_network = module.network.network_name @@ -145,7 +145,7 @@ module "cloud_sql_private_service_access_network" { module "router" { source = "terraform-google-modules/cloud-router/google" - version = "~> 1.2.0" + version = "~> 6.2.0" name = "router" project = module.project.project_id @@ -170,7 +170,7 @@ module "router" { module "google_apis" { source = "terraform-google-modules/cloud-dns/google" - version = "~> 3.1.0" + version = "~> 5.3.0" name = "google-apis" project_id = module.project.project_id @@ -203,7 +203,7 @@ module "google_apis" { module "gcr" { source = "terraform-google-modules/cloud-dns/google" - version = "~> 3.1.0" + version = "~> 5.3.0" name = "gcr" project_id = module.project.project_id diff --git a/examples/tfengine/generated/team/project_secrets/main.tf b/examples/tfengine/generated/team/project_secrets/main.tf index ffbf242a3..256c1a786 100644 --- a/examples/tfengine/generated/team/project_secrets/main.tf +++ b/examples/tfengine/generated/team/project_secrets/main.tf @@ -15,8 +15,8 @@ terraform { required_version = ">=0.14" required_providers { - google = ">=3.0, <= 3.71" - google-beta = "~>3.50" + google = "<= 6.15" + google-beta = "~> 6.0" null = "~> 3.0" kubernetes = "~> 2.10" } @@ -36,7 +36,7 @@ resource "random_password" "db" { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "example-prod-secrets" org_id = "" diff --git a/templates/tfengine/components/audit/main.tf b/templates/tfengine/components/audit/main.tf index 0940aa530..99a14950b 100644 --- a/templates/tfengine/components/audit/main.tf +++ b/templates/tfengine/components/audit/main.tf @@ -42,7 +42,7 @@ resource "google_{{.parent_type}}_iam_audit_config" "config" { module "bigquery_export" { source = "terraform-google-modules/log-export/google" - version = "~> 7.3.0" + version = "~> 10.0.0" log_sink_name = "{{get .logs_bigquery_dataset "sink_name" "bigquery-audit-logs-sink"}}" destination_uri = "${module.bigquery_destination.destination_uri}" @@ -55,7 +55,7 @@ module "bigquery_export" { module "bigquery_destination" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "~> 7.3.0" + version = "~> 10.0.0" dataset_name = "{{.logs_bigquery_dataset.dataset_id}}" project_id = module.project.project_id @@ -66,7 +66,7 @@ module "bigquery_destination" { module "storage_export" { source = "terraform-google-modules/log-export/google" - version = "~> 7.3.0" + version = "~> 10.0.0" log_sink_name = "{{get .logs_storage_bucket "sink_name" "storage-audit-logs-sink"}}" destination_uri = "${module.storage_destination.destination_uri}" @@ -82,7 +82,7 @@ module "storage_export" { // and set the actual expiry to be greater than this amount (7 years). module "storage_destination" { source = "terraform-google-modules/log-export/google//modules/storage" - version = "~> 7.3.0" + version = "~> 10.0.0" storage_bucket_name = "{{.logs_storage_bucket.name}}" project_id = module.project.project_id diff --git a/templates/tfengine/components/cicd/main.tf b/templates/tfengine/components/cicd/main.tf index 39b0acd20..5d2ffb2bf 100644 --- a/templates/tfengine/components/cicd/main.tf +++ b/templates/tfengine/components/cicd/main.tf @@ -264,7 +264,7 @@ resource "google_service_account" "cloudbuild_sa" { # Cloud Build - Storage Bucket to store Cloud Build logs. module "logs_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = var.logs_bucket project_id = var.project_id diff --git a/templates/tfengine/components/devops/main.tf b/templates/tfengine/components/devops/main.tf index 20167570c..1deb47af7 100644 --- a/templates/tfengine/components/devops/main.tf +++ b/templates/tfengine/components/devops/main.tf @@ -33,7 +33,7 @@ provider "google-beta" { # Create the project, enable APIs, and create the deletion lien, if specified. module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "{{.project.project_id}}" {{- if eq .parent_type "organization"}} @@ -67,7 +67,7 @@ module "project" { # Terraform state bucket, hosted in the devops project. module "state_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "{{.state_bucket}}" project_id = module.project.project_id diff --git a/templates/tfengine/components/iam_members/main.tf b/templates/tfengine/components/iam_members/main.tf index 661e25b64..2c2e3bbdf 100644 --- a/templates/tfengine/components/iam_members/main.tf +++ b/templates/tfengine/components/iam_members/main.tf @@ -14,7 +14,7 @@ limitations under the License. */ -}} module "storage_bucket_iam_members" { source = "terraform-google-modules/iam/google//modules/storage_buckets_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.storage_bucket_iam_members : @@ -26,7 +26,7 @@ module "storage_bucket_iam_members" { module "project_iam_members" { source = "terraform-google-modules/iam/google//modules/projects_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.project_iam_members : @@ -38,7 +38,7 @@ module "project_iam_members" { module "folder_iam_members" { source = "terraform-google-modules/iam/google//modules/folders_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.folder_iam_members : @@ -50,7 +50,7 @@ module "folder_iam_members" { module "organization_iam_members" { source = "terraform-google-modules/iam/google//modules/organizations_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.organization_iam_members : @@ -62,7 +62,7 @@ module "organization_iam_members" { module "service_account_iam_members" { source = "terraform-google-modules/iam/google//modules/service_accounts_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" mode = "additive" for_each = { for idx, member in var.service_account_iam_members : diff --git a/templates/tfengine/components/org_policies/main.tf b/templates/tfengine/components/org_policies/main.tf index 36f0da26e..8368a6c7d 100644 --- a/templates/tfengine/components/org_policies/main.tf +++ b/templates/tfengine/components/org_policies/main.tf @@ -21,7 +21,7 @@ limitations under the License. */ -}} # App Engine module "orgpolicy_appengine_disable_code_download" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -34,7 +34,7 @@ module "orgpolicy_appengine_disable_code_download" { # Cloud SQL module "orgpolicy_sql_restrict_authorized_networks" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -46,7 +46,7 @@ module "orgpolicy_sql_restrict_authorized_networks" { module "orgpolicy_sql_restrict_public_ip" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -59,7 +59,7 @@ module "orgpolicy_sql_restrict_public_ip" { # Compute Engine module "orgpolicy_compute_disable_nested_virtualization" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -71,7 +71,7 @@ module "orgpolicy_compute_disable_nested_virtualization" { module "orgpolicy_compute_disable_serial_port_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -84,7 +84,7 @@ module "orgpolicy_compute_disable_serial_port_access" { {{- if index . "allowed_shared_vpc_host_projects"}} module "orgpolicy_compute_restrict_shared_vpc_host_projects" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -98,7 +98,7 @@ module "orgpolicy_compute_restrict_shared_vpc_host_projects" { module "orgpolicy_compute_skip_default_network_creation" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -111,7 +111,7 @@ module "orgpolicy_compute_skip_default_network_creation" { {{- if index . "allowed_trusted_image_projects"}} module "orgpolicy_compute_trusted_image_projects" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -127,7 +127,7 @@ module "orgpolicy_compute_trusted_image_projects" { {{- if index . "allowed_ip_forwarding_vms"}} module "orgpolicy_compute_vm_can_ip_forward" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -141,7 +141,7 @@ module "orgpolicy_compute_vm_can_ip_forward" { module "orgpolicy_compute_vm_external_ip_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -154,7 +154,7 @@ module "orgpolicy_compute_vm_external_ip_access" { module "orgpolicy_compute_restrict_xpn_project_lien_removal" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -167,7 +167,7 @@ module "orgpolicy_compute_restrict_xpn_project_lien_removal" { # Cloud Identity and Access Management module "orgpolicy_iam_allowed_policy_member_domains" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -181,7 +181,7 @@ module "orgpolicy_iam_allowed_policy_member_domains" { # https://medium.com/@jryancanty/stop-downloading-google-cloud-service-account-keys-1811d44a97d9 module "orgpolicy_disable_service_account_key_creation" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -193,7 +193,7 @@ module "orgpolicy_disable_service_account_key_creation" { module "orgpolicy_disable_service_account_key_upload" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -205,7 +205,7 @@ module "orgpolicy_disable_service_account_key_upload" { module "orgpolicy_disable_automatic_iam_grants_for_default_service_accounts" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -218,7 +218,7 @@ module "orgpolicy_disable_automatic_iam_grants_for_default_service_accounts" { # Google Cloud Platform - Resource Locations module "orgpolicy_gcp_resource_locations" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" @@ -232,7 +232,7 @@ module "orgpolicy_gcp_resource_locations" { # Cloud Storage module "orgpolicy_storage_uniform_bucket_level_access" { source = "terraform-google-modules/org-policy/google" - version = "~> 5.0.0" + version = "~> 6.0.0" policy_for = "{{.parent_type}}" {{$type_field}} = "{{.parent_id}}" diff --git a/templates/tfengine/components/project/main.tf b/templates/tfengine/components/project/main.tf index eed82566d..bb6faeba9 100644 --- a/templates/tfengine/components/project/main.tf +++ b/templates/tfengine/components/project/main.tf @@ -12,7 +12,7 @@ limitations under the License. */ -}} {{- if get . "exists"}} module "project" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 11.3.0" + version = "~> 18.0.0" project_id = "{{.project_id}}" activate_apis = {{- if has . "apis"}} {{hcl .apis}} {{- else}} [] {{end}} @@ -23,7 +23,7 @@ module "project" { # Shared VPC: https://cloud.google.com/docs/enterprise/best-practices-for-enterprise-organizations#centralize_network_control module "project" { source = "terraform-google-modules/project-factory/google" - version = "~> 11.3.0" + version = "~> 18.0.0" name = "{{.project_id}}" {{- if eq .parent_type "organization"}} diff --git a/templates/tfengine/components/resources/bastion_hosts/main.tf b/templates/tfengine/components/resources/bastion_hosts/main.tf index 053ba8b5f..46cc4bc41 100644 --- a/templates/tfengine/components/resources/bastion_hosts/main.tf +++ b/templates/tfengine/components/resources/bastion_hosts/main.tf @@ -15,7 +15,7 @@ limitations under the License. */ -}} {{range .bastion_hosts}} module "{{resourceName . "name"}}" { source = "terraform-google-modules/bastion-host/google" - version = "~> 3.2.0" + version = "~> 8.0.0" name = "{{.name}}" project = module.project.project_id diff --git a/templates/tfengine/components/resources/bigquery_datasets/main.tf b/templates/tfengine/components/resources/bigquery_datasets/main.tf index 3c2bb5d1b..21f8b088c 100644 --- a/templates/tfengine/components/resources/bigquery_datasets/main.tf +++ b/templates/tfengine/components/resources/bigquery_datasets/main.tf @@ -15,7 +15,7 @@ limitations under the License. */ -}} {{range get . "bigquery_datasets"}} module "{{resourceName . "dataset_id"}}" { source = "terraform-google-modules/bigquery/google" - version = "~> 5.3.0" + version = "~> 9.0.0" dataset_id = "{{.dataset_id}}" project_id = module.project.project_id diff --git a/templates/tfengine/components/resources/cloud_sql_instances/main.tf b/templates/tfengine/components/resources/cloud_sql_instances/main.tf index 82516fe1b..e96b4a1e8 100644 --- a/templates/tfengine/components/resources/cloud_sql_instances/main.tf +++ b/templates/tfengine/components/resources/cloud_sql_instances/main.tf @@ -21,7 +21,7 @@ limitations under the License. */ -}} {{if eq .type "mysql" -}} module "{{resourceName . "name"}}" { source = "GoogleCloudPlatform/sql-db/google//modules/safer_mysql" - version = "~> 9.0.0" + version = "~> 25.0.0" name = "{{.name}}" project_id = module.project.project_id diff --git a/templates/tfengine/components/resources/compute_instance_templates/main.tf b/templates/tfengine/components/resources/compute_instance_templates/main.tf index c3d5d1c7e..a32367038 100644 --- a/templates/tfengine/components/resources/compute_instance_templates/main.tf +++ b/templates/tfengine/components/resources/compute_instance_templates/main.tf @@ -23,7 +23,7 @@ limitations under the License. */ -}} {{$subnet := .subnet -}} module "{{$template_resource_name}}" { source = "terraform-google-modules/vm/google//modules/instance_template" - version = "~> 6.6.0" + version = "~> 13.0.0" name_prefix = "{{.name_prefix}}" project_id = module.project.project_id @@ -87,7 +87,7 @@ EOF {{range get . "instances" -}} module "{{resourceName . "name"}}" { source = "terraform-google-modules/vm/google//modules/compute_instance" - version = "~> 6.6.0" + version = "~> 13.0.0" hostname = "{{.name}}" instance_template = module.{{$template_resource_name}}.self_link diff --git a/templates/tfengine/components/resources/compute_networks/main.tf b/templates/tfengine/components/resources/compute_networks/main.tf index 44f3def9a..9f36448be 100644 --- a/templates/tfengine/components/resources/compute_networks/main.tf +++ b/templates/tfengine/components/resources/compute_networks/main.tf @@ -18,7 +18,7 @@ limitations under the License. */ -}} module "{{$resource_name}}" { source = "terraform-google-modules/network/google" - version = "~> 4.0.1" + version = "~> 10.0.0" network_name = "{{.name}}" project_id = module.project.project_id @@ -60,7 +60,7 @@ module "{{$resource_name}}" { {{- if has . "cloud_sql_private_service_access"}} module "cloud_sql_private_service_access_{{$resource_name}}" { source = "GoogleCloudPlatform/sql-db/google//modules/private_service_access" - version = "~> 9.0.0" + version = "~> 25.0.0" project_id = module.project.project_id vpc_network = module.{{$resource_name}}.network_name diff --git a/templates/tfengine/components/resources/compute_routers/main.tf b/templates/tfengine/components/resources/compute_routers/main.tf index 009a8b8cf..a5f1baf40 100644 --- a/templates/tfengine/components/resources/compute_routers/main.tf +++ b/templates/tfengine/components/resources/compute_routers/main.tf @@ -15,7 +15,7 @@ limitations under the License. */ -}} {{range .compute_routers}} module "{{resourceName . "name"}}" { source = "terraform-google-modules/cloud-router/google" - version = "~> 1.2.0" + version = "~> 6.2.0" name = "{{.name}}" project = module.project.project_id diff --git a/templates/tfengine/components/resources/dns_zones/main.tf b/templates/tfengine/components/resources/dns_zones/main.tf index ae27745e0..f4bfd16b6 100644 --- a/templates/tfengine/components/resources/dns_zones/main.tf +++ b/templates/tfengine/components/resources/dns_zones/main.tf @@ -15,7 +15,7 @@ limitations under the License. */ -}} {{range get . "dns_zones"}} module "{{resourceName . "name"}}" { source = "terraform-google-modules/cloud-dns/google" - version = "~> 3.1.0" + version = "~> 5.3.0" name = "{{.name}}" project_id = module.project.project_id diff --git a/templates/tfengine/components/resources/gke_clusters/main.tf b/templates/tfengine/components/resources/gke_clusters/main.tf index ee8d6803b..db2fe1fab 100644 --- a/templates/tfengine/components/resources/gke_clusters/main.tf +++ b/templates/tfengine/components/resources/gke_clusters/main.tf @@ -24,7 +24,7 @@ provider "kubernetes" { module "{{resourceName . "name"}}" { source = "terraform-google-modules/kubernetes-engine/google//modules/safer-cluster-update-variant" - version = "~> 21.2" + version = "~> 35.0" providers = { kubernetes = kubernetes.{{resourceName . "name"}} diff --git a/templates/tfengine/components/resources/project_iam_members/main.tf b/templates/tfengine/components/resources/project_iam_members/main.tf index d97acf524..500174466 100644 --- a/templates/tfengine/components/resources/project_iam_members/main.tf +++ b/templates/tfengine/components/resources/project_iam_members/main.tf @@ -13,7 +13,7 @@ See the License for the specific language governing permissions and limitations under the License. */}} module "project_iam_members" { source = "terraform-google-modules/iam/google//modules/projects_iam" - version = "~> 7.4.0" + version = "~> 8.0.0" projects = [module.project.project_id] mode = "additive" diff --git a/templates/tfengine/components/resources/pubsub_topics/main.tf b/templates/tfengine/components/resources/pubsub_topics/main.tf index 41a022933..f4f0dd6d1 100644 --- a/templates/tfengine/components/resources/pubsub_topics/main.tf +++ b/templates/tfengine/components/resources/pubsub_topics/main.tf @@ -15,7 +15,7 @@ limitations under the License. */ -}} {{range .pubsub_topics}} module "{{resourceName . "name"}}" { source = "terraform-google-modules/pubsub/google" - version = "~> 4.0.0" + version = "~> 7.0.0" topic = "{{.name}}" project_id = module.project.project_id diff --git a/templates/tfengine/components/resources/storage_buckets/main.tf b/templates/tfengine/components/resources/storage_buckets/main.tf index a52f3046b..6db7e0ecd 100644 --- a/templates/tfengine/components/resources/storage_buckets/main.tf +++ b/templates/tfengine/components/resources/storage_buckets/main.tf @@ -15,7 +15,7 @@ limitations under the License. */ -}} {{range get . "storage_buckets"}} module "{{resourceName . "name"}}" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 1.4" + version = "~> 9.0" name = "{{.name}}" project_id = module.project.project_id diff --git a/templates/tfengine/components/resources/workload_identity/main.tf b/templates/tfengine/components/resources/workload_identity/main.tf index 541a45548..dd9d77690 100644 --- a/templates/tfengine/components/resources/workload_identity/main.tf +++ b/templates/tfengine/components/resources/workload_identity/main.tf @@ -15,7 +15,7 @@ limitations under the License. */ -}} {{range get . "workload_identity"}} module "workload_identity_{{resourceName . "namespace"}}" { source = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity" - version = "16.1.0" + version = "35.0.1" project_id = "{{.project_id}}" name = "{{.google_service_account_id}}"