Add support for Terraform v0.12 #237

aaron-lane · 2019-06-27T18:33:49Z

No description provided.

Jberlinsky · 2019-07-05T21:18:08Z

@aaron-lane Could you kindly rebase this against master please?

Co-Authored-By: Aaron Lane <[email protected]>

From https://github.com/antonbabenko/pre-commit-terraform/blob/83629157c22800f59ab59642f82abef3df31721a/terraform_docs.sh

In ./test/make.sh line 133: cd $path && echo "Working in ${path} ..." ^---^ SC2086: Double quote to prevent globbing and word splitting.

Without this patch CI fails with Terraform 0.12 syntax errors becasue Terraform 0.11 is used. Error: Error parsing /tmp/build/f541ec31/terraform-google-project-factory/test/fixtures/shared_vpc_no_subnets/main.tf: At 26:29: Unknown token: 26:29 IDENT file This patch upgrades to Terraform 0.12.3 using the kitchen-terraform 2.2.0 docker image. See GoogleCloudPlatform/cloud-foundation-toolkit#216

Without this patch make check_terraform fails, causing the lint test pipeline to fail. This patch updates the task to work with Terraform 0.12. In 0.12 terraform validate requires terraform init to have run. This behavior is implemented in the helper script, helpers/terraform_validate Example output: make check_terraform Running terraform fmt terraform fmt -diff -check=true -write=false . terraform fmt -diff -check=true -write=false ./examples/app_engine examples/app_engine/main.tf --- old/examples/app_engine/main.tf +++ new/examples/app_engine/main.tf @@ -22,15 +22,15 @@ Provider configuration *****************************************/ provider "gsuite" { - credentials = file(local.credentials_file_path) - version = "~> 0.1.9" + credentials = file(local.credentials_file_path) + version = "~> 0.1.9" } module "app-engine" { - source = "../../modules/app_engine" - location_id = var.location_id - auth_domain = var.auth_domain - serving_status = var.serving_status + source = "../../modules/app_engine" + location_id = var.location_id + auth_domain = var.auth_domain + serving_status = var.serving_status feature_settings = [{ enabled = true }] - project_id = "example-project" + project_id = "example-project" } terraform fmt -diff -check=true -write=false ./examples/gke_shared_vpc Warning: compat_xargs -t -n1 terraform fmt -diff -check=true -write=false failed with exit code 1 Error: terraform fmt failed with exit code 1 Check the output for diffs and correct using terraform fmt <dir> make: *** [check_terraform] Error 1 This patch also uses a temporary version of the network module to correct the error: Error: Unsupported block type on .terraform/modules/vpc/terraform-google-modules-terraform-google-network-d1b6646/main.tf line 94, in resource "null_resource" "delete_default_internet_gateway_routes": 94: triggers { Blocks of type "triggers" are not expected here. Did you mean to define argument "triggers"? If so, use the equals sign to assign it a value.

This patch fixes: make check_python Running flake8 ./modules/core_project_factory/scripts/preconditions/preconditions.py:405:19: E201 whitespace after '[' Warning: compat_xargs -0 flake8 failed with exit code 1

Without this patch lint checks fail with: make check_headers Checking file headers 1 files have incorrect boilerplate headers: examples/app_engine/outputs.tf Warning: compat_xargs -0 python test/verify_boilerplate.py failed with exit code 1 make: *** [check_headers] Error 1

Without this patch `make check` fails lint checks with: Checking for trailing whitespace ./.kitchen/minimal-local.yml:2:last_error: ./.kitchen/logs/minimal-local.log:76:I, [2019-07-08T22:44:40.720556 #252] INFO -- minimal-local: ./.kitchen/logs/minimal-local.log:78:I, [2019-07-08T22:44:40.721441 #252] INFO -- minimal-local: group_email = ./.kitchen/logs/minimal-local.log:87:I, [2019-07-08T22:44:40.730335 #252] INFO -- minimal-local: shared_vpc = ./.kitchen/logs/minimal-local.log:88:I, [2019-07-08T22:44:40.730870 #252] INFO -- minimal-local: usage_bucket_name = ./.kitchen/logs/kitchen.log:4:I, [2019-07-08T22:34:45.979975 #252] INFO -- Kitchen: ./.kitchen/logs/kitchen.log:9:I, [2019-07-08T22:39:51.765208 #252] INFO -- Kitchen: ./.kitchen/logs/kitchen.log:14:I, [2019-07-08T22:44:40.886354 #252] INFO -- Kitchen: ./.kitchen/logs/shared-vpc-no-subnets-local.log:77:I, [2019-07-08T22:49:02.628309 #252] INFO -- shared-vpc-no-subnets-local: ./.kitchen/logs/full-local.log:95:I, [2019-07-08T22:39:51.630494 #252] INFO -- full-local: make: *** [check_trailing_whitespace] Error 1

Without this patch the following test fails: × project-factory-app-engine: Project Factory App Engine configuration (1 failed) ✔ Command: `gcloud app describe --project pf-ci-test-full-id-mvuis --format=json` should include {:authDomain => "phoogle.net"} × Command: `gcloud app describe --project pf-ci-test-full-id-mvuis --format=json` should include {:featureSettings => {:splitHealthChecks => true}} expected {:authDomain => "phoogle.net", :codeBucket => "staging.pf-ci-test-full-id-mvuis.appspot.com", :defaultBuc...-mvuis", :locationId => "us-east4", :name => "apps/pf-ci-test-full-id-mvuis", :servingStatus => "SERVING"} to include {:featureSettings => {:splitHealthChecks => true}} Diff: @@ -1,2 +1,11 @@ -:featureSettings => {:splitHealthChecks=>true}, +:authDomain => "phoogle.net", +:codeBucket => "staging.pf-ci-test-full-id-mvuis.appspot.com", +:defaultBucket => "pf-ci-test-full-id-mvuis.appspot.com", +:defaultHostname => "pf-ci-test-full-id-mvuis.appspot.com", +:featureSettings => {:splitHealthChecks=>true, :useContainerOptimizedOs=>true}, +:gcrDomain => "us.gcr.io", +:id => "pf-ci-test-full-id-mvuis", +:locationId => "us-east4", +:name => "apps/pf-ci-test-full-id-mvuis", +:servingStatus => "SERVING",

jeffmccune · 2019-07-12T20:38:40Z

LGTM

Jberlinsky

A couple nit-picks, but largely LGTM otherwise!

Jberlinsky · 2019-07-12T20:54:27Z

examples/app_engine/main.tf

-  impersonated_user_email = "${var.admin_email}"
-  version                 = "~> 0.1.9"
+  credentials = file(local.credentials_file_path)
+  version     = "~> 0.1.9"


Given the addition to TROUBLESHOOTING.md, do we want to change this version-pin to > 0.1.12?

Jberlinsky · 2019-07-12T21:06:12Z

test/fixtures/full/main.tf

@@ -52,22 +52,22 @@ locals {
 }

 module "vpc" {
-  source       = "terraform-google-modules/network/google"
-  version      = "~> 0.4.0"
+  source = "git::https://github.com/terraform-google-modules/terraform-google-network.git?ref=master"


Can we pin this to a specific version? 0.12.x compatibility was introduced in terraform-google-modules/terraform-google-network@7ba1b23

Jberlinsky · 2019-07-12T21:06:22Z

examples/shared_vpc/main.tf

+  #
+  # source  = "terraform-google-modules/network/google"
+  # version = "0.8.0"
+  source = "git::https://github.com/terraform-google-modules/terraform-google-network.git?ref=master"


Can we pin this to a specific version? 0.12.x compatibility was introduced in terraform-google-modules/terraform-google-network@7ba1b23

Jberlinsky · 2019-07-12T21:08:49Z

Sorry, race condition where this was merged while I was reviewing it. My suggestions are nit-picky -- would suggest making them follow-up issues for future addressing.

aaron-lane added the enhancement New feature or request label Jun 27, 2019

aaron-lane mentioned this pull request Jul 3, 2019

Add support for Terraform v0.12 #209

Closed

aaron-lane marked this pull request as ready for review July 8, 2019 19:21

aaron-lane requested review from adrienthebo and morgante as code owners July 8, 2019 19:21

aaron-lane force-pushed the aaron-lane-0.12 branch from 7504354 to d4cf4a8 Compare July 8, 2019 19:27

ingwarr mentioned this pull request Jul 10, 2019

Fixes for Fails with shared VPC being specified using a reference #47 #244

Closed

ingwarr and others added 22 commits July 12, 2019 13:49

Adopted to terraform-0.12

96231b6

Provider versions changed for compatibility

548e6e7

fixed examples but it depend on terraform-google-network

e9161bb

feature_settings fix

fc3f72d

Adopted to terraform-0.12

c1ff333

Provider versions changed for compatibility

f1b6d72

fixed examples but it depend on terraform-google-network

41eb03a

3 examples upgraded to 0.12 terraform

b84d529

5-th example fixed plus all modules

129acf0

shared_vpc example variables fixed

9581f4f

additional fixes for tests

2978bf1

app_engine example fixed

7592d8e

Update examples/app_engine/variables.tf

91b3ea8

Co-Authored-By: Aaron Lane <[email protected]>

Update examples/app_engine/variables.tf

2241eb3

Co-Authored-By: Aaron Lane <[email protected]>

Fixed doc generator

9b2e8d9

Add terraform_docs.sh

fc63ea4

From https://github.com/antonbabenko/pre-commit-terraform/blob/83629157c22800f59ab59642f82abef3df31721a/terraform_docs.sh

Fix make.sh $path SC2086 Lint error

d00160d

In ./test/make.sh line 133: cd $path && echo "Working in ${path} ..." ^---^ SC2086: Double quote to prevent globbing and word splitting.

Fix make check_python failure

2933021

This patch fixes: make check_python Running flake8 ./modules/core_project_factory/scripts/preconditions/preconditions.py:405:19: E201 whitespace after '[' Warning: compat_xargs -0 flake8 failed with exit code 1

aaron-lane force-pushed the aaron-lane-0.12 branch from 6004b31 to 5d17bd7 Compare July 12, 2019 17:49

aaron-lane added 4 commits July 12, 2019 15:56

Upgrade full fixture to 0.12

b223b37

Update reference to Network prerelease

a2b08dd

Interpolate subnet name locals for map keys

255304f

Add compatibility note, update version in README

f90b827

aaron-lane force-pushed the aaron-lane-0.12 branch from b54d2fc to f90b827 Compare July 12, 2019 19:57

morgante approved these changes Jul 12, 2019

View reviewed changes

aaron-lane merged commit 0e44a1b into master Jul 12, 2019

Jberlinsky suggested changes Jul 12, 2019

View reviewed changes

aaron-lane added a commit that referenced this pull request Jul 12, 2019

Add entry for #237 to CHANGELOG

94aaa1c

ingwarr deleted the aaron-lane-0.12 branch August 15, 2019 12:32

ingwarr restored the aaron-lane-0.12 branch August 15, 2019 12:33

aaron-lane deleted the aaron-lane-0.12 branch October 11, 2019 20:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for Terraform v0.12 #237

Add support for Terraform v0.12 #237

aaron-lane commented Jun 27, 2019

Jberlinsky commented Jul 5, 2019

jeffmccune commented Jul 12, 2019

Jberlinsky left a comment

Jberlinsky Jul 12, 2019

Jberlinsky Jul 12, 2019

Jberlinsky Jul 12, 2019

Jberlinsky commented Jul 12, 2019

Add support for Terraform v0.12 #237

Add support for Terraform v0.12 #237

Conversation

aaron-lane commented Jun 27, 2019

Jberlinsky commented Jul 5, 2019

jeffmccune commented Jul 12, 2019

Jberlinsky left a comment

Choose a reason for hiding this comment

Jberlinsky Jul 12, 2019

Choose a reason for hiding this comment

Jberlinsky Jul 12, 2019

Choose a reason for hiding this comment

Jberlinsky Jul 12, 2019

Choose a reason for hiding this comment

Jberlinsky commented Jul 12, 2019