From 091218440657ebf0d16ff803712abd6f81b510d8 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Fri, 30 Nov 2018 17:20:59 -0800 Subject: [PATCH 1/5] only set auto_healing_policies in tests in beta --- ...source_google_compute_region_instance_group_test.go.erb} | 3 +++ .../tests/resource_compute_backend_service_test.go.erb | 6 ++++++ 2 files changed, 9 insertions(+) rename third_party/terraform/tests/{data_source_google_compute_region_instance_group_test.go => data_source_google_compute_region_instance_group_test.go.erb} (96%) diff --git a/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go b/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go.erb similarity index 96% rename from third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go rename to third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go.erb index e72824673347..bbf97facba8d 100644 --- a/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go +++ b/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go.erb @@ -1,3 +1,4 @@ +<% autogen_exception -%> package google import ( @@ -76,10 +77,12 @@ resource "google_compute_region_instance_group_manager" "foo" { } wait_for_instances = true +<% unless version.nil? || version == 'ga' -%> auto_healing_policies { health_check = "${google_compute_health_check.autohealing.self_link}" initial_delay_sec = 10 } +<% end -%> } data "google_compute_region_instance_group" "data_source" { diff --git a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb index 120df5c297dd..35c13dec91cb 100644 --- a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb +++ b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb @@ -713,10 +713,12 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 +<% unless version.nil? || version == 'ga' -%> auto_healing_policies { health_check = "${google_compute_http_health_check.default.self_link}" initial_delay_sec = "10" } +<% end -%> } resource "google_compute_instance_template" "foobar" { @@ -943,10 +945,12 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 +<% unless version.nil? || version == 'ga' -%> auto_healing_policies { health_check = "${google_compute_health_check.default.self_link}" initial_delay_sec = "10" } +<% end -%> } resource "google_compute_instance_template" "foobar" { @@ -1008,10 +1012,12 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 +<% unless version.nil? || version == 'ga' -%> auto_healing_policies { health_check = "${google_compute_health_check.default.self_link}" initial_delay_sec = "10" } +<% end -%> } resource "google_compute_instance_template" "foobar" { From 3777828f0e44222891f3b10fd3e2d1730cf9765c Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Mon, 3 Dec 2018 09:48:02 -0800 Subject: [PATCH 2/5] Revert "only set auto_healing_policies in tests in beta" This reverts commit da6b1b99b81fca747e7f9b7e5f6b17091e2e3878. --- ...ata_source_google_compute_region_instance_group_test.go} | 3 --- .../tests/resource_compute_backend_service_test.go.erb | 6 ------ 2 files changed, 9 deletions(-) rename third_party/terraform/tests/{data_source_google_compute_region_instance_group_test.go.erb => data_source_google_compute_region_instance_group_test.go} (96%) diff --git a/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go.erb b/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go similarity index 96% rename from third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go.erb rename to third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go index bbf97facba8d..e72824673347 100644 --- a/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go.erb +++ b/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go @@ -1,4 +1,3 @@ -<% autogen_exception -%> package google import ( @@ -77,12 +76,10 @@ resource "google_compute_region_instance_group_manager" "foo" { } wait_for_instances = true -<% unless version.nil? || version == 'ga' -%> auto_healing_policies { health_check = "${google_compute_health_check.autohealing.self_link}" initial_delay_sec = 10 } -<% end -%> } data "google_compute_region_instance_group" "data_source" { diff --git a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb index 35c13dec91cb..120df5c297dd 100644 --- a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb +++ b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb @@ -713,12 +713,10 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 -<% unless version.nil? || version == 'ga' -%> auto_healing_policies { health_check = "${google_compute_http_health_check.default.self_link}" initial_delay_sec = "10" } -<% end -%> } resource "google_compute_instance_template" "foobar" { @@ -945,12 +943,10 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 -<% unless version.nil? || version == 'ga' -%> auto_healing_policies { health_check = "${google_compute_health_check.default.self_link}" initial_delay_sec = "10" } -<% end -%> } resource "google_compute_instance_template" "foobar" { @@ -1012,12 +1008,10 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 -<% unless version.nil? || version == 'ga' -%> auto_healing_policies { health_check = "${google_compute_health_check.default.self_link}" initial_delay_sec = "10" } -<% end -%> } resource "google_compute_instance_template" "foobar" { From 51c8495ff3651b5dd3d9a534e4c4dc616fcd9e6e Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Mon, 3 Dec 2018 09:51:20 -0800 Subject: [PATCH 3/5] remove auto_healing_policies from IGMs in non-IGM tests --- ...oogle_compute_region_instance_group_test.go | 18 ------------------ ...esource_compute_backend_service_test.go.erb | 12 ------------ 2 files changed, 30 deletions(-) diff --git a/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go b/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go index e72824673347..652648bffcea 100644 --- a/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go +++ b/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go @@ -28,19 +28,6 @@ func TestAccDataSourceRegionInstanceGroup(t *testing.T) { func testAccDataSourceRegionInstanceGroup_basic(instanceManagerName string) string { return fmt.Sprintf(` -resource "google_compute_health_check" "autohealing" { - name = "%s" - check_interval_sec = 1 - timeout_sec = 1 - healthy_threshold = 2 - unhealthy_threshold = 10 - - http_health_check { - request_path = "/" - port = "80" - } -} - resource "google_compute_target_pool" "foo" { name = "%s" } @@ -75,11 +62,6 @@ resource "google_compute_region_instance_group_manager" "foo" { port = 80 } wait_for_instances = true - - auto_healing_policies { - health_check = "${google_compute_health_check.autohealing.self_link}" - initial_delay_sec = 10 - } } data "google_compute_region_instance_group" "data_source" { diff --git a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb index 120df5c297dd..fd2a3414a3d7 100644 --- a/third_party/terraform/tests/resource_compute_backend_service_test.go.erb +++ b/third_party/terraform/tests/resource_compute_backend_service_test.go.erb @@ -713,10 +713,6 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 - auto_healing_policies { - health_check = "${google_compute_http_health_check.default.self_link}" - initial_delay_sec = "10" - } } resource "google_compute_instance_template" "foobar" { @@ -943,10 +939,6 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 - auto_healing_policies { - health_check = "${google_compute_health_check.default.self_link}" - initial_delay_sec = "10" - } } resource "google_compute_instance_template" "foobar" { @@ -1008,10 +1000,6 @@ resource "google_compute_instance_group_manager" "foobar" { base_instance_name = "foobar" zone = "us-central1-f" target_size = 1 - auto_healing_policies { - health_check = "${google_compute_health_check.default.self_link}" - initial_delay_sec = "10" - } } resource "google_compute_instance_template" "foobar" { From b8072a90018314891709996469b919f521091d7d Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Tue, 4 Dec 2018 13:04:39 -0800 Subject: [PATCH 4/5] remove extra arg --- .../data_source_google_compute_region_instance_group_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go b/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go index 652648bffcea..cc75583177c2 100644 --- a/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go +++ b/third_party/terraform/tests/data_source_google_compute_region_instance_group_test.go @@ -67,5 +67,5 @@ resource "google_compute_region_instance_group_manager" "foo" { data "google_compute_region_instance_group" "data_source" { self_link = "${google_compute_region_instance_group_manager.foo.instance_group}" } -`, acctest.RandomWithPrefix("test-rigm-"), acctest.RandomWithPrefix("test-rigm-"), instanceManagerName) +`, acctest.RandomWithPrefix("test-rigm-"), instanceManagerName) } From 0ef303f78e55243fc7dc89fbfbd39287aaa348ca Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Wed, 5 Dec 2018 01:22:56 +0000 Subject: [PATCH 5/5] Update tracked submodules -> HEAD on Wed Dec 5 01:22:56 UTC 2018 Tracked submodules are build/terraform-beta build/terraform build/ansible build/inspec. --- build/inspec | 2 +- build/terraform | 2 +- build/terraform-beta | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/inspec b/build/inspec index 7c21d35e75d7..1bcd66a8c380 160000 --- a/build/inspec +++ b/build/inspec @@ -1 +1 @@ -Subproject commit 7c21d35e75d7d51d663736a9f8f9bb5185bca937 +Subproject commit 1bcd66a8c3808fa0d19d916968250649f0a7f8eb diff --git a/build/terraform b/build/terraform index 3f0ade1aee99..300821aabaf3 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 3f0ade1aee991750ec8dd54555248224575cd1b4 +Subproject commit 300821aabaf3f8597b89a475e0b0cf440118d82b diff --git a/build/terraform-beta b/build/terraform-beta index 45f9b081972d..cc7e0b6d441f 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 45f9b081972d48db3b2132e56cdb6d80ea7d4fad +Subproject commit cc7e0b6d441f0fb74152d30fc1793652fe0a8047