From 5a1fe4f0beff6847dd748e66072e568ff9cbd72b Mon Sep 17 00:00:00 2001 From: The Magician Date: Fri, 27 Apr 2018 16:33:57 -0700 Subject: [PATCH] Simplify the custom update calls by only sending the required fields (#1395) --- google/resource_compute_target_http_proxy.go | 12 +--- google/resource_compute_target_ssl_proxy.go | 64 +------------------- 2 files changed, 3 insertions(+), 73 deletions(-) diff --git a/google/resource_compute_target_http_proxy.go b/google/resource_compute_target_http_proxy.go index 51e7dc39..9819c647 100644 --- a/google/resource_compute_target_http_proxy.go +++ b/google/resource_compute_target_http_proxy.go @@ -187,23 +187,13 @@ func resourceComputeTargetHttpProxyUpdate(d *schema.ResourceData, meta interface d.Partial(true) if d.HasChange("url_map") { - descriptionProp, err := expandComputeTargetHttpProxyDescription(d.Get("description"), d, config) - if err != nil { - return err - } - nameProp, err := expandComputeTargetHttpProxyName(d.Get("name"), d, config) - if err != nil { - return err - } urlMapProp, err := expandComputeTargetHttpProxyUrlMap(d.Get("url_map"), d, config) if err != nil { return err } obj := map[string]interface{}{ - "description": descriptionProp, - "name": nameProp, - "urlMap": urlMapProp, + "urlMap": urlMapProp, } url, err = replaceVars(d, config, "https://www.googleapis.com/compute/v1/projects/{{project}}/targetHttpProxies/{{name}}/setUrlMap") if err != nil { diff --git a/google/resource_compute_target_ssl_proxy.go b/google/resource_compute_target_ssl_proxy.go index 91598977..93832965 100644 --- a/google/resource_compute_target_ssl_proxy.go +++ b/google/resource_compute_target_ssl_proxy.go @@ -215,33 +215,13 @@ func resourceComputeTargetSslProxyUpdate(d *schema.ResourceData, meta interface{ d.Partial(true) if d.HasChange("proxy_header") { - descriptionProp, err := expandComputeTargetSslProxyDescription(d.Get("description"), d, config) - if err != nil { - return err - } - nameProp, err := expandComputeTargetSslProxyName(d.Get("name"), d, config) - if err != nil { - return err - } proxyHeaderProp, err := expandComputeTargetSslProxyProxyHeader(d.Get("proxy_header"), d, config) if err != nil { return err } - serviceProp, err := expandComputeTargetSslProxyBackendService(d.Get("backend_service"), d, config) - if err != nil { - return err - } - sslCertificatesProp, err := expandComputeTargetSslProxySslCertificates(d.Get("ssl_certificates"), d, config) - if err != nil { - return err - } obj := map[string]interface{}{ - "description": descriptionProp, - "name": nameProp, - "proxyHeader": proxyHeaderProp, - "service": serviceProp, - "sslCertificates": sslCertificatesProp, + "proxyHeader": proxyHeaderProp, } url, err = replaceVars(d, config, "https://www.googleapis.com/compute/v1/projects/{{project}}/global/targetSslProxies/{{name}}/setProxyHeader") if err != nil { @@ -268,33 +248,13 @@ func resourceComputeTargetSslProxyUpdate(d *schema.ResourceData, meta interface{ d.SetPartial("proxy_header") } if d.HasChange("backend_service") { - descriptionProp, err := expandComputeTargetSslProxyDescription(d.Get("description"), d, config) - if err != nil { - return err - } - nameProp, err := expandComputeTargetSslProxyName(d.Get("name"), d, config) - if err != nil { - return err - } - proxyHeaderProp, err := expandComputeTargetSslProxyProxyHeader(d.Get("proxy_header"), d, config) - if err != nil { - return err - } serviceProp, err := expandComputeTargetSslProxyBackendService(d.Get("backend_service"), d, config) if err != nil { return err } - sslCertificatesProp, err := expandComputeTargetSslProxySslCertificates(d.Get("ssl_certificates"), d, config) - if err != nil { - return err - } obj := map[string]interface{}{ - "description": descriptionProp, - "name": nameProp, - "proxyHeader": proxyHeaderProp, - "service": serviceProp, - "sslCertificates": sslCertificatesProp, + "service": serviceProp, } url, err = replaceVars(d, config, "https://www.googleapis.com/compute/v1/projects/{{project}}/global/targetSslProxies/{{name}}/setBackendService") if err != nil { @@ -321,32 +281,12 @@ func resourceComputeTargetSslProxyUpdate(d *schema.ResourceData, meta interface{ d.SetPartial("backend_service") } if d.HasChange("ssl_certificates") { - descriptionProp, err := expandComputeTargetSslProxyDescription(d.Get("description"), d, config) - if err != nil { - return err - } - nameProp, err := expandComputeTargetSslProxyName(d.Get("name"), d, config) - if err != nil { - return err - } - proxyHeaderProp, err := expandComputeTargetSslProxyProxyHeader(d.Get("proxy_header"), d, config) - if err != nil { - return err - } - serviceProp, err := expandComputeTargetSslProxyBackendService(d.Get("backend_service"), d, config) - if err != nil { - return err - } sslCertificatesProp, err := expandComputeTargetSslProxySslCertificates(d.Get("ssl_certificates"), d, config) if err != nil { return err } obj := map[string]interface{}{ - "description": descriptionProp, - "name": nameProp, - "proxyHeader": proxyHeaderProp, - "service": serviceProp, "sslCertificates": sslCertificatesProp, } url, err = replaceVars(d, config, "https://www.googleapis.com/compute/v1/projects/{{project}}/global/targetSslProxies/{{name}}/setSslCertificates")