Revert "Upgrade to Terraform 1.0 (#939)" (#950)

This reverts commit 12cc56a.
GoogleCloudPlatform · Jul 12, 2021 · f18accf · f18accf
1 parent ec52303
commit f18accf
Show file tree

Hide file tree

Showing 67 changed files with 131 additions and 129 deletions.
diff --git a/build/presubmit_int.yaml b/build/presubmit_int.yaml
@@ -12,19 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Terraform version used is 1.0.1.
+# Terraform version used is 0.14.8.
 substitutions:
-  _CFT_TOOLS_CONTAINER: "gcr.io/cloud-foundation-cicd/cft/developer-tools@sha256:22113ceabae0cccfc8eaeb3a9521a0950fa75e2fe38777f47c3d32f071cc7834"
+  _CFT_TOOLS_CONTAINER: "gcr.io/cloud-foundation-cicd/cft/developer-tools@sha256:8b0d85766044b0e4701729f9e70ee78dcecdb8688bd86915eb2a1cb00580ba1e"
 
 timeout: 3600s
 
 options:
-  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="
+  env: ["GOPATH=/go"]
   machineType: "N1_HIGHCPU_8"
 
 steps:

diff --git a/build/presubmit_unit.yaml b/build/presubmit_unit.yaml
@@ -12,17 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Terraform version used is 1.0.1.
+# Terraform version used is 0.14.8.
 substitutions:
-  _CFT_TOOLS_CONTAINER: "gcr.io/cloud-foundation-cicd/cft/developer-tools@sha256:22113ceabae0cccfc8eaeb3a9521a0950fa75e2fe38777f47c3d32f071cc7834"
+  _CFT_TOOLS_CONTAINER: "gcr.io/cloud-foundation-cicd/cft/developer-tools@sha256:8b0d85766044b0e4701729f9e70ee78dcecdb8688bd86915eb2a1cb00580ba1e"
 
 options:
-  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="
+  env: ["GOPATH=/go"]
   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 1.0.1](https://releases.hashicorp.com/terraform/)
+    * [Terraform 0.14.8](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 1.0.1](https://releases.hashicorp.com/terraform/)
+    - [Terraform 0.14.8](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 1.0.1](https://releases.hashicorp.com/terraform/) (consistent
+- [Terraform 0.14.8](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/devops/cicd/main.tf b/examples/tfengine/generated/devops/cicd/main.tf
diff --git a/examples/tfengine/generated/devops/devops/main.tf b/examples/tfengine/generated/devops/devops/main.tf
diff --git a/examples/tfengine/generated/devops/groups/main.tf b/examples/tfengine/generated/devops/groups/main.tf
diff --git a/examples/tfengine/generated/folder_foundation/audit/main.tf b/examples/tfengine/generated/folder_foundation/audit/main.tf
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/folder_foundation/cicd/main.tf b/examples/tfengine/generated/folder_foundation/cicd/main.tf
diff --git a/examples/tfengine/generated/folder_foundation/devops/main.tf b/examples/tfengine/generated/folder_foundation/devops/main.tf
diff --git a/examples/tfengine/generated/folder_foundation/example-prod-networks/main.tf b/examples/tfengine/generated/folder_foundation/example-prod-networks/main.tf
diff --git a/examples/tfengine/generated/folder_foundation/folders/main.tf b/examples/tfengine/generated/folder_foundation/folders/main.tf
diff --git a/examples/tfengine/generated/folder_foundation/groups/main.tf b/examples/tfengine/generated/folder_foundation/groups/main.tf
diff --git a/examples/tfengine/generated/folder_foundation/monitor/main.tf b/examples/tfengine/generated/folder_foundation/monitor/main.tf
diff --git a/examples/tfengine/generated/multi_envs/audit/main.tf b/examples/tfengine/generated/multi_envs/audit/main.tf
diff --git a/examples/tfengine/generated/multi_envs/cicd/README.md b/examples/tfengine/generated/multi_envs/cicd/README.md