Merge pull request #106 from thefirstofthe300/ds/google-provider-2.0

aaron-lane · web-flow · commit b4aec9b3e079 · 2019-03-22T17:55:50.000-04:00
Update support of google and google-beta providers to v2.0
diff --git a/autogen/cluster_regional.tf b/autogen/cluster_regional.tf
@@ -98,7 +98,7 @@ resource "google_container_cluster" "primary" {
   Create regional node pools
  *****************************************/
 resource "google_container_node_pool" "pools" {
-  provider           = "{% if private_cluster %}google-beta{%else %}google{% endif %}"
+  provider           = "google-beta"
   count              = "${var.regional ? length(var.node_pools) : 0}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
diff --git a/autogen/cluster_zonal.tf b/autogen/cluster_zonal.tf
@@ -98,7 +98,7 @@ resource "google_container_cluster" "zonal_primary" {
   Create zonal node pools
  *****************************************/
 resource "google_container_node_pool" "zonal_pools" {
-  provider           = "{% if private_cluster %}google-beta{%else %}google{% endif %}"
+  provider           = "google-beta"
   count              = "${var.regional ? 0 : length(var.node_pools)}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -91,7 +91,7 @@ resource "google_container_cluster" "primary" {
   Create regional node pools
  *****************************************/
 resource "google_container_node_pool" "pools" {
-  provider           = "google"
+  provider           = "google-beta"
   count              = "${var.regional ? length(var.node_pools) : 0}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -91,7 +91,7 @@ resource "google_container_cluster" "zonal_primary" {
   Create zonal node pools
  *****************************************/
 resource "google_container_node_pool" "zonal_pools" {
-  provider           = "google"
+  provider           = "google-beta"
   count              = "${var.regional ? 0 : length(var.node_pools)}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
diff --git a/examples/deploy_service/main.tf b/examples/deploy_service/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
-  version     = "~> 1.20"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
diff --git a/examples/shared_vpc/main.tf b/examples/shared_vpc/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
diff --git a/examples/simple_regional/main.tf b/examples/simple_regional/main.tf
@@ -19,11 +19,13 @@ locals {
 }
 
 provider "google" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
diff --git a/examples/simple_zonal/main.tf b/examples/simple_zonal/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
diff --git a/examples/simple_zonal_private/main.tf b/examples/simple_zonal_private/main.tf
@@ -19,7 +19,7 @@ locals {
 }
 
 provider "google-beta" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
diff --git a/examples/stub_domains/main.tf b/examples/stub_domains/main.tf
@@ -19,12 +19,13 @@ locals {
 }
 
 provider "google" {
-  version     = "~> 1.20"
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }
 
 provider "google-beta" {
+  version     = "~> 2.2"
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,13 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google" {`
	`22`	`+ version = "~> 2.2"`
`22`	`23`	`credentials = "${file(var.credentials_path)}"`
`23`	`24`	`region = "${var.region}"`
`24`		`- version = "~> 1.20"`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`provider "google-beta" {`
	`28`	`+ version = "~> 2.2"`
`28`	`29`	`credentials = "${file(var.credentials_path)}"`
`29`	`30`	`region = "${var.region}"`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,13 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google" {`
	`22`	`+ version = "~> 2.2"`
`22`	`23`	`credentials = "${file(var.credentials_path)}"`
`23`	`24`	`region = "${var.region}"`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`provider "google-beta" {`
	`28`	`+ version = "~> 2.2"`
`27`	`29`	`credentials = "${file(var.credentials_path)}"`
`28`	`30`	`region = "${var.region}"`
`29`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ locals {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`provider "google-beta" {`
`22`		`- version = "~> 1.20"`
	`22`	`+ version = "~> 2.2"`
`23`	`23`	`credentials = "${file(var.credentials_path)}"`
`24`	`24`	`region = "${var.region}"`
`25`	`25`	`}`