Use random name in instance template to enable parallel testing (#1872)

Merged PR #1872.
GoogleCloudPlatform · Jun 3, 2019 · 0ace53f · 0ace53f
1 parent 381f22f
commit 0ace53f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/build/terraform b/build/terraform
diff --git a/build/terraform-beta b/build/terraform-beta
diff --git a/templates/terraform/examples/global_forwarding_rule_internal.tf.erb b/templates/terraform/examples/global_forwarding_rule_internal.tf.erb
@@ -45,7 +45,7 @@ resource "google_compute_backend_service" "default" {
   load_balancing_scheme = "INTERNAL_SELF_MANAGED"
 
   backend {
-    group = "${google_compute_instance_group_manager.foobar.instance_group}"
+    group = "${google_compute_instance_group_manager.igm.instance_group}"
     balancing_mode = "RATE"
     capacity_scaler = 0.4
     max_rate_per_instance = 50
@@ -60,21 +60,21 @@ data "google_compute_image" "debian_image" {
   project  = "debian-cloud"
 }
 
-resource "google_compute_instance_group_manager" "foobar" {
+resource "google_compute_instance_group_manager" "igm" {
   provider           = "google-beta"
   name               = "igm-internal"
   version {
-    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    instance_template  = "${google_compute_instance_template.instance_template.self_link}"
     name               = "primary"
   }
-  base_instance_name = "foobar"
+  base_instance_name = "internal-glb"
   zone               = "us-central1-f"
   target_size        = 1
 }
 
-resource "google_compute_instance_template" "foobar" {
+resource "google_compute_instance_template" "instance_template" {
   provider     = "google-beta"
-  name         = "instance-template-internal"
+  name         = "template-<%= ctx[:vars]['backend_service_name'] %>"
   machine_type = "n1-standard-1"
 
   network_interface {

diff --git a/third_party/terraform/tests/resource_compute_global_forwarding_rule_test.go.erb b/third_party/terraform/tests/resource_compute_global_forwarding_rule_test.go.erb
@@ -393,7 +393,7 @@ resource "google_compute_backend_service" "default" {
   load_balancing_scheme = "INTERNAL_SELF_MANAGED"
 
   backend {
-    group = "${google_compute_instance_group_manager.foobar.instance_group}"
+    group = "${google_compute_instance_group_manager.igm.instance_group}"
     balancing_mode = "RATE"
     capacity_scaler = 0.4
     max_rate_per_instance = 50
@@ -438,18 +438,18 @@ data "google_compute_image" "debian_image" {
   project  = "debian-cloud"
 }
 
-resource "google_compute_instance_group_manager" "foobar" {
+resource "google_compute_instance_group_manager" "igm" {
   name               = "igm-internal"
   version {
-    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    instance_template  = "${google_compute_instance_template.instance_template.self_link}"
     name               = "primary"
   }
-  base_instance_name = "foobar"
+  base_instance_name = "internal-igm"
   zone               = "us-central1-f"
   target_size        = 1
 }
 
-resource "google_compute_instance_template" "foobar" {
+resource "google_compute_instance_template" "instance_template" {
   name         = "instance-template-internal"
   machine_type = "n1-standard-1"