From 3db96c9073428888902db1a794bc9d2754caaefc Mon Sep 17 00:00:00 2001 From: The Magician Date: Wed, 15 Aug 2018 13:46:55 -0700 Subject: [PATCH] Make flatteners of sets return sets (#1880) /cc @danawillow --- google/resource_compute_forwarding_rule.go | 5 ++++- google/resource_compute_route.go | 5 ++++- google/resource_compute_ssl_policy.go | 10 ++++++++-- google/resource_compute_vpn_tunnel.go | 10 ++++++++-- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/google/resource_compute_forwarding_rule.go b/google/resource_compute_forwarding_rule.go index f83d24e5..2c762455 100644 --- a/google/resource_compute_forwarding_rule.go +++ b/google/resource_compute_forwarding_rule.go @@ -628,7 +628,10 @@ func flattenComputeForwardingRulePortRange(v interface{}) interface{} { } func flattenComputeForwardingRulePorts(v interface{}) interface{} { - return v + if v == nil { + return v + } + return schema.NewSet(schema.HashString, v.([]interface{})) } func flattenComputeForwardingRuleSubnetwork(v interface{}) interface{} { diff --git a/google/resource_compute_route.go b/google/resource_compute_route.go index 22e0970a..5a86ebd2 100644 --- a/google/resource_compute_route.go +++ b/google/resource_compute_route.go @@ -379,7 +379,10 @@ func flattenComputeRoutePriority(v interface{}) interface{} { } func flattenComputeRouteTags(v interface{}) interface{} { - return v + if v == nil { + return v + } + return schema.NewSet(schema.HashString, v.([]interface{})) } func flattenComputeRouteNextHopGateway(v interface{}) interface{} { diff --git a/google/resource_compute_ssl_policy.go b/google/resource_compute_ssl_policy.go index 4fbb5717..2c41e921 100644 --- a/google/resource_compute_ssl_policy.go +++ b/google/resource_compute_ssl_policy.go @@ -399,11 +399,17 @@ func flattenComputeSslPolicyMinTlsVersion(v interface{}) interface{} { } func flattenComputeSslPolicyEnabledFeatures(v interface{}) interface{} { - return v + if v == nil { + return v + } + return schema.NewSet(schema.HashString, v.([]interface{})) } func flattenComputeSslPolicyCustomFeatures(v interface{}) interface{} { - return v + if v == nil { + return v + } + return schema.NewSet(schema.HashString, v.([]interface{})) } func flattenComputeSslPolicyFingerprint(v interface{}) interface{} { diff --git a/google/resource_compute_vpn_tunnel.go b/google/resource_compute_vpn_tunnel.go index 6dcab5dc..451867f2 100644 --- a/google/resource_compute_vpn_tunnel.go +++ b/google/resource_compute_vpn_tunnel.go @@ -589,11 +589,17 @@ func flattenComputeVpnTunnelIkeVersion(v interface{}) interface{} { } func flattenComputeVpnTunnelLocalTrafficSelector(v interface{}) interface{} { - return v + if v == nil { + return v + } + return schema.NewSet(schema.HashString, v.([]interface{})) } func flattenComputeVpnTunnelRemoteTrafficSelector(v interface{}) interface{} { - return v + if v == nil { + return v + } + return schema.NewSet(schema.HashString, v.([]interface{})) } func flattenComputeVpnTunnelLabels(v interface{}) interface{} {