changed the waiting to happen in the delete function

Author: varundeepsaini

internal/providers/pluginfw/products/app/resource_app.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"reflect"
 	"slices"
+	"time"
 
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/apierr"
@@ -27,6 +28,7 @@ import (
 const (
 	resourceName       = "app"
 	resourceNamePlural = "apps"
+	appDeletionTimeout = 10 * time.Minute
 )
 
 type AppResource struct {
@@ -127,11 +129,6 @@ func (a *resourceApp) Create(ctx context.Context, req resource.CreateRequest, re
 		return
 	}
 
-	if err := waitForAppDeleted(ctx, w, appGoSdk.Name); err != nil {
-		resp.Diagnostics.AddError("failed to wait for app deletion", err.Error())
-		return
-	}
-
 	// Create the app
 	var forceSendFields []string
 	if !app.NoCompute.IsNull() {
@@ -217,7 +214,7 @@ func (a *resourceApp) waitForApp(ctx context.Context, w *databricks.WorkspaceCli
 }
 
 func waitForAppDeleted(ctx context.Context, w *databricks.WorkspaceClient, name string) error {
-	retrier := retries.New[struct{}](retries.WithTimeout(-1), retries.WithRetryFunc(shouldRetry))
+	retrier := retries.New[struct{}](retries.WithTimeout(appDeletionTimeout), retries.WithRetryFunc(shouldRetry))
 	_, err := retrier.Run(ctx, func(ctx context.Context) (*struct{}, error) {
 		app, err := w.Apps.GetByName(ctx, name)
 		if apierr.IsMissing(err) {
@@ -226,10 +223,17 @@ func waitForAppDeleted(ctx context.Context, w *databricks.WorkspaceClient, name
 		if err != nil {
 			return nil, retries.Halt(err)
 		}
-		if app.ComputeStatus.State == apps.ComputeStateDeleting {
-			return nil, retries.Continues(fmt.Sprintf("app %s is still deleting", name))
+		if app.ComputeStatus == nil {
+			return nil, retries.Continues("waiting for compute status")
+		}
+		switch app.ComputeStatus.State {
+		case apps.ComputeStateDeleting:
+			return nil, retries.Continues("app is deleting")
+		case apps.ComputeStateActive, apps.ComputeStateStopped, apps.ComputeStateError:
+			return nil, retries.Halt(fmt.Errorf("app %s was not deleted, current state: %s", name, app.ComputeStatus.State))
+		default:
+			return nil, retries.Continues(fmt.Sprintf("app is in %s state", app.ComputeStatus.State))
 		}
-		return &struct{}{}, nil
 	})
 	return err
 }
@@ -349,6 +353,11 @@ func (a *resourceApp) Delete(ctx context.Context, req resource.DeleteRequest, re
 		resp.Diagnostics.AddError("failed to delete app", err.Error())
 		return
 	}
+
+	if err := waitForAppDeleted(ctx, w, app.Name.ValueString()); err != nil {
+		resp.Diagnostics.AddError("failed to wait for app deletion", err.Error())
+		return
+	}
 }
 
 func (a *resourceApp) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {

internal/providers/pluginfw/products/app/resource_app_test.go

@@ -25,16 +25,15 @@ func TestWaitForAppDeleted_AppDoesNotExist(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func TestWaitForAppDeleted_AppInDeletingState(t *testing.T) {
+func TestWaitForAppDeleted_WaitsUntilDeleted(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	mockClient := mocks.NewMockWorkspaceClient(t)
 	mockAppsAPI := mockClient.GetMockAppsAPI()
 
 	mockAppsAPI.EXPECT().GetByName(mock.Anything, "test-app").Return(&apps.App{
 		Name: "test-app",
 		ComputeStatus: &apps.ComputeStatus{
-			State:   apps.ComputeStateDeleting,
-			Message: "App is being deleted",
+			State: apps.ComputeStateDeleting,
 		},
 	}, nil).Once()
 
@@ -49,23 +48,21 @@ func TestWaitForAppDeleted_AppInDeletingState(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func TestWaitForAppDeleted_AppNotInDeletingState_ReturnsImmediately(t *testing.T) {
+func TestWaitForAppDeleted_AppNotDeleted_Halts(t *testing.T) {
 	ctx := context.Background()
 	mockClient := mocks.NewMockWorkspaceClient(t)
 	mockAppsAPI := mockClient.GetMockAppsAPI()
 
-	// If app exists but is not in DELETING state, return immediately.
-	// The subsequent Create() call will fail with a proper API error.
 	mockAppsAPI.EXPECT().GetByName(mock.Anything, "test-app").Return(&apps.App{
 		Name: "test-app",
 		ComputeStatus: &apps.ComputeStatus{
-			State:   apps.ComputeStateActive,
-			Message: "App is active",
+			State: apps.ComputeStateActive,
 		},
 	}, nil).Once()
 
 	err := waitForAppDeleted(ctx, mockClient.WorkspaceClient, "test-app")
-	assert.NoError(t, err)
+	assert.Error(t, err)
+	assert.Contains(t, err.Error(), "was not deleted")
 }
 
 func TestWaitForAppDeleted_APIError(t *testing.T) {