Fix CI problems for 0.12 SDK (#3252)

<!-- This change is generated by MagicModules. -->
/cc @rileykarson
This commit is contained in:
The Magician 2019-03-15 16:34:30 -07:00 committed by Riley Karson
parent d9510464a3
commit 4708ab21b3
7 changed files with 15 additions and 7 deletions

View File

@ -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

View File

@ -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 {

View File

@ -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))
}
}

View File

@ -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.%"])
}

View File

@ -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"
}

View File

@ -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 {

View File

@ -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"
}