Fixes #261: Invalid plan when re-applying terraform module

bohdanyurov-gl · bohdanyurov-gl · commit 44263e9117aa · 2019-10-28T16:08:13.000+02:00
#261 Bumbed minimal provider version to 2.18
diff --git a/autogen/versions.tf b/autogen/versions.tf
@@ -17,3 +17,13 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+{% if beta_cluster %}
+provider "google-beta" {
+  version = "~> 2.17.0"
+}
+{% else %}
+provider "google" {
+  version = "~> 2.17.0"
+}
+{% endif %}
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf
@@ -15,14 +15,9 @@
  */
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
-provider "random" {
-  version = "~> 2.1"
-}
-
 data "google_compute_subnetwork" "subnetwork" {
   name    = var.subnetwork
   project = var.project_id
diff --git a/examples/stub_domains_upstream_nameservers/main.tf b/examples/stub_domains_upstream_nameservers/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf
@@ -19,7 +19,6 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
   region  = var.region
 }
 
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -17,3 +17,7 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+provider "google-beta" {
+  version = "~> 2.17.0"
+}
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -17,3 +17,7 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+provider "google-beta" {
+  version = "~> 2.17.0"
+}
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -17,3 +17,7 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+provider "google-beta" {
+  version = "~> 2.17.0"
+}
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
@@ -17,3 +17,7 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+provider "google" {
+  version = "~> 2.17.0"
+}
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -17,3 +17,7 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+provider "google" {
+  version = "~> 2.17.0"
+}
diff --git a/versions.tf b/versions.tf
@@ -17,3 +17,7 @@
 terraform {
   required_version = ">= 0.12"
 }
+
+provider "google" {
+  version = "~> 2.17.0"
+}

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google" {`
`22`		`- version = "~> 2.12.0"`
`23`	`22`	`region = var.region`
`24`	`23`	`}`
`25`	`24`
Original file line number	Diff line number	Diff line change
`@@ -17,3 +17,7 @@`
`17`	`17`	`terraform {`
`18`	`18`	`required_version = ">= 0.12"`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+provider "google-beta" {`
	`22`	`+ version = "~> 2.17.0"`
	`23`	`+}`