feat: Upgrade default Terraform version to v1.0.2 (#112)

BREAKING CHANGE: Default Terraform version increased to v1.0.2. BREAKING CHANGE: Default branch trigger changed from `master` to `main`. BREAKING CHANGE: Default trigger location in Terraform state changed, see upgrade guide for details.
terraform-google-modules · Jul 28, 2021 · dac0483 · dac0483
1 parent db8c978
commit dac0483
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/modules/cloudbuild/README.md b/modules/cloudbuild/README.md
@@ -68,13 +68,13 @@ Functional examples and sample Cloud Build definitions are included in the [exam
 | random\_suffix | Appends a 4 character random suffix to project ID and GCS bucket name. | `bool` | `true` | no |
 | sa\_enable\_impersonation | Allow org\_admins group to impersonate service account & enable APIs required. | `bool` | `false` | no |
 | storage\_bucket\_labels | Labels to apply to the storage bucket. | `map(string)` | `{}` | no |
-| terraform\_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>  "master"<br>]</pre> | no |
+| terraform\_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 |
 | terraform\_sa\_email | Email for terraform service account. | `string` | n/a | yes |
 | terraform\_sa\_name | Fully-qualified name of the terraform service account. | `string` | n/a | yes |
 | terraform\_state\_bucket | Default state bucket, used in Cloud Build substitutions. | `string` | n/a | yes |
-| terraform\_validator\_release | Default terraform-validator release. | `string` | `"2021-03-22"` | no |
-| terraform\_version | Default terraform version. | `string` | `"0.13.6"` | no |
-| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"` | no |
+| terraform\_validator\_release | Default terraform-validator release. | `string` | `"v0.4.0"` | no |
+| terraform\_version | Default terraform version. | `string` | `"1.0.2"` | no |
+| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"7329f887cc5a5bda4bedaec59c439a4af7ea0465f83e3c1b0f4d04951e1181f4"` | no |
 
 ## Outputs
 

diff --git a/modules/cloudbuild/cloudbuild_builder/Dockerfile b/modules/cloudbuild/cloudbuild_builder/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright 2019 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml b/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml
@@ -27,7 +27,7 @@ steps:
 - name: '${_REGION}-docker.pkg.dev/${PROJECT_ID}/${_REPOSITORY}/terraform'
   args: ['version']
 substitutions:
-  _TERRAFORM_VERSION: '0.13.6' # default value
-  _TERRAFORM_VERSION_SHA256SUM: '55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9' # default value
-  _TERRAFORM_VALIDATOR_RELEASE: '2021-03-22'
+  _TERRAFORM_VERSION: '1.0.2' # default value
+  _TERRAFORM_VERSION_SHA256SUM: '7329f887cc5a5bda4bedaec59c439a4af7ea0465f83e3c1b0f4d04951e1181f4' # default value
+  _TERRAFORM_VALIDATOR_RELEASE: 'v0.4.0'
 images: ['${_REGION}-docker.pkg.dev/${PROJECT_ID}/${_REPOSITORY}/terraform']
diff --git a/modules/cloudbuild/main.tf b/modules/cloudbuild/main.tf
@@ -149,10 +149,10 @@ resource "google_project_iam_member" "org_admins_source_repo_admin" {
 }
 
 /***********************************************
- Cloud Build - Master branch triggers
+ Cloud Build - Main branch triggers
  ***********************************************/
 
-resource "google_cloudbuild_trigger" "master_trigger" {
+resource "google_cloudbuild_trigger" "main_trigger" {
   for_each    = var.create_cloud_source_repos ? toset(var.cloud_source_repos) : []
   project     = module.cloudbuild_project.project_id
   description = "${each.value} - terraform apply."
@@ -180,10 +180,10 @@ resource "google_cloudbuild_trigger" "master_trigger" {
 }
 
 /***********************************************
- Cloud Build - Non Master branch triggers
+ Cloud Build - Non Main branch triggers
  ***********************************************/
 
-resource "google_cloudbuild_trigger" "non_master_trigger" {
+resource "google_cloudbuild_trigger" "non_main_trigger" {
   for_each    = var.create_cloud_source_repos ? toset(var.cloud_source_repos) : []
   project     = module.cloudbuild_project.project_id
   description = "${each.value} - terraform plan."

diff --git a/modules/cloudbuild/variables.tf b/modules/cloudbuild/variables.tf
@@ -1,6 +1,6 @@
 
 /**
- * Copyright 2019 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -134,19 +134,19 @@ variable "folder_id" {
 variable "terraform_version" {
   description = "Default terraform version."
   type        = string
-  default     = "0.13.6"
+  default     = "1.0.2"
 }
 
 variable "terraform_version_sha256sum" {
   description = "sha256sum for default terraform version."
   type        = string
-  default     = "55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"
+  default     = "7329f887cc5a5bda4bedaec59c439a4af7ea0465f83e3c1b0f4d04951e1181f4"
 }
 
 variable "terraform_validator_release" {
   description = "Default terraform-validator release."
   type        = string
-  default     = "2021-03-22"
+  default     = "v0.4.0"
 }
 
 variable "cloudbuild_plan_filename" {
@@ -166,7 +166,7 @@ variable "terraform_apply_branches" {
   type        = list(string)
 
   default = [
-    "master"
+    "main"
   ]
 }