Update beta_cluster project configuration

Author: Aaron Lane

test/fixtures/beta_cluster/main.tf

@@ -14,26 +14,15 @@
  * limitations under the License.
  */
 
-
-provider "google" {
-  version = "~> 2.18.0"
-  project = var.project_id
-  region  = var.region
-}
-
-provider "google-beta" {
-  version = "~> 2.18.0"
-  project = var.project_id
-  region  = var.region
-}
-
 locals {
-  name = "beta-cluster-${random_string.suffix.result}"
+  name       = "beta-cluster-${random_string.suffix.result}"
+  project_id = var.project_ids[0]
 }
 
 resource "google_kms_key_ring" "db" {
   location = var.region
   name     = "${local.name}-db"
+  project  = local.project_id
 }
 
 resource "google_kms_crypto_key" "db" {
@@ -45,7 +34,7 @@ module "this" {
   source = "../../../examples/simple_regional_beta"
 
   cluster_name_suffix            = "-${random_string.suffix.result}"
-  project_id                     = var.project_id
+  project_id                     = local.project_id
   regional                       = false
   region                         = var.region
   zones                          = slice(var.zones, 0, 1)

test/fixtures/beta_cluster/network.tf

@@ -23,13 +23,15 @@ resource "random_string" "suffix" {
 resource "google_compute_network" "main" {
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = false
+  project                 = local.project_id
 }
 
 resource "google_compute_subnetwork" "main" {
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = var.region
   network       = google_compute_network.main.self_link
+  project       = local.project_id
 
   secondary_ip_range {
     range_name    = "cft-gke-test-pods-${random_string.suffix.result}"
@@ -41,4 +43,3 @@ resource "google_compute_subnetwork" "main" {
     ip_cidr_range = "192.168.64.0/18"
   }
 }
-

test/fixtures/beta_cluster/outputs.tf

@@ -15,7 +15,7 @@
  */
 
 output "project_id" {
-  value = var.project_id
+  value = local.project_id
 }
 
 output "region" {

test/setup/iam.tf

@@ -75,10 +75,10 @@ resource "google_service_account_key" "int_test" {
 }
 
 resource "google_project_iam_binding" "kubernetes_engine_kms_access" {
-  project = module.gke-project.project_id
+  project = module.gke-project-1.project_id
   role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
 
   members = [
-    "serviceAccount:service-${module.gke-project.project_number}@container-engine-robot.iam.gserviceaccount.com",
+    "serviceAccount:service-${module.gke-project-1.project_number}@container-engine-robot.iam.gserviceaccount.com",
   ]
 }