Upgrade to Terraform 1.0.1

GoogleCloudPlatform · Jul 5, 2021 · 0e4b21d · 0e4b21d
1 parent 8ad019d
commit 0e4b21d
Show file tree

Hide file tree

Showing 29 changed files with 91 additions and 81 deletions.
diff --git a/build/presubmit_int.yaml b/build/presubmit_int.yaml
@@ -12,14 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Terraform version used is 0.14.8.
+# Terraform version used is 1.0.1.
 substitutions:
-  _CFT_TOOLS_CONTAINER: "gcr.io/cloud-foundation-cicd/cft/developer-tools@sha256:8b0d85766044b0e4701729f9e70ee78dcecdb8688bd86915eb2a1cb00580ba1e"
+  _CFT_TOOLS_CONTAINER: "gcr.io/cloud-foundation-cicd/cft/developer-tools@sha256:22113ceabae0cccfc8eaeb3a9521a0950fa75e2fe38777f47c3d32f071cc7834"
 
 timeout: 3600s
 
 options:
-  env: ["GOPATH=/go"]
+  env:
+  - "GOPATH=/go"
+  # Unset TF_PLUGIN_CACHE_DIR so different build steps do not share Terraform cache.
+  # It's set to `/workspace/test/integration/tmp/.terraform` in the CFT Developer Tool's container
+  # for CFT's testing purpose. We don't need it.
+  - "TF_PLUGIN_CACHE_DIR="
   machineType: "N1_HIGHCPU_8"
 
 steps:

diff --git a/build/presubmit_unit.yaml b/build/presubmit_unit.yaml
@@ -12,12 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Terraform version used is 0.14.8.
+# Terraform version used is 1.0.1.
 substitutions:
-  _CFT_TOOLS_CONTAINER: "gcr.io/cloud-foundation-cicd/cft/developer-tools@sha256:8b0d85766044b0e4701729f9e70ee78dcecdb8688bd86915eb2a1cb00580ba1e"
+  _CFT_TOOLS_CONTAINER: "gcr.io/cloud-foundation-cicd/cft/developer-tools@sha256:22113ceabae0cccfc8eaeb3a9521a0950fa75e2fe38777f47c3d32f071cc7834"
 
 options:
-  env: ["GOPATH=/go"]
+  env:
+  - "GOPATH=/go"
+  # Unset TF_PLUGIN_CACHE_DIR so different build steps do not share Terraform cache.
+  # It's set to `/workspace/test/integration/tmp/.terraform` in the CFT Developer Tool's container
+  # for CFT's testing purpose. We don't need it.
+  - "TF_PLUGIN_CACHE_DIR="
   machineType: "N1_HIGHCPU_8"
 
 steps:

diff --git a/docs/policygen/README.md b/docs/policygen/README.md
@@ -21,7 +21,7 @@ are now generated by [tfengine](../tfengine/README.md) as Terraform configs. See
 1. Install the following dependencies and add them to your PATH:
 
     * [gcloud](https://cloud.google.com/sdk/gcloud)
-    * [Terraform 0.14.8](https://releases.hashicorp.com/terraform/)
+    * [Terraform 1.0.1](https://releases.hashicorp.com/terraform/)
         (consistent with the version of Terraform used by CICD)
     * [Go 1.14+](https://golang.org/dl/)
 

diff --git a/docs/tfengine/README.md b/docs/tfengine/README.md
@@ -142,7 +142,7 @@ This tool helps you follow Google Cloud, Terraform and security best practices.
 1. Install the following dependencies and add them to your PATH:
 
     - [gcloud](https://cloud.google.com/sdk/gcloud)
-    - [Terraform 0.14.8](https://releases.hashicorp.com/terraform/)
+    - [Terraform 1.0.1](https://releases.hashicorp.com/terraform/)
         (consistent with the version of Terraform used by CICD)
     - [Go 1.14+](https://golang.org/dl/)
 

diff --git a/docs/tfimport/README.md b/docs/tfimport/README.md
@@ -8,7 +8,7 @@ generated by the Terrarom Engine.
 
 ## Requirements
 
-- [Terraform 0.14.8](https://releases.hashicorp.com/terraform/) (consistent
+- [Terraform 1.0.1](https://releases.hashicorp.com/terraform/) (consistent
     with the version of Terraform used by CICD)
 - [Go 1.14+](https://golang.org/dl/)
 

diff --git a/examples/tfengine/generated/devops/cicd/README.md b/examples/tfengine/generated/devops/cicd/README.md
diff --git a/examples/tfengine/generated/devops/cicd/configs/tf-apply.yaml b/examples/tfengine/generated/devops/cicd/configs/tf-apply.yaml
diff --git a/examples/tfengine/generated/devops/cicd/configs/tf-plan.yaml b/examples/tfengine/generated/devops/cicd/configs/tf-plan.yaml
diff --git a/examples/tfengine/generated/devops/cicd/configs/tf-validate.yaml b/examples/tfengine/generated/devops/cicd/configs/tf-validate.yaml
diff --git a/examples/tfengine/generated/folder_foundation/cicd/README.md b/examples/tfengine/generated/folder_foundation/cicd/README.md
diff --git a/examples/tfengine/generated/folder_foundation/cicd/configs/tf-apply.yaml b/examples/tfengine/generated/folder_foundation/cicd/configs/tf-apply.yaml
diff --git a/examples/tfengine/generated/folder_foundation/cicd/configs/tf-plan.yaml b/examples/tfengine/generated/folder_foundation/cicd/configs/tf-plan.yaml
diff --git a/examples/tfengine/generated/folder_foundation/cicd/configs/tf-validate.yaml b/examples/tfengine/generated/folder_foundation/cicd/configs/tf-validate.yaml
diff --git a/examples/tfengine/generated/multi_envs/cicd/README.md b/examples/tfengine/generated/multi_envs/cicd/README.md
diff --git a/examples/tfengine/generated/multi_envs/cicd/configs/tf-apply.yaml b/examples/tfengine/generated/multi_envs/cicd/configs/tf-apply.yaml
diff --git a/examples/tfengine/generated/multi_envs/cicd/configs/tf-plan.yaml b/examples/tfengine/generated/multi_envs/cicd/configs/tf-plan.yaml
diff --git a/examples/tfengine/generated/multi_envs/cicd/configs/tf-validate.yaml b/examples/tfengine/generated/multi_envs/cicd/configs/tf-validate.yaml
diff --git a/examples/tfengine/generated/org_foundation/cicd/README.md b/examples/tfengine/generated/org_foundation/cicd/README.md
@@ -67,7 +67,7 @@ in [./configs](./configs) directory to point to your container.
 
 We leverage Google Container Registry's Vulnerability scanning feature to detect
 potential security risks in this container, and
-[None](https://console.cloud.google.com/gcr/images/cloud-foundation-cicd/global/cft/developer-tools-light@sha256:d881ce4ff2a73fa0877dd357af798a431a601b2ccfe5a140837bcb883cd3f011/details?tab=vulnz)
+[None](https://console.cloud.google.com/gcr/images/cloud-foundation-cicd/global/cft/developer-tools-light@sha256:7c40255f4df73cca81c943456bf1ebe6c58da455a24d90b5d7d9964e97bf5646/details?tab=vulnz)
 is reported.
 
 ## Features