HCPF-2903: Fix project resource - move logic of waiting in retry func

Author: prashantiyer-hashicorp

internal/clients/project.go

@@ -6,6 +6,7 @@ package clients
 import (
 	"context"
 	"fmt"
+	sharedmodels "github.com/hashicorp/hcp-sdk-go/clients/cloud-shared/v1/models"
 
 	"github.com/cenkalti/backoff/v4"
 
@@ -61,6 +62,10 @@ func CreateProjectWithRetry(client *Client, params *project_service.ProjectServi
 	op := func() error {
 		var err error
 		res, err = client.Project.ProjectServiceCreate(params, nil)
+		// Wait for the project to be created, if an operation ID is returned.
+		if res.Payload.OperationID != "" {
+			return waitForProjectOperation(params.Context, client, "create project", res.Payload.Project.ID, res.Payload.OperationID)
+		}
 		return err
 	}
 
@@ -76,6 +81,10 @@ func SetProjectNameWithRetry(client *Client, params *project_service.ProjectServ
 	op := func() error {
 		var err error
 		res, err = client.Project.ProjectServiceSetName(params, nil)
+		// Wait for the project name to be set, if an operation ID is returned.
+		if res.Payload.OperationID != "" {
+			return waitForProjectOperation(params.Context, client, "set project name", params.ID, res.Payload.OperationID)
+		}
 		return err
 	}
 
@@ -91,6 +100,10 @@ func SetProjectDescriptionWithRetry(client *Client, params *project_service.Proj
 	op := func() error {
 		var err error
 		res, err = client.Project.ProjectServiceSetDescription(params, nil)
+		// Wait for the project description to be set, if an operation ID is returned.
+		if res.Payload.OperationID != "" {
+			return waitForProjectOperation(params.Context, client, "set project description", params.ID, res.Payload.OperationID)
+		}
 		return err
 	}
 
@@ -99,3 +112,29 @@ func SetProjectDescriptionWithRetry(client *Client, params *project_service.Proj
 
 	return res, err
 }
+
+// DeleteProjectWithRetry wraps the projects service client with an exponential backoff retry mechanism.
+func DeleteProjectWithRetry(client *Client, params *project_service.ProjectServiceDeleteParams) (*project_service.ProjectServiceDeleteOK, error) {
+	var res *project_service.ProjectServiceDeleteOK
+	op := func() error {
+		var err error
+		res, err = client.Project.ProjectServiceDelete(params, nil)
+		// Wait for the project to be deleted, if an operation ID is returned.
+		if res.Payload.Operation.ID != "" {
+			// For delete operations, the operation is scoped at the organization level
+			projectID := ""
+			return waitForProjectOperation(params.Context, client, "delete project", projectID, res.Payload.Operation.ID)
+		}
+		return err
+	}
+
+	serviceErr := &project_service.ProjectServiceDeleteDefault{}
+	err := backoff.Retry(newBackoffOp(op, serviceErr), newBackoff())
+
+	return res, err
+}
+
+func waitForProjectOperation(ctx context.Context, client *Client, operationName, projectID string, operationID string) error {
+	loc := &sharedmodels.HashicorpCloudLocationLocation{OrganizationID: client.Config.OrganizationID, ProjectID: projectID}
+	return WaitForOperation(ctx, client, operationName, loc, operationID)
+}

internal/provider/resourcemanager/resource_project.go

@@ -13,7 +13,6 @@ import (
 	billingModels "github.com/hashicorp/hcp-sdk-go/clients/cloud-billing/preview/2020-11-05/models"
 	"github.com/hashicorp/hcp-sdk-go/clients/cloud-resource-manager/stable/2019-12-10/client/project_service"
 	"github.com/hashicorp/hcp-sdk-go/clients/cloud-resource-manager/stable/2019-12-10/models"
-	sharedmodels "github.com/hashicorp/hcp-sdk-go/clients/cloud-shared/v1/models"
 	"github.com/hashicorp/terraform-plugin-framework-validators/stringvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
@@ -132,15 +131,6 @@ func (r *resourceProject) Create(ctx context.Context, req resource.CreateRequest
 		return
 	}
 
-	// Wait for the project to be created, if an operation ID is returned.
-	if res.Payload.OperationID != "" {
-		err = waitForProjectOperation(ctx, r.client, "create project", res.Payload.Project.ID, res.Payload.OperationID)
-		if err != nil {
-			resp.Diagnostics.AddError("Error waiting for project creation", err.Error())
-			return
-		}
-	}
-
 	p := res.GetPayload().Project
 	plan.ResourceID = types.StringValue(p.ID)
 	plan.ResourceName = types.StringValue(fmt.Sprintf("project/%s", p.ID))
@@ -230,21 +220,11 @@ func (r *resourceProject) Update(ctx context.Context, req resource.UpdateRequest
 			Name: plan.Name.ValueString(),
 		}
 
-		res, err := clients.SetProjectNameWithRetry(r.client, setNameReq)
+		_, err := clients.SetProjectNameWithRetry(r.client, setNameReq)
 		if err != nil {
 			resp.Diagnostics.AddError("Error updating project name", err.Error())
 			return
 		}
-
-		// Wait for the project name to be updated, if an operation ID is returned.
-		if res.Payload.OperationID != "" {
-			// Wait for the project name to be updated.
-			err = waitForProjectOperation(ctx, r.client, "update project name", plan.ResourceID.ValueString(), res.Payload.OperationID)
-			if err != nil {
-				resp.Diagnostics.AddError("Error waiting for project name update", err.Error())
-				return
-			}
-		}
 	}
 
 	// Check if the description was updated
@@ -255,21 +235,12 @@ func (r *resourceProject) Update(ctx context.Context, req resource.UpdateRequest
 			Description: plan.Description.ValueString(),
 		}
 
-		res, err := clients.SetProjectDescriptionWithRetry(r.client, setDescReq)
+		_, err := clients.SetProjectDescriptionWithRetry(r.client, setDescReq)
 		if err != nil {
 			resp.Diagnostics.AddError("Error updating project description", err.Error())
 			return
 		}
 
-		// Wait for the project description to be updated, if an operation ID is returned.
-		if res.Payload.OperationID != "" {
-			err = waitForProjectOperation(ctx, r.client, "update project description", plan.ResourceID.ValueString(), res.Payload.OperationID)
-			if err != nil {
-				resp.Diagnostics.AddError("Error waiting for project description update", err.Error())
-				return
-			}
-		}
-
 	}
 
 	// Store the updated values
@@ -283,10 +254,10 @@ func (r *resourceProject) Delete(ctx context.Context, req resource.DeleteRequest
 		return
 	}
 
-	getParams := project_service.NewProjectServiceDeleteParams()
-	getParams.ID = state.ResourceID.ValueString()
+	deleteParams := project_service.NewProjectServiceDeleteParams()
+	deleteParams.ID = state.ResourceID.ValueString()
 
-	res, err := r.client.Project.ProjectServiceDelete(getParams, nil)
+	_, err := clients.DeleteProjectWithRetry(r.client, deleteParams)
 	if err != nil {
 		var deleteErr *project_service.ProjectServiceDeleteDefault
 		if errors.As(err, &deleteErr) && deleteErr.IsCode(http.StatusNotFound) {
@@ -296,28 +267,8 @@ func (r *resourceProject) Delete(ctx context.Context, req resource.DeleteRequest
 		resp.Diagnostics.AddError("Error deleting project", err.Error())
 		return
 	}
-
-	// Wait for the project to be deleted, if an operation ID is returned.
-	if res.Payload.Operation.ID != "" {
-		// For delete operations, the operation is scoped at the organization level
-		projectID := ""
-		err = waitForProjectOperation(ctx, r.client, "delete project", projectID, res.Payload.Operation.ID)
-		if err != nil {
-			resp.Diagnostics.AddError("Error waiting for project deletion", err.Error())
-			return
-		}
-	}
 }
 
 func (r *resourceProject) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
 	resource.ImportStatePassthroughID(ctx, path.Root("resource_id"), req, resp)
 }
-
-func waitForProjectOperation(ctx context.Context, client *clients.Client, operationName, projectID string, operationID string) error {
-	loc := &sharedmodels.HashicorpCloudLocationLocation{
-		OrganizationID: client.Config.OrganizationID,
-		ProjectID:      projectID,
-	}
-
-	return clients.WaitForOperation(ctx, client, operationName, loc, operationID)
-}