From 6fb2b42bd96f90d3c2baffd511cb58200fbc074c Mon Sep 17 00:00:00 2001 From: "Brandon J. Bjelland" Date: Tue, 25 Aug 2020 23:55:29 -0700 Subject: [PATCH] fix: relax version constraints to enable terraform 0.13.x compatibility (#108) --- .kitchen.yml | 1 + autogen/versions.tf | 2 +- build/int.cloudbuild.yaml | 2 +- build/lint.cloudbuild.yaml | 2 +- examples/compute_instance/simple/versions.tf | 2 +- .../instance_template/additional_disks/versions.tf | 2 +- examples/instance_template/simple/versions.tf | 2 +- examples/mig/autoscaler/versions.tf | 2 +- examples/mig/full/versions.tf | 2 +- examples/mig/simple/versions.tf | 2 +- examples/mig_with_percent/simple/versions.tf | 2 +- .../simple/versions.tf | 2 +- examples/umig/full/versions.tf | 2 +- examples/umig/named_ports/versions.tf | 2 +- examples/umig/simple/versions.tf | 2 +- examples/umig/static_ips/versions.tf | 2 +- modules/compute_instance/versions.tf | 2 +- modules/instance_template/versions.tf | 2 +- modules/mig/versions.tf | 2 +- modules/mig_with_percent/versions.tf | 2 +- .../versions.tf | 2 +- modules/umig/versions.tf | 2 +- test/fixtures/compute_instance/simple/versions.tf | 2 +- .../instance_template/additional_disks/versions.tf | 2 +- test/fixtures/instance_template/simple/versions.tf | 2 +- test/fixtures/mig/autoscaler/versions.tf | 2 +- test/fixtures/mig/simple/versions.tf | 2 +- test/fixtures/mig_with_percent/simple/versions.tf | 2 +- .../simple/versions.tf | 2 +- test/fixtures/umig/named_ports/versions.tf | 2 +- test/fixtures/umig/simple/versions.tf | 2 +- test/fixtures/umig/static_ips/versions.tf | 2 +- test/setup/main.tf | 13 +++++++------ test/setup/versions.tf | 2 +- 34 files changed, 40 insertions(+), 38 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index a1211b0b..f5df34f8 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -15,6 +15,7 @@ --- driver: name: terraform + verify_version: false provisioner: name: terraform diff --git a/autogen/versions.tf b/autogen/versions.tf index 37b48316..51105dc4 100644 --- a/autogen/versions.tf +++ b/autogen/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 2.7, <4.0" google-beta = ">= 2.7, <4.0" diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 5008c963..2c89704c 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -246,4 +246,4 @@ tags: - 'integration' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0' diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml index bd8cdc27..cb7d925f 100644 --- a/build/lint.cloudbuild.yaml +++ b/build/lint.cloudbuild.yaml @@ -21,4 +21,4 @@ tags: - 'lint' substitutions: _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools' - _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0' + _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0' diff --git a/examples/compute_instance/simple/versions.tf b/examples/compute_instance/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/compute_instance/simple/versions.tf +++ b/examples/compute_instance/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/instance_template/additional_disks/versions.tf b/examples/instance_template/additional_disks/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/instance_template/additional_disks/versions.tf +++ b/examples/instance_template/additional_disks/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/instance_template/simple/versions.tf b/examples/instance_template/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/instance_template/simple/versions.tf +++ b/examples/instance_template/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/mig/autoscaler/versions.tf b/examples/mig/autoscaler/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/mig/autoscaler/versions.tf +++ b/examples/mig/autoscaler/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/mig/full/versions.tf b/examples/mig/full/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/mig/full/versions.tf +++ b/examples/mig/full/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/mig/simple/versions.tf b/examples/mig/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/mig/simple/versions.tf +++ b/examples/mig/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/mig_with_percent/simple/versions.tf b/examples/mig_with_percent/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/mig_with_percent/simple/versions.tf +++ b/examples/mig_with_percent/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/preemptible_and_regular_instance_templates/simple/versions.tf b/examples/preemptible_and_regular_instance_templates/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/preemptible_and_regular_instance_templates/simple/versions.tf +++ b/examples/preemptible_and_regular_instance_templates/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/umig/full/versions.tf b/examples/umig/full/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/umig/full/versions.tf +++ b/examples/umig/full/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/umig/named_ports/versions.tf b/examples/umig/named_ports/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/umig/named_ports/versions.tf +++ b/examples/umig/named_ports/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/umig/simple/versions.tf b/examples/umig/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/umig/simple/versions.tf +++ b/examples/umig/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/examples/umig/static_ips/versions.tf b/examples/umig/static_ips/versions.tf index 1a9363a3..420dddda 100644 --- a/examples/umig/static_ips/versions.tf +++ b/examples/umig/static_ips/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/modules/compute_instance/versions.tf b/modules/compute_instance/versions.tf index fb32dd3f..26140833 100644 --- a/modules/compute_instance/versions.tf +++ b/modules/compute_instance/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 2.7, <4.0" } diff --git a/modules/instance_template/versions.tf b/modules/instance_template/versions.tf index fb32dd3f..26140833 100644 --- a/modules/instance_template/versions.tf +++ b/modules/instance_template/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 2.7, <4.0" } diff --git a/modules/mig/versions.tf b/modules/mig/versions.tf index 37b48316..51105dc4 100644 --- a/modules/mig/versions.tf +++ b/modules/mig/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 2.7, <4.0" google-beta = ">= 2.7, <4.0" diff --git a/modules/mig_with_percent/versions.tf b/modules/mig_with_percent/versions.tf index 37b48316..51105dc4 100644 --- a/modules/mig_with_percent/versions.tf +++ b/modules/mig_with_percent/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 2.7, <4.0" google-beta = ">= 2.7, <4.0" diff --git a/modules/preemptible_and_regular_instance_templates/versions.tf b/modules/preemptible_and_regular_instance_templates/versions.tf index 1a9363a3..420dddda 100644 --- a/modules/preemptible_and_regular_instance_templates/versions.tf +++ b/modules/preemptible_and_regular_instance_templates/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/modules/umig/versions.tf b/modules/umig/versions.tf index fb32dd3f..26140833 100644 --- a/modules/umig/versions.tf +++ b/modules/umig/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 2.7, <4.0" } diff --git a/test/fixtures/compute_instance/simple/versions.tf b/test/fixtures/compute_instance/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/compute_instance/simple/versions.tf +++ b/test/fixtures/compute_instance/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/instance_template/additional_disks/versions.tf b/test/fixtures/instance_template/additional_disks/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/instance_template/additional_disks/versions.tf +++ b/test/fixtures/instance_template/additional_disks/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/instance_template/simple/versions.tf b/test/fixtures/instance_template/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/instance_template/simple/versions.tf +++ b/test/fixtures/instance_template/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/mig/autoscaler/versions.tf b/test/fixtures/mig/autoscaler/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/mig/autoscaler/versions.tf +++ b/test/fixtures/mig/autoscaler/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/mig/simple/versions.tf b/test/fixtures/mig/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/mig/simple/versions.tf +++ b/test/fixtures/mig/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/mig_with_percent/simple/versions.tf b/test/fixtures/mig_with_percent/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/mig_with_percent/simple/versions.tf +++ b/test/fixtures/mig_with_percent/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/preemptible_and_regular_instance_templates/simple/versions.tf b/test/fixtures/preemptible_and_regular_instance_templates/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/preemptible_and_regular_instance_templates/simple/versions.tf +++ b/test/fixtures/preemptible_and_regular_instance_templates/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/umig/named_ports/versions.tf b/test/fixtures/umig/named_ports/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/umig/named_ports/versions.tf +++ b/test/fixtures/umig/named_ports/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/umig/simple/versions.tf b/test/fixtures/umig/simple/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/umig/simple/versions.tf +++ b/test/fixtures/umig/simple/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/fixtures/umig/static_ips/versions.tf b/test/fixtures/umig/static_ips/versions.tf index 1a9363a3..420dddda 100644 --- a/test/fixtures/umig/static_ips/versions.tf +++ b/test/fixtures/umig/static_ips/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" } diff --git a/test/setup/main.tf b/test/setup/main.tf index d37930ee..b70d1122 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -32,13 +32,14 @@ provider "random" { module "project_ci_vm" { source = "terraform-google-modules/project-factory/google" - version = "~> 7.0" + version = "~> 9.0" - name = "ci-vm-module" - random_project_id = true - org_id = var.org_id - folder_id = var.folder_id - billing_account = var.billing_account + name = "ci-vm-module" + random_project_id = true + org_id = var.org_id + folder_id = var.folder_id + billing_account = var.billing_account + skip_gcloud_download = true activate_apis = [ "cloudresourcemanager.googleapis.com", diff --git a/test/setup/versions.tf b/test/setup/versions.tf index 27ba8fc1..eb533263 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" }