Use dcl ID function by default. (#6292) (#4507)

modular-magician · web-flow · commit 5ecfa93427d8 · 2022-07-19T16:54:32.000-07:00
Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/6292.txt b/.changelog/6292.txt
@@ -0,0 +1,3 @@
+```release-note:none
+
+```
diff --git a/google-beta/resource_apikeys_key.go b/google-beta/resource_apikeys_key.go
@@ -239,7 +239,7 @@ func resourceApikeysKeyCreate(d *schema.ResourceData, meta interface{}) error {
 		Restrictions: expandApikeysKeyRestrictions(d.Get("restrictions")),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/global/keys/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_assured_workloads_workload.go b/google-beta/resource_assured_workloads_workload.go
@@ -207,7 +207,7 @@ func resourceAssuredWorkloadsWorkloadCreate(d *schema.ResourceData, meta interfa
 		ResourceSettings:           expandAssuredWorkloadsWorkloadResourceSettingsArray(d.Get("resource_settings")),
 	}
 
-	id, err := replaceVarsForId(d, config, "organizations/{{organization}}/locations/{{location}}/workloads/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
@@ -242,10 +242,11 @@ func resourceAssuredWorkloadsWorkloadCreate(d *schema.ResourceData, meta interfa
 	if err = d.Set("name", res.Name); err != nil {
 		return fmt.Errorf("error setting name in state: %s", err)
 	}
-	// Id has a server-generated value, set again after creation
-	id, err = replaceVarsForId(d, config, "organizations/{{organization}}/locations/{{location}}/workloads/{{name}}")
+	// ID has a server-generated value, set again after creation.
+
+	id, err = res.ID()
 	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
+		return fmt.Errorf("error constructing id: %s", err)
 	}
 	d.SetId(id)
 
diff --git a/google-beta/resource_bigquery_reservation_assignment.go b/google-beta/resource_bigquery_reservation_assignment.go
@@ -145,7 +145,12 @@ func resourceBigqueryReservationAssignmentCreate(d *schema.ResourceData, meta in
 		return fmt.Errorf("Error creating Assignment: %s", err)
 	}
 
-	id, err = obj.ID()
+	if err = d.Set("name", res.Name); err != nil {
+		return fmt.Errorf("error setting name in state: %s", err)
+	}
+	// ID has a server-generated value, set again after creation.
+
+	id, err = res.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_cloudbuild_worker_pool.go b/google-beta/resource_cloudbuild_worker_pool.go
@@ -188,7 +188,7 @@ func resourceCloudbuildWorkerPoolCreate(d *schema.ResourceData, meta interface{}
 		WorkerConfig:  expandCloudbuildWorkerPoolWorkerConfig(d.Get("worker_config")),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/workerPools/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_clouddeploy_delivery_pipeline.go b/google-beta/resource_clouddeploy_delivery_pipeline.go
@@ -249,7 +249,7 @@ func resourceClouddeployDeliveryPipelineCreate(d *schema.ResourceData, meta inte
 		Suspended:      dcl.Bool(d.Get("suspended").(bool)),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/deliveryPipelines/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_clouddeploy_target.go b/google-beta/resource_clouddeploy_target.go
@@ -239,7 +239,7 @@ func resourceClouddeployTargetCreate(d *schema.ResourceData, meta interface{}) e
 		RequireApproval:  dcl.Bool(d.Get("require_approval").(bool)),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/targets/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_compute_firewall_policy.go b/google-beta/resource_compute_firewall_policy.go
@@ -120,7 +120,7 @@ func resourceComputeFirewallPolicyCreate(d *schema.ResourceData, meta interface{
 		Description: dcl.String(d.Get("description").(string)),
 	}
 
-	id, err := replaceVars(d, config, "locations/global/firewallPolicies/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
@@ -155,10 +155,11 @@ func resourceComputeFirewallPolicyCreate(d *schema.ResourceData, meta interface{
 	if err = d.Set("name", res.Name); err != nil {
 		return fmt.Errorf("error setting name in state: %s", err)
 	}
-	// Id has a server-generated value, set again after creation
-	id, err = replaceVars(d, config, "locations/global/firewallPolicies/{{name}}")
+	// ID has a server-generated value, set again after creation.
+
+	id, err = res.ID()
 	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
+		return fmt.Errorf("error constructing id: %s", err)
 	}
 	d.SetId(id)
 
diff --git a/google-beta/resource_compute_firewall_policy_association.go b/google-beta/resource_compute_firewall_policy_association.go
@@ -84,7 +84,7 @@ func resourceComputeFirewallPolicyAssociationCreate(d *schema.ResourceData, meta
 		Name:             dcl.String(d.Get("name").(string)),
 	}
 
-	id, err := replaceVarsForId(d, config, "locations/global/firewallPolicies/{{firewall_policy}}/associations/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_compute_firewall_policy_rule.go b/google-beta/resource_compute_firewall_policy_rule.go
@@ -190,7 +190,7 @@ func resourceComputeFirewallPolicyRuleCreate(d *schema.ResourceData, meta interf
 		TargetServiceAccounts: expandStringArray(d.Get("target_service_accounts")),
 	}
 
-	id, err := replaceVarsForId(d, config, "locations/global/firewallPolicies/{{firewall_policy}}/rules/{{priority}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_compute_global_forwarding_rule.go b/google-beta/resource_compute_global_forwarding_rule.go
@@ -232,7 +232,7 @@ func resourceComputeGlobalForwardingRuleCreate(d *schema.ResourceData, meta inte
 		Project:             dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/global/forwardingRules/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_container_aws_cluster.go b/google-beta/resource_container_aws_cluster.go
@@ -608,7 +608,7 @@ func resourceContainerAwsClusterCreate(d *schema.ResourceData, meta interface{})
 		Project:       dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/awsClusters/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_container_aws_node_pool.go b/google-beta/resource_container_aws_node_pool.go
@@ -429,7 +429,7 @@ func resourceContainerAwsNodePoolCreate(d *schema.ResourceData, meta interface{}
 		Project:           dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/awsClusters/{{cluster}}/awsNodePools/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_container_azure_client.go b/google-beta/resource_container_azure_client.go
@@ -116,7 +116,7 @@ func resourceContainerAzureClientCreate(d *schema.ResourceData, meta interface{}
 		Project:       dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/azureClients/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_container_azure_cluster.go b/google-beta/resource_container_azure_cluster.go
@@ -530,7 +530,7 @@ func resourceContainerAzureClusterCreate(d *schema.ResourceData, meta interface{
 		Project:         dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/azureClusters/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_container_azure_node_pool.go b/google-beta/resource_container_azure_node_pool.go
@@ -329,7 +329,7 @@ func resourceContainerAzureNodePoolCreate(d *schema.ResourceData, meta interface
 		Project:               dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/azureClusters/{{cluster}}/azureNodePools/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_dataplex_lake.go b/google-beta/resource_dataplex_lake.go
@@ -225,7 +225,7 @@ func resourceDataplexLakeCreate(d *schema.ResourceData, meta interface{}) error
 		Project:     dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/lakes/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_dataproc_workflow_template.go b/google-beta/resource_dataproc_workflow_template.go
@@ -2121,7 +2121,7 @@ func resourceDataprocWorkflowTemplateCreate(d *schema.ResourceData, meta interfa
 		Version:    dcl.Int64OrNil(int64(d.Get("version").(int))),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/workflowTemplates/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_eventarc_trigger.go b/google-beta/resource_eventarc_trigger.go
@@ -311,7 +311,7 @@ func resourceEventarcTriggerCreate(d *schema.ResourceData, meta interface{}) err
 		Transport:        expandEventarcTriggerTransport(d.Get("transport")),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/triggers/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_firebaserules_release.go b/google-beta/resource_firebaserules_release.go
@@ -102,7 +102,7 @@ func resourceFirebaserulesReleaseCreate(d *schema.ResourceData, meta interface{}
 		Project:     dcl.String(project),
 	}
 
-	id, err := replaceVars(d, config, "projects/{{project}}/releases/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_firebaserules_ruleset.go b/google-beta/resource_firebaserules_ruleset.go
@@ -156,7 +156,7 @@ func resourceFirebaserulesRulesetCreate(d *schema.ResourceData, meta interface{}
 		Project: dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/rulesets/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
@@ -191,10 +191,11 @@ func resourceFirebaserulesRulesetCreate(d *schema.ResourceData, meta interface{}
 	if err = d.Set("name", res.Name); err != nil {
 		return fmt.Errorf("error setting name in state: %s", err)
 	}
-	// Id has a server-generated value, set again after creation
-	id, err = replaceVarsForId(d, config, "projects/{{project}}/rulesets/{{name}}")
+	// ID has a server-generated value, set again after creation.
+
+	id, err = res.ID()
 	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
+		return fmt.Errorf("error constructing id: %s", err)
 	}
 	d.SetId(id)
 
diff --git a/google-beta/resource_gke_hub_feature.go b/google-beta/resource_gke_hub_feature.go
@@ -221,7 +221,7 @@ func resourceGkeHubFeatureCreate(d *schema.ResourceData, meta interface{}) error
 	mutexKV.Lock(lockName)
 	defer mutexKV.Unlock(lockName)
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/features/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_monitoring_monitored_project.go b/google-beta/resource_monitoring_monitored_project.go
@@ -74,7 +74,7 @@ func resourceMonitoringMonitoredProjectCreate(d *schema.ResourceData, meta inter
 		Name:         dcl.String(d.Get("name").(string)),
 	}
 
-	id, err := replaceVarsForId(d, config, "locations/global/metricsScopes/{{metrics_scope}}/projects/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_network_connectivity_hub.go b/google-beta/resource_network_connectivity_hub.go
@@ -134,7 +134,7 @@ func resourceNetworkConnectivityHubCreate(d *schema.ResourceData, meta interface
 		Project:     dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/global/hubs/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_network_connectivity_spoke.go b/google-beta/resource_network_connectivity_spoke.go
@@ -249,7 +249,7 @@ func resourceNetworkConnectivitySpokeCreate(d *schema.ResourceData, meta interfa
 		Project:                        dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/spokes/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_os_config_os_policy_assignment.go b/google-beta/resource_os_config_os_policy_assignment.go
@@ -1326,7 +1326,7 @@ func resourceOsConfigOsPolicyAssignmentCreate(d *schema.ResourceData, meta inter
 		Project:        dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/osPolicyAssignments/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_privateca_certificate_template.go b/google-beta/resource_privateca_certificate_template.go
@@ -484,7 +484,7 @@ func resourcePrivatecaCertificateTemplateCreate(d *schema.ResourceData, meta int
 		Project:               dcl.String(project),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/certificateTemplates/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
diff --git a/google-beta/resource_recaptcha_enterprise_key.go b/google-beta/resource_recaptcha_enterprise_key.go
@@ -233,7 +233,7 @@ func resourceRecaptchaEnterpriseKeyCreate(d *schema.ResourceData, meta interface
 		WebSettings:     expandRecaptchaEnterpriseKeyWebSettings(d.Get("web_settings")),
 	}
 
-	id, err := replaceVarsForId(d, config, "projects/{{project}}/keys/{{name}}")
+	id, err := obj.ID()
 	if err != nil {
 		return fmt.Errorf("error constructing id: %s", err)
 	}
@@ -268,10 +268,11 @@ func resourceRecaptchaEnterpriseKeyCreate(d *schema.ResourceData, meta interface
 	if err = d.Set("name", res.Name); err != nil {
 		return fmt.Errorf("error setting name in state: %s", err)
 	}
-	// Id has a server-generated value, set again after creation
-	id, err = replaceVarsForId(d, config, "projects/{{project}}/keys/{{name}}")
+	// ID has a server-generated value, set again after creation.
+
+	id, err = res.ID()
 	if err != nil {
-		return fmt.Errorf("Error constructing id: %s", err)
+		return fmt.Errorf("error constructing id: %s", err)
 	}
 	d.SetId(id)
 

Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ func resourceApikeysKeyCreate(d *schema.ResourceData, meta interface{}) error {`
`239`	`239`	`Restrictions: expandApikeysKeyRestrictions(d.Get("restrictions")),`
`240`	`240`	`}`
`241`	`241`
`242`		`- id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/global/keys/{{name}}")`
	`242`	`+ id, err := obj.ID()`
`243`	`243`	`if err != nil {`
`244`	`244`	`return fmt.Errorf("error constructing id: %s", err)`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ func resourceAssuredWorkloadsWorkloadCreate(d *schema.ResourceData, meta interfa`
`207`	`207`	`ResourceSettings: expandAssuredWorkloadsWorkloadResourceSettingsArray(d.Get("resource_settings")),`
`208`	`208`	`}`
`209`	`209`
`210`		`- id, err := replaceVarsForId(d, config, "organizations/{{organization}}/locations/{{location}}/workloads/{{name}}")`
	`210`	`+ id, err := obj.ID()`
`211`	`211`	`if err != nil {`
`212`	`212`	`return fmt.Errorf("error constructing id: %s", err)`
`213`	`213`	`}`
`@@ -242,10 +242,11 @@ func resourceAssuredWorkloadsWorkloadCreate(d *schema.ResourceData, meta interfa`
`242`	`242`	`if err = d.Set("name", res.Name); err != nil {`
`243`	`243`	`return fmt.Errorf("error setting name in state: %s", err)`
`244`	`244`	`}`
`245`		`- // Id has a server-generated value, set again after creation`
`246`		`- id, err = replaceVarsForId(d, config, "organizations/{{organization}}/locations/{{location}}/workloads/{{name}}")`
	`245`	`+ // ID has a server-generated value, set again after creation.`
	`246`	`+`
	`247`	`+ id, err = res.ID()`
`247`	`248`	`if err != nil {`
`248`		`- return fmt.Errorf("Error constructing id: %s", err)`
	`249`	`+ return fmt.Errorf("error constructing id: %s", err)`
`249`	`250`	`}`
`250`	`251`	`d.SetId(id)`
`251`	`252`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,12 @@ func resourceBigqueryReservationAssignmentCreate(d *schema.ResourceData, meta in`
`145`	`145`	`return fmt.Errorf("Error creating Assignment: %s", err)`
`146`	`146`	`}`
`147`	`147`
`148`		`- id, err = obj.ID()`
	`148`	`+ if err = d.Set("name", res.Name); err != nil {`
	`149`	`+ return fmt.Errorf("error setting name in state: %s", err)`
	`150`	`+ }`
	`151`	`+ // ID has a server-generated value, set again after creation.`
	`152`	`+`
	`153`	`+ id, err = res.ID()`
`149`	`154`	`if err != nil {`
`150`	`155`	`return fmt.Errorf("error constructing id: %s", err)`
`151`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func resourceCloudbuildWorkerPoolCreate(d *schema.ResourceData, meta interface{}`
`188`	`188`	`WorkerConfig: expandCloudbuildWorkerPoolWorkerConfig(d.Get("worker_config")),`
`189`	`189`	`}`
`190`	`190`
`191`		`- id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/workerPools/{{name}}")`
	`191`	`+ id, err := obj.ID()`
`192`	`192`	`if err != nil {`
`193`	`193`	`return fmt.Errorf("error constructing id: %s", err)`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ func resourceClouddeployDeliveryPipelineCreate(d *schema.ResourceData, meta inte`
`249`	`249`	`Suspended: dcl.Bool(d.Get("suspended").(bool)),`
`250`	`250`	`}`
`251`	`251`
`252`		`- id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/deliveryPipelines/{{name}}")`
	`252`	`+ id, err := obj.ID()`
`253`	`253`	`if err != nil {`
`254`	`254`	`return fmt.Errorf("error constructing id: %s", err)`
`255`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,7 @@ func resourceClouddeployTargetCreate(d *schema.ResourceData, meta interface{}) e`
`239`	`239`	`RequireApproval: dcl.Bool(d.Get("require_approval").(bool)),`
`240`	`240`	`}`
`241`	`241`
`242`		`- id, err := replaceVarsForId(d, config, "projects/{{project}}/locations/{{location}}/targets/{{name}}")`
	`242`	`+ id, err := obj.ID()`
`243`	`243`	`if err != nil {`
`244`	`244`	`return fmt.Errorf("error constructing id: %s", err)`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func resourceComputeFirewallPolicyCreate(d *schema.ResourceData, meta interface{`
`120`	`120`	`Description: dcl.String(d.Get("description").(string)),`
`121`	`121`	`}`
`122`	`122`
`123`		`- id, err := replaceVars(d, config, "locations/global/firewallPolicies/{{name}}")`
	`123`	`+ id, err := obj.ID()`
`124`	`124`	`if err != nil {`
`125`	`125`	`return fmt.Errorf("error constructing id: %s", err)`
`126`	`126`	`}`
`@@ -155,10 +155,11 @@ func resourceComputeFirewallPolicyCreate(d *schema.ResourceData, meta interface{`
`155`	`155`	`if err = d.Set("name", res.Name); err != nil {`
`156`	`156`	`return fmt.Errorf("error setting name in state: %s", err)`
`157`	`157`	`}`
`158`		`- // Id has a server-generated value, set again after creation`
`159`		`- id, err = replaceVars(d, config, "locations/global/firewallPolicies/{{name}}")`
	`158`	`+ // ID has a server-generated value, set again after creation.`
	`159`	`+`
	`160`	`+ id, err = res.ID()`
`160`	`161`	`if err != nil {`
`161`		`- return fmt.Errorf("Error constructing id: %s", err)`
	`162`	`+ return fmt.Errorf("error constructing id: %s", err)`
`162`	`163`	`}`
`163`	`164`	`d.SetId(id)`
`164`	`165`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func resourceComputeFirewallPolicyAssociationCreate(d *schema.ResourceData, meta`
`84`	`84`	`Name: dcl.String(d.Get("name").(string)),`
`85`	`85`	`}`
`86`	`86`
`87`		`- id, err := replaceVarsForId(d, config, "locations/global/firewallPolicies/{{firewall_policy}}/associations/{{name}}")`
	`87`	`+ id, err := obj.ID()`
`88`	`88`	`if err != nil {`
`89`	`89`	`return fmt.Errorf("error constructing id: %s", err)`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ func resourceComputeFirewallPolicyRuleCreate(d *schema.ResourceData, meta interf`
`190`	`190`	`TargetServiceAccounts: expandStringArray(d.Get("target_service_accounts")),`
`191`	`191`	`}`
`192`	`192`
`193`		`- id, err := replaceVarsForId(d, config, "locations/global/firewallPolicies/{{firewall_policy}}/rules/{{priority}}")`
	`193`	`+ id, err := obj.ID()`
`194`	`194`	`if err != nil {`
`195`	`195`	`return fmt.Errorf("error constructing id: %s", err)`
`196`	`196`	`}`