From ce6fe1f8b47e6bae1fc2effb65c25558cc28fc14 Mon Sep 17 00:00:00 2001
From: Bohdan Yurov <bohdan.yurov@globallogic.com>
Date: Thu, 24 Oct 2019 19:15:32 +0200
Subject: [PATCH] Fixes #261: Invalid plan when re-applying terraform module
 https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/issues/261

Bumbed minimal provider version to 2.18
---
 autogen/versions.tf                                     | 8 ++++++++
 examples/deploy_service/main.tf                         | 2 +-
 examples/disable_client_cert/main.tf                    | 2 +-
 examples/node_pool/main.tf                              | 2 +-
 examples/node_pool_update_variant/main.tf               | 2 +-
 examples/node_pool_update_variant_beta/main.tf          | 2 +-
 examples/shared_vpc/main.tf                             | 2 +-
 examples/simple_regional/main.tf                        | 2 +-
 examples/simple_regional_beta/main.tf                   | 2 +-
 examples/simple_regional_private/main.tf                | 2 +-
 examples/simple_regional_private_beta/main.tf           | 2 +-
 examples/simple_zonal/main.tf                           | 2 +-
 examples/simple_zonal_private/main.tf                   | 2 +-
 examples/stub_domains/main.tf                           | 2 +-
 examples/stub_domains_private/main.tf                   | 6 +-----
 examples/stub_domains_upstream_nameservers/main.tf      | 2 +-
 examples/upstream_nameservers/main.tf                   | 2 +-
 examples/workload_metadata_config/main.tf               | 2 +-
 modules/beta-private-cluster-update-variant/versions.tf | 4 ++++
 modules/beta-private-cluster/versions.tf                | 4 ++++
 modules/beta-public-cluster/versions.tf                 | 4 ++++
 modules/private-cluster-update-variant/versions.tf      | 4 ++++
 modules/private-cluster/versions.tf                     | 4 ++++
 test/setup/versions.tf                                  | 4 ++--
 versions.tf                                             | 4 ++++
 25 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/autogen/versions.tf b/autogen/versions.tf
index 832ec1df39..387a2e37c8 100644
--- a/autogen/versions.tf
+++ b/autogen/versions.tf
@@ -16,4 +16,12 @@
 
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+{% if beta_cluster %}
+    google-beta = "~> 2.18.0"
+{% else %}
+    google = "~> 2.18.0"
+{% endif %}
+  }
 }
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
index 3e15164913..a61aa9c9b8 100644
--- a/examples/deploy_service/main.tf
+++ b/examples/deploy_service/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/disable_client_cert/main.tf b/examples/disable_client_cert/main.tf
index 221eb994ce..4d040ffcb7 100644
--- a/examples/disable_client_cert/main.tf
+++ b/examples/disable_client_cert/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
index 6662bb84ac..c7a7f852ae 100644
--- a/examples/node_pool/main.tf
+++ b/examples/node_pool/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf
index c10e797511..9b29a5f0fe 100644
--- a/examples/node_pool_update_variant/main.tf
+++ b/examples/node_pool_update_variant/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf
index 373fd59f30..37b595f793 100644
--- a/examples/node_pool_update_variant_beta/main.tf
+++ b/examples/node_pool_update_variant_beta/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 2.12.0"
+  version     = "~> 2.18.0"
   credentials = file(var.credentials_path)
   region      = var.region
 }
diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
index 766239ead8..3533130a4e 100644
--- a/examples/shared_vpc/main.tf
+++ b/examples/shared_vpc/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
index 4662435fbd..76046ff888 100644
--- a/examples/simple_regional/main.tf
+++ b/examples/simple_regional/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
index fc95090ede..ad1b6257d6 100644
--- a/examples/simple_regional_beta/main.tf
+++ b/examples/simple_regional_beta/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 2.12.0"
+  version     = "~> 2.18.0"
   credentials = file(var.credentials_path)
   region      = var.region
 }
diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
index 89568e86ee..f17a3728a6 100644
--- a/examples/simple_regional_private/main.tf
+++ b/examples/simple_regional_private/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/simple_regional_private_beta/main.tf b/examples/simple_regional_private_beta/main.tf
index 0ca1873d86..e5f289123e 100644
--- a/examples/simple_regional_private_beta/main.tf
+++ b/examples/simple_regional_private_beta/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 2.12.0"
+  version     = "~> 2.18.0"
   credentials = file(var.credentials_path)
   region      = var.region
 }
diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf
index edd90f7a0d..3490252a4a 100644
--- a/examples/simple_zonal/main.tf
+++ b/examples/simple_zonal/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
index 428218d76a..7a3db12157 100644
--- a/examples/simple_zonal_private/main.tf
+++ b/examples/simple_zonal_private/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
index 37264f781b..b81dc0cf8c 100644
--- a/examples/stub_domains/main.tf
+++ b/examples/stub_domains/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/stub_domains_private/main.tf b/examples/stub_domains_private/main.tf
index 65bc48247d..3f268e75a4 100644
--- a/examples/stub_domains_private/main.tf
+++ b/examples/stub_domains_private/main.tf
@@ -15,14 +15,10 @@
  */
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.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
index 0da83b95c6..4b7448b7e8 100644
--- a/examples/stub_domains_upstream_nameservers/main.tf
+++ b/examples/stub_domains_upstream_nameservers/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/upstream_nameservers/main.tf b/examples/upstream_nameservers/main.tf
index ecded7c29c..784e8a0cd3 100644
--- a/examples/upstream_nameservers/main.tf
+++ b/examples/upstream_nameservers/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/examples/workload_metadata_config/main.tf b/examples/workload_metadata_config/main.tf
index f9fb25da5b..3d2254c2da 100644
--- a/examples/workload_metadata_config/main.tf
+++ b/examples/workload_metadata_config/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version = "~> 2.12.0"
+  version = "~> 2.18.0"
   region  = var.region
 }
 
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
index 832ec1df39..8e29303fa9 100644
--- a/modules/beta-private-cluster-update-variant/versions.tf
+++ b/modules/beta-private-cluster-update-variant/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+    google-beta = "~> 2.18.0"
+  }
 }
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
index 832ec1df39..8e29303fa9 100644
--- a/modules/beta-private-cluster/versions.tf
+++ b/modules/beta-private-cluster/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+    google-beta = "~> 2.18.0"
+  }
 }
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
index 832ec1df39..8e29303fa9 100644
--- a/modules/beta-public-cluster/versions.tf
+++ b/modules/beta-public-cluster/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+    google-beta = "~> 2.18.0"
+  }
 }
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
index 832ec1df39..e4544656fa 100644
--- a/modules/private-cluster-update-variant/versions.tf
+++ b/modules/private-cluster-update-variant/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+    google = "~> 2.18.0"
+  }
 }
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
index 832ec1df39..e4544656fa 100644
--- a/modules/private-cluster/versions.tf
+++ b/modules/private-cluster/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+    google = "~> 2.18.0"
+  }
 }
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
index efbd8ea517..51f6a433b0 100644
--- a/test/setup/versions.tf
+++ b/test/setup/versions.tf
@@ -19,9 +19,9 @@ terraform {
 }
 
 provider "google" {
-  version = "~> 2.13.0"
+  version = "~> 2.18.0"
 }
 
 provider "google-beta" {
-  version = "~> 2.13.0"
+  version = "~> 2.18.0"
 }
diff --git a/versions.tf b/versions.tf
index 832ec1df39..e4544656fa 100644
--- a/versions.tf
+++ b/versions.tf
@@ -16,4 +16,8 @@
 
 terraform {
   required_version = ">= 0.12"
+
+  required_providers {
+    google = "~> 2.18.0"
+  }
 }