Migrate examples to google-beta provider

Author: Jberlinsky

auth.tf

@@ -17,7 +17,9 @@
 /******************************************
   Retrieve authentication token
  *****************************************/
-data "google_client_config" "default" {}
+data "google_client_config" "default" {
+  provider = "google-beta"
+}
 
 /******************************************
   Configure provider

cluster_regional.tf

@@ -18,6 +18,7 @@
   Create regional cluster
  *****************************************/
 resource "google_container_cluster" "primary" {
+  provider    = "google-beta"
   count       = "${var.regional ? 1 : 0}"
   name        = "${var.name}"
   description = "${var.description}"
@@ -87,6 +88,7 @@ resource "google_container_cluster" "primary" {
   Create regional node pools
  *****************************************/
 resource "google_container_node_pool" "pools" {
+  provider           = "google-beta"
   count              = "${var.regional ? length(var.node_pools) : 0}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"

cluster_zonal.tf

@@ -18,6 +18,7 @@
   Create zonal cluster
  *****************************************/
 resource "google_container_cluster" "zonal_primary" {
+  provider    = "google-beta"
   count       = "${var.regional ? 0 : 1}"
   name        = "${var.name}"
   description = "${var.description}"
@@ -87,6 +88,7 @@ resource "google_container_cluster" "zonal_primary" {
   Create zonal node pools
  *****************************************/
 resource "google_container_node_pool" "zonal_pools" {
+  provider           = "google-beta"
   count              = "${var.regional ? 0 : length(var.node_pools)}"
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"

examples/deploy_service/main.tf

@@ -18,7 +18,7 @@ locals {
   cluster_type = "deploy-service"
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

examples/node_pool/main.tf

@@ -18,7 +18,7 @@ locals {
   cluster_type = "node-pool"
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

examples/shared_vpc/main.tf

@@ -18,7 +18,7 @@ locals {
   cluster_type = "shared-vpc"
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

examples/simple_regional/main.tf

@@ -18,7 +18,7 @@ locals {
   cluster_type = "simple-regional"
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

examples/simple_zonal/main.tf

@@ -18,7 +18,7 @@ locals {
   cluster_type = "simple-zonal"
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

examples/stub_domains/main.tf

@@ -18,7 +18,7 @@ locals {
   cluster_type = "stub-domains"
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(var.credentials_path)}"
   region      = "${var.region}"
 }

main.tf

@@ -18,8 +18,9 @@
   Get available zones in region
  *****************************************/
 data "google_compute_zones" "available" {
-  project = "${var.project_id}"
-  region  = "${var.region}"
+  provider = "google-beta"
+  project  = "${var.project_id}"
+  region   = "${var.region}"
 }
 
 resource "random_shuffle" "available_zones" {
@@ -146,6 +147,7 @@ locals {
   Get available container engine versions
  *****************************************/
 data "google_container_engine_versions" "region" {
-  zone    = "${data.google_compute_zones.available.names[0]}"
-  project = "${var.project_id}"
+  provider = "google-beta"
+  zone     = "${data.google_compute_zones.available.names[0]}"
+  project  = "${var.project_id}"
 }

networks.tf

@@ -15,12 +15,14 @@
  */
 
 data "google_compute_network" "gke_network" {
-  name    = "${var.network}"
-  project = "${local.network_project_id}"
+  provider = "google-beta"
+  name     = "${var.network}"
+  project  = "${local.network_project_id}"
 }
 
 data "google_compute_subnetwork" "gke_subnetwork" {
-  name    = "${var.subnetwork}"
-  region  = "${var.region}"
-  project = "${local.network_project_id}"
+  provider = "google-beta"
+  name     = "${var.subnetwork}"
+  region   = "${var.region}"
+  project  = "${local.network_project_id}"
 }

test/fixtures/deploy_service/network.tf

@@ -24,17 +24,19 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(local.credentials_path)}"
   project     = "${var.project_id}"
 }
 
 resource "google_compute_network" "main" {
+  provider                = "google-beta"
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = "false"
 }
 
 resource "google_compute_subnetwork" "main" {
+  provider      = "google-beta"
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = "${var.region}"

test/fixtures/node_pool/network.tf

@@ -24,17 +24,19 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(local.credentials_path)}"
   project     = "${var.project_id}"
 }
 
 resource "google_compute_network" "main" {
+  provider                = "google-beta"
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = "false"
 }
 
 resource "google_compute_subnetwork" "main" {
+  provider      = "google-beta"
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = "${var.region}"

test/fixtures/shared_vpc/network.tf

@@ -24,17 +24,19 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(local.credentials_path)}"
   project     = "${var.project_id}"
 }
 
 resource "google_compute_network" "main" {
+  provider                = "google-beta"
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = "false"
 }
 
 resource "google_compute_subnetwork" "main" {
+  provider      = "google-beta"
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = "${var.region}"

test/fixtures/simple_regional/network.tf

@@ -24,17 +24,19 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(local.credentials_path)}"
   project     = "${var.project_id}"
 }
 
 resource "google_compute_network" "main" {
+  provider                = "google-beta"
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = "false"
 }
 
 resource "google_compute_subnetwork" "main" {
+  provider      = "google-beta"
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = "${var.region}"

test/fixtures/simple_zonal/network.tf

@@ -24,17 +24,19 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(local.credentials_path)}"
   project     = "${var.project_id}"
 }
 
 resource "google_compute_network" "main" {
+  provider                = "google-beta"
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = "false"
 }
 
 resource "google_compute_subnetwork" "main" {
+  provider      = "google-beta"
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = "${var.region}"

test/fixtures/stub_domains/network.tf

@@ -24,17 +24,19 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
-provider "google" {
+provider "google-beta" {
   credentials = "${file(local.credentials_path)}"
   project     = "${var.project_id}"
 }
 
 resource "google_compute_network" "main" {
+  provider                = "google-beta"
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = "false"
 }
 
 resource "google_compute_subnetwork" "main" {
+  provider      = "google-beta"
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = "${var.region}"