From 74d7ef257b9f7a076e878ec9ed56dabbf006d78f Mon Sep 17 00:00:00 2001
From: Mike Laramie <mikelaramie@google.com>
Date: Mon, 26 Oct 2020 18:13:20 -0400
Subject: [PATCH] feat: update terraform to 12.29 and terraform-validator to
 2020-09-24 (#71)

---
 modules/cloudbuild/README.md                          | 6 +++---
 modules/cloudbuild/cloudbuild_builder/Dockerfile      | 6 +++---
 modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml | 6 +++---
 modules/cloudbuild/variables.tf                       | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/cloudbuild/README.md b/modules/cloudbuild/README.md
index 434cefbc..00c1619e 100644
--- a/modules/cloudbuild/README.md
+++ b/modules/cloudbuild/README.md
@@ -70,9 +70,9 @@ Functional examples and sample Cloud Build definitions are included in the [exam
 | 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` | `"2020-03-05"` | no |
-| terraform\_version | Default terraform version. | `string` | `"0.12.24"` | no |
-| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"602d2529aafdaa0f605c06adb7c72cfb585d8aa19b3f4d8d189b42589e27bf11"` | no |
+| terraform\_validator\_release | Default terraform-validator release. | `string` | `"2020-09-24"` | no |
+| terraform\_version | Default terraform version. | `string` | `"0.12.29"` | no |
+| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d"` | no |
 
 ## Outputs
 
diff --git a/modules/cloudbuild/cloudbuild_builder/Dockerfile b/modules/cloudbuild/cloudbuild_builder/Dockerfile
index 52707727..adeafff0 100644
--- a/modules/cloudbuild/cloudbuild_builder/Dockerfile
+++ b/modules/cloudbuild/cloudbuild_builder/Dockerfile
@@ -15,9 +15,9 @@
 FROM gcr.io/cloud-builders/gcloud-slim
 
 # Use ARG so that values can be overriden by user/cloudbuild
-ARG TERRAFORM_VERSION=0.12.24
-ARG TERRAFORM_VERSION_SHA256SUM=602d2529aafdaa0f605c06adb7c72cfb585d8aa19b3f4d8d189b42589e27bf11
-ARG TERRAFORM_VALIDATOR_RELEASE=2020-03-05
+ARG TERRAFORM_VERSION=0.12.29
+ARG TERRAFORM_VERSION_SHA256SUM=872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d
+ARG TERRAFORM_VALIDATOR_RELEASE=2020-09-24
 
 ENV ENV_TERRAFORM_VERSION=$TERRAFORM_VERSION
 ENV ENV_TERRAFORM_VERSION_SHA256SUM=$TERRAFORM_VERSION_SHA256SUM
diff --git a/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml b/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml
index 013e1567..9046c3dc 100644
--- a/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml
+++ b/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml
@@ -27,7 +27,7 @@ steps:
 - name: 'gcr.io/${PROJECT_ID}/terraform'
   args: ['version']
 substitutions:
-  _TERRAFORM_VERSION: '0.12.24' # default value
-  _TERRAFORM_VERSION_SHA256SUM: '602d2529aafdaa0f605c06adb7c72cfb585d8aa19b3f4d8d189b42589e27bf11' # default value
-  _TERRAFORM_VALIDATOR_RELEASE: '2020-03-05'
+  _TERRAFORM_VERSION: '0.12.29' # default value
+  _TERRAFORM_VERSION_SHA256SUM: '872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d' # default value
+  _TERRAFORM_VALIDATOR_RELEASE: '2020-09-24'
 images: ['gcr.io/${PROJECT_ID}/terraform']
diff --git a/modules/cloudbuild/variables.tf b/modules/cloudbuild/variables.tf
index 278040fd..515d19ca 100644
--- a/modules/cloudbuild/variables.tf
+++ b/modules/cloudbuild/variables.tf
@@ -128,19 +128,19 @@ variable "folder_id" {
 variable "terraform_version" {
   description = "Default terraform version."
   type        = string
-  default     = "0.12.24"
+  default     = "0.12.29"
 }
 
 variable "terraform_version_sha256sum" {
   description = "sha256sum for default terraform version."
   type        = string
-  default     = "602d2529aafdaa0f605c06adb7c72cfb585d8aa19b3f4d8d189b42589e27bf11"
+  default     = "872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d"
 }
 
 variable "terraform_validator_release" {
   description = "Default terraform-validator release."
   type        = string
-  default     = "2020-03-05"
+  default     = "2020-09-24"
 }
 
 variable "skip_gcloud_download" {