From 4708ab21b331e2daf65f179cda7e4d54976265c7 Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 15 Mar 2019 16:34:30 -0700 Subject: [PATCH] Fix CI problems for 0.12 SDK (#3252) /cc @rileykarson --- google/resource_compute_backend_service.go | 2 +- google/resource_compute_instance_group_manager.go | 2 +- google/resource_compute_region_instance_group_manager.go | 4 ++-- google/resource_google_project_test.go | 2 +- google/resource_tpu_node_generated_test.go | 2 +- google/utils.go | 8 ++++++++ website/docs/r/tpu_node.html.markdown | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/google/resource_compute_backend_service.go b/google/resource_compute_backend_service.go index 33a9595a..0ad4c183 100644 --- a/google/resource_compute_backend_service.go +++ b/google/resource_compute_backend_service.go @@ -506,7 +506,7 @@ func flattenBackends(backends []*computeBeta.Backend) []map[string]interface{} { data["balancing_mode"] = b.BalancingMode data["capacity_scaler"] = b.CapacityScaler data["description"] = b.Description - data["group"] = b.Group + data["group"] = ConvertSelfLinkToV1(b.Group) data["max_rate"] = b.MaxRate data["max_rate_per_instance"] = b.MaxRatePerInstance data["max_connections"] = b.MaxConnections diff --git a/google/resource_compute_instance_group_manager.go b/google/resource_compute_instance_group_manager.go index 77f05781..7410daa5 100644 --- a/google/resource_compute_instance_group_manager.go +++ b/google/resource_compute_instance_group_manager.go @@ -407,7 +407,7 @@ func resourceComputeInstanceGroupManagerRead(d *schema.ResourceData, meta interf d.Set("description", manager.Description) d.Set("project", project) d.Set("target_size", manager.TargetSize) - if err = d.Set("target_pools", manager.TargetPools); err != nil { + if err = d.Set("target_pools", mapStringArr(manager.TargetPools, ConvertSelfLinkToV1)); err != nil { return fmt.Errorf("Error setting target_pools in state: %s", err.Error()) } if err = d.Set("named_port", flattenNamedPortsBeta(manager.NamedPorts)); err != nil { diff --git a/google/resource_compute_region_instance_group_manager.go b/google/resource_compute_region_instance_group_manager.go index 77cd8f8e..c2e3a380 100644 --- a/google/resource_compute_region_instance_group_manager.go +++ b/google/resource_compute_region_instance_group_manager.go @@ -400,7 +400,7 @@ func resourceComputeRegionInstanceGroupManagerRead(d *schema.ResourceData, meta d.Set("description", manager.Description) d.Set("project", regionalID.Project) d.Set("target_size", manager.TargetSize) - if err := d.Set("target_pools", manager.TargetPools); err != nil { + if err := d.Set("target_pools", mapStringArr(manager.TargetPools, ConvertSelfLinkToV1)); err != nil { return fmt.Errorf("Error setting target_pools in state: %s", err.Error()) } if err := d.Set("named_port", flattenNamedPortsBeta(manager.NamedPorts)); err != nil { @@ -601,7 +601,7 @@ func flattenDistributionPolicy(distributionPolicy *computeBeta.DistributionPolic if distributionPolicy != nil { for _, zone := range distributionPolicy.Zones { - zones = append(zones, zone.Zone) + zones = append(zones, GetResourceNameFromSelfLink(zone.Zone)) } } diff --git a/google/resource_google_project_test.go b/google/resource_google_project_test.go index 67285dee..84df51e9 100644 --- a/google/resource_google_project_test.go +++ b/google/resource_google_project_test.go @@ -282,7 +282,7 @@ func testAccCheckGoogleProjectHasNoLabels(r, pid string) resource.TestCheckFunc } // State should have zero labels - if rs.Primary.Attributes["labels.%"] != "0" { + if v, ok := rs.Primary.Attributes["labels.%"]; ok && v != "0" { return fmt.Errorf("Expected 0 labels, got %s", rs.Primary.Attributes["labels.%"]) } diff --git a/google/resource_tpu_node_generated_test.go b/google/resource_tpu_node_generated_test.go index 5313e6b8..35b835b1 100644 --- a/google/resource_tpu_node_generated_test.go +++ b/google/resource_tpu_node_generated_test.go @@ -106,7 +106,7 @@ resource "google_tpu_node" "tpu" { description = "Terraform Google Provider test TPU" network = "${google_compute_network.tpu_network.name}" - labels { + labels = { foo = "bar" } diff --git a/google/utils.go b/google/utils.go index abf42856..153e192e 100644 --- a/google/utils.go +++ b/google/utils.go @@ -257,6 +257,14 @@ func convertAndMapStringArr(ifaceArr []interface{}, f func(string) string) []str return arr } +func mapStringArr(original []string, f func(string) string) []string { + var arr []string + for _, v := range original { + arr = append(arr, f(v)) + } + return arr +} + func convertStringArrToInterface(strs []string) []interface{} { arr := make([]interface{}, len(strs)) for i, str := range strs { diff --git a/website/docs/r/tpu_node.html.markdown b/website/docs/r/tpu_node.html.markdown index 9c46ee8a..31e9a41d 100644 --- a/website/docs/r/tpu_node.html.markdown +++ b/website/docs/r/tpu_node.html.markdown @@ -74,7 +74,7 @@ resource "google_tpu_node" "tpu" { description = "Terraform Google Provider test TPU" network = "${google_compute_network.tpu_network.name}" - labels { + labels = { foo = "bar" }