Skip to content

Commit

Permalink
fix(deps)!: Update TF modules (major) (#241)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Andrew Peabody <andrewpeabody@google.com>
  • Loading branch information
renovate[bot] and apeabody authored Jan 13, 2024
1 parent 3360ef2 commit 6f2e3a0
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion examples/tf_cloudbuild_workspace_simple/files/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/tf_cloudbuild_builder/cb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/tf_cloudbuild_source/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/tf_cloudbuild_workspace/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)` | <pre>[<br> "main"<br>]</pre> | 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 |
Expand Down
6 changes: 3 additions & 3 deletions modules/tf_cloudbuild_workspace/buckets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion modules/tf_cloudbuild_workspace/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down

0 comments on commit 6f2e3a0

Please sign in to comment.