From 1f0eae579ff66df181efee3d96b773b95204a49a Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 28 Sep 2018 15:10:55 -0700 Subject: [PATCH] Bugfix: Stop reading region from Redis API. (#2133) Bugfix: Stop reading region from Redis API, remove unnecessary Flatten methods. --- google/resource_compute_ssl_certificate.go | 4 ---- google/resource_compute_vpn_tunnel.go | 4 ---- google/resource_filestore_instance.go | 4 ---- google/resource_redis_instance.go | 7 ------- 4 files changed, 19 deletions(-) diff --git a/google/resource_compute_ssl_certificate.go b/google/resource_compute_ssl_certificate.go index 575515b1..fbd620e1 100644 --- a/google/resource_compute_ssl_certificate.go +++ b/google/resource_compute_ssl_certificate.go @@ -297,10 +297,6 @@ func flattenComputeSslCertificateName(v interface{}) interface{} { return v } -func flattenComputeSslCertificatePrivateKey(v interface{}) interface{} { - return v -} - func expandComputeSslCertificateCertificate(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { return v, nil } diff --git a/google/resource_compute_vpn_tunnel.go b/google/resource_compute_vpn_tunnel.go index d693b850..af7d02e1 100644 --- a/google/resource_compute_vpn_tunnel.go +++ b/google/resource_compute_vpn_tunnel.go @@ -565,10 +565,6 @@ func flattenComputeVpnTunnelPeerIp(v interface{}) interface{} { return v } -func flattenComputeVpnTunnelSharedSecret(v interface{}) interface{} { - return v -} - func flattenComputeVpnTunnelSharedSecretHash(v interface{}) interface{} { return v } diff --git a/google/resource_filestore_instance.go b/google/resource_filestore_instance.go index 91e4e64d..a746a145 100644 --- a/google/resource_filestore_instance.go +++ b/google/resource_filestore_instance.go @@ -501,10 +501,6 @@ func flattenFilestoreInstanceEtag(v interface{}) interface{} { return v } -func flattenFilestoreInstanceZone(v interface{}) interface{} { - return v -} - func expandFilestoreInstanceDescription(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { return v, nil } diff --git a/google/resource_redis_instance.go b/google/resource_redis_instance.go index 051bd458..a3395e9c 100644 --- a/google/resource_redis_instance.go +++ b/google/resource_redis_instance.go @@ -310,9 +310,6 @@ func resourceRedisInstanceRead(d *schema.ResourceData, meta interface{}) error { if err := d.Set("tier", flattenRedisInstanceTier(res["tier"])); err != nil { return fmt.Errorf("Error reading Instance: %s", err) } - if err := d.Set("region", flattenRedisInstanceRegion(res["region"])); err != nil { - return fmt.Errorf("Error reading Instance: %s", err) - } project, err := getProject(d, config) if err != nil { return err @@ -573,10 +570,6 @@ func flattenRedisInstanceTier(v interface{}) interface{} { return v } -func flattenRedisInstanceRegion(v interface{}) interface{} { - return v -} - func expandRedisInstanceAlternativeLocationId(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) { return v, nil }