update int test to split between two projects

bharathkkb · bharathkkb · commit b06c42541ca2 · 2019-11-25T23:10:50.000-06:00
diff --git a/examples/safer_cluster/README.md b/examples/safer_cluster/README.md
@@ -22,6 +22,7 @@ This example illustrates how to instantiate the opinionated Safer Cluster module
 | location |  |
 | master\_kubernetes\_version | Kubernetes version of the master |
 | network\_name | The name of the VPC being created |
+| project\_id | The project ID the cluster is in |
 | region | The region in which the cluster resides |
 | service\_account | The service account to default running nodes as if not overridden in `node_pools`. |
 | subnet\_names | The names of the subnet being created |
diff --git a/examples/safer_cluster/outputs.tf b/examples/safer_cluster/outputs.tf
@@ -69,3 +69,8 @@ output "zones" {
   description = "List of zones in which the cluster resides"
   value       = module.gke.zones
 }
+
+output "project_id" {
+  description = "The project ID the cluster is in"
+  value       = var.project_id
+}
diff --git a/test/fixtures/deploy_service/example.tf b/test/fixtures/deploy_service/example.tf
@@ -17,13 +17,13 @@
 module "example" {
   source = "../../../examples/deploy_service"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[0]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   network                        = google_compute_network.main.name
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[0]
 }
 
diff --git a/test/fixtures/deploy_service/network.tf b/test/fixtures/deploy_service/network.tf
@@ -21,7 +21,7 @@ resource "random_string" "suffix" {
 }
 
 provider "google" {
-  project = var.project_id
+  project = var.project_ids[0]
 }
 
 resource "google_compute_network" "main" {
diff --git a/test/fixtures/disable_client_cert/example.tf b/test/fixtures/disable_client_cert/example.tf
@@ -17,14 +17,14 @@
 module "example" {
   source = "../../../examples/disable_client_cert"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[0]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   network                        = google_compute_network.main.name
-  network_project_id             = var.project_id
+  network_project_id             = var.project_ids[0]
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[0]
 }
 
diff --git a/test/fixtures/disable_client_cert/network.tf b/test/fixtures/disable_client_cert/network.tf
@@ -21,7 +21,7 @@ resource "random_string" "suffix" {
 }
 
 provider "google" {
-  project = var.project_id
+  project = var.project_ids[0]
 }
 
 resource "google_compute_network" "main" {
diff --git a/test/fixtures/node_pool/example.tf b/test/fixtures/node_pool/example.tf
@@ -17,14 +17,14 @@
 module "example" {
   source = "../../../examples/node_pool"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[0]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   zones                          = slice(var.zones, 0, 1)
   network                        = google_compute_network.main.name
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[0]
 }
 
diff --git a/test/fixtures/node_pool/network.tf b/test/fixtures/node_pool/network.tf
@@ -21,7 +21,7 @@ resource "random_string" "suffix" {
 }
 
 provider "google" {
-  project = var.project_id
+  project = var.project_ids[0]
 }
 
 resource "google_compute_network" "main" {
diff --git a/test/fixtures/node_pool_update_variant/example.tf b/test/fixtures/node_pool_update_variant/example.tf
@@ -17,13 +17,13 @@
 module "example" {
   source = "../../../examples/node_pool_update_variant"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[0]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   zones                          = slice(var.zones, 0, 1)
   network                        = google_compute_network.main.name
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[0]
 }
diff --git a/test/fixtures/node_pool_update_variant/network.tf b/test/fixtures/node_pool_update_variant/network.tf
@@ -21,7 +21,7 @@ resource "random_string" "suffix" {
 }
 
 provider "google" {
-  project = var.project_id
+  project = var.project_ids[0]
 }
 
 resource "google_compute_network" "main" {
diff --git a/test/fixtures/private_zonal_with_networking/example.tf b/test/fixtures/private_zonal_with_networking/example.tf
@@ -17,7 +17,7 @@
 module "example" {
   source = "../../../examples/private_zonal_with_networking"
 
-  project_id = var.project_id
+  project_id = var.project_ids[0]
   region     = var.region
   zones      = var.zones
 }
diff --git a/test/fixtures/private_zonal_with_networking/outputs.tf b/test/fixtures/private_zonal_with_networking/outputs.tf
@@ -16,7 +16,7 @@
 
 
 output "project_id" {
-  value = var.project_id
+  value = module.example.project_id
 }
 
 output "location" {
diff --git a/test/fixtures/private_zonal_with_networking/variables.tf b/test/fixtures/private_zonal_with_networking/variables.tf
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-variable "project_id" {
+variable "project_ids" {
+  type        = list(string)
   description = "The project ID to host the cluster in"
 }
 
diff --git a/test/fixtures/safer_cluster/example.tf b/test/fixtures/safer_cluster/example.tf
@@ -17,7 +17,7 @@
 module "example" {
   source = "../../../examples/safer_cluster"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[0]
   region                         = var.region
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[0]
 }
diff --git a/test/fixtures/safer_cluster/outputs.tf b/test/fixtures/safer_cluster/outputs.tf
@@ -15,7 +15,7 @@
  */
 
 output "project_id" {
-  value = var.project_id
+  value = module.example.project_id
 }
 
 output "region" {
diff --git a/test/fixtures/sandbox_enabled/example.tf b/test/fixtures/sandbox_enabled/example.tf
@@ -17,14 +17,14 @@
 module "example" {
   source = "../../../examples/simple_regional_beta"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[0]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   network                        = google_compute_network.main.name
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[0]
   istio                          = false
   cloudrun                       = false
   node_metadata                  = "UNSPECIFIED"
diff --git a/test/fixtures/sandbox_enabled/network.tf b/test/fixtures/sandbox_enabled/network.tf
@@ -21,7 +21,7 @@ resource "random_string" "suffix" {
 }
 
 provider "google" {
-  project = var.project_id
+  project = var.project_ids[0]
 }
 
 resource "google_compute_network" "main" {
diff --git a/test/fixtures/shared/outputs.tf b/test/fixtures/shared/outputs.tf
@@ -15,7 +15,7 @@
  */
 
 output "project_id" {
-  value = var.project_id
+  value = module.example.project_id
 }
 
 output "region" {
diff --git a/test/fixtures/shared/variables.tf b/test/fixtures/shared/variables.tf
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-variable "project_id" {
-  description = "The GCP project to use for integration tests"
+variable "project_ids" {
+  type        = list(string)
+  description = "The GCP projects to use for integration tests"
 }
 
 variable "region" {
@@ -29,8 +30,9 @@ variable "zones" {
   default     = ["us-central1-a", "us-central1-b", "us-central1-c"]
 }
 
-variable "compute_engine_service_account" {
-  description = "The email address of the service account to associate with the GKE cluster"
+variable "compute_engine_service_accounts" {
+  type        = list(string)
+  description = "The email addresses of the service account to associate with the GKE cluster"
 }
 
 variable "registry_project_id" {
diff --git a/test/fixtures/shared_vpc/example.tf b/test/fixtures/shared_vpc/example.tf
@@ -17,14 +17,14 @@
 module "example" {
   source = "../../../examples/shared_vpc"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[0]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   network                        = google_compute_network.main.name
-  network_project_id             = var.project_id
+  network_project_id             = var.project_ids[0]
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[0]
 }
 
diff --git a/test/fixtures/shared_vpc/network.tf b/test/fixtures/shared_vpc/network.tf
@@ -21,7 +21,7 @@ resource "random_string" "suffix" {
 }
 
 provider "google" {
-  project = var.project_id
+  project = var.project_ids[0]
 }
 
 resource "google_compute_network" "main" {
diff --git a/test/fixtures/simple_regional/example.tf b/test/fixtures/simple_regional/example.tf
@@ -17,13 +17,13 @@
 module "example" {
   source = "../../../examples/simple_regional"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[0]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   network                        = google_compute_network.main.name
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[0]
   skip_provisioners              = true
 }
diff --git a/test/fixtures/simple_regional/network.tf b/test/fixtures/simple_regional/network.tf
@@ -21,7 +21,7 @@ resource "random_string" "suffix" {
 }
 
 provider "google" {
-  project = var.project_id
+  project = var.project_ids[0]
 }
 
 resource "google_compute_network" "main" {
diff --git a/test/fixtures/simple_regional_private/example.tf b/test/fixtures/simple_regional_private/example.tf
@@ -17,13 +17,13 @@
 module "example" {
   source = "../../../examples/simple_regional_private"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[1]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   network                        = google_compute_network.main.name
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[1]
 }
 
diff --git a/test/fixtures/simple_regional_private/network.tf b/test/fixtures/simple_regional_private/network.tf
@@ -21,13 +21,13 @@ resource "random_string" "suffix" {
 }
 
 resource "google_compute_network" "main" {
-  project                 = var.project_id
+  project                 = var.project_ids[1]
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "main" {
-  project       = var.project_id
+  project       = var.project_ids[1]
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = var.region
diff --git a/test/fixtures/simple_regional_with_networking/example.tf b/test/fixtures/simple_regional_with_networking/example.tf
@@ -17,6 +17,6 @@
 module "example" {
   source = "../../../examples/simple_regional_with_networking"
 
-  project_id = var.project_id
+  project_id = var.project_ids[1]
   region     = var.region
 }
diff --git a/test/fixtures/simple_regional_with_networking/outputs.tf b/test/fixtures/simple_regional_with_networking/outputs.tf
@@ -16,7 +16,7 @@
 
 
 output "project_id" {
-  value = var.project_id
+  value = module.example.project_id
 }
 
 output "location" {
diff --git a/test/fixtures/simple_regional_with_networking/variables.tf b/test/fixtures/simple_regional_with_networking/variables.tf
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-variable "project_id" {
-  description = "The project ID to host the cluster in"
+variable "project_ids" {
+  type        = list(string)
+  description = "The GCP projects to use for integration tests"
 }
 
 variable "region" {
diff --git a/test/fixtures/simple_zonal/example.tf b/test/fixtures/simple_zonal/example.tf
@@ -17,7 +17,7 @@
 module "example" {
   source = "../../../examples/simple_zonal_with_acm"
 
-  project_id          = var.project_id
+  project_id          = var.project_ids[1]
   cluster_name_suffix = "-${random_string.suffix.result}"
   region              = var.region
   zones               = slice(var.zones, 0, 1)
diff --git a/test/fixtures/simple_zonal/network.tf b/test/fixtures/simple_zonal/network.tf
@@ -21,7 +21,7 @@ resource "random_string" "suffix" {
 }
 
 provider "google" {
-  project = var.project_id
+  project = var.project_ids[1]
 }
 
 resource "google_compute_network" "main" {
diff --git a/test/fixtures/simple_zonal_private/example.tf b/test/fixtures/simple_zonal_private/example.tf
@@ -17,14 +17,14 @@
 module "example" {
   source = "../../../examples/simple_zonal_private"
 
-  project_id                     = var.project_id
+  project_id                     = var.project_ids[1]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = var.region
   zones                          = slice(var.zones, 0, 1)
   network                        = google_compute_network.main.name
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name
   ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  compute_engine_service_account = var.compute_engine_service_account
+  compute_engine_service_account = var.compute_engine_service_accounts[1]
 }
 
diff --git a/test/fixtures/simple_zonal_private/network.tf b/test/fixtures/simple_zonal_private/network.tf
@@ -22,13 +22,13 @@ resource "random_string" "suffix" {
 
 
 resource "google_compute_network" "main" {
-  project                 = var.project_id
+  project                 = var.project_ids[1]
   name                    = "cft-gke-test-${random_string.suffix.result}"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "main" {
-  project       = var.project_id
+  project       = var.project_ids[1]
   name          = "cft-gke-test-${random_string.suffix.result}"
   ip_cidr_range = "10.0.0.0/17"
   region        = var.region
diff --git a/test/fixtures/stub_domains/example.tf b/test/fixtures/stub_domains/example.tf
diff --git a/test/fixtures/stub_domains/network.tf b/test/fixtures/stub_domains/network.tf
diff --git a/test/fixtures/stub_domains_private/main.tf b/test/fixtures/stub_domains_private/main.tf
diff --git a/test/fixtures/stub_domains_upstream_nameservers/example.tf b/test/fixtures/stub_domains_upstream_nameservers/example.tf
diff --git a/test/fixtures/stub_domains_upstream_nameservers/network.tf b/test/fixtures/stub_domains_upstream_nameservers/network.tf
diff --git a/test/fixtures/upstream_nameservers/example.tf b/test/fixtures/upstream_nameservers/example.tf
diff --git a/test/fixtures/upstream_nameservers/network.tf b/test/fixtures/upstream_nameservers/network.tf
diff --git a/test/fixtures/workload_metadata_config/example.tf b/test/fixtures/workload_metadata_config/example.tf
diff --git a/test/fixtures/workload_metadata_config/network.tf b/test/fixtures/workload_metadata_config/network.tf
diff --git a/test/setup/iam.tf b/test/setup/iam.tf
diff --git a/test/setup/main.tf b/test/setup/main.tf
diff --git a/test/setup/outputs.tf b/test/setup/outputs.tf

Original file line number	Diff line number	Diff line change
`@@ -69,3 +69,8 @@ output "zones" {`
`69`	`69`	`description = "List of zones in which the cluster resides"`
`70`	`70`	`value = module.gke.zones`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+output "project_id" {`
	`74`	`+ description = "The project ID the cluster is in"`
	`75`	`+ value = var.project_id`
	`76`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ resource "random_string" "suffix" {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`provider "google" {`
`24`		`- project = var.project_id`
	`24`	`+ project = var.project_ids[0]`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`resource "google_compute_network" "main" {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`module "example" {`
`18`	`18`	`source = "../../../examples/private_zonal_with_networking"`
`19`	`19`
`20`		`- project_id = var.project_id`
	`20`	`+ project_id = var.project_ids[0]`
`21`	`21`	`region = var.region`
`22`	`22`	`zones = var.zones`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`
`18`	`18`	`output "project_id" {`
`19`		`- value = var.project_id`
	`19`	`+ value = module.example.project_id`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`output "location" {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-variable "project_id" {`
	`17`	`+variable "project_ids" {`
	`18`	`+ type = list(string)`
`18`	`19`	`description = "The project ID to host the cluster in"`
`19`	`20`	`}`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`output "project_id" {`
`18`		`- value = var.project_id`
	`18`	`+ value = module.example.project_id`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`output "region" {`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,9 @@`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
`16`	`16`
`17`		`-variable "project_id" {`
`18`		`- description = "The GCP project to use for integration tests"`
	`17`	`+variable "project_ids" {`
	`18`	`+ type = list(string)`
	`19`	`+ description = "The GCP projects to use for integration tests"`
`19`	`20`	`}`
`20`	`21`
`21`	`22`	`variable "region" {`
`@@ -29,8 +30,9 @@ variable "zones" {`
`29`	`30`	`default = ["us-central1-a", "us-central1-b", "us-central1-c"]`
`30`	`31`	`}`
`31`	`32`
`32`		`-variable "compute_engine_service_account" {`
`33`		`- description = "The email address of the service account to associate with the GKE cluster"`
	`33`	`+variable "compute_engine_service_accounts" {`
	`34`	`+ type = list(string)`
	`35`	`+ description = "The email addresses of the service account to associate with the GKE cluster"`
`34`	`36`	`}`
`35`	`37`
`36`	`38`	`variable "registry_project_id" {`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ resource "random_string" "suffix" {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`resource "google_compute_network" "main" {`
`24`		`- project = var.project_id`
	`24`	`+ project = var.project_ids[1]`
`25`	`25`	`name = "cft-gke-test-${random_string.suffix.result}"`
`26`	`26`	`auto_create_subnetworks = false`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`resource "google_compute_subnetwork" "main" {`
`30`		`- project = var.project_id`
	`30`	`+ project = var.project_ids[1]`
`31`	`31`	`name = "cft-gke-test-${random_string.suffix.result}"`
`32`	`32`	`ip_cidr_range = "10.0.0.0/17"`
`33`	`33`	`region = var.region`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`module "example" {`
`18`	`18`	`source = "../../../examples/simple_regional_with_networking"`
`19`	`19`
`20`		`- project_id = var.project_id`
	`20`	`+ project_id = var.project_ids[1]`
`21`	`21`	`region = var.region`
`22`	`22`	`}`