From 5b67e989d9f18bcebf53459d4c1d885b5e125a1c Mon Sep 17 00:00:00 2001 From: Sam Levenick Date: Fri, 25 Oct 2019 14:41:04 -0700 Subject: [PATCH 1/2] Update datasources --- .../data_source_compute_network_endpoint_group.go | 2 +- .../data_sources/data_source_dns_managed_zone.go | 10 +++++++--- .../data_source_google_compute_address.go | 2 +- .../data_source_google_compute_backend_service.go | 9 ++++++++- .../data_source_google_compute_forwarding_rule.go | 2 +- .../data_source_google_compute_global_address.go | 3 +-- .../data_source_google_compute_instance.go | 2 +- .../data_source_google_compute_instance_group.go | 8 ++++++-- .../data_source_google_compute_network.go | 2 +- ...ta_source_google_compute_region_instance_group.go | 2 +- ...data_source_google_compute_resource_policy.go.erb | 2 +- .../data_source_google_compute_ssl_certificate.go | 8 +++++++- .../data_source_google_compute_ssl_policy.go | 6 +++++- .../data_source_google_compute_subnetwork.go | 2 +- .../data_source_google_compute_vpn_gateway.go | 2 +- .../data_source_google_container_cluster.go | 12 +++++++++++- .../data_sources/data_source_google_organization.go | 2 +- .../data_sources/data_source_google_project.go | 2 +- 18 files changed, 56 insertions(+), 22 deletions(-) diff --git a/third_party/terraform/data_sources/data_source_compute_network_endpoint_group.go b/third_party/terraform/data_sources/data_source_compute_network_endpoint_group.go index 9945d578fb4f..5f0c48dd5e19 100644 --- a/third_party/terraform/data_sources/data_source_compute_network_endpoint_group.go +++ b/third_party/terraform/data_sources/data_source_compute_network_endpoint_group.go @@ -38,7 +38,7 @@ func dataSourceComputeNetworkEndpointGroupRead(d *schema.ResourceData, meta inte d.Set("name", parsed.Name) d.Set("zone", parsed.Zone) d.Set("project", parsed.Project) - d.SetId(fmt.Sprintf("%s/%s", parsed.Zone, parsed.Name)) + d.SetId(fmt.Sprintf("projects/%s/zones/%s/networkEndpointGroups/%s", parsed.Zone, parsed.Name)) } else { return errors.New("Must provide either `self_link` or `zone/name`") } diff --git a/third_party/terraform/data_sources/data_source_dns_managed_zone.go b/third_party/terraform/data_sources/data_source_dns_managed_zone.go index f86699203a50..e5a281b8598e 100644 --- a/third_party/terraform/data_sources/data_source_dns_managed_zone.go +++ b/third_party/terraform/data_sources/data_source_dns_managed_zone.go @@ -1,6 +1,10 @@ package google -import "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +import ( + "fmt" + + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" +) func dataSourceDnsManagedZone() *schema.Resource { return &schema.Resource{ @@ -43,13 +47,13 @@ func dataSourceDnsManagedZone() *schema.Resource { func dataSourceDnsManagedZoneRead(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) - d.SetId(d.Get("name").(string)) - project, err := getProject(d, config) if err != nil { return err } + d.SetId(fmt.Sprintf("projects/%s/managedZones/%s", project, d.Get("name").(string))) + zone, err := config.clientDns.ManagedZones.Get( project, d.Id()).Do() if err != nil { diff --git a/third_party/terraform/data_sources/data_source_google_compute_address.go b/third_party/terraform/data_sources/data_source_google_compute_address.go index c1286e3f9d5b..40ddf79aef15 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_address.go +++ b/third_party/terraform/data_sources/data_source_google_compute_address.go @@ -78,7 +78,7 @@ func dataSourceGoogleComputeAddressRead(d *schema.ResourceData, meta interface{} d.Set("project", project) d.Set("region", region) - d.SetId(strconv.FormatUint(address.Id, 10)) + d.SetId(fmt.Sprintf("projects/%s/regions/%s/addresses/%s", project, region, name)) return nil } diff --git a/third_party/terraform/data_sources/data_source_google_compute_backend_service.go b/third_party/terraform/data_sources/data_source_google_compute_backend_service.go index 55078c5d5be2..2e300cb41e70 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_backend_service.go +++ b/third_party/terraform/data_sources/data_source_google_compute_backend_service.go @@ -1,6 +1,8 @@ package google import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) @@ -22,7 +24,12 @@ func dataSourceGoogleComputeBackendService() *schema.Resource { func dataSourceComputeBackendServiceRead(d *schema.ResourceData, meta interface{}) error { serviceName := d.Get("name").(string) - d.SetId(serviceName) + project, err := getProject(d, config) + if err != nil { + return err + } + + d.SetId(fmt.Sprintf("projects/%s/global/backendServices/%s", project, serviceName)) return resourceComputeBackendServiceRead(d, meta) } diff --git a/third_party/terraform/data_sources/data_source_google_compute_forwarding_rule.go b/third_party/terraform/data_sources/data_source_google_compute_forwarding_rule.go index 6acbc98c9f31..bb6613fc2ef3 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_forwarding_rule.go +++ b/third_party/terraform/data_sources/data_source_google_compute_forwarding_rule.go @@ -107,7 +107,7 @@ func dataSourceGoogleComputeForwardingRuleRead(d *schema.ResourceData, meta inte if err != nil { return handleNotFoundError(err, d, fmt.Sprintf("Forwarding Rule Not Found : %s", name)) } - d.SetId(frule.Name) + d.SetId(fmt.Sprintf("projects/%s/regions/%s/forwardingRules/%s", project, region, name)) d.Set("self_link", frule.SelfLink) d.Set("description", frule.Description) diff --git a/third_party/terraform/data_sources/data_source_google_compute_global_address.go b/third_party/terraform/data_sources/data_source_google_compute_global_address.go index 5825e74da10a..4283e2e1a8ac 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_global_address.go +++ b/third_party/terraform/data_sources/data_source_google_compute_global_address.go @@ -58,7 +58,6 @@ func dataSourceGoogleComputeGlobalAddressRead(d *schema.ResourceData, meta inter d.Set("status", address.Status) d.Set("self_link", address.SelfLink) d.Set("project", project) - - d.SetId(strconv.FormatUint(address.Id, 10)) + d.SetId(fmt.Sprintf("projects/%s/global/addresses/%s", project, name)) return nil } diff --git a/third_party/terraform/data_sources/data_source_google_compute_instance.go b/third_party/terraform/data_sources/data_source_google_compute_instance.go index c2678fd767df..fa43f8371064 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_instance.go +++ b/third_party/terraform/data_sources/data_source_google_compute_instance.go @@ -149,6 +149,6 @@ func dataSourceGoogleComputeInstanceRead(d *schema.ResourceData, meta interface{ d.Set("project", project) d.Set("zone", GetResourceNameFromSelfLink(instance.Zone)) d.Set("name", instance.Name) - d.SetId(ConvertSelfLinkToV1(instance.SelfLink)) + d.SetId(fmt.Sprintf("projects/%s/zones/%s/instances/%s", project, instance.Zone, instance.Name)) return nil } diff --git a/third_party/terraform/data_sources/data_source_google_compute_instance_group.go b/third_party/terraform/data_sources/data_source_google_compute_instance_group.go index 42945a59eba6..9809f7a656a3 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_instance_group.go +++ b/third_party/terraform/data_sources/data_source_google_compute_instance_group.go @@ -87,7 +87,11 @@ func dataSourceComputeInstanceGroupRead(d *schema.ResourceData, meta interface{} if err != nil { return err } - d.SetId(fmt.Sprintf("%s/%s", zone, name.(string))) + project, err := getProject(d, config) + if err != nil { + return err + } + d.SetId(fmt.Sprintf("projects/%s/zones/%s/instanceGroups/%s", project, zone, name.(string))) } else if selfLink, ok := d.GetOk("self_link"); ok { parsed, err := ParseInstanceGroupFieldValue(selfLink.(string), d, config) if err != nil { @@ -96,7 +100,7 @@ func dataSourceComputeInstanceGroupRead(d *schema.ResourceData, meta interface{} d.Set("name", parsed.Name) d.Set("zone", parsed.Zone) d.Set("project", parsed.Project) - d.SetId(fmt.Sprintf("%s/%s", parsed.Zone, parsed.Name)) + d.SetId(fmt.Sprintf("projects/%s/zones/%s/instanceGroups/%s", parsed.Project, parsed.Zone, parsed.Name)) } else { return errors.New("Must provide either `self_link` or `zone/name`") } diff --git a/third_party/terraform/data_sources/data_source_google_compute_network.go b/third_party/terraform/data_sources/data_source_google_compute_network.go index 9c4d2cba5617..31e9655497ae 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_network.go +++ b/third_party/terraform/data_sources/data_source_google_compute_network.go @@ -61,6 +61,6 @@ func dataSourceGoogleComputeNetworkRead(d *schema.ResourceData, meta interface{} d.Set("self_link", network.SelfLink) d.Set("description", network.Description) d.Set("subnetworks_self_links", network.Subnetworks) - d.SetId(network.Name) + d.SetId(fmt.Sprintf("projects/%s/global/networks/%s", project, network.Name)) return nil } diff --git a/third_party/terraform/data_sources/data_source_google_compute_region_instance_group.go b/third_party/terraform/data_sources/data_source_google_compute_region_instance_group.go index cd01ae00100b..788bf3fb712a 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_region_instance_group.go +++ b/third_party/terraform/data_sources/data_source_google_compute_region_instance_group.go @@ -113,7 +113,7 @@ func dataSourceComputeRegionInstanceGroupRead(d *schema.ResourceData, meta inter } else { d.Set("instances", flattenInstancesWithNamedPorts(members.Items)) } - d.SetId(strconv.FormatUint(instanceGroup.Id, 16)) + d.SetId(fmt.Sprintf("projects/%s/regions/%s/instanceGroups/%s", project, region, name)) d.Set("self_link", instanceGroup.SelfLink) d.Set("name", name) d.Set("project", project) diff --git a/third_party/terraform/data_sources/data_source_google_compute_resource_policy.go.erb b/third_party/terraform/data_sources/data_source_google_compute_resource_policy.go.erb index 40dce7229e73..09f8b3d4dc1f 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_resource_policy.go.erb +++ b/third_party/terraform/data_sources/data_source_google_compute_resource_policy.go.erb @@ -59,7 +59,7 @@ func dataSourceGoogleComputeResourcePolicyRead(d *schema.ResourceData, meta inte } d.Set("self_link", resourcePolicy.SelfLink) d.Set("description", resourcePolicy.Description) - d.SetId(resourcePolicy.Name) + d.SetId(fmt.Sprintf("projects/%s/regions/%s/resourcePolicies/%s", project, regions, name) return nil } <% end -%> diff --git a/third_party/terraform/data_sources/data_source_google_compute_ssl_certificate.go b/third_party/terraform/data_sources/data_source_google_compute_ssl_certificate.go index 3f49e66aae9f..0b5c465ead88 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_ssl_certificate.go +++ b/third_party/terraform/data_sources/data_source_google_compute_ssl_certificate.go @@ -1,6 +1,8 @@ package google import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) @@ -21,9 +23,13 @@ func dataSourceGoogleComputeSslCertificate() *schema.Resource { } func dataSourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{}) error { + project, err := getProject(d, config) + if err != nil { + return err + } certificateName := d.Get("name").(string) - d.SetId(certificateName) + d.SetId(fmt.Sprintf("projects/%s/global/sslCertificates/%s", project, certificateName)) return resourceComputeSslCertificateRead(d, meta) } diff --git a/third_party/terraform/data_sources/data_source_google_compute_ssl_policy.go b/third_party/terraform/data_sources/data_source_google_compute_ssl_policy.go index cec4d28acd6a..bec60c2ebba3 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_ssl_policy.go +++ b/third_party/terraform/data_sources/data_source_google_compute_ssl_policy.go @@ -21,9 +21,13 @@ func dataSourceGoogleComputeSslPolicy() *schema.Resource { } func datasourceComputeSslPolicyRead(d *schema.ResourceData, meta interface{}) error { + project, err := getProject(d, config) + if err != nil { + return err + } policyName := d.Get("name").(string) - d.SetId(policyName) + d.SetId(fmt.Sprintf("projects/%s/global/sslPolicies/%s", project, policyName)) return resourceComputeSslPolicyRead(d, meta) } diff --git a/third_party/terraform/data_sources/data_source_google_compute_subnetwork.go b/third_party/terraform/data_sources/data_source_google_compute_subnetwork.go index 4ba2649cda1e..51270d513e3d 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_subnetwork.go +++ b/third_party/terraform/data_sources/data_source_google_compute_subnetwork.go @@ -95,7 +95,7 @@ func dataSourceGoogleComputeSubnetworkRead(d *schema.ResourceData, meta interfac d.Set("region", region) d.Set("secondary_ip_range", flattenSecondaryRanges(subnetwork.SecondaryIpRanges)) - d.SetId(fmt.Sprintf("%s/%s", region, name)) + d.SetId(fmt.Sprintf("projects/%s/regions/%s/subnetworks/%s", project, region, name)) return nil } diff --git a/third_party/terraform/data_sources/data_source_google_compute_vpn_gateway.go b/third_party/terraform/data_sources/data_source_google_compute_vpn_gateway.go index b8b39ba915e9..dfab9a5c484b 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_vpn_gateway.go +++ b/third_party/terraform/data_sources/data_source_google_compute_vpn_gateway.go @@ -73,6 +73,6 @@ func dataSourceGoogleComputeVpnGatewayRead(d *schema.ResourceData, meta interfac d.Set("self_link", gateway.SelfLink) d.Set("description", gateway.Description) d.Set("project", project) - d.SetId(gateway.Name) + d.SetId(fmt.Sprintf("projects/%s/regions/%s/targetVpnGateways/%s", project, region, name)) return nil } diff --git a/third_party/terraform/data_sources/data_source_google_container_cluster.go b/third_party/terraform/data_sources/data_source_google_container_cluster.go index 7e884cc61e99..666aafc089fc 100644 --- a/third_party/terraform/data_sources/data_source_google_container_cluster.go +++ b/third_party/terraform/data_sources/data_source_google_container_cluster.go @@ -23,7 +23,17 @@ func dataSourceGoogleContainerCluster() *schema.Resource { func datasourceContainerClusterRead(d *schema.ResourceData, meta interface{}) error { clusterName := d.Get("name").(string) - d.SetId(clusterName) + location, err := getLocation(d, config) + if err != nil { + return err + } + + project, err := getProject(d, config) + if err != nil { + return err + } + + d.SetId(containerClusterFullName(project, location, clusterName)) return resourceContainerClusterRead(d, meta) } diff --git a/third_party/terraform/data_sources/data_source_google_organization.go b/third_party/terraform/data_sources/data_source_google_organization.go index 0bf0a723ee7c..eed599e1e54c 100644 --- a/third_party/terraform/data_sources/data_source_google_organization.go +++ b/third_party/terraform/data_sources/data_source_google_organization.go @@ -76,7 +76,7 @@ func dataSourceOrganizationRead(d *schema.ResourceData, meta interface{}) error return fmt.Errorf("one of domain or organization must be set") } - d.SetId(GetResourceNameFromSelfLink(organization.Name)) + d.SetId(organization.Name) d.Set("name", organization.Name) d.Set("domain", organization.DisplayName) d.Set("create_time", organization.CreationTime) diff --git a/third_party/terraform/data_sources/data_source_google_project.go b/third_party/terraform/data_sources/data_source_google_project.go index 618c752d5573..b7ca3a5a07a1 100644 --- a/third_party/terraform/data_sources/data_source_google_project.go +++ b/third_party/terraform/data_sources/data_source_google_project.go @@ -27,7 +27,7 @@ func datasourceGoogleProjectRead(d *schema.ResourceData, meta interface{}) error if err != nil { return err } - d.SetId(project) + d.SetId(fmt.Sprintf("projects/%s", project)) } return resourceGoogleProjectRead(d, meta) From fa620e3806f08a7dda76af770e9775c3bfbf56fe Mon Sep 17 00:00:00 2001 From: Sam Levenick Date: Fri, 25 Oct 2019 14:48:16 -0700 Subject: [PATCH 2/2] formatting --- .../data_source_compute_network_endpoint_group.go | 8 ++++++-- .../data_sources/data_source_google_compute_address.go | 1 - .../data_source_google_compute_backend_service.go | 2 ++ .../data_source_google_compute_global_address.go | 1 - .../data_source_google_compute_region_instance_group.go | 1 - .../data_source_google_compute_ssl_certificate.go | 2 ++ .../data_sources/data_source_google_compute_ssl_policy.go | 4 ++++ .../data_sources/data_source_google_container_cluster.go | 2 ++ .../terraform/data_sources/data_source_google_project.go | 3 ++- 9 files changed, 18 insertions(+), 6 deletions(-) diff --git a/third_party/terraform/data_sources/data_source_compute_network_endpoint_group.go b/third_party/terraform/data_sources/data_source_compute_network_endpoint_group.go index 5f0c48dd5e19..bf0b16f6e1e4 100644 --- a/third_party/terraform/data_sources/data_source_compute_network_endpoint_group.go +++ b/third_party/terraform/data_sources/data_source_compute_network_endpoint_group.go @@ -25,11 +25,15 @@ func dataSourceGoogleComputeNetworkEndpointGroup() *schema.Resource { func dataSourceComputeNetworkEndpointGroupRead(d *schema.ResourceData, meta interface{}) error { config := meta.(*Config) if name, ok := d.GetOk("name"); ok { + project, err := getProject(d, config) + if err != nil { + return err + } zone, err := getZone(d, config) if err != nil { return err } - d.SetId(fmt.Sprintf("%s/%s", zone, name.(string))) + d.SetId(fmt.Sprintf("projects/%s/zones/%s/networkEndpointGroups/%s", project, zone, name.(string))) } else if selfLink, ok := d.GetOk("self_link"); ok { parsed, err := ParseNetworkEndpointGroupFieldValue(selfLink.(string), d, config) if err != nil { @@ -38,7 +42,7 @@ func dataSourceComputeNetworkEndpointGroupRead(d *schema.ResourceData, meta inte d.Set("name", parsed.Name) d.Set("zone", parsed.Zone) d.Set("project", parsed.Project) - d.SetId(fmt.Sprintf("projects/%s/zones/%s/networkEndpointGroups/%s", parsed.Zone, parsed.Name)) + d.SetId(fmt.Sprintf("projects/%s/zones/%s/networkEndpointGroups/%s", parsed.Project, parsed.Zone, parsed.Name)) } else { return errors.New("Must provide either `self_link` or `zone/name`") } diff --git a/third_party/terraform/data_sources/data_source_google_compute_address.go b/third_party/terraform/data_sources/data_source_google_compute_address.go index 40ddf79aef15..28bee45f3539 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_address.go +++ b/third_party/terraform/data_sources/data_source_google_compute_address.go @@ -3,7 +3,6 @@ package google import ( "fmt" "regexp" - "strconv" "strings" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" diff --git a/third_party/terraform/data_sources/data_source_google_compute_backend_service.go b/third_party/terraform/data_sources/data_source_google_compute_backend_service.go index 2e300cb41e70..a8ac7db3b9a3 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_backend_service.go +++ b/third_party/terraform/data_sources/data_source_google_compute_backend_service.go @@ -22,6 +22,8 @@ func dataSourceGoogleComputeBackendService() *schema.Resource { } func dataSourceComputeBackendServiceRead(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + serviceName := d.Get("name").(string) project, err := getProject(d, config) diff --git a/third_party/terraform/data_sources/data_source_google_compute_global_address.go b/third_party/terraform/data_sources/data_source_google_compute_global_address.go index 4283e2e1a8ac..3662a2d3666a 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_global_address.go +++ b/third_party/terraform/data_sources/data_source_google_compute_global_address.go @@ -2,7 +2,6 @@ package google import ( "fmt" - "strconv" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) diff --git a/third_party/terraform/data_sources/data_source_google_compute_region_instance_group.go b/third_party/terraform/data_sources/data_source_google_compute_region_instance_group.go index 788bf3fb712a..749797b46615 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_region_instance_group.go +++ b/third_party/terraform/data_sources/data_source_google_compute_region_instance_group.go @@ -3,7 +3,6 @@ package google import ( "fmt" "log" - "strconv" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" diff --git a/third_party/terraform/data_sources/data_source_google_compute_ssl_certificate.go b/third_party/terraform/data_sources/data_source_google_compute_ssl_certificate.go index 0b5c465ead88..04369989bf51 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_ssl_certificate.go +++ b/third_party/terraform/data_sources/data_source_google_compute_ssl_certificate.go @@ -23,6 +23,8 @@ func dataSourceGoogleComputeSslCertificate() *schema.Resource { } func dataSourceComputeSslCertificateRead(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + project, err := getProject(d, config) if err != nil { return err diff --git a/third_party/terraform/data_sources/data_source_google_compute_ssl_policy.go b/third_party/terraform/data_sources/data_source_google_compute_ssl_policy.go index bec60c2ebba3..6e994847122e 100644 --- a/third_party/terraform/data_sources/data_source_google_compute_ssl_policy.go +++ b/third_party/terraform/data_sources/data_source_google_compute_ssl_policy.go @@ -1,6 +1,8 @@ package google import ( + "fmt" + "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) @@ -21,6 +23,8 @@ func dataSourceGoogleComputeSslPolicy() *schema.Resource { } func datasourceComputeSslPolicyRead(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + project, err := getProject(d, config) if err != nil { return err diff --git a/third_party/terraform/data_sources/data_source_google_container_cluster.go b/third_party/terraform/data_sources/data_source_google_container_cluster.go index 666aafc089fc..069a17d281d8 100644 --- a/third_party/terraform/data_sources/data_source_google_container_cluster.go +++ b/third_party/terraform/data_sources/data_source_google_container_cluster.go @@ -21,6 +21,8 @@ func dataSourceGoogleContainerCluster() *schema.Resource { } func datasourceContainerClusterRead(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + clusterName := d.Get("name").(string) location, err := getLocation(d, config) diff --git a/third_party/terraform/data_sources/data_source_google_project.go b/third_party/terraform/data_sources/data_source_google_project.go index b7ca3a5a07a1..3b23b74cdc9d 100644 --- a/third_party/terraform/data_sources/data_source_google_project.go +++ b/third_party/terraform/data_sources/data_source_google_project.go @@ -1,6 +1,7 @@ package google import ( + "fmt" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) @@ -21,7 +22,7 @@ func datasourceGoogleProjectRead(d *schema.ResourceData, meta interface{}) error if v, ok := d.GetOk("project_id"); ok { project := v.(string) - d.SetId(project) + d.SetId(fmt.Sprintf("projects/%s", project)) } else { project, err := getProject(d, config) if err != nil {