Merge remote-tracking branch 'origin/major-terraform-google-provider-…

…v6' into do-not-create-secrets
terraform-google-modules · Oct 23, 2024 · 96b8afc · 96b8afc
2 parents f80dcf5 + c84ebd6
commit 96b8afc
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 27 deletions.
diff --git a/examples/cloudbuild_repo_connection_github/main.tf b/examples/cloudbuild_repo_connection_github/main.tf
@@ -15,9 +15,8 @@
  */
 
 module "github_connection" {
-  # source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
-  # version = "~> 8.0"
-  source = "../../modules/cloudbuild_repo_connection"
+  source  = "terraform-google-modules/bootstrap/google//modules/cloudbuild_repo_connection"
+  version = "~> 9.0"
 
   project_id = var.project_id
   connection_config = {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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/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/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_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/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_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/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}"

diff --git 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"
     }
   }
 

diff --git a/...tegration/tf_cloudbuild_builder_simple_gitlab/tf_cloudbuild_builder_simple_gitlab_test.go b/...tegration/tf_cloudbuild_builder_simple_gitlab/tf_cloudbuild_builder_simple_gitlab_test.go
@@ -107,7 +107,7 @@ func TestTFCloudBuildBuilderGitLab(t *testing.T) {
 	vars := map[string]interface{}{
 		"gitlab_authorizer_credential":      gitlabPAT,
 		"gitlab_read_authorizer_credential": gitlabPAT,
-		"repository_uri":               client.project.HTTPURLToRepo,
+		"repository_uri":                    client.project.HTTPURLToRepo,
 	}
 	bpt := tft.NewTFBlueprintTest(t, tft.WithVars(vars))