From ff93f1bc4ba3306daab9f2819fc76871796bcb41 Mon Sep 17 00:00:00 2001 From: Daniel Andrade Date: Mon, 14 Oct 2024 16:24:20 -0300 Subject: [PATCH 1/3] feat(deps): Update Terraform Google Provider to v6 --- modules/cloudbuild/versions.tf | 4 ++-- modules/cloudbuild_repo_connection/versions.tf | 4 ++-- modules/im_cloudbuild_workspace/versions.tf | 4 ++-- modules/tf_cloudbuild_builder/versions.tf | 4 ++-- modules/tf_cloudbuild_source/versions.tf | 4 ++-- modules/tf_cloudbuild_workspace/versions.tf | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/cloudbuild/versions.tf b/modules/cloudbuild/versions.tf index b7d82450..61ba17ab 100644 --- a/modules/cloudbuild/versions.tf +++ b/modules/cloudbuild/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, != 4.31.0, <6" + version = ">= 3.50, != 4.31.0, <7" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, != 4.31.0, <6" + version = ">= 3.50, != 4.31.0, <7" } random = { source = "hashicorp/random" diff --git a/modules/cloudbuild_repo_connection/versions.tf b/modules/cloudbuild_repo_connection/versions.tf index 12cf63d4..355d6234 100644 --- a/modules/cloudbuild_repo_connection/versions.tf +++ b/modules/cloudbuild_repo_connection/versions.tf @@ -21,7 +21,7 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, != 4.31.0, < 6" + version = ">= 4.17, != 4.31.0, < 7" } time = { @@ -37,7 +37,7 @@ terraform { google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, != 4.31.0, < 6" + version = ">= 4.17, != 4.31.0, < 7" } } } diff --git a/modules/im_cloudbuild_workspace/versions.tf b/modules/im_cloudbuild_workspace/versions.tf index ab515502..5e70d8c1 100644 --- a/modules/im_cloudbuild_workspace/versions.tf +++ b/modules/im_cloudbuild_workspace/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, != 4.31.0, < 6" + version = ">= 4.17, != 4.31.0, < 7" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, != 4.31.0, < 6" + version = ">= 4.17, != 4.31.0, < 7" } random = { source = "hashicorp/random" diff --git a/modules/tf_cloudbuild_builder/versions.tf b/modules/tf_cloudbuild_builder/versions.tf index c8e138c1..148ded64 100644 --- a/modules/tf_cloudbuild_builder/versions.tf +++ b/modules/tf_cloudbuild_builder/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, != 4.31.0, < 6" + version = ">= 3.50, != 4.31.0, < 7" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, != 4.31.0, < 6" + version = ">= 3.50, != 4.31.0, < 7" } } diff --git a/modules/tf_cloudbuild_source/versions.tf b/modules/tf_cloudbuild_source/versions.tf index 12061af6..b0ae7d32 100644 --- a/modules/tf_cloudbuild_source/versions.tf +++ b/modules/tf_cloudbuild_source/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, != 4.31.0, < 6" + version = ">= 3.50, != 4.31.0, < 7" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 3.50, != 4.31.0, < 6" + version = ">= 3.50, != 4.31.0, < 7" } } diff --git a/modules/tf_cloudbuild_workspace/versions.tf b/modules/tf_cloudbuild_workspace/versions.tf index b300f3e7..1dda7923 100644 --- a/modules/tf_cloudbuild_workspace/versions.tf +++ b/modules/tf_cloudbuild_workspace/versions.tf @@ -21,12 +21,12 @@ terraform { google = { source = "hashicorp/google" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, != 4.31.0, < 6" + version = ">= 4.17, != 4.31.0, < 7" } google-beta = { source = "hashicorp/google-beta" # Exclude 4.31.0 for https://github.com/hashicorp/terraform-provider-google/issues/12226 - version = ">= 4.17, != 4.31.0, < 6" + version = ">= 4.17, != 4.31.0, < 7" } } From 911f5f73d6ce1acc19ac9eab4bb10bf48a462207 Mon Sep 17 00:00:00 2001 From: Daniel Andrade Date: Tue, 15 Oct 2024 11:47:59 -0300 Subject: [PATCH 2/3] update project_services module to v17.0 --- examples/cloudbuild_repo_connection_github/main.tf | 2 +- examples/im_cloudbuild_workspace_github/apis.tf | 2 +- examples/im_cloudbuild_workspace_gitlab/apis.tf | 2 +- examples/tf_cloudbuild_builder_simple/apis.tf | 2 +- examples/tf_cloudbuild_builder_simple_github/apis.tf | 2 +- examples/tf_cloudbuild_builder_simple_gitlab/apis.tf | 2 +- examples/tf_cloudbuild_workspace_simple/apis.tf | 2 +- examples/tf_cloudbuild_workspace_simple_github/apis.tf | 2 +- examples/tf_cloudbuild_workspace_simple_gitlab/apis.tf | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/cloudbuild_repo_connection_github/main.tf b/examples/cloudbuild_repo_connection_github/main.tf index c0280d26..10eecfe5 100644 --- a/examples/cloudbuild_repo_connection_github/main.tf +++ b/examples/cloudbuild_repo_connection_github/main.tf @@ -15,7 +15,7 @@ */ module "github_connection" { - source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection" + source = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection" version = "~> 9.0" project_id = var.project_id diff --git a/examples/im_cloudbuild_workspace_github/apis.tf b/examples/im_cloudbuild_workspace_github/apis.tf index ab21511c..67bca188 100644 --- a/examples/im_cloudbuild_workspace_github/apis.tf +++ b/examples/im_cloudbuild_workspace_github/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 15.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false diff --git a/examples/im_cloudbuild_workspace_gitlab/apis.tf b/examples/im_cloudbuild_workspace_gitlab/apis.tf index bdf4910c..6a85dac2 100644 --- a/examples/im_cloudbuild_workspace_gitlab/apis.tf +++ b/examples/im_cloudbuild_workspace_gitlab/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 15.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false diff --git a/examples/tf_cloudbuild_builder_simple/apis.tf b/examples/tf_cloudbuild_builder_simple/apis.tf index ea576bdd..4d381d45 100644 --- a/examples/tf_cloudbuild_builder_simple/apis.tf +++ b/examples/tf_cloudbuild_builder_simple/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 15.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false diff --git a/examples/tf_cloudbuild_builder_simple_github/apis.tf b/examples/tf_cloudbuild_builder_simple_github/apis.tf index 9ca1a473..34a74a41 100644 --- a/examples/tf_cloudbuild_builder_simple_github/apis.tf +++ b/examples/tf_cloudbuild_builder_simple_github/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 15.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false diff --git a/examples/tf_cloudbuild_builder_simple_gitlab/apis.tf b/examples/tf_cloudbuild_builder_simple_gitlab/apis.tf index 9ca1a473..34a74a41 100644 --- a/examples/tf_cloudbuild_builder_simple_gitlab/apis.tf +++ b/examples/tf_cloudbuild_builder_simple_gitlab/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 15.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false diff --git a/examples/tf_cloudbuild_workspace_simple/apis.tf b/examples/tf_cloudbuild_workspace_simple/apis.tf index 5b8585f0..be770f13 100644 --- a/examples/tf_cloudbuild_workspace_simple/apis.tf +++ b/examples/tf_cloudbuild_workspace_simple/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 15.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false diff --git a/examples/tf_cloudbuild_workspace_simple_github/apis.tf b/examples/tf_cloudbuild_workspace_simple_github/apis.tf index 38049631..fb0eb8c0 100644 --- a/examples/tf_cloudbuild_workspace_simple_github/apis.tf +++ b/examples/tf_cloudbuild_workspace_simple_github/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 15.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false diff --git a/examples/tf_cloudbuild_workspace_simple_gitlab/apis.tf b/examples/tf_cloudbuild_workspace_simple_gitlab/apis.tf index 38049631..fb0eb8c0 100644 --- a/examples/tf_cloudbuild_workspace_simple_gitlab/apis.tf +++ b/examples/tf_cloudbuild_workspace_simple_gitlab/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 15.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false From c84ebd6ec3c411cee51ffdfa028166ed8a6c5d88 Mon Sep 17 00:00:00 2001 From: Daniel Andrade Date: Wed, 16 Oct 2024 19:05:33 -0300 Subject: [PATCH 3/3] update module simple_bucket version to v7.0 --- modules/tf_cloudbuild_builder/cb.tf | 2 +- modules/tf_cloudbuild_source/main.tf | 2 +- modules/tf_cloudbuild_workspace/buckets.tf | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/tf_cloudbuild_builder/cb.tf b/modules/tf_cloudbuild_builder/cb.tf index 420e355f..249e7d0a 100644 --- a/modules/tf_cloudbuild_builder/cb.tf +++ b/modules/tf_cloudbuild_builder/cb.tf @@ -125,7 +125,7 @@ resource "google_project_iam_member" "logs_writer" { # https://cloud.google.com/build/docs/securing-builds/store-manage-build-logs#store-custom-bucket module "bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 6.0" + version = "~> 7.0" name = local.log_bucket_name project_id = var.project_id diff --git a/modules/tf_cloudbuild_source/main.tf b/modules/tf_cloudbuild_source/main.tf index 35142b89..6eda7ed3 100644 --- a/modules/tf_cloudbuild_source/main.tf +++ b/modules/tf_cloudbuild_source/main.tf @@ -52,7 +52,7 @@ module "cloudbuild_project" { // Creating the bucket beforehand make it is possible to define a custom location. module "cloudbuild_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 6.0" + version = "~> 7.0" name = "${module.cloudbuild_project.project_id}_cloudbuild" project_id = module.cloudbuild_project.project_id diff --git a/modules/tf_cloudbuild_workspace/buckets.tf b/modules/tf_cloudbuild_workspace/buckets.tf index 929ded08..90a0c829 100644 --- a/modules/tf_cloudbuild_workspace/buckets.tf +++ b/modules/tf_cloudbuild_workspace/buckets.tf @@ -29,7 +29,7 @@ locals { module "artifacts_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 6.0" + version = "~> 7.0" name = var.artifacts_bucket_name != "" ? var.artifacts_bucket_name : "${local.default_prefix}-build-artifacts-${var.project_id}" project_id = var.project_id @@ -45,7 +45,7 @@ resource "google_storage_bucket_iam_member" "artifacts_admin" { module "log_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 6.0" + version = "~> 7.0" name = var.log_bucket_name != "" ? var.log_bucket_name : "${local.default_prefix}-build-logs-${var.project_id}" project_id = var.project_id @@ -62,7 +62,7 @@ resource "google_storage_bucket_iam_member" "log_admin" { # Custom bucket for storing TF state module "state_bucket" { source = "terraform-google-modules/cloud-storage/google//modules/simple_bucket" - version = "~> 6.0" + version = "~> 7.0" count = var.create_state_bucket ? 1 : 0 name = var.create_state_bucket_name != "" ? var.create_state_bucket_name : "${local.default_prefix}-build-state-${var.project_id}"