From 6f2e3a01663abe8fbc90d09b50e4740603c13ac8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Jan 2024 16:27:45 -0800 Subject: [PATCH] fix(deps)!: Update TF modules (major) (#241) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Peabody --- examples/tf_cloudbuild_workspace_simple/files/main.tf | 2 +- modules/tf_cloudbuild_builder/cb.tf | 2 +- modules/tf_cloudbuild_source/main.tf | 2 +- modules/tf_cloudbuild_workspace/README.md | 2 +- modules/tf_cloudbuild_workspace/buckets.tf | 6 +++--- modules/tf_cloudbuild_workspace/variables.tf | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/tf_cloudbuild_workspace_simple/files/main.tf b/examples/tf_cloudbuild_workspace_simple/files/main.tf index 3c883574..4fbf40ef 100644 --- a/examples/tf_cloudbuild_workspace_simple/files/main.tf +++ b/examples/tf_cloudbuild_workspace_simple/files/main.tf @@ -16,7 +16,7 @@ module "test-vpc-module" { source = "terraform-google-modules/network/google" - version = "~> 6.0" + version = "~> 9.0" project_id = var.project_id network_name = "my-custom-mode-network" mtu = 1460 diff --git a/modules/tf_cloudbuild_builder/cb.tf b/modules/tf_cloudbuild_builder/cb.tf index b7f86241..9b5e9d13 100644 --- a/modules/tf_cloudbuild_builder/cb.tf +++ b/modules/tf_cloudbuild_builder/cb.tf @@ -105,7 +105,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 = "~> 3.2" + version = "~> 5.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 ef771df1..167e9f4e 100644 --- a/modules/tf_cloudbuild_source/main.tf +++ b/modules/tf_cloudbuild_source/main.tf @@ -51,7 +51,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 = "~> 3.2" + version = "~> 5.0" name = "${module.cloudbuild_project.project_id}_cloudbuild" project_id = module.cloudbuild_project.project_id diff --git a/modules/tf_cloudbuild_workspace/README.md b/modules/tf_cloudbuild_workspace/README.md index ee20b4cd..9c7f8d5a 100644 --- a/modules/tf_cloudbuild_workspace/README.md +++ b/modules/tf_cloudbuild_workspace/README.md @@ -59,7 +59,7 @@ This module creates: | state\_bucket\_self\_link | Custom GCS bucket for storing TF state. Defaults to being created if empty. | `string` | `""` | no | | substitutions | Map of substitutions to use in builds. | `map(string)` | `{}` | no | | tf\_apply\_branches | List of git branches configured to run terraform apply Cloud Build trigger. All other branches will run plan by default. | `list(string)` | 
[
  "main"
]
| no | -| tf\_cloudbuilder | Name of the Cloud Builder image used for running build steps. | `string` | `"hashicorp/terraform:1.2.2"` | no | +| tf\_cloudbuilder | Name of the Cloud Builder image used for running build steps. | `string` | `"hashicorp/terraform:1.3.10"` | no | | tf\_repo\_dir | The directory inside the repo where the Terrafrom root config is located. If empty defaults to repo root. | `string` | `""` | no | | tf\_repo\_type | Type of repo | `string` | `"CLOUD_SOURCE_REPOSITORIES"` | no | | tf\_repo\_uri | The URI of the repo where Terraform configs are stored. | `string` | n/a | yes | diff --git a/modules/tf_cloudbuild_workspace/buckets.tf b/modules/tf_cloudbuild_workspace/buckets.tf index acbe2ff4..1ee55065 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 = "~> 3.2" + version = "~> 5.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 = "~> 3.2" + version = "~> 5.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 = "~> 3.2" + version = "~> 5.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/variables.tf b/modules/tf_cloudbuild_workspace/variables.tf index e73d5065..6450116c 100644 --- a/modules/tf_cloudbuild_workspace/variables.tf +++ b/modules/tf_cloudbuild_workspace/variables.tf @@ -139,7 +139,7 @@ variable "substitutions" { variable "tf_cloudbuilder" { description = "Name of the Cloud Builder image used for running build steps." type = string - default = "hashicorp/terraform:1.2.2" + default = "hashicorp/terraform:1.3.10" } variable "prefix" {