public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-10-01 16:21:06 +00:00
Code Issues Projects Releases Wiki Activity

Don't silently fail when d.Set fails at read time (#1403)

Browse Source
This commit is contained in:
The Magician 2018-04-30 16:18:17 -07:00 committed by Vincent Roseberry
parent e58e099b1a
commit f04a1d0eba
6 changed files with 162 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
google/resource_compute_backend_bucket.go
View File

@ -163,14 +163,27 @@ func resourceComputeBackendBucketRead(d *schema.ResourceData, meta interface{})
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("ComputeBackendBucket %q", d.Id()))
}
d.Set("bucket_name", flattenComputeBackendBucketBucketName(res["bucketName"]))
d.Set("creation_timestamp", flattenComputeBackendBucketCreationTimestamp(res["creationTimestamp"]))
d.Set("description", flattenComputeBackendBucketDescription(res["description"]))
d.Set("enable_cdn", flattenComputeBackendBucketEnableCdn(res["enableCdn"]))
d.Set("name", flattenComputeBackendBucketName(res["name"]))
d.Set("self_link", res["selfLink"])
d.Set("project", project)
if err := d.Set("bucket_name", flattenComputeBackendBucketBucketName(res["bucketName"])); err != nil {
return fmt.Errorf("Error reading BackendBucket: %s", err)
}
if err := d.Set("creation_timestamp", flattenComputeBackendBucketCreationTimestamp(res["creationTimestamp"])); err != nil {
return fmt.Errorf("Error reading BackendBucket: %s", err)
}
if err := d.Set("description", flattenComputeBackendBucketDescription(res["description"])); err != nil {
return fmt.Errorf("Error reading BackendBucket: %s", err)
}
if err := d.Set("enable_cdn", flattenComputeBackendBucketEnableCdn(res["enableCdn"])); err != nil {
return fmt.Errorf("Error reading BackendBucket: %s", err)
}
if err := d.Set("name", flattenComputeBackendBucketName(res["name"])); err != nil {
return fmt.Errorf("Error reading BackendBucket: %s", err)
}
if err := d.Set("self_link", res["selfLink"]); err != nil {
return fmt.Errorf("Error reading BackendBucket: %s", err)
}
if err := d.Set("project", project); err != nil {
return fmt.Errorf("Error reading BackendBucket: %s", err)
}
return nil
}

29
google/resource_compute_global_address.go
View File

@ -159,14 +159,27 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{})
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("ComputeGlobalAddress %q", d.Id()))
}
d.Set("address", flattenComputeGlobalAddressAddress(res["address"]))
d.Set("creation_timestamp", flattenComputeGlobalAddressCreationTimestamp(res["creationTimestamp"]))
d.Set("description", flattenComputeGlobalAddressDescription(res["description"]))
d.Set("name", flattenComputeGlobalAddressName(res["name"]))
d.Set("ip_version", flattenComputeGlobalAddressIpVersion(res["ipVersion"]))
d.Set("self_link", res["selfLink"])
d.Set("project", project)
if err := d.Set("address", flattenComputeGlobalAddressAddress(res["address"])); err != nil {
return fmt.Errorf("Error reading GlobalAddress: %s", err)
}
if err := d.Set("creation_timestamp", flattenComputeGlobalAddressCreationTimestamp(res["creationTimestamp"])); err != nil {
return fmt.Errorf("Error reading GlobalAddress: %s", err)
}
if err := d.Set("description", flattenComputeGlobalAddressDescription(res["description"])); err != nil {
return fmt.Errorf("Error reading GlobalAddress: %s", err)
}
if err := d.Set("name", flattenComputeGlobalAddressName(res["name"])); err != nil {
return fmt.Errorf("Error reading GlobalAddress: %s", err)
}
if err := d.Set("ip_version", flattenComputeGlobalAddressIpVersion(res["ipVersion"])); err != nil {
return fmt.Errorf("Error reading GlobalAddress: %s", err)
}
if err := d.Set("self_link", res["selfLink"]); err != nil {
return fmt.Errorf("Error reading GlobalAddress: %s", err)
}
if err := d.Set("project", project); err != nil {
return fmt.Errorf("Error reading GlobalAddress: %s", err)
}
return nil
}

49
google/resource_compute_http_health_check.go
View File

@ -214,19 +214,42 @@ func resourceComputeHttpHealthCheckRead(d *schema.ResourceData, meta interface{}
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("ComputeHttpHealthCheck %q", d.Id()))
}
d.Set("check_interval_sec", flattenComputeHttpHealthCheckCheckIntervalSec(res["checkIntervalSec"]))
d.Set("creation_timestamp", flattenComputeHttpHealthCheckCreationTimestamp(res["creationTimestamp"]))
d.Set("description", flattenComputeHttpHealthCheckDescription(res["description"]))
d.Set("healthy_threshold", flattenComputeHttpHealthCheckHealthyThreshold(res["healthyThreshold"]))
d.Set("host", flattenComputeHttpHealthCheckHost(res["host"]))
d.Set("name", flattenComputeHttpHealthCheckName(res["name"]))
d.Set("port", flattenComputeHttpHealthCheckPort(res["port"]))
d.Set("request_path", flattenComputeHttpHealthCheckRequestPath(res["requestPath"]))
d.Set("timeout_sec", flattenComputeHttpHealthCheckTimeoutSec(res["timeoutSec"]))
d.Set("unhealthy_threshold", flattenComputeHttpHealthCheckUnhealthyThreshold(res["unhealthyThreshold"]))
d.Set("self_link", res["selfLink"])
d.Set("project", project)
if err := d.Set("check_interval_sec", flattenComputeHttpHealthCheckCheckIntervalSec(res["checkIntervalSec"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("creation_timestamp", flattenComputeHttpHealthCheckCreationTimestamp(res["creationTimestamp"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("description", flattenComputeHttpHealthCheckDescription(res["description"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("healthy_threshold", flattenComputeHttpHealthCheckHealthyThreshold(res["healthyThreshold"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("host", flattenComputeHttpHealthCheckHost(res["host"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("name", flattenComputeHttpHealthCheckName(res["name"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("port", flattenComputeHttpHealthCheckPort(res["port"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("request_path", flattenComputeHttpHealthCheckRequestPath(res["requestPath"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("timeout_sec", flattenComputeHttpHealthCheckTimeoutSec(res["timeoutSec"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("unhealthy_threshold", flattenComputeHttpHealthCheckUnhealthyThreshold(res["unhealthyThreshold"])); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("self_link", res["selfLink"]); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
if err := d.Set("project", project); err != nil {
return fmt.Errorf("Error reading HttpHealthCheck: %s", err)
}
return nil
}

49
google/resource_compute_https_health_check.go
View File

@ -214,19 +214,42 @@ func resourceComputeHttpsHealthCheckRead(d *schema.ResourceData, meta interface{
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("ComputeHttpsHealthCheck %q", d.Id()))
}
d.Set("check_interval_sec", flattenComputeHttpsHealthCheckCheckIntervalSec(res["checkIntervalSec"]))
d.Set("creation_timestamp", flattenComputeHttpsHealthCheckCreationTimestamp(res["creationTimestamp"]))
d.Set("description", flattenComputeHttpsHealthCheckDescription(res["description"]))
d.Set("healthy_threshold", flattenComputeHttpsHealthCheckHealthyThreshold(res["healthyThreshold"]))
d.Set("host", flattenComputeHttpsHealthCheckHost(res["host"]))
d.Set("name", flattenComputeHttpsHealthCheckName(res["name"]))
d.Set("port", flattenComputeHttpsHealthCheckPort(res["port"]))
d.Set("request_path", flattenComputeHttpsHealthCheckRequestPath(res["requestPath"]))
d.Set("timeout_sec", flattenComputeHttpsHealthCheckTimeoutSec(res["timeoutSec"]))
d.Set("unhealthy_threshold", flattenComputeHttpsHealthCheckUnhealthyThreshold(res["unhealthyThreshold"]))
d.Set("self_link", res["selfLink"])
d.Set("project", project)
if err := d.Set("check_interval_sec", flattenComputeHttpsHealthCheckCheckIntervalSec(res["checkIntervalSec"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("creation_timestamp", flattenComputeHttpsHealthCheckCreationTimestamp(res["creationTimestamp"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("description", flattenComputeHttpsHealthCheckDescription(res["description"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("healthy_threshold", flattenComputeHttpsHealthCheckHealthyThreshold(res["healthyThreshold"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("host", flattenComputeHttpsHealthCheckHost(res["host"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("name", flattenComputeHttpsHealthCheckName(res["name"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("port", flattenComputeHttpsHealthCheckPort(res["port"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("request_path", flattenComputeHttpsHealthCheckRequestPath(res["requestPath"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("timeout_sec", flattenComputeHttpsHealthCheckTimeoutSec(res["timeoutSec"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("unhealthy_threshold", flattenComputeHttpsHealthCheckUnhealthyThreshold(res["unhealthyThreshold"])); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("self_link", res["selfLink"]); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
if err := d.Set("project", project); err != nil {
return fmt.Errorf("Error reading HttpsHealthCheck: %s", err)
}
return nil
}

29
google/resource_compute_target_http_proxy.go
View File

@ -160,14 +160,27 @@ func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{}
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("ComputeTargetHttpProxy %q", d.Id()))
}
d.Set("creation_timestamp", flattenComputeTargetHttpProxyCreationTimestamp(res["creationTimestamp"]))
d.Set("description", flattenComputeTargetHttpProxyDescription(res["description"]))
d.Set("proxy_id", flattenComputeTargetHttpProxyProxyId(res["id"]))
d.Set("name", flattenComputeTargetHttpProxyName(res["name"]))
d.Set("url_map", flattenComputeTargetHttpProxyUrlMap(res["urlMap"]))
d.Set("self_link", res["selfLink"])
d.Set("project", project)
if err := d.Set("creation_timestamp", flattenComputeTargetHttpProxyCreationTimestamp(res["creationTimestamp"])); err != nil {
return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
}
if err := d.Set("description", flattenComputeTargetHttpProxyDescription(res["description"])); err != nil {
return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
}
if err := d.Set("proxy_id", flattenComputeTargetHttpProxyProxyId(res["id"])); err != nil {
return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
}
if err := d.Set("name", flattenComputeTargetHttpProxyName(res["name"])); err != nil {
return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
}
if err := d.Set("url_map", flattenComputeTargetHttpProxyUrlMap(res["urlMap"])); err != nil {
return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
}
if err := d.Set("self_link", res["selfLink"]); err != nil {
return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
}
if err := d.Set("project", project); err != nil {
return fmt.Errorf("Error reading TargetHttpProxy: %s", err)
}
return nil
}

37
google/resource_compute_target_ssl_proxy.go
View File

@ -186,16 +186,33 @@ func resourceComputeTargetSslProxyRead(d *schema.ResourceData, meta interface{})
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("ComputeTargetSslProxy %q", d.Id()))
}
d.Set("creation_timestamp", flattenComputeTargetSslProxyCreationTimestamp(res["creationTimestamp"]))
d.Set("description", flattenComputeTargetSslProxyDescription(res["description"]))
d.Set("proxy_id", flattenComputeTargetSslProxyProxyId(res["id"]))
d.Set("name", flattenComputeTargetSslProxyName(res["name"]))
d.Set("proxy_header", flattenComputeTargetSslProxyProxyHeader(res["proxyHeader"]))
d.Set("backend_service", flattenComputeTargetSslProxyBackendService(res["service"]))
d.Set("ssl_certificates", flattenComputeTargetSslProxySslCertificates(res["sslCertificates"]))
d.Set("self_link", res["selfLink"])
d.Set("project", project)
if err := d.Set("creation_timestamp", flattenComputeTargetSslProxyCreationTimestamp(res["creationTimestamp"])); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
if err := d.Set("description", flattenComputeTargetSslProxyDescription(res["description"])); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
if err := d.Set("proxy_id", flattenComputeTargetSslProxyProxyId(res["id"])); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
if err := d.Set("name", flattenComputeTargetSslProxyName(res["name"])); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
if err := d.Set("proxy_header", flattenComputeTargetSslProxyProxyHeader(res["proxyHeader"])); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
if err := d.Set("backend_service", flattenComputeTargetSslProxyBackendService(res["service"])); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
if err := d.Set("ssl_certificates", flattenComputeTargetSslProxySslCertificates(res["sslCertificates"])); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
if err := d.Set("self_link", res["selfLink"]); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
if err := d.Set("project", project); err != nil {
return fmt.Errorf("Error reading TargetSslProxy: %s", err)
}
return nil
}