From cd607bd111050652a93d7ae1a942f4226a6bac8a Mon Sep 17 00:00:00 2001 From: The Magician Date: Wed, 7 Nov 2018 13:34:32 -0800 Subject: [PATCH] Remove unnecessary fields in PATCH updates (#2420) /cc @rileykarson --- google/resource_compute_firewall.go | 6 ---- google/resource_compute_router.go | 18 ------------ google/resource_compute_ssl_policy.go | 12 -------- google/resource_redis_instance.go | 42 --------------------------- 4 files changed, 78 deletions(-) diff --git a/google/resource_compute_firewall.go b/google/resource_compute_firewall.go index 7c367363..61367ad9 100644 --- a/google/resource_compute_firewall.go +++ b/google/resource_compute_firewall.go @@ -458,12 +458,6 @@ func resourceComputeFirewallUpdate(d *schema.ResourceData, meta interface{}) err } else if v, ok := d.GetOkExists("disabled"); ok || !reflect.DeepEqual(v, disabledProp) { obj["disabled"] = disabledProp } - nameProp, err := expandComputeFirewallName(d.Get("name"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, nameProp)) { - obj["name"] = nameProp - } networkProp, err := expandComputeFirewallNetwork(d.Get("network"), d, config) if err != nil { return err diff --git a/google/resource_compute_router.go b/google/resource_compute_router.go index b00dd5cf..ca465bfe 100644 --- a/google/resource_compute_router.go +++ b/google/resource_compute_router.go @@ -261,36 +261,18 @@ func resourceComputeRouterUpdate(d *schema.ResourceData, meta interface{}) error config := meta.(*Config) obj := make(map[string]interface{}) - nameProp, err := expandComputeRouterName(d.Get("name"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, nameProp)) { - obj["name"] = nameProp - } descriptionProp, err := expandComputeRouterDescription(d.Get("description"), d, config) if err != nil { return err } else if v, ok := d.GetOkExists("description"); ok || !reflect.DeepEqual(v, descriptionProp) { obj["description"] = descriptionProp } - networkProp, err := expandComputeRouterNetwork(d.Get("network"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("network"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, networkProp)) { - obj["network"] = networkProp - } bgpProp, err := expandComputeRouterBgp(d.Get("bgp"), d, config) if err != nil { return err } else if v, ok := d.GetOkExists("bgp"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, bgpProp)) { obj["bgp"] = bgpProp } - regionProp, err := expandComputeRouterRegion(d.Get("region"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("region"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, regionProp)) { - obj["region"] = regionProp - } lockName, err := replaceVars(d, config, "router/{{region}}/{{name}}") if err != nil { diff --git a/google/resource_compute_ssl_policy.go b/google/resource_compute_ssl_policy.go index b6313c27..4b668a6f 100644 --- a/google/resource_compute_ssl_policy.go +++ b/google/resource_compute_ssl_policy.go @@ -258,18 +258,6 @@ func resourceComputeSslPolicyUpdate(d *schema.ResourceData, meta interface{}) er config := meta.(*Config) obj := make(map[string]interface{}) - descriptionProp, err := expandComputeSslPolicyDescription(d.Get("description"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, descriptionProp)) { - obj["description"] = descriptionProp - } - nameProp, err := expandComputeSslPolicyName(d.Get("name"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, nameProp)) { - obj["name"] = nameProp - } profileProp, err := expandComputeSslPolicyProfile(d.Get("profile"), d, config) if err != nil { return err diff --git a/google/resource_redis_instance.go b/google/resource_redis_instance.go index 6feef9b0..3ee101d6 100644 --- a/google/resource_redis_instance.go +++ b/google/resource_redis_instance.go @@ -325,18 +325,6 @@ func resourceRedisInstanceUpdate(d *schema.ResourceData, meta interface{}) error config := meta.(*Config) obj := make(map[string]interface{}) - alternativeLocationIdProp, err := expandRedisInstanceAlternativeLocationId(d.Get("alternative_location_id"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("alternative_location_id"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, alternativeLocationIdProp)) { - obj["alternativeLocationId"] = alternativeLocationIdProp - } - authorizedNetworkProp, err := expandRedisInstanceAuthorizedNetwork(d.Get("authorized_network"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("authorized_network"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, authorizedNetworkProp)) { - obj["authorizedNetwork"] = authorizedNetworkProp - } displayNameProp, err := expandRedisInstanceDisplayName(d.Get("display_name"), d, config) if err != nil { return err @@ -355,42 +343,12 @@ func resourceRedisInstanceUpdate(d *schema.ResourceData, meta interface{}) error } else if v, ok := d.GetOkExists("redis_configs"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, redisConfigsProp)) { obj["redisConfigs"] = redisConfigsProp } - locationIdProp, err := expandRedisInstanceLocationId(d.Get("location_id"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("location_id"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, locationIdProp)) { - obj["locationId"] = locationIdProp - } - nameProp, err := expandRedisInstanceName(d.Get("name"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, nameProp)) { - obj["name"] = nameProp - } memorySizeGbProp, err := expandRedisInstanceMemorySizeGb(d.Get("memory_size_gb"), d, config) if err != nil { return err } else if v, ok := d.GetOkExists("memory_size_gb"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, memorySizeGbProp)) { obj["memorySizeGb"] = memorySizeGbProp } - redisVersionProp, err := expandRedisInstanceRedisVersion(d.Get("redis_version"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("redis_version"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, redisVersionProp)) { - obj["redisVersion"] = redisVersionProp - } - reservedIpRangeProp, err := expandRedisInstanceReservedIpRange(d.Get("reserved_ip_range"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("reserved_ip_range"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, reservedIpRangeProp)) { - obj["reservedIpRange"] = reservedIpRangeProp - } - tierProp, err := expandRedisInstanceTier(d.Get("tier"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("tier"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, tierProp)) { - obj["tier"] = tierProp - } url, err := replaceVars(d, config, "https://redis.googleapis.com/v1/projects/{{project}}/locations/{{region}}/instances/{{name}}") if err != nil {