From defeab51c4ce1c435f52ce1893fd0efeabe2084c Mon Sep 17 00:00:00 2001 From: Riley Karson Date: Thu, 6 Dec 2018 08:26:41 -0800 Subject: [PATCH 1/2] Remove update_strategy from rigm. --- .../resource_compute_region_instance_group_manager.go.erb | 3 +-- .../resource_compute_region_instance_group_manager_test.go.erb | 2 -- .../docs/r/compute_region_instance_group_manager.html.markdown | 3 --- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb b/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb index 4ee2e4ec64c0..277f3538a249 100644 --- a/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb +++ b/third_party/terraform/resources/resource_compute_region_instance_group_manager.go.erb @@ -172,10 +172,9 @@ func resourceComputeRegionInstanceGroupManager() *schema.Resource { <% if version.nil? || version == 'ga' -%> "update_strategy": &schema.Schema{ Type: schema.TypeString, - Deprecated: "This field is deprecated as it has no functionality anymore. It will be removed in 3.0.0.", + Deprecated: "This field is removed.", Optional: true, Computed: true, - ValidateFunc: validation.StringInSlice([]string{"NONE", "ROLLING_UPDATE"}, false), }, <% end -%> diff --git a/third_party/terraform/tests/resource_compute_region_instance_group_manager_test.go.erb b/third_party/terraform/tests/resource_compute_region_instance_group_manager_test.go.erb index e3870d04cadb..fa661b90a8bf 100644 --- a/third_party/terraform/tests/resource_compute_region_instance_group_manager_test.go.erb +++ b/third_party/terraform/tests/resource_compute_region_instance_group_manager_test.go.erb @@ -148,7 +148,6 @@ func TestAccRegionInstanceGroupManager_updateStrategy(t *testing.T) { ResourceName: "google_compute_region_instance_group_manager.igm-update-strategy", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"update_strategy"}, }, }, }) @@ -998,7 +997,6 @@ resource "google_compute_region_instance_group_manager" "igm-update-strategy" { base_instance_name = "rigm-update-strategy" region = "us-central1" target_size = 2 - update_strategy = "NONE" named_port { name = "customhttp" port = 8080 diff --git a/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown b/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown index 2b511f366b2a..acbffd0d15a8 100644 --- a/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown +++ b/third_party/terraform/website/docs/r/compute_region_instance_group_manager.html.markdown @@ -116,9 +116,6 @@ The following arguments are supported: * `project` - (Optional) The ID of the project in which the resource belongs. If it is not provided, the provider project is used. -* `update_strategy` - (Optional, Default `"NONE"`) This field is deprecated as it has no functionality anymore. -It previously turned update behaviour on and off. This field is only present in the `google` provider. - * `target_size` - (Optional) The target number of running instances for this managed instance group. This value should always be explicitly set unless this resource is attached to an autoscaler, in which case it should never be set. Defaults to `0`. From 9d0c2916b871ccb057b7bd7c846d784494e984a9 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Mon, 10 Dec 2018 16:27:11 +0000 Subject: [PATCH 2/2] Update tracked submodules -> HEAD on Mon Dec 10 16:27:11 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 0a137d3f21fc..d6c69c7591b4 160000 --- a/build/inspec +++ b/build/inspec @@ -1 +1 @@ -Subproject commit 0a137d3f21fc4db9283b4a788505f22d7dd4a625 +Subproject commit d6c69c7591b4dbe2d3c8eb23c2614f51f1ca5db0 diff --git a/build/terraform b/build/terraform index 7f932bb4a2b0..f1676a1978c4 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit 7f932bb4a2b0afd2b895fb94d3dd93a6ddf0b80d +Subproject commit f1676a1978c4d7e4f65b8cd53245c1232a5020d5 diff --git a/build/terraform-beta b/build/terraform-beta index 4f70abccaefc..abf8b0bb44ea 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit 4f70abccaefc99fbdeb4e4c7245c540f57902ecd +Subproject commit abf8b0bb44ea7c2e12fe6ec2e2d62a2eb0051f54