Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Terraform 1.0 #939

Merged
merged 3 commits into from
Jul 6, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions build/presubmit_int.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
MartinPetkov marked this conversation as resolved.
Show resolved Hide resolved
- "TF_PLUGIN_CACHE_DIR="
machineType: "N1_HIGHCPU_8"

steps:
Expand Down
11 changes: 8 additions & 3 deletions build/presubmit_unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/policygen/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

Expand Down
2 changes: 1 addition & 1 deletion docs/tfengine/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

Expand Down
2 changes: 1 addition & 1 deletion docs/tfimport/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

Expand Down
4 changes: 1 addition & 3 deletions examples/tfengine/generated/devops/cicd/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/tfengine/generated/devops/cicd/main.tf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/tfengine/generated/devops/devops/main.tf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/tfengine/generated/devops/groups/main.tf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/tfengine/generated/multi_envs/audit/main.tf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions examples/tfengine/generated/multi_envs/cicd/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading