unify log and id setting

Signed-off-by: Dmitry Kisler <admin@dkisler.com>

Author: kislerdm

provider/resource_branch.go

@@ -270,6 +270,7 @@ func resourceBranchImport(ctx context.Context, d *schema.ResourceData, meta inte
 	}
 
 	if diags := projectReadiness.Retry(resourceBranchRead, ctx, d, meta); diags.HasError() {
+		d.SetId("")
 		return nil, errors.New(diags[0].Summary)
 	}
 	return []*schema.ResourceData{d}, nil

provider/resource_database.go

@@ -93,15 +93,12 @@ func resourceDatabaseReadRetry(ctx context.Context, d *schema.ResourceData, meta
 		http.StatusNotFound: func(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
 			tflog.Debug(ctx, "database not found, removing from state",
 				map[string]interface{}{
-					"project_id":  d.Get("project_id"),
-					"branch_id":   d.Get("branch_id"),
-					"database_id": d.Id(),
+					"id":         d.Id(),
+					"project_id": d.Get("project_id"),
+					"branch_id":  d.Get("branch_id"),
 				})
 			d.SetId("")
-			tflog.Debug(ctx, "recreating database", map[string]interface{}{
-				"project_id": d.Get("project_id"), "branch_id": d.Get("branch_id"),
-			})
-			return resourceDatabaseCreate(ctx, d, meta)
+			return nil
 		}})
 }
 
@@ -152,9 +149,11 @@ func resourceDatabaseUpdate(ctx context.Context, d *schema.ResourceData, meta in
 func resourceDatabaseDeleteRetry(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	return projectReadiness.RetryWithFallback(resourceDatabaseDelete, ctx, d, meta, map[int]FallbackFn{
 		http.StatusNotFound: func(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
+			d.SetId("")
 			return nil
 		},
 		http.StatusUnprocessableEntity: func(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
+			d.SetId("")
 			return nil
 		},
 	})

provider/resource_endpoint.go

@@ -240,7 +240,11 @@ func resourceEndpointReadRetry(ctx context.Context, d *schema.ResourceData, meta
 		map[int]FallbackFn{
 			http.StatusNotFound: func(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
 				tflog.Debug(ctx, "endpoint not found, removing from state",
-					map[string]interface{}{"endpoint_id": d.Id()})
+					map[string]interface{}{
+						"id":         d.Id(),
+						"project_id": d.Get("project_id"),
+						"branch_id":  d.Get("branch_id"),
+					})
 				d.SetId("")
 				return nil
 			}})
@@ -313,6 +317,7 @@ func resourceEndpointImport(ctx context.Context, d *schema.ResourceData, meta in
 		return nil, err
 	}
 	if diags := projectReadiness.Retry(resourceEndpointRead, ctx, d, meta); diags.HasError() {
+		d.SetId("")
 		return nil, errors.New(diags[0].Summary)
 	}
 	return []*schema.ResourceData{d}, nil

provider/resource_project.go

@@ -1055,7 +1055,7 @@ func resourceProjectReadRetry(ctx context.Context, d *schema.ResourceData, meta
 	return projectReadiness.RetryWithFallback(resourceProjectRead, ctx, d, meta, map[int]FallbackFn{
 		http.StatusNotFound: func(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
 			tflog.Debug(ctx, "project not found, deleting from the state",
-				map[string]interface{}{"project_id": d.Id()})
+				map[string]interface{}{"id": d.Id()})
 			d.SetId("")
 			return nil
 		}})

provider/resource_role.go

@@ -115,8 +115,9 @@ func resourceRoleReadRetry(ctx context.Context, d *schema.ResourceData, meta int
 		http.StatusNotFound: func(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
 			tflog.Debug(ctx, "role not found, removing from state",
 				map[string]interface{}{
-					"project_id": d.Get("project_id"), "branch_id": d.Get("project_id"),
-					"name": d.Get("name"),
+					"name":       d.Get("name"),
+					"project_id": d.Get("project_id"),
+					"branch_id":  d.Get("project_id"),
 				})
 			d.SetId("")
 			return nil
@@ -194,6 +195,7 @@ func resourceRoleImport(ctx context.Context, d *schema.ResourceData, meta interf
 
 	setResourceAttrsFromComplexID(d, r)
 	if diags := projectReadiness.Retry(resourceRoleRead, ctx, d, meta); diags.HasError() {
+		d.SetId("")
 		return nil, errors.New(diags[0].Summary)
 	}
 	return []*schema.ResourceData{d}, nil

provider/resource_vpc_endpoint_assignment.go

@@ -100,9 +100,9 @@ func resourceVPCEndpointAssignmentReadRetry(ctx context.Context, d *schema.Resou
 		http.StatusNotFound: func(ctx context.Context, d *schema.ResourceData, meta interface{}) error {
 			tflog.Debug(ctx, "VPC endpoint assignment not found, removing from state",
 				map[string]interface{}{
-					"org_id":          d.Get("org_id"),
-					"region_id":       d.Get("region_id"),
-					"vpc_endpoint_id": d.Get("vpc_endpoint_id"),
+					"id":        d.Get("vpc_endpoint_id"),
+					"org_id":    d.Get("org_id"),
+					"region_id": d.Get("region_id"),
 				})
 			d.SetId("")
 			return nil