Merge pull request hashicorp#5 from terraform-providers/paddy_test_fixes

Fix test breaks from IGM and cluster changes.
luis-silva · Oct 5, 2018 · d4bb4c1 · d4bb4c1
2 parents b57be25 + 21908b9
commit d4bb4c1
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 12 deletions.
diff --git a/google-beta/data_source_google_compute_instance_group_test.go b/google-beta/data_source_google_compute_instance_group_test.go
@@ -311,7 +311,10 @@ resource "google_compute_instance_template" "igm-basic" {
 
 resource "google_compute_instance_group_manager" "igm" {
   name = "%s"
-  instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+  version {
+    instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+    name = "primary"
+  }
   base_instance_name = "igm"
   zone = "us-central1-a"
   target_size = 10

diff --git a/google-beta/resource_compute_autoscaler_generated_test.go b/google-beta/resource_compute_autoscaler_generated_test.go
@@ -92,7 +92,10 @@ resource "google_compute_instance_group_manager" "foobar" {
   name = "my-igm-%s"
   zone = "us-central1-f"
 
-  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  version {
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
+  }
   target_pools       = ["${google_compute_target_pool.foobar.self_link}"]
   base_instance_name = "foobar"
 }

diff --git a/google-beta/resource_compute_autoscaler_test.go b/google-beta/resource_compute_autoscaler_test.go
@@ -260,7 +260,10 @@ resource "google_compute_target_pool" "foobar" {
 resource "google_compute_instance_group_manager" "foobar" {
 	description = "Terraform test instance group manager"
 	name = "%s"
-	instance_template = "${google_compute_instance_template.foobar.self_link}"
+	version {
+		instance_template = "${google_compute_instance_template.foobar.self_link}"
+		name = "primary"
+	}
 	target_pools = ["${google_compute_target_pool.foobar.self_link}"]
 	base_instance_name = "foobar"
 	zone = "us-central1-a"

diff --git a/google-beta/resource_compute_backend_service_test.go b/google-beta/resource_compute_backend_service_test.go
@@ -699,7 +699,10 @@ resource "google_compute_backend_service" "lipsum" {
 
 resource "google_compute_instance_group_manager" "foobar" {
   name               = "%s"
-  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  version {
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
+  }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
   target_size        = 1
@@ -762,7 +765,10 @@ resource "google_compute_backend_service" "lipsum" {
 
 resource "google_compute_instance_group_manager" "foobar" {
   name               = "%s"
-  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  version {
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
+  }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
   target_size        = 1
@@ -915,7 +921,10 @@ resource "google_compute_backend_service" "lipsum" {
 
 resource "google_compute_instance_group_manager" "foobar" {
   name               = "%s"
-  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  version {
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
+  }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
   target_size        = 1
@@ -973,7 +982,10 @@ resource "google_compute_backend_service" "lipsum" {
 
 resource "google_compute_instance_group_manager" "foobar" {
   name               = "%s"
-  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  version {
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
+  }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
   target_size        = 1

diff --git a/google-beta/resource_compute_disk_test.go b/google-beta/resource_compute_disk_test.go
@@ -802,7 +802,15 @@ resource "google_compute_instance_template" "template" {
 resource "google_compute_instance_group_manager" "manager" {
   name               = "%s"
   base_instance_name = "disk-igm"
-  instance_template  = "${google_compute_instance_template.template.self_link}"
+  version {
+    instance_template  = "${google_compute_instance_template.template.self_link}"
+    name               = "primary"
+  }
+  update_policy {
+    minimal_action        = "RESTART"
+    type                  = "PROACTIVE"
+    max_unavailable_fixed = 1
+  }
   zone               = "us-central1-a"
   target_size        = 1
 }`, diskName, mgrName)

diff --git a/google-beta/resource_compute_region_autoscaler_generated_test.go b/google-beta/resource_compute_region_autoscaler_generated_test.go
@@ -92,7 +92,10 @@ resource "google_compute_region_instance_group_manager" "foobar" {
   name   = "my-region-igm-%s"
   region = "us-central1"
 
-  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  version {
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
+  }
   target_pools       = ["${google_compute_target_pool.foobar.self_link}"]
   base_instance_name = "foobar"
 }

diff --git a/google-beta/resource_compute_region_autoscaler_test.go b/google-beta/resource_compute_region_autoscaler_test.go
@@ -191,7 +191,10 @@ resource "google_compute_target_pool" "foobar" {
 resource "google_compute_region_instance_group_manager" "foobar" {
 	description = "Terraform test instance group manager"
 	name = "%s"
-	instance_template = "${google_compute_instance_template.foobar.self_link}"
+	version {
+		instance_template = "${google_compute_instance_template.foobar.self_link}"
+		name = "primary"
+	}
 	target_pools = ["${google_compute_target_pool.foobar.self_link}"]
 	base_instance_name = "foobar"
 	region = "us-central1"
@@ -256,7 +259,10 @@ resource "google_compute_target_pool" "foobar" {
 resource "google_compute_region_instance_group_manager" "foobar" {
 	description = "Terraform test instance group manager"
 	name = "%s"
-	instance_template = "${google_compute_instance_template.foobar.self_link}"
+	version {
+		instance_template = "${google_compute_instance_template.foobar.self_link}"
+		name = "primary"
+	}
 	target_pools = ["${google_compute_target_pool.foobar.self_link}"]
 	base_instance_name = "foobar"
 	region = "us-central1"

diff --git a/google-beta/resource_compute_region_backend_service_test.go b/google-beta/resource_compute_region_backend_service_test.go
@@ -328,7 +328,10 @@ resource "google_compute_region_backend_service" "lipsum" {
 
 resource "google_compute_instance_group_manager" "foobar" {
   name               = "%s"
-  instance_template  = "${google_compute_instance_template.foobar.self_link}"
+  version {
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
+  }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
   target_size        = 1