Combine DoUpdate and DoUpdateWithChanges (#3995)

## Changes

This PR:
1. Combines DoUpdate and DoUpdateWithChanges
2. Keeps the combined new function as optional

## Why
Some resources don't support DoUpdate operations:
1. **Secret scopes** - The Databricks API doesn't provide an update
method for secret scopes
3. **Serving endpoints** - Only `DoUpdateWithChanges` is necessary, not
the standard `DoUpdate` method

This also simplifies the direct deployment framework.

## Tests
All existing tests continue to pass.

Author: shreyas-goenka

bundle/direct/apply.go

@@ -105,15 +105,11 @@ func (d *DeploymentUnit) Recreate(ctx context.Context, db *dstate.DeploymentStat
 }
 
 func (d *DeploymentUnit) Update(ctx context.Context, db *dstate.DeploymentState, id string, newState any, changes *deployplan.Changes) error {
-	var remoteState any
-	var err error
-
-	if d.Adapter.HasDoUpdateWithChanges() && changes != nil {
-		remoteState, err = d.Adapter.DoUpdateWithChanges(ctx, id, newState, changes)
-	} else {
-		remoteState, err = d.Adapter.DoUpdate(ctx, id, newState)
+	if !d.Adapter.HasDoUpdate() {
+		return fmt.Errorf("internal error: DoUpdate not implemented for resource %s", d.ResourceKey)
 	}
 
+	remoteState, err := d.Adapter.DoUpdate(ctx, id, newState, changes)
 	if err != nil {
 		return fmt.Errorf("updating id=%s: %w", id, err)
 	}

bundle/direct/bundle_plan.go

@@ -202,6 +202,12 @@ func (b *DeploymentBundle) CalculatePlan(ctx context.Context, client *databricks
 			b.RemoteStateCache.Store(resourceKey, remoteState)
 		}
 
+		// Validate that resources without DoUpdate don't have update actions
+		if action == deployplan.ActionTypeUpdate && !adapter.HasDoUpdate() {
+			logdiag.LogError(ctx, fmt.Errorf("%s: resource does not support update action but plan produced update", errorPrefix))
+			return false
+		}
+
 		entry.Action = action.String()
 
 		if len(localChangeMap) > 0 || len(remoteChangeMap) > 0 {

bundle/direct/dresources/adapter.go

@@ -63,13 +63,10 @@ type IResource interface {
 	// Example: func (r *ResourceVolume) DoCreate(ctx context.Context, newState *catalog.CreateVolumeRequestContent) (string, *catalog.VolumeInfo, error)
 	DoCreate(ctx context.Context, newState any) (id string, remoteState any, e error)
 
-	// DoUpdate updates the resource. ID must not change as a result of this operation. Returns optionally remote state.
+	// [Optional] DoUpdate updates the resource. ID must not change as a result of this operation. Returns optionally remote state.
 	// If remote state is available as part of the operation, return it; otherwise return nil.
-	// Example: func (r *ResourceSchema) DoUpdate(ctx context.Context, id string, newState *catalog.CreateSchema) (*catalog.SchemaInfo, error)
-	DoUpdate(ctx context.Context, id string, newState any) (remoteState any, e error)
-
-	// [Optional] DoUpdateWithChanges updates the resource with information about changes computed during plan. Returns optionally remote state.
-	DoUpdateWithChanges(ctx context.Context, id string, newState any, changes *deployplan.Changes) (remoteState any, e error)
+	// Example: func (r *ResourceSchema) DoUpdate(ctx context.Context, id string, newState *catalog.CreateSchema, changes *deployplan.Changes) (*catalog.SchemaInfo, error)
+	DoUpdate(ctx context.Context, id string, newState any, changes *deployplan.Changes) (remoteState any, e error)
 
 	// [Optional] DoUpdateWithID performs an update that may result in resource having a new ID. Returns new id and optionally remote state.
 	DoUpdateWithID(ctx context.Context, id string, newState any) (newID string, remoteState any, e error)
@@ -94,15 +91,14 @@ type Adapter struct {
 	doRefresh    *calladapt.BoundCaller
 	doDelete     *calladapt.BoundCaller
 	doCreate     *calladapt.BoundCaller
-	doUpdate     *calladapt.BoundCaller
 
 	// Optional:
-	doUpdateWithChanges *calladapt.BoundCaller
-	doUpdateWithID      *calladapt.BoundCaller
-	waitAfterCreate     *calladapt.BoundCaller
-	waitAfterUpdate     *calladapt.BoundCaller
-	classifyChange      *calladapt.BoundCaller
-	doResize            *calladapt.BoundCaller
+	doUpdate        *calladapt.BoundCaller
+	doUpdateWithID  *calladapt.BoundCaller
+	waitAfterCreate *calladapt.BoundCaller
+	waitAfterUpdate *calladapt.BoundCaller
+	classifyChange  *calladapt.BoundCaller
+	doResize        *calladapt.BoundCaller
 
 	fieldTriggersLocal  map[string]deployplan.ActionType
 	fieldTriggersRemote map[string]deployplan.ActionType
@@ -128,7 +124,6 @@ func NewAdapter(typedNil any, client *databricks.WorkspaceClient) (*Adapter, err
 		doDelete:            nil,
 		doCreate:            nil,
 		doUpdate:            nil,
-		doUpdateWithChanges: nil,
 		doUpdateWithID:      nil,
 		doResize:            nil,
 		waitAfterCreate:     nil,
@@ -225,14 +220,9 @@ func (a *Adapter) initMethods(resource any) error {
 		return err
 	}
 
-	a.doUpdate, err = prepareCallRequired(resource, "DoUpdate")
-	if err != nil {
-		return err
-	}
-
 	// Optional methods with varying signatures:
 
-	a.doUpdateWithChanges, err = calladapt.PrepareCall(resource, calladapt.TypeOf[IResource](), "DoUpdateWithChanges")
+	a.doUpdate, err = calladapt.PrepareCall(resource, calladapt.TypeOf[IResource](), "DoUpdate")
 	if err != nil {
 		return err
 	}
@@ -299,7 +289,6 @@ func (a *Adapter) validate() error {
 	validations := []any{
 		"PrepareState return", a.prepareState.OutTypes[0], stateType,
 		"DoCreate newState", a.doCreate.InTypes[1], stateType,
-		"DoUpdate newState", a.doUpdate.InTypes[2], stateType,
 	}
 
 	// If RemapState is implemented, validate its signature.
@@ -319,19 +308,13 @@ func (a *Adapter) validate() error {
 	}
 	validations = append(validations, "DoCreate remoteState return", a.doCreate.OutTypes[1], remoteType)
 
-	// Validate DoUpdate: must return (remoteType, error)
-	if len(a.doUpdate.OutTypes) != 2 {
-		return fmt.Errorf("DoUpdate must return (remoteType, error), got %d return values", len(a.doUpdate.OutTypes))
-	}
-	validations = append(validations, "DoUpdate remoteState return", a.doUpdate.OutTypes[0], remoteType)
-
-	if a.doUpdateWithChanges != nil {
-		validations = append(validations, "DoUpdateWithChanges newState", a.doUpdateWithChanges.InTypes[2], stateType)
-		// DoUpdateWithChanges must return (remoteType, error)
-		if len(a.doUpdateWithChanges.OutTypes) != 2 {
-			return fmt.Errorf("DoUpdateWithChanges must return (remoteType, error), got %d return values", len(a.doUpdateWithChanges.OutTypes))
+	// Validate DoUpdate: must return (remoteType, error) if implemented
+	if a.doUpdate != nil {
+		validations = append(validations, "DoUpdate newState", a.doUpdate.InTypes[2], stateType)
+		if len(a.doUpdate.OutTypes) != 2 {
+			return fmt.Errorf("DoUpdate must return (remoteType, error), got %d return values", len(a.doUpdate.OutTypes))
 		}
-		validations = append(validations, "DoUpdateWithChanges remoteState return", a.doUpdateWithChanges.OutTypes[0], remoteType)
+		validations = append(validations, "DoUpdate remoteState return", a.doUpdate.OutTypes[0], remoteType)
 	}
 
 	if a.doResize != nil {
@@ -471,30 +454,19 @@ func (a *Adapter) DoCreate(ctx context.Context, newState any) (string, any, erro
 	return id, remoteState, nil
 }
 
-// DoUpdate updates the resource. Returns remote state if available, otherwise nil.
-func (a *Adapter) DoUpdate(ctx context.Context, id string, newState any) (any, error) {
-	outs, err := a.doUpdate.Call(ctx, id, newState)
-	if err != nil {
-		return nil, err
-	}
-
-	remoteState := normalizeNilPointer(outs[0])
-	return remoteState, nil
-}
-
-// HasDoUpdateWithChanges returns true if the resource implements DoUpdateWithChanges method.
-func (a *Adapter) HasDoUpdateWithChanges() bool {
-	return a.doUpdateWithChanges != nil
+// HasDoUpdate returns true if the resource implements DoUpdate method.
+func (a *Adapter) HasDoUpdate() bool {
+	return a.doUpdate != nil
 }
 
-// DoUpdateWithChanges updates the resource with information about changes computed during plan.
+// DoUpdate updates the resource with information about changes computed during plan.
 // Returns remote state if available, otherwise nil.
-func (a *Adapter) DoUpdateWithChanges(ctx context.Context, id string, newState any, changes *deployplan.Changes) (any, error) {
-	if a.doUpdateWithChanges == nil {
-		return nil, errors.New("internal error: DoUpdateWithChanges not found")
+func (a *Adapter) DoUpdate(ctx context.Context, id string, newState any, changes *deployplan.Changes) (any, error) {
+	if a.doUpdate == nil {
+		return nil, errors.New("internal error: DoUpdate not found")
 	}
 
-	outs, err := a.doUpdateWithChanges.Call(ctx, id, newState, changes)
+	outs, err := a.doUpdate.Call(ctx, id, newState, changes)
 	if err != nil {
 		return nil, err
 	}

bundle/direct/dresources/alert.go

@@ -4,10 +4,13 @@ import (
 	"context"
 
 	"github.com/databricks/cli/bundle/config/resources"
+	"github.com/databricks/cli/bundle/deployplan"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/service/sql"
 )
 
+type Changes = deployplan.Changes
+
 type ResourceAlert struct {
 	client *databricks.WorkspaceClient
 }
@@ -40,7 +43,7 @@ func (r *ResourceAlert) DoCreate(ctx context.Context, config *sql.AlertV2) (stri
 }
 
 // DoUpdate updates the alert in place.
-func (r *ResourceAlert) DoUpdate(ctx context.Context, id string, config *sql.AlertV2) (*sql.AlertV2, error) {
+func (r *ResourceAlert) DoUpdate(ctx context.Context, id string, config *sql.AlertV2, _ *Changes) (*sql.AlertV2, error) {
 	request := sql.UpdateAlertV2Request{
 		Id:         id,
 		Alert:      *config,

bundle/direct/dresources/all_test.go

@@ -465,7 +465,7 @@ func testCRUD(t *testing.T, group string, adapter *Adapter, client *databricks.W
 		require.Equal(t, remote, remoteStateFromWaitCreate)
 	}
 
-	remoteStateFromUpdate, err := adapter.DoUpdate(ctx, createdID, newState)
+	remoteStateFromUpdate, err := adapter.DoUpdate(ctx, createdID, newState, nil)
 	require.NoError(t, err, "DoUpdate failed")
 	if remoteStateFromUpdate != nil {
 		remappedStateFromUpdate, err := adapter.RemapState(remoteStateFromUpdate)
@@ -576,6 +576,33 @@ func TestFieldTriggers(t *testing.T) {
 	}
 }
 
+// TestFieldTriggersNoUpdateWhenNotImplemented validates that resources without
+// DoUpdate implementation don't produce update actions in their FieldTriggers.
+func TestFieldTriggersNoUpdateWhenNotImplemented(t *testing.T) {
+	for resourceName, resource := range SupportedResources {
+		adapter, err := NewAdapter(resource, nil)
+		require.NoError(t, err)
+
+		if adapter.HasDoUpdate() {
+			continue
+		}
+
+		t.Run(resourceName+"_local", func(t *testing.T) {
+			for field, action := range adapter.fieldTriggersLocal {
+				assert.NotEqual(t, deployplan.ActionTypeUpdate, action,
+					"resource %s does not implement DoUpdate but field %s triggers update action", resourceName, field)
+			}
+		})
+
+		t.Run(resourceName+"_remote", func(t *testing.T) {
+			for field, action := range adapter.fieldTriggersRemote {
+				assert.NotEqual(t, deployplan.ActionTypeUpdate, action,
+					"resource %s does not implement DoUpdate but field %s triggers update action", resourceName, field)
+			}
+		})
+	}
+}
+
 func setupTestServerClient(t *testing.T) (*testserver.Server, *databricks.WorkspaceClient) {
 	server := testserver.New(t)
 	testserver.AddDefaultHandlers(server)

bundle/direct/dresources/app.go

@@ -42,7 +42,7 @@ func (r *ResourceApp) DoCreate(ctx context.Context, config *apps.App) (string, *
 	return waiter.Response.Name, nil, nil
 }
 
-func (r *ResourceApp) DoUpdate(ctx context.Context, id string, config *apps.App) (*apps.App, error) {
+func (r *ResourceApp) DoUpdate(ctx context.Context, id string, config *apps.App, _ *Changes) (*apps.App, error) {
 	request := apps.UpdateAppRequest{
 		App:  *config,
 		Name: id,

bundle/direct/dresources/cluster.go

@@ -85,7 +85,7 @@ func (r *ResourceCluster) DoCreate(ctx context.Context, config *compute.ClusterS
 	return wait.ClusterId, nil, nil
 }
 
-func (r *ResourceCluster) DoUpdate(ctx context.Context, id string, config *compute.ClusterSpec) (*compute.ClusterDetails, error) {
+func (r *ResourceCluster) DoUpdate(ctx context.Context, id string, config *compute.ClusterSpec, _ *Changes) (*compute.ClusterDetails, error) {
 	// Same retry as in TF provider logic
 	// https://github.com/databricks/terraform-provider-databricks/blob/3eecd0f90cf99d7777e79a3d03c41f9b2aafb004/clusters/resource_cluster.go#L624
 	timeout := 15 * time.Minute

bundle/direct/dresources/dashboard.go

@@ -234,7 +234,7 @@ func (r *ResourceDashboard) DoCreate(ctx context.Context, config *resources.Dash
 	return createResp.DashboardId, responseToState(createResp, publishResp), nil
 }
 
-func (r *ResourceDashboard) DoUpdate(ctx context.Context, id string, config *resources.DashboardConfig) (*resources.DashboardConfig, error) {
+func (r *ResourceDashboard) DoUpdate(ctx context.Context, id string, config *resources.DashboardConfig, _ *Changes) (*resources.DashboardConfig, error) {
 	dashboard, err := prepareDashboardRequest(config)
 	if err != nil {
 		return nil, err

bundle/direct/dresources/database_catalog.go

@@ -34,7 +34,7 @@ func (r *ResourceDatabaseCatalog) DoCreate(ctx context.Context, config *database
 	return result.Name, nil, nil
 }
 
-func (r *ResourceDatabaseCatalog) DoUpdate(ctx context.Context, id string, config *database.DatabaseCatalog) (*database.DatabaseCatalog, error) {
+func (r *ResourceDatabaseCatalog) DoUpdate(ctx context.Context, id string, config *database.DatabaseCatalog, _ *Changes) (*database.DatabaseCatalog, error) {
 	request := database.UpdateDatabaseCatalogRequest{
 		DatabaseCatalog: *config,
 		Name:            id,

bundle/direct/dresources/database_instance.go

@@ -35,7 +35,7 @@ func (d *ResourceDatabaseInstance) DoCreate(ctx context.Context, config *databas
 	return waiter.Response.Name, nil, nil
 }
 
-func (d *ResourceDatabaseInstance) DoUpdate(ctx context.Context, id string, config *database.DatabaseInstance) (*database.DatabaseInstance, error) {
+func (d *ResourceDatabaseInstance) DoUpdate(ctx context.Context, id string, config *database.DatabaseInstance, _ *Changes) (*database.DatabaseInstance, error) {
 	request := database.UpdateDatabaseInstanceRequest{
 		DatabaseInstance: *config,
 		Name:             config.Name,