fix: relax version to allow 0.13 (#621)

bharathkkb · web-flow · commit dd96aa595090 · 2020-08-09T22:17:15.000-04:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`{{ autogeneration_note }}`
`18`	`18`
`19`	`19`	`terraform {`
`20`		`- required_version = ">= 0.12"`
	`20`	`+ required_version = ">=0.12, <0.14"`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`terraform {`
`18`		`- required_version = ">= 0.12"`
	`18`	`+ required_version = ">=0.12, <0.14"`
`19`	`19`	`}`