From dd96aa595090bbd02f6b38fc682ea3de74aca531 Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Sun, 9 Aug 2020 21:17:15 -0500 Subject: [PATCH] fix: relax version to allow 0.13 (#621) --- autogen/main/versions.tf.tmpl | 2 +- autogen/safer-cluster/versions.tf.tmpl | 2 +- examples/safer_cluster/versions.tf | 2 +- examples/simple_regional_beta/versions.tf | 2 +- examples/simple_regional_private_beta/versions.tf | 2 +- examples/simple_zonal_with_asm/versions.tf | 2 +- examples/stub_domains_upstream_nameservers/versions.tf | 2 +- examples/upstream_nameservers/versions.tf | 2 +- examples/workload_metadata_config/versions.tf | 2 +- modules/beta-private-cluster-update-variant/versions.tf | 2 +- modules/beta-private-cluster/versions.tf | 2 +- modules/beta-public-cluster-update-variant/versions.tf | 2 +- modules/beta-public-cluster/versions.tf | 2 +- modules/private-cluster-update-variant/versions.tf | 2 +- modules/private-cluster/versions.tf | 2 +- modules/safer-cluster-update-variant/versions.tf | 2 +- modules/safer-cluster/versions.tf | 2 +- test/fixtures/stub_domains_upstream_nameservers/versions.tf | 2 +- test/fixtures/upstream_nameservers/versions.tf | 2 +- test/fixtures/workload_metadata_config/versions.tf | 2 +- test/integration/simple_zonal_with_asm/controls/gcloud.rb | 2 +- test/setup/versions.tf | 2 +- versions.tf | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl index 2616a7006..aeab7ae54 100644 --- a/autogen/main/versions.tf.tmpl +++ b/autogen/main/versions.tf.tmpl @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { {% if beta_cluster %} diff --git a/autogen/safer-cluster/versions.tf.tmpl b/autogen/safer-cluster/versions.tf.tmpl index fcd99b883..01db961ca 100644 --- a/autogen/safer-cluster/versions.tf.tmpl +++ b/autogen/safer-cluster/versions.tf.tmpl @@ -17,5 +17,5 @@ {{ autogeneration_note }} terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/examples/safer_cluster/versions.tf b/examples/safer_cluster/versions.tf index 832ec1df3..aac81c269 100644 --- a/examples/safer_cluster/versions.tf +++ b/examples/safer_cluster/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/examples/simple_regional_beta/versions.tf b/examples/simple_regional_beta/versions.tf index 832ec1df3..aac81c269 100644 --- a/examples/simple_regional_beta/versions.tf +++ b/examples/simple_regional_beta/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/examples/simple_regional_private_beta/versions.tf b/examples/simple_regional_private_beta/versions.tf index 832ec1df3..aac81c269 100644 --- a/examples/simple_regional_private_beta/versions.tf +++ b/examples/simple_regional_private_beta/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/examples/simple_zonal_with_asm/versions.tf b/examples/simple_zonal_with_asm/versions.tf index 832ec1df3..aac81c269 100644 --- a/examples/simple_zonal_with_asm/versions.tf +++ b/examples/simple_zonal_with_asm/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/examples/stub_domains_upstream_nameservers/versions.tf b/examples/stub_domains_upstream_nameservers/versions.tf index 832ec1df3..aac81c269 100644 --- a/examples/stub_domains_upstream_nameservers/versions.tf +++ b/examples/stub_domains_upstream_nameservers/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/examples/upstream_nameservers/versions.tf b/examples/upstream_nameservers/versions.tf index 832ec1df3..aac81c269 100644 --- a/examples/upstream_nameservers/versions.tf +++ b/examples/upstream_nameservers/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/examples/workload_metadata_config/versions.tf b/examples/workload_metadata_config/versions.tf index 832ec1df3..aac81c269 100644 --- a/examples/workload_metadata_config/versions.tf +++ b/examples/workload_metadata_config/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf index 83be3ce1f..a8d571865 100644 --- a/modules/beta-private-cluster-update-variant/versions.tf +++ b/modules/beta-private-cluster-update-variant/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google-beta = ">= 3.29.0, <4.0.0" diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf index 83be3ce1f..a8d571865 100644 --- a/modules/beta-private-cluster/versions.tf +++ b/modules/beta-private-cluster/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google-beta = ">= 3.29.0, <4.0.0" diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf index 83be3ce1f..a8d571865 100644 --- a/modules/beta-public-cluster-update-variant/versions.tf +++ b/modules/beta-public-cluster-update-variant/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google-beta = ">= 3.29.0, <4.0.0" diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf index 83be3ce1f..a8d571865 100644 --- a/modules/beta-public-cluster/versions.tf +++ b/modules/beta-public-cluster/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google-beta = ">= 3.29.0, <4.0.0" diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf index 7b6c516d4..ed96650ec 100644 --- a/modules/private-cluster-update-variant/versions.tf +++ b/modules/private-cluster-update-variant/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 3.16, <4.0.0" diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf index 7b6c516d4..ed96650ec 100644 --- a/modules/private-cluster/versions.tf +++ b/modules/private-cluster/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 3.16, <4.0.0" diff --git a/modules/safer-cluster-update-variant/versions.tf b/modules/safer-cluster-update-variant/versions.tf index 30c80d1bb..2b411e951 100644 --- a/modules/safer-cluster-update-variant/versions.tf +++ b/modules/safer-cluster-update-variant/versions.tf @@ -17,5 +17,5 @@ // This file was automatically generated from a template in ./autogen/safer-cluster terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/modules/safer-cluster/versions.tf b/modules/safer-cluster/versions.tf index 30c80d1bb..2b411e951 100644 --- a/modules/safer-cluster/versions.tf +++ b/modules/safer-cluster/versions.tf @@ -17,5 +17,5 @@ // This file was automatically generated from a template in ./autogen/safer-cluster terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/test/fixtures/stub_domains_upstream_nameservers/versions.tf b/test/fixtures/stub_domains_upstream_nameservers/versions.tf index 832ec1df3..aac81c269 100644 --- a/test/fixtures/stub_domains_upstream_nameservers/versions.tf +++ b/test/fixtures/stub_domains_upstream_nameservers/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/test/fixtures/upstream_nameservers/versions.tf b/test/fixtures/upstream_nameservers/versions.tf index 832ec1df3..aac81c269 100644 --- a/test/fixtures/upstream_nameservers/versions.tf +++ b/test/fixtures/upstream_nameservers/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/test/fixtures/workload_metadata_config/versions.tf b/test/fixtures/workload_metadata_config/versions.tf index 832ec1df3..aac81c269 100644 --- a/test/fixtures/workload_metadata_config/versions.tf +++ b/test/fixtures/workload_metadata_config/versions.tf @@ -15,5 +15,5 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } diff --git a/test/integration/simple_zonal_with_asm/controls/gcloud.rb b/test/integration/simple_zonal_with_asm/controls/gcloud.rb index 1b97dfe68..3478bf379 100644 --- a/test/integration/simple_zonal_with_asm/controls/gcloud.rb +++ b/test/integration/simple_zonal_with_asm/controls/gcloud.rb @@ -40,7 +40,7 @@ end end - describe command("gcloud container hub memberships describe gke-asm-membership --format=json") do + describe command("gcloud container hub memberships describe gke-asm-membership --project=#{project_id} --format=json") do its(:exit_status) { should eq 0 } its(:stderr) { should eq '' } diff --git a/test/setup/versions.tf b/test/setup/versions.tf index 9f1de41ea..4f8f9a028 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = ">= 0.12" + required_version = ">=0.12, <0.14" } provider "google" { diff --git a/versions.tf b/versions.tf index 7b6c516d4..ed96650ec 100644 --- a/versions.tf +++ b/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = "~> 0.12.6" + required_version = ">=0.12.6, <0.14" required_providers { google = ">= 3.16, <4.0.0"