From e04ab658516e8c7bda4689589d5ef8f01ba6ed88 Mon Sep 17 00:00:00 2001
From: Eric Zhao <zhaoe@google.com>
Date: Tue, 23 Feb 2021 09:35:46 +1100
Subject: [PATCH] fix: upgrade project factory to 10.1.1 and terraform to
 0.13.6 (#93)

---
 main.tf                                               | 2 +-
 modules/cloudbuild/README.md                          | 4 ++--
 modules/cloudbuild/cloudbuild_builder/Dockerfile      | 4 ++--
 modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml | 4 ++--
 modules/cloudbuild/main.tf                            | 2 +-
 modules/cloudbuild/variables.tf                       | 4 ++--
 terraform.example.tfvars                              | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/main.tf b/main.tf
index 37f33e8c..5b9b2704 100644
--- a/main.tf
+++ b/main.tf
@@ -54,7 +54,7 @@ resource "google_folder_iam_member" "tmp_project_creator" {
 
 module "seed_project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 10.0.1"
+  version                     = "~> 10.1.1"
   name                        = local.seed_project_id
   random_project_id           = true
   disable_services_on_destroy = false
diff --git a/modules/cloudbuild/README.md b/modules/cloudbuild/README.md
index c59f4b24..3c8cfc15 100644
--- a/modules/cloudbuild/README.md
+++ b/modules/cloudbuild/README.md
@@ -71,8 +71,8 @@ Functional examples and sample Cloud Build definitions are included in the [exam
 | 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-09-24"` | no |
-| terraform\_version | Default terraform version. | `string` | `"0.12.29"` | no |
-| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d"` | no |
+| terraform\_version | Default terraform version. | `string` | `"0.13.6"` | no |
+| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"` | no |
 
 ## Outputs
 
diff --git a/modules/cloudbuild/cloudbuild_builder/Dockerfile b/modules/cloudbuild/cloudbuild_builder/Dockerfile
index adeafff0..17798801 100644
--- a/modules/cloudbuild/cloudbuild_builder/Dockerfile
+++ b/modules/cloudbuild/cloudbuild_builder/Dockerfile
@@ -15,8 +15,8 @@
 FROM gcr.io/cloud-builders/gcloud-slim
 
 # Use ARG so that values can be overriden by user/cloudbuild
-ARG TERRAFORM_VERSION=0.12.29
-ARG TERRAFORM_VERSION_SHA256SUM=872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d
+ARG TERRAFORM_VERSION=0.13.6
+ARG TERRAFORM_VERSION_SHA256SUM=55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9
 ARG TERRAFORM_VALIDATOR_RELEASE=2020-09-24
 
 ENV ENV_TERRAFORM_VERSION=$TERRAFORM_VERSION
diff --git a/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml b/modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml
index 9046c3dc..68d9fcc0 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.29' # default value
-  _TERRAFORM_VERSION_SHA256SUM: '872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d' # default value
+  _TERRAFORM_VERSION: '0.13.6' # default value
+  _TERRAFORM_VERSION_SHA256SUM: '55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9' # default value
   _TERRAFORM_VALIDATOR_RELEASE: '2020-09-24'
 images: ['gcr.io/${PROJECT_ID}/terraform']
diff --git a/modules/cloudbuild/main.tf b/modules/cloudbuild/main.tf
index 69ab6127..b425a094 100644
--- a/modules/cloudbuild/main.tf
+++ b/modules/cloudbuild/main.tf
@@ -37,7 +37,7 @@ data "google_organization" "org" {
 
 module "cloudbuild_project" {
   source                      = "terraform-google-modules/project-factory/google"
-  version                     = "~> 10.0.1"
+  version                     = "~> 10.1.1"
   name                        = local.cloudbuild_project_id
   random_project_id           = true
   disable_services_on_destroy = false
diff --git a/modules/cloudbuild/variables.tf b/modules/cloudbuild/variables.tf
index 8072979a..2e5348ac 100644
--- a/modules/cloudbuild/variables.tf
+++ b/modules/cloudbuild/variables.tf
@@ -134,13 +134,13 @@ variable "folder_id" {
 variable "terraform_version" {
   description = "Default terraform version."
   type        = string
-  default     = "0.12.29"
+  default     = "0.13.6"
 }
 
 variable "terraform_version_sha256sum" {
   description = "sha256sum for default terraform version."
   type        = string
-  default     = "872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d"
+  default     = "55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"
 }
 
 variable "terraform_validator_release" {
diff --git a/terraform.example.tfvars b/terraform.example.tfvars
index ba48933e..fcbb88c4 100644
--- a/terraform.example.tfvars
+++ b/terraform.example.tfvars
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-organization_id = "000000000000"
+org_id = "000000000000"
 
 billing_account = "000000-000000-000000"