From 1fe4aca6e7ae8d7850c64f48469e7827ca5d6bde Mon Sep 17 00:00:00 2001 From: Chris Stephens Date: Tue, 20 Nov 2018 20:31:26 +0000 Subject: [PATCH] Move the set project logic higher in the read method --- google/resource_compute_address.go | 15 ++++++++------- google/resource_compute_autoscaler.go | 15 ++++++++------- google/resource_compute_backend_bucket.go | 15 ++++++++------- google/resource_compute_disk.go | 15 ++++++++------- google/resource_compute_firewall.go | 15 ++++++++------- google/resource_compute_forwarding_rule.go | 15 ++++++++------- google/resource_compute_global_address.go | 15 ++++++++------- google/resource_compute_health_check.go | 15 ++++++++------- google/resource_compute_http_health_check.go | 15 ++++++++------- google/resource_compute_https_health_check.go | 15 ++++++++------- .../resource_compute_interconnect_attachment.go | 15 ++++++++------- google/resource_compute_region_autoscaler.go | 15 ++++++++------- google/resource_compute_region_disk.go | 15 ++++++++------- google/resource_compute_route.go | 15 ++++++++------- google/resource_compute_router.go | 15 ++++++++------- google/resource_compute_ssl_certificate.go | 15 ++++++++------- google/resource_compute_ssl_policy.go | 15 ++++++++------- google/resource_compute_subnetwork.go | 15 ++++++++------- google/resource_compute_target_http_proxy.go | 15 ++++++++------- google/resource_compute_target_https_proxy.go | 15 ++++++++------- google/resource_compute_target_ssl_proxy.go | 15 ++++++++------- google/resource_compute_target_tcp_proxy.go | 15 ++++++++------- google/resource_compute_url_map.go | 15 ++++++++------- google/resource_compute_vpn_gateway.go | 15 ++++++++------- google/resource_compute_vpn_tunnel.go | 15 ++++++++------- google/resource_dns_managed_zone.go | 15 ++++++++------- google/resource_monitoring_alert_policy.go | 15 ++++++++------- google/resource_monitoring_group.go | 15 ++++++++------- .../resource_monitoring_notification_channel.go | 15 ++++++++------- google/resource_redis_instance.go | 15 ++++++++------- 30 files changed, 240 insertions(+), 210 deletions(-) diff --git a/google/resource_compute_address.go b/google/resource_compute_address.go index 18e34c02..c12f32b2 100644 --- a/google/resource_compute_address.go +++ b/google/resource_compute_address.go @@ -214,6 +214,14 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error return handleNotFoundError(err, d, fmt.Sprintf("ComputeAddress %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Address: %s", err) + } + if err := d.Set("address", flattenComputeAddressAddress(res["address"])); err != nil { return fmt.Errorf("Error reading Address: %s", err) } @@ -244,13 +252,6 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading Address: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Address: %s", err) - } return nil } diff --git a/google/resource_compute_autoscaler.go b/google/resource_compute_autoscaler.go index eb607e32..f5530809 100644 --- a/google/resource_compute_autoscaler.go +++ b/google/resource_compute_autoscaler.go @@ -245,6 +245,14 @@ func resourceComputeAutoscalerRead(d *schema.ResourceData, meta interface{}) err return handleNotFoundError(err, d, fmt.Sprintf("ComputeAutoscaler %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Autoscaler: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeAutoscalerCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading Autoscaler: %s", err) } @@ -266,13 +274,6 @@ func resourceComputeAutoscalerRead(d *schema.ResourceData, meta interface{}) err if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading Autoscaler: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Autoscaler: %s", err) - } return nil } diff --git a/google/resource_compute_backend_bucket.go b/google/resource_compute_backend_bucket.go index 19d2613c..b04a35ba 100644 --- a/google/resource_compute_backend_bucket.go +++ b/google/resource_compute_backend_bucket.go @@ -163,6 +163,14 @@ func resourceComputeBackendBucketRead(d *schema.ResourceData, meta interface{}) return handleNotFoundError(err, d, fmt.Sprintf("ComputeBackendBucket %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading BackendBucket: %s", err) + } + if err := d.Set("bucket_name", flattenComputeBackendBucketBucketName(res["bucketName"])); err != nil { return fmt.Errorf("Error reading BackendBucket: %s", err) } @@ -181,13 +189,6 @@ func resourceComputeBackendBucketRead(d *schema.ResourceData, meta interface{}) if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading BackendBucket: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading BackendBucket: %s", err) - } return nil } diff --git a/google/resource_compute_disk.go b/google/resource_compute_disk.go index f9ec7987..d7b71f11 100644 --- a/google/resource_compute_disk.go +++ b/google/resource_compute_disk.go @@ -557,6 +557,14 @@ func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error { return err } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Disk: %s", err) + } + if err := d.Set("label_fingerprint", flattenComputeDiskLabelFingerprint(res["labelFingerprint"])); err != nil { return fmt.Errorf("Error reading Disk: %s", err) } @@ -614,13 +622,6 @@ func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error { if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading Disk: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Disk: %s", err) - } return nil } diff --git a/google/resource_compute_firewall.go b/google/resource_compute_firewall.go index faa41ffc..bef8b992 100644 --- a/google/resource_compute_firewall.go +++ b/google/resource_compute_firewall.go @@ -359,6 +359,14 @@ func resourceComputeFirewallRead(d *schema.ResourceData, meta interface{}) error return handleNotFoundError(err, d, fmt.Sprintf("ComputeFirewall %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Firewall: %s", err) + } + if err := d.Set("allow", flattenComputeFirewallAllow(res["allowed"])); err != nil { return fmt.Errorf("Error reading Firewall: %s", err) } @@ -407,13 +415,6 @@ func resourceComputeFirewallRead(d *schema.ResourceData, meta interface{}) error if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading Firewall: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Firewall: %s", err) - } return nil } diff --git a/google/resource_compute_forwarding_rule.go b/google/resource_compute_forwarding_rule.go index 4983a719..067c19db 100644 --- a/google/resource_compute_forwarding_rule.go +++ b/google/resource_compute_forwarding_rule.go @@ -299,6 +299,14 @@ func resourceComputeForwardingRuleRead(d *schema.ResourceData, meta interface{}) return handleNotFoundError(err, d, fmt.Sprintf("ComputeForwardingRule %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading ForwardingRule: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeForwardingRuleCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading ForwardingRule: %s", err) } @@ -347,13 +355,6 @@ func resourceComputeForwardingRuleRead(d *schema.ResourceData, meta interface{}) if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading ForwardingRule: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading ForwardingRule: %s", err) - } return nil } diff --git a/google/resource_compute_global_address.go b/google/resource_compute_global_address.go index b9d49209..31714e07 100644 --- a/google/resource_compute_global_address.go +++ b/google/resource_compute_global_address.go @@ -173,6 +173,14 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) return handleNotFoundError(err, d, fmt.Sprintf("ComputeGlobalAddress %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading GlobalAddress: %s", err) + } + if err := d.Set("address", flattenComputeGlobalAddressAddress(res["address"])); err != nil { return fmt.Errorf("Error reading GlobalAddress: %s", err) } @@ -194,13 +202,6 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{}) if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading GlobalAddress: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading GlobalAddress: %s", err) - } return nil } diff --git a/google/resource_compute_health_check.go b/google/resource_compute_health_check.go index c7f4c227..0b1289cc 100644 --- a/google/resource_compute_health_check.go +++ b/google/resource_compute_health_check.go @@ -339,6 +339,14 @@ func resourceComputeHealthCheckRead(d *schema.ResourceData, meta interface{}) er return handleNotFoundError(err, d, fmt.Sprintf("ComputeHealthCheck %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading HealthCheck: %s", err) + } + if err := d.Set("check_interval_sec", flattenComputeHealthCheckCheckIntervalSec(res["checkIntervalSec"])); err != nil { return fmt.Errorf("Error reading HealthCheck: %s", err) } @@ -378,13 +386,6 @@ func resourceComputeHealthCheckRead(d *schema.ResourceData, meta interface{}) er if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading HealthCheck: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading HealthCheck: %s", err) - } return nil } diff --git a/google/resource_compute_http_health_check.go b/google/resource_compute_http_health_check.go index 5af3a567..6912c87e 100644 --- a/google/resource_compute_http_health_check.go +++ b/google/resource_compute_http_health_check.go @@ -219,6 +219,14 @@ func resourceComputeHttpHealthCheckRead(d *schema.ResourceData, meta interface{} return handleNotFoundError(err, d, fmt.Sprintf("ComputeHttpHealthCheck %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading HttpHealthCheck: %s", err) + } + if err := d.Set("check_interval_sec", flattenComputeHttpHealthCheckCheckIntervalSec(res["checkIntervalSec"])); err != nil { return fmt.Errorf("Error reading HttpHealthCheck: %s", err) } @@ -252,13 +260,6 @@ func resourceComputeHttpHealthCheckRead(d *schema.ResourceData, meta interface{} if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading HttpHealthCheck: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading HttpHealthCheck: %s", err) - } return nil } diff --git a/google/resource_compute_https_health_check.go b/google/resource_compute_https_health_check.go index 7aa6e529..ce87061b 100644 --- a/google/resource_compute_https_health_check.go +++ b/google/resource_compute_https_health_check.go @@ -219,6 +219,14 @@ func resourceComputeHttpsHealthCheckRead(d *schema.ResourceData, meta interface{ return handleNotFoundError(err, d, fmt.Sprintf("ComputeHttpsHealthCheck %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading HttpsHealthCheck: %s", err) + } + if err := d.Set("check_interval_sec", flattenComputeHttpsHealthCheckCheckIntervalSec(res["checkIntervalSec"])); err != nil { return fmt.Errorf("Error reading HttpsHealthCheck: %s", err) } @@ -252,13 +260,6 @@ func resourceComputeHttpsHealthCheckRead(d *schema.ResourceData, meta interface{ if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading HttpsHealthCheck: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading HttpsHealthCheck: %s", err) - } return nil } diff --git a/google/resource_compute_interconnect_attachment.go b/google/resource_compute_interconnect_attachment.go index 2a624891..a0708e20 100644 --- a/google/resource_compute_interconnect_attachment.go +++ b/google/resource_compute_interconnect_attachment.go @@ -205,6 +205,14 @@ func resourceComputeInterconnectAttachmentRead(d *schema.ResourceData, meta inte return handleNotFoundError(err, d, fmt.Sprintf("ComputeInterconnectAttachment %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading InterconnectAttachment: %s", err) + } + if err := d.Set("cloud_router_ip_address", flattenComputeInterconnectAttachmentCloudRouterIpAddress(res["cloudRouterIpAddress"])); err != nil { return fmt.Errorf("Error reading InterconnectAttachment: %s", err) } @@ -238,13 +246,6 @@ func resourceComputeInterconnectAttachmentRead(d *schema.ResourceData, meta inte if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading InterconnectAttachment: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading InterconnectAttachment: %s", err) - } return nil } diff --git a/google/resource_compute_region_autoscaler.go b/google/resource_compute_region_autoscaler.go index 4d3e64ff..7ff06c83 100644 --- a/google/resource_compute_region_autoscaler.go +++ b/google/resource_compute_region_autoscaler.go @@ -244,6 +244,14 @@ func resourceComputeRegionAutoscalerRead(d *schema.ResourceData, meta interface{ return handleNotFoundError(err, d, fmt.Sprintf("ComputeRegionAutoscaler %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading RegionAutoscaler: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeRegionAutoscalerCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading RegionAutoscaler: %s", err) } @@ -265,13 +273,6 @@ func resourceComputeRegionAutoscalerRead(d *schema.ResourceData, meta interface{ if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading RegionAutoscaler: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading RegionAutoscaler: %s", err) - } return nil } diff --git a/google/resource_compute_region_disk.go b/google/resource_compute_region_disk.go index a0f08b86..52cecbee 100644 --- a/google/resource_compute_region_disk.go +++ b/google/resource_compute_region_disk.go @@ -315,6 +315,14 @@ func resourceComputeRegionDiskRead(d *schema.ResourceData, meta interface{}) err return err } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading RegionDisk: %s", err) + } + if err := d.Set("label_fingerprint", flattenComputeRegionDiskLabelFingerprint(res["labelFingerprint"])); err != nil { return fmt.Errorf("Error reading RegionDisk: %s", err) } @@ -366,13 +374,6 @@ func resourceComputeRegionDiskRead(d *schema.ResourceData, meta interface{}) err if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading RegionDisk: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading RegionDisk: %s", err) - } return nil } diff --git a/google/resource_compute_route.go b/google/resource_compute_route.go index ecc9f47a..705ae3fc 100644 --- a/google/resource_compute_route.go +++ b/google/resource_compute_route.go @@ -249,6 +249,14 @@ func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error { return err } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Route: %s", err) + } + if err := d.Set("dest_range", flattenComputeRouteDestRange(res["destRange"])); err != nil { return fmt.Errorf("Error reading Route: %s", err) } @@ -285,13 +293,6 @@ func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error { if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading Route: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Route: %s", err) - } return nil } diff --git a/google/resource_compute_router.go b/google/resource_compute_router.go index 2ae6c69c..70c0f1df 100644 --- a/google/resource_compute_router.go +++ b/google/resource_compute_router.go @@ -225,6 +225,14 @@ func resourceComputeRouterRead(d *schema.ResourceData, meta interface{}) error { return handleNotFoundError(err, d, fmt.Sprintf("ComputeRouter %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Router: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeRouterCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading Router: %s", err) } @@ -246,13 +254,6 @@ func resourceComputeRouterRead(d *schema.ResourceData, meta interface{}) error { if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading Router: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Router: %s", err) - } return nil } diff --git a/google/resource_compute_ssl_certificate.go b/google/resource_compute_ssl_certificate.go index fbd620e1..d46fb8ce 100644 --- a/google/resource_compute_ssl_certificate.go +++ b/google/resource_compute_ssl_certificate.go @@ -191,6 +191,14 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{}) return handleNotFoundError(err, d, fmt.Sprintf("ComputeSslCertificate %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading SslCertificate: %s", err) + } + if err := d.Set("certificate", flattenComputeSslCertificateCertificate(res["certificate"])); err != nil { return fmt.Errorf("Error reading SslCertificate: %s", err) } @@ -209,13 +217,6 @@ func resourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{}) if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading SslCertificate: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading SslCertificate: %s", err) - } return nil } diff --git a/google/resource_compute_ssl_policy.go b/google/resource_compute_ssl_policy.go index 4b668a6f..772bcc8e 100644 --- a/google/resource_compute_ssl_policy.go +++ b/google/resource_compute_ssl_policy.go @@ -216,6 +216,14 @@ func resourceComputeSslPolicyRead(d *schema.ResourceData, meta interface{}) erro return handleNotFoundError(err, d, fmt.Sprintf("ComputeSslPolicy %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading SslPolicy: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeSslPolicyCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading SslPolicy: %s", err) } @@ -243,13 +251,6 @@ func resourceComputeSslPolicyRead(d *schema.ResourceData, meta interface{}) erro if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading SslPolicy: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading SslPolicy: %s", err) - } return nil } diff --git a/google/resource_compute_subnetwork.go b/google/resource_compute_subnetwork.go index 0b4416f2..4aa5bfd3 100644 --- a/google/resource_compute_subnetwork.go +++ b/google/resource_compute_subnetwork.go @@ -315,6 +315,14 @@ func resourceComputeSubnetworkRead(d *schema.ResourceData, meta interface{}) err return handleNotFoundError(err, d, fmt.Sprintf("ComputeSubnetwork %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Subnetwork: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeSubnetworkCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading Subnetwork: %s", err) } @@ -351,13 +359,6 @@ func resourceComputeSubnetworkRead(d *schema.ResourceData, meta interface{}) err if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading Subnetwork: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Subnetwork: %s", err) - } return nil } diff --git a/google/resource_compute_target_http_proxy.go b/google/resource_compute_target_http_proxy.go index 54137767..5324f8a3 100644 --- a/google/resource_compute_target_http_proxy.go +++ b/google/resource_compute_target_http_proxy.go @@ -159,6 +159,14 @@ func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{} return handleNotFoundError(err, d, fmt.Sprintf("ComputeTargetHttpProxy %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading TargetHttpProxy: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeTargetHttpProxyCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading TargetHttpProxy: %s", err) } @@ -177,13 +185,6 @@ func resourceComputeTargetHttpProxyRead(d *schema.ResourceData, meta interface{} if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading TargetHttpProxy: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading TargetHttpProxy: %s", err) - } return nil } diff --git a/google/resource_compute_target_https_proxy.go b/google/resource_compute_target_https_proxy.go index e8b5d7aa..0f6716d3 100644 --- a/google/resource_compute_target_https_proxy.go +++ b/google/resource_compute_target_https_proxy.go @@ -196,6 +196,14 @@ func resourceComputeTargetHttpsProxyRead(d *schema.ResourceData, meta interface{ return handleNotFoundError(err, d, fmt.Sprintf("ComputeTargetHttpsProxy %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading TargetHttpsProxy: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeTargetHttpsProxyCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading TargetHttpsProxy: %s", err) } @@ -223,13 +231,6 @@ func resourceComputeTargetHttpsProxyRead(d *schema.ResourceData, meta interface{ if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading TargetHttpsProxy: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading TargetHttpsProxy: %s", err) - } return nil } diff --git a/google/resource_compute_target_ssl_proxy.go b/google/resource_compute_target_ssl_proxy.go index 4bc05f0f..bcaf1326 100644 --- a/google/resource_compute_target_ssl_proxy.go +++ b/google/resource_compute_target_ssl_proxy.go @@ -198,6 +198,14 @@ func resourceComputeTargetSslProxyRead(d *schema.ResourceData, meta interface{}) return handleNotFoundError(err, d, fmt.Sprintf("ComputeTargetSslProxy %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading TargetSslProxy: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeTargetSslProxyCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading TargetSslProxy: %s", err) } @@ -225,13 +233,6 @@ func resourceComputeTargetSslProxyRead(d *schema.ResourceData, meta interface{}) if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading TargetSslProxy: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading TargetSslProxy: %s", err) - } return nil } diff --git a/google/resource_compute_target_tcp_proxy.go b/google/resource_compute_target_tcp_proxy.go index a750b5ae..f70eb548 100644 --- a/google/resource_compute_target_tcp_proxy.go +++ b/google/resource_compute_target_tcp_proxy.go @@ -172,6 +172,14 @@ func resourceComputeTargetTcpProxyRead(d *schema.ResourceData, meta interface{}) return handleNotFoundError(err, d, fmt.Sprintf("ComputeTargetTcpProxy %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading TargetTcpProxy: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeTargetTcpProxyCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading TargetTcpProxy: %s", err) } @@ -193,13 +201,6 @@ func resourceComputeTargetTcpProxyRead(d *schema.ResourceData, meta interface{}) if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading TargetTcpProxy: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading TargetTcpProxy: %s", err) - } return nil } diff --git a/google/resource_compute_url_map.go b/google/resource_compute_url_map.go index 8bb635b0..4057c2de 100644 --- a/google/resource_compute_url_map.go +++ b/google/resource_compute_url_map.go @@ -278,6 +278,14 @@ func resourceComputeUrlMapRead(d *schema.ResourceData, meta interface{}) error { return handleNotFoundError(err, d, fmt.Sprintf("ComputeUrlMap %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading UrlMap: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeUrlMapCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading UrlMap: %s", err) } @@ -308,13 +316,6 @@ func resourceComputeUrlMapRead(d *schema.ResourceData, meta interface{}) error { if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading UrlMap: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading UrlMap: %s", err) - } return nil } diff --git a/google/resource_compute_vpn_gateway.go b/google/resource_compute_vpn_gateway.go index e84e6e4d..e2a74eae 100644 --- a/google/resource_compute_vpn_gateway.go +++ b/google/resource_compute_vpn_gateway.go @@ -166,6 +166,14 @@ func resourceComputeVpnGatewayRead(d *schema.ResourceData, meta interface{}) err return handleNotFoundError(err, d, fmt.Sprintf("ComputeVpnGateway %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading VpnGateway: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeVpnGatewayCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading VpnGateway: %s", err) } @@ -184,13 +192,6 @@ func resourceComputeVpnGatewayRead(d *schema.ResourceData, meta interface{}) err if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading VpnGateway: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading VpnGateway: %s", err) - } return nil } diff --git a/google/resource_compute_vpn_tunnel.go b/google/resource_compute_vpn_tunnel.go index b4230859..adf90c7a 100644 --- a/google/resource_compute_vpn_tunnel.go +++ b/google/resource_compute_vpn_tunnel.go @@ -382,6 +382,14 @@ func resourceComputeVpnTunnelRead(d *schema.ResourceData, meta interface{}) erro return handleNotFoundError(err, d, fmt.Sprintf("ComputeVpnTunnel %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading VpnTunnel: %s", err) + } + if err := d.Set("creation_timestamp", flattenComputeVpnTunnelCreationTimestamp(res["creationTimestamp"])); err != nil { return fmt.Errorf("Error reading VpnTunnel: %s", err) } @@ -427,13 +435,6 @@ func resourceComputeVpnTunnelRead(d *schema.ResourceData, meta interface{}) erro if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { return fmt.Errorf("Error reading VpnTunnel: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading VpnTunnel: %s", err) - } return nil } diff --git a/google/resource_dns_managed_zone.go b/google/resource_dns_managed_zone.go index ffc07234..d03eb2c6 100644 --- a/google/resource_dns_managed_zone.go +++ b/google/resource_dns_managed_zone.go @@ -136,6 +136,14 @@ func resourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) error return handleNotFoundError(err, d, fmt.Sprintf("DnsManagedZone %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading ManagedZone: %s", err) + } + if err := d.Set("description", flattenDnsManagedZoneDescription(res["description"])); err != nil { return fmt.Errorf("Error reading ManagedZone: %s", err) } @@ -151,13 +159,6 @@ func resourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) error if err := d.Set("labels", flattenDnsManagedZoneLabels(res["labels"])); err != nil { return fmt.Errorf("Error reading ManagedZone: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading ManagedZone: %s", err) - } return nil } diff --git a/google/resource_monitoring_alert_policy.go b/google/resource_monitoring_alert_policy.go index 4ebe8d9a..c79947a9 100644 --- a/google/resource_monitoring_alert_policy.go +++ b/google/resource_monitoring_alert_policy.go @@ -395,6 +395,14 @@ func resourceMonitoringAlertPolicyRead(d *schema.ResourceData, meta interface{}) return handleNotFoundError(err, d, fmt.Sprintf("MonitoringAlertPolicy %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading AlertPolicy: %s", err) + } + if err := d.Set("name", flattenMonitoringAlertPolicyName(res["name"])); err != nil { return fmt.Errorf("Error reading AlertPolicy: %s", err) } @@ -422,13 +430,6 @@ func resourceMonitoringAlertPolicyRead(d *schema.ResourceData, meta interface{}) if err := d.Set("documentation", flattenMonitoringAlertPolicyDocumentation(res["documentation"])); err != nil { return fmt.Errorf("Error reading AlertPolicy: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading AlertPolicy: %s", err) - } return nil } diff --git a/google/resource_monitoring_group.go b/google/resource_monitoring_group.go index 8712b1cd..ec9abe49 100644 --- a/google/resource_monitoring_group.go +++ b/google/resource_monitoring_group.go @@ -145,6 +145,14 @@ func resourceMonitoringGroupRead(d *schema.ResourceData, meta interface{}) error return handleNotFoundError(err, d, fmt.Sprintf("MonitoringGroup %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Group: %s", err) + } + if err := d.Set("parent_name", flattenMonitoringGroupParentName(res["parentName"])); err != nil { return fmt.Errorf("Error reading Group: %s", err) } @@ -160,13 +168,6 @@ func resourceMonitoringGroupRead(d *schema.ResourceData, meta interface{}) error if err := d.Set("filter", flattenMonitoringGroupFilter(res["filter"])); err != nil { return fmt.Errorf("Error reading Group: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Group: %s", err) - } return nil } diff --git a/google/resource_monitoring_notification_channel.go b/google/resource_monitoring_notification_channel.go index e8e419d1..bea071af 100644 --- a/google/resource_monitoring_notification_channel.go +++ b/google/resource_monitoring_notification_channel.go @@ -171,6 +171,14 @@ func resourceMonitoringNotificationChannelRead(d *schema.ResourceData, meta inte return handleNotFoundError(err, d, fmt.Sprintf("MonitoringNotificationChannel %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading NotificationChannel: %s", err) + } + if err := d.Set("labels", flattenMonitoringNotificationChannelLabels(res["labels"])); err != nil { return fmt.Errorf("Error reading NotificationChannel: %s", err) } @@ -195,13 +203,6 @@ func resourceMonitoringNotificationChannelRead(d *schema.ResourceData, meta inte if err := d.Set("enabled", flattenMonitoringNotificationChannelEnabled(res["enabled"])); err != nil { return fmt.Errorf("Error reading NotificationChannel: %s", err) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading NotificationChannel: %s", err) - } return nil } diff --git a/google/resource_redis_instance.go b/google/resource_redis_instance.go index 3ee101d6..bf2829fb 100644 --- a/google/resource_redis_instance.go +++ b/google/resource_redis_instance.go @@ -265,6 +265,14 @@ func resourceRedisInstanceRead(d *schema.ResourceData, meta interface{}) error { return handleNotFoundError(err, d, fmt.Sprintf("RedisInstance %q", d.Id())) } + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading Instance: %s", err) + } + if err := d.Set("alternative_location_id", flattenRedisInstanceAlternativeLocationId(res["alternativeLocationId"])); err != nil { return fmt.Errorf("Error reading Instance: %s", err) } @@ -310,13 +318,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) } - project, err := getProject(d, config) - if err != nil { - return err - } - if err := d.Set("project", project); err != nil { - return fmt.Errorf("Error reading Instance: %s", err) - } return nil }