fix error msgs

sergelogvinov · Jul 11, 2022 · 3a86e95 · 3a86e95
1 parent e0134cf
commit 3a86e95
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/internal/services/resource/resource_group_template_deployment_data_source.go b/internal/services/resource/resource_group_template_deployment_data_source.go
@@ -48,11 +48,14 @@ func dataSourceResourceGroupTemplateDeploymentRead(d *schema.ResourceData, meta
 	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
 	defer cancel()
 
-	id := parse.NewResourceGroupTemplateDeploymentID(subscriptionId, d.Get("resource_group_name").(string), d.Get("name").(string))
+	resourceGroupName := d.Get("resource_group_name").(string)
+	deploymentName := d.Get("name").(string)
+	id := parse.NewResourceGroupTemplateDeploymentID(subscriptionId, resourceGroupName, deploymentName)
+
 	resp, err := client.Get(ctx, id.ResourceGroup, id.DeploymentName)
 	if err != nil {
 		if utils.ResponseWasNotFound(resp.Response) {
-			return fmt.Errorf("Resource Group %s was not found", *id)
+			return fmt.Errorf("template %s in resource Group %s was not found", deploymentName, resourceGroupName)
 		}
 
 		return fmt.Errorf("retrieving Template Deployment %q (Resource Group %q): %+v", id.DeploymentName, id.ResourceGroup, err)

diff --git a/internal/services/resource/subscription_template_deployment_data_source.go b/internal/services/resource/subscription_template_deployment_data_source.go
@@ -48,7 +48,7 @@ func dataSourceSubscriptionTemplateDeploymentRead(d *schema.ResourceData, meta i
 	resp, err := client.GetAtSubscriptionScope(ctx, id.DeploymentName)
 	if err != nil {
 		if utils.ResponseWasNotFound(resp.Response) {
-			return fmt.Errorf("Subscription %s was not found", *id)
+			return fmt.Errorf("template %s in subscription %s was not found", id.DeploymentName, subscriptionId)
 		}
 
 		return fmt.Errorf("retrieving Subscription Template Deployment %q: %+v", id.DeploymentName, err)

diff --git a/internal/services/resource/tenant_template_deployment_data_source.go b/internal/services/resource/tenant_template_deployment_data_source.go
@@ -47,7 +47,7 @@ func dataSourceTenantTemplateDeploymentRead(d *schema.ResourceData, meta interfa
 	resp, err := client.GetAtTenantScope(ctx, id.DeploymentName)
 	if err != nil {
 		if utils.ResponseWasNotFound(resp.Response) {
-			return fmt.Errorf("Tenant %s was not found", *id)
+			return fmt.Errorf("template %s in tenant was not found", id.DeploymentName)
 		}
 
 		return fmt.Errorf("retrieving Tenant Template Deployment %q: %+v", id.DeploymentName, err)