direct: internal: merge IResourceNoRefresh and IResourceWithRefresh (#3932)

denik · web-flow · commit f5cd1b7a1da1 · 2025-11-18T14:00:32.000Z
## Changes
Remove ability to specify DoCreate/DoUpdate/Wait.. without remoteState
return, now all methods must return remote state (can be nil if not
available).

## Why
Simplification, there are too many DoUpdate variants.

For resources that do not have remote state the new approach is slightly
more verbose.

However, for some resources it also highlights missing opportunity to
return remote state, e.g. database_catalogs.go

## Tests
Existing tests.
diff --git a/bundle/direct/dresources/adapter.go b/bundle/direct/dresources/adapter.go
diff --git a/bundle/direct/dresources/app.go b/bundle/direct/dresources/app.go
@@ -28,35 +28,35 @@ func (r *ResourceApp) DoRefresh(ctx context.Context, id string) (*apps.App, erro
 	return r.client.Apps.GetByName(ctx, id)
 }
 
-func (r *ResourceApp) DoCreate(ctx context.Context, config *apps.App) (string, error) {
+func (r *ResourceApp) DoCreate(ctx context.Context, config *apps.App) (string, *apps.App, error) {
 	request := apps.CreateAppRequest{
 		App:             *config,
 		NoCompute:       true,
 		ForceSendFields: nil,
 	}
 	waiter, err := r.client.Apps.Create(ctx, request)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
 
-	return waiter.Response.Name, nil
+	return waiter.Response.Name, nil, nil
 }
 
-func (r *ResourceApp) DoUpdate(ctx context.Context, id string, config *apps.App) error {
+func (r *ResourceApp) DoUpdate(ctx context.Context, id string, config *apps.App) (*apps.App, error) {
 	request := apps.UpdateAppRequest{
 		App:  *config,
 		Name: id,
 	}
 	response, err := r.client.Apps.Update(ctx, request)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	if response.Name != id {
 		log.Warnf(ctx, "apps: response contains unexpected name=%#v (expected %#v)", response.Name, id)
 	}
 
-	return nil
+	return nil, nil
 }
 
 func (r *ResourceApp) DoDelete(ctx context.Context, id string) error {
diff --git a/bundle/direct/dresources/cluster.go b/bundle/direct/dresources/cluster.go
@@ -77,15 +77,15 @@ func (r *ResourceCluster) DoRefresh(ctx context.Context, id string) (*compute.Cl
 	return r.client.Clusters.GetByClusterId(ctx, id)
 }
 
-func (r *ResourceCluster) DoCreate(ctx context.Context, config *compute.ClusterSpec) (string, error) {
+func (r *ResourceCluster) DoCreate(ctx context.Context, config *compute.ClusterSpec) (string, *compute.ClusterDetails, error) {
 	wait, err := r.client.Clusters.Create(ctx, makeCreateCluster(config))
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
-	return wait.ClusterId, nil
+	return wait.ClusterId, nil, nil
 }
 
-func (r *ResourceCluster) DoUpdate(ctx context.Context, id string, config *compute.ClusterSpec) error {
+func (r *ResourceCluster) DoUpdate(ctx context.Context, id string, config *compute.ClusterSpec) (*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
@@ -103,7 +103,7 @@ func (r *ResourceCluster) DoUpdate(ctx context.Context, id string, config *compu
 		}
 		return nil, retries.Halt(err)
 	})
-	return err
+	return nil, err
 }
 
 func (r *ResourceCluster) DoResize(ctx context.Context, id string, config *compute.ClusterSpec) error {
diff --git a/bundle/direct/dresources/database_catalog.go b/bundle/direct/dresources/database_catalog.go
@@ -24,25 +24,25 @@ func (r *ResourceDatabaseCatalog) DoRefresh(ctx context.Context, id string) (*da
 	return r.client.Database.GetDatabaseCatalogByName(ctx, id)
 }
 
-func (r *ResourceDatabaseCatalog) DoCreate(ctx context.Context, config *database.DatabaseCatalog) (string, error) {
+func (r *ResourceDatabaseCatalog) DoCreate(ctx context.Context, config *database.DatabaseCatalog) (string, *database.DatabaseCatalog, error) {
 	result, err := r.client.Database.CreateDatabaseCatalog(ctx, database.CreateDatabaseCatalogRequest{
 		Catalog: *config,
 	})
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
-	return result.Name, nil
+	return result.Name, nil, nil
 }
 
-func (r *ResourceDatabaseCatalog) DoUpdate(ctx context.Context, id string, config *database.DatabaseCatalog) error {
+func (r *ResourceDatabaseCatalog) DoUpdate(ctx context.Context, id string, config *database.DatabaseCatalog) (*database.DatabaseCatalog, error) {
 	request := database.UpdateDatabaseCatalogRequest{
 		DatabaseCatalog: *config,
 		Name:            id,
 		UpdateMask:      "*",
 	}
 
 	_, err := r.client.Database.UpdateDatabaseCatalog(ctx, request)
-	return err
+	return nil, err
 }
 
 func (r *ResourceDatabaseCatalog) DoDelete(ctx context.Context, id string) error {
diff --git a/bundle/direct/dresources/database_instance.go b/bundle/direct/dresources/database_instance.go
@@ -25,37 +25,39 @@ func (d *ResourceDatabaseInstance) DoRefresh(ctx context.Context, id string) (*d
 	return d.client.Database.GetDatabaseInstanceByName(ctx, id)
 }
 
-func (d *ResourceDatabaseInstance) DoCreate(ctx context.Context, config *database.DatabaseInstance) (string, error) {
+func (d *ResourceDatabaseInstance) DoCreate(ctx context.Context, config *database.DatabaseInstance) (string, *database.DatabaseInstance, error) {
 	waiter, err := d.client.Database.CreateDatabaseInstance(ctx, database.CreateDatabaseInstanceRequest{
 		DatabaseInstance: *config,
 	})
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
-	return waiter.Response.Name, nil
+	return waiter.Response.Name, nil, nil
 }
 
-func (d *ResourceDatabaseInstance) DoUpdate(ctx context.Context, id string, config *database.DatabaseInstance) error {
+func (d *ResourceDatabaseInstance) DoUpdate(ctx context.Context, id string, config *database.DatabaseInstance) (*database.DatabaseInstance, error) {
 	request := database.UpdateDatabaseInstanceRequest{
 		DatabaseInstance: *config,
 		Name:             config.Name,
 		UpdateMask:       "*",
 	}
 	request.DatabaseInstance.Uid = id
 	_, err := d.client.Database.UpdateDatabaseInstance(ctx, request)
-	return err
+	return nil, err
 }
 
-func (d *ResourceDatabaseInstance) WaitAfterCreate(ctx context.Context, config *database.DatabaseInstance) error {
+func (d *ResourceDatabaseInstance) WaitAfterCreate(ctx context.Context, config *database.DatabaseInstance) (*database.DatabaseInstance, error) {
 	waiter := &database.WaitGetDatabaseInstanceDatabaseAvailable[database.DatabaseInstance]{
 		Response: config,
 		Name:     config.Name,
 		Poll: func(timeout time.Duration, callback func(*database.DatabaseInstance)) (*database.DatabaseInstance, error) {
 			return d.client.Database.WaitGetDatabaseInstanceDatabaseAvailable(ctx, config.Name, timeout, callback)
 		},
 	}
+
+	// _ is remoteState, should we return it here?
 	_, err := waiter.GetWithTimeout(20 * time.Minute)
-	return err
+	return nil, err
 }
 
 func (d *ResourceDatabaseInstance) DoDelete(ctx context.Context, name string) error {
diff --git a/bundle/direct/dresources/experiment.go b/bundle/direct/dresources/experiment.go
@@ -48,22 +48,22 @@ func (r *ResourceExperiment) DoRefresh(ctx context.Context, id string) (*ml.Expe
 	return result.Experiment, nil
 }
 
-func (r *ResourceExperiment) DoCreate(ctx context.Context, config *ml.CreateExperiment) (string, error) {
+func (r *ResourceExperiment) DoCreate(ctx context.Context, config *ml.CreateExperiment) (string, *ml.Experiment, error) {
 	result, err := r.client.Experiments.CreateExperiment(ctx, *config)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
-	return result.ExperimentId, nil
+	return result.ExperimentId, nil, nil
 }
 
-func (r *ResourceExperiment) DoUpdate(ctx context.Context, id string, config *ml.CreateExperiment) error {
+func (r *ResourceExperiment) DoUpdate(ctx context.Context, id string, config *ml.CreateExperiment) (*ml.Experiment, error) {
 	updateReq := ml.UpdateExperiment{
 		ExperimentId:    id,
 		NewName:         config.Name,
 		ForceSendFields: utils.FilterFields[ml.UpdateExperiment](config.ForceSendFields),
 	}
 
-	return r.client.Experiments.UpdateExperiment(ctx, updateReq)
+	return nil, r.client.Experiments.UpdateExperiment(ctx, updateReq)
 }
 
 func (r *ResourceExperiment) DoDelete(ctx context.Context, id string) error {
diff --git a/bundle/direct/dresources/grants.go b/bundle/direct/dresources/grants.go
@@ -136,17 +136,17 @@ func (r *ResourceGrants) DoRefresh(ctx context.Context, id string) (*GrantsState
 	}, nil
 }
 
-func (r *ResourceGrants) DoCreate(ctx context.Context, state *GrantsState) (string, error) {
+func (r *ResourceGrants) DoCreate(ctx context.Context, state *GrantsState) (string, *GrantsState, error) {
 	err := r.applyGrants(ctx, state)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
 
-	return makeGrantsID(state.SecurableType, state.FullName), nil
+	return makeGrantsID(state.SecurableType, state.FullName), nil, nil
 }
 
-func (r *ResourceGrants) DoUpdate(ctx context.Context, _ string, state *GrantsState) error {
-	return r.applyGrants(ctx, state)
+func (r *ResourceGrants) DoUpdate(ctx context.Context, _ string, state *GrantsState) (*GrantsState, error) {
+	return nil, r.applyGrants(ctx, state)
 }
 
 func (r *ResourceGrants) DoDelete(ctx context.Context, id string) error {
diff --git a/bundle/direct/dresources/job.go b/bundle/direct/dresources/job.go
@@ -37,24 +37,24 @@ func (r *ResourceJob) DoRefresh(ctx context.Context, id string) (*jobs.Job, erro
 	return r.client.Jobs.GetByJobId(ctx, idInt)
 }
 
-func (r *ResourceJob) DoCreate(ctx context.Context, config *jobs.JobSettings) (string, error) {
+func (r *ResourceJob) DoCreate(ctx context.Context, config *jobs.JobSettings) (string, *jobs.Job, error) {
 	request, err := makeCreateJob(*config)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
 	response, err := r.client.Jobs.Create(ctx, request)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
-	return strconv.FormatInt(response.JobId, 10), nil
+	return strconv.FormatInt(response.JobId, 10), nil, nil
 }
 
-func (r *ResourceJob) DoUpdate(ctx context.Context, id string, config *jobs.JobSettings) error {
+func (r *ResourceJob) DoUpdate(ctx context.Context, id string, config *jobs.JobSettings) (*jobs.Job, error) {
 	request, err := makeResetJob(*config, id)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return r.client.Jobs.Reset(ctx, request)
+	return nil, r.client.Jobs.Reset(ctx, request)
 }
 
 func (r *ResourceJob) DoDelete(ctx context.Context, id string) error {
diff --git a/bundle/direct/dresources/model_serving_endpoint.go b/bundle/direct/dresources/model_serving_endpoint.go
@@ -115,13 +115,13 @@ func (r *ResourceModelServingEndpoint) DoRefresh(ctx context.Context, id string)
 	}, nil
 }
 
-func (r *ResourceModelServingEndpoint) DoCreate(ctx context.Context, config *serving.CreateServingEndpoint) (string, error) {
+func (r *ResourceModelServingEndpoint) DoCreate(ctx context.Context, config *serving.CreateServingEndpoint) (string, *RefreshOutput, error) {
 	waiter, err := r.client.ServingEndpoints.Create(ctx, *config)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
 
-	return waiter.Response.Name, nil
+	return waiter.Response.Name, nil, nil
 }
 
 // waitForEndpointReady waits for the serving endpoint to be ready (not updating)
@@ -273,7 +273,7 @@ func (r *ResourceModelServingEndpoint) updateTags(ctx context.Context, id string
 	return nil
 }
 
-func (r *ResourceModelServingEndpoint) DoUpdate(ctx context.Context, id string, config *serving.CreateServingEndpoint) error {
+func (r *ResourceModelServingEndpoint) DoUpdate(ctx context.Context, id string, config *serving.CreateServingEndpoint) (*RefreshOutput, error) {
 	errGroup := errgroup.Group{}
 	errGroup.Go(func() error {
 		return r.updateAiGateway(ctx, id, config.AiGateway)
@@ -287,7 +287,7 @@ func (r *ResourceModelServingEndpoint) DoUpdate(ctx context.Context, id string,
 	errGroup.Go(func() error {
 		return r.updateTags(ctx, id, config.Tags)
 	})
-	return errGroup.Wait()
+	return nil, errGroup.Wait()
 }
 
 func (r *ResourceModelServingEndpoint) WaitAfterUpdate(ctx context.Context, config *serving.CreateServingEndpoint) (*RefreshOutput, error) {
diff --git a/bundle/direct/dresources/permissions.go b/bundle/direct/dresources/permissions.go
@@ -145,21 +145,21 @@ func (r *ResourcePermissions) DoRefresh(ctx context.Context, id string) (*Permis
 }
 
 // DoCreate calls https://docs.databricks.com/api/workspace/jobs/setjobpermissions.
-func (r *ResourcePermissions) DoCreate(ctx context.Context, newState *PermissionsState) (string, error) {
+func (r *ResourcePermissions) DoCreate(ctx context.Context, newState *PermissionsState) (string, *PermissionsState, error) {
 	// should we remember the default here?
-	err := r.DoUpdate(ctx, newState.ObjectID, newState)
+	_, err := r.DoUpdate(ctx, newState.ObjectID, newState)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
 
-	return newState.ObjectID, nil
+	return newState.ObjectID, nil, nil
 }
 
 // DoUpdate calls https://docs.databricks.com/api/workspace/jobs/setjobpermissions.
-func (r *ResourcePermissions) DoUpdate(ctx context.Context, _ string, newState *PermissionsState) error {
+func (r *ResourcePermissions) DoUpdate(ctx context.Context, _ string, newState *PermissionsState) (*PermissionsState, error) {
 	extractedType, extractedID, err := parsePermissionsID(newState.ObjectID)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	_, err = r.client.Permissions.Set(ctx, iam.SetObjectPermissions{
@@ -168,7 +168,7 @@ func (r *ResourcePermissions) DoUpdate(ctx context.Context, _ string, newState *
 		AccessControlList: newState.Permissions,
 	})
 
-	return err
+	return nil, err
 }
 
 // DoDelete is activated in 2 distinct cases:
diff --git a/bundle/direct/dresources/pipeline.go b/bundle/direct/dresources/pipeline.go
@@ -68,15 +68,15 @@ func (r *ResourcePipeline) DoRefresh(ctx context.Context, id string) (*pipelines
 	return r.client.Pipelines.GetByPipelineId(ctx, id)
 }
 
-func (r *ResourcePipeline) DoCreate(ctx context.Context, config *pipelines.CreatePipeline) (string, error) {
+func (r *ResourcePipeline) DoCreate(ctx context.Context, config *pipelines.CreatePipeline) (string, *pipelines.GetPipelineResponse, error) {
 	response, err := r.client.Pipelines.Create(ctx, *config)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
-	return response.PipelineId, nil
+	return response.PipelineId, nil, nil
 }
 
-func (r *ResourcePipeline) DoUpdate(ctx context.Context, id string, config *pipelines.CreatePipeline) error {
+func (r *ResourcePipeline) DoUpdate(ctx context.Context, id string, config *pipelines.CreatePipeline) (*pipelines.GetPipelineResponse, error) {
 	request := pipelines.EditPipeline{
 		AllowDuplicateNames:  config.AllowDuplicateNames,
 		BudgetPolicyId:       config.BudgetPolicyId,
@@ -113,7 +113,7 @@ func (r *ResourcePipeline) DoUpdate(ctx context.Context, id string, config *pipe
 		ForceSendFields:      utils.FilterFields[pipelines.EditPipeline](config.ForceSendFields),
 	}
 
-	return r.client.Pipelines.Update(ctx, request)
+	return nil, r.client.Pipelines.Update(ctx, request)
 }
 
 func (r *ResourcePipeline) DoDelete(ctx context.Context, id string) error {
diff --git a/bundle/direct/dresources/sql_warehouse.go b/bundle/direct/dresources/sql_warehouse.go
@@ -49,16 +49,16 @@ func (r *ResourceSqlWarehouse) DoRefresh(ctx context.Context, id string) (*sql.G
 }
 
 // DoCreate creates the warehouse and returns its id.
-func (r *ResourceSqlWarehouse) DoCreate(ctx context.Context, config *sql.CreateWarehouseRequest) (string, error) {
+func (r *ResourceSqlWarehouse) DoCreate(ctx context.Context, config *sql.CreateWarehouseRequest) (string, *sql.GetWarehouseResponse, error) {
 	waiter, err := r.client.Warehouses.Create(ctx, *config)
 	if err != nil {
-		return "", err
+		return "", nil, err
 	}
-	return waiter.Id, nil
+	return waiter.Id, nil, nil
 }
 
 // DoUpdate updates the warehouse in place.
-func (r *ResourceSqlWarehouse) DoUpdate(ctx context.Context, id string, config *sql.CreateWarehouseRequest) error {
+func (r *ResourceSqlWarehouse) DoUpdate(ctx context.Context, id string, config *sql.CreateWarehouseRequest) (*sql.GetWarehouseResponse, error) {
 	request := sql.EditWarehouseRequest{
 		AutoStopMins:            config.AutoStopMins,
 		Channel:                 config.Channel,
@@ -79,14 +79,14 @@ func (r *ResourceSqlWarehouse) DoUpdate(ctx context.Context, id string, config *
 
 	waiter, err := r.client.Warehouses.Edit(ctx, request)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	if waiter.Id != id {
 		log.Warnf(ctx, "sql_warehouses: response contains unexpected id=%#v (expected %#v)", waiter.Id, id)
 	}
 
-	return nil
+	return nil, nil
 }
 
 func (r *ResourceSqlWarehouse) DoDelete(ctx context.Context, oldID string) error {
diff --git a/bundle/direct/dresources/synced_database_table.go b/bundle/direct/dresources/synced_database_table.go

Original file line number	Diff line number	Diff line change
`@@ -28,35 +28,35 @@ func (r ResourceApp) DoRefresh(ctx context.Context, id string) (apps.App, erro`
`28`	`28`	`return r.client.Apps.GetByName(ctx, id)`
`29`	`29`	`}`
`30`	`30`
`31`		`-func (r ResourceApp) DoCreate(ctx context.Context, config apps.App) (string, error) {`
	`31`	`+func (r ResourceApp) DoCreate(ctx context.Context, config apps.App) (string, *apps.App, error) {`
`32`	`32`	`request := apps.CreateAppRequest{`
`33`	`33`	`App: *config,`
`34`	`34`	`NoCompute: true,`
`35`	`35`	`ForceSendFields: nil,`
`36`	`36`	`}`
`37`	`37`	`waiter, err := r.client.Apps.Create(ctx, request)`
`38`	`38`	`if err != nil {`
`39`		`- return "", err`
	`39`	`+ return "", nil, err`
`40`	`40`	`}`
`41`	`41`
`42`		`- return waiter.Response.Name, nil`
	`42`	`+ return waiter.Response.Name, nil, nil`
`43`	`43`	`}`
`44`	`44`
`45`		`-func (r ResourceApp) DoUpdate(ctx context.Context, id string, config apps.App) error {`
	`45`	`+func (r ResourceApp) DoUpdate(ctx context.Context, id string, config apps.App) (*apps.App, error) {`
`46`	`46`	`request := apps.UpdateAppRequest{`
`47`	`47`	`App: *config,`
`48`	`48`	`Name: id,`
`49`	`49`	`}`
`50`	`50`	`response, err := r.client.Apps.Update(ctx, request)`
`51`	`51`	`if err != nil {`
`52`		`- return err`
	`52`	`+ return nil, err`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`if response.Name != id {`
`56`	`56`	`log.Warnf(ctx, "apps: response contains unexpected name=%#v (expected %#v)", response.Name, id)`
`57`	`57`	`}`
`58`	`58`
`59`		`- return nil`
	`59`	`+ return nil, nil`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func (r *ResourceApp) DoDelete(ctx context.Context, id string) error {`
Original file line number	Diff line number	Diff line change
`@@ -77,15 +77,15 @@ func (r ResourceCluster) DoRefresh(ctx context.Context, id string) (compute.Cl`
`77`	`77`	`return r.client.Clusters.GetByClusterId(ctx, id)`
`78`	`78`	`}`
`79`	`79`
`80`		`-func (r ResourceCluster) DoCreate(ctx context.Context, config compute.ClusterSpec) (string, error) {`
	`80`	`+func (r ResourceCluster) DoCreate(ctx context.Context, config compute.ClusterSpec) (string, *compute.ClusterDetails, error) {`
`81`	`81`	`wait, err := r.client.Clusters.Create(ctx, makeCreateCluster(config))`
`82`	`82`	`if err != nil {`
`83`		`- return "", err`
	`83`	`+ return "", nil, err`
`84`	`84`	`}`
`85`		`- return wait.ClusterId, nil`
	`85`	`+ return wait.ClusterId, nil, nil`
`86`	`86`	`}`
`87`	`87`
`88`		`-func (r ResourceCluster) DoUpdate(ctx context.Context, id string, config compute.ClusterSpec) error {`
	`88`	`+func (r ResourceCluster) DoUpdate(ctx context.Context, id string, config compute.ClusterSpec) (*compute.ClusterDetails, error) {`
`89`	`89`	`// Same retry as in TF provider logic`
`90`	`90`	`// https://github.com/databricks/terraform-provider-databricks/blob/3eecd0f90cf99d7777e79a3d03c41f9b2aafb004/clusters/resource_cluster.go#L624`
`91`	`91`	`timeout := 15 * time.Minute`
`@@ -103,7 +103,7 @@ func (r ResourceCluster) DoUpdate(ctx context.Context, id string, config compu`
`103`	`103`	`}`
`104`	`104`	`return nil, retries.Halt(err)`
`105`	`105`	`})`
`106`		`- return err`
	`106`	`+ return nil, err`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func (r ResourceCluster) DoResize(ctx context.Context, id string, config compute.ClusterSpec) error {`
Original file line number	Diff line number	Diff line change
`@@ -24,25 +24,25 @@ func (r ResourceDatabaseCatalog) DoRefresh(ctx context.Context, id string) (da`
`24`	`24`	`return r.client.Database.GetDatabaseCatalogByName(ctx, id)`
`25`	`25`	`}`
`26`	`26`
`27`		`-func (r ResourceDatabaseCatalog) DoCreate(ctx context.Context, config database.DatabaseCatalog) (string, error) {`
	`27`	`+func (r ResourceDatabaseCatalog) DoCreate(ctx context.Context, config database.DatabaseCatalog) (string, *database.DatabaseCatalog, error) {`
`28`	`28`	`result, err := r.client.Database.CreateDatabaseCatalog(ctx, database.CreateDatabaseCatalogRequest{`
`29`	`29`	`Catalog: *config,`
`30`	`30`	`})`
`31`	`31`	`if err != nil {`
`32`		`- return "", err`
	`32`	`+ return "", nil, err`
`33`	`33`	`}`
`34`		`- return result.Name, nil`
	`34`	`+ return result.Name, nil, nil`
`35`	`35`	`}`
`36`	`36`
`37`		`-func (r ResourceDatabaseCatalog) DoUpdate(ctx context.Context, id string, config database.DatabaseCatalog) error {`
	`37`	`+func (r ResourceDatabaseCatalog) DoUpdate(ctx context.Context, id string, config database.DatabaseCatalog) (*database.DatabaseCatalog, error) {`
`38`	`38`	`request := database.UpdateDatabaseCatalogRequest{`
`39`	`39`	`DatabaseCatalog: *config,`
`40`	`40`	`Name: id,`
`41`	`41`	`UpdateMask: "*",`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`_, err := r.client.Database.UpdateDatabaseCatalog(ctx, request)`
`45`		`- return err`
	`45`	`+ return nil, err`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`func (r *ResourceDatabaseCatalog) DoDelete(ctx context.Context, id string) error {`
Original file line number	Diff line number	Diff line change
`@@ -48,22 +48,22 @@ func (r ResourceExperiment) DoRefresh(ctx context.Context, id string) (ml.Expe`
`48`	`48`	`return result.Experiment, nil`
`49`	`49`	`}`
`50`	`50`
`51`		`-func (r ResourceExperiment) DoCreate(ctx context.Context, config ml.CreateExperiment) (string, error) {`
	`51`	`+func (r ResourceExperiment) DoCreate(ctx context.Context, config ml.CreateExperiment) (string, *ml.Experiment, error) {`
`52`	`52`	`result, err := r.client.Experiments.CreateExperiment(ctx, *config)`
`53`	`53`	`if err != nil {`
`54`		`- return "", err`
	`54`	`+ return "", nil, err`
`55`	`55`	`}`
`56`		`- return result.ExperimentId, nil`
	`56`	`+ return result.ExperimentId, nil, nil`
`57`	`57`	`}`
`58`	`58`
`59`		`-func (r ResourceExperiment) DoUpdate(ctx context.Context, id string, config ml.CreateExperiment) error {`
	`59`	`+func (r ResourceExperiment) DoUpdate(ctx context.Context, id string, config ml.CreateExperiment) (*ml.Experiment, error) {`
`60`	`60`	`updateReq := ml.UpdateExperiment{`
`61`	`61`	`ExperimentId: id,`
`62`	`62`	`NewName: config.Name,`
`63`	`63`	`ForceSendFields: utils.FilterFields[ml.UpdateExperiment](config.ForceSendFields),`
`64`	`64`	`}`
`65`	`65`
`66`		`- return r.client.Experiments.UpdateExperiment(ctx, updateReq)`
	`66`	`+ return nil, r.client.Experiments.UpdateExperiment(ctx, updateReq)`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`func (r *ResourceExperiment) DoDelete(ctx context.Context, id string) error {`
Original file line number	Diff line number	Diff line change
`@@ -136,17 +136,17 @@ func (r ResourceGrants) DoRefresh(ctx context.Context, id string) (GrantsState`
`136`	`136`	`}, nil`
`137`	`137`	`}`
`138`	`138`
`139`		`-func (r ResourceGrants) DoCreate(ctx context.Context, state GrantsState) (string, error) {`
	`139`	`+func (r ResourceGrants) DoCreate(ctx context.Context, state GrantsState) (string, *GrantsState, error) {`
`140`	`140`	`err := r.applyGrants(ctx, state)`
`141`	`141`	`if err != nil {`
`142`		`- return "", err`
	`142`	`+ return "", nil, err`
`143`	`143`	`}`
`144`	`144`
`145`		`- return makeGrantsID(state.SecurableType, state.FullName), nil`
	`145`	`+ return makeGrantsID(state.SecurableType, state.FullName), nil, nil`
`146`	`146`	`}`
`147`	`147`
`148`		`-func (r ResourceGrants) DoUpdate(ctx context.Context, _ string, state GrantsState) error {`
`149`		`- return r.applyGrants(ctx, state)`
	`148`	`+func (r ResourceGrants) DoUpdate(ctx context.Context, _ string, state GrantsState) (*GrantsState, error) {`
	`149`	`+ return nil, r.applyGrants(ctx, state)`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`func (r *ResourceGrants) DoDelete(ctx context.Context, id string) error {`
Original file line number	Diff line number	Diff line change
`@@ -37,24 +37,24 @@ func (r ResourceJob) DoRefresh(ctx context.Context, id string) (jobs.Job, erro`
`37`	`37`	`return r.client.Jobs.GetByJobId(ctx, idInt)`
`38`	`38`	`}`
`39`	`39`
`40`		`-func (r ResourceJob) DoCreate(ctx context.Context, config jobs.JobSettings) (string, error) {`
	`40`	`+func (r ResourceJob) DoCreate(ctx context.Context, config jobs.JobSettings) (string, *jobs.Job, error) {`
`41`	`41`	`request, err := makeCreateJob(*config)`
`42`	`42`	`if err != nil {`
`43`		`- return "", err`
	`43`	`+ return "", nil, err`
`44`	`44`	`}`
`45`	`45`	`response, err := r.client.Jobs.Create(ctx, request)`
`46`	`46`	`if err != nil {`
`47`		`- return "", err`
	`47`	`+ return "", nil, err`
`48`	`48`	`}`
`49`		`- return strconv.FormatInt(response.JobId, 10), nil`
	`49`	`+ return strconv.FormatInt(response.JobId, 10), nil, nil`
`50`	`50`	`}`
`51`	`51`
`52`		`-func (r ResourceJob) DoUpdate(ctx context.Context, id string, config jobs.JobSettings) error {`
	`52`	`+func (r ResourceJob) DoUpdate(ctx context.Context, id string, config jobs.JobSettings) (*jobs.Job, error) {`
`53`	`53`	`request, err := makeResetJob(*config, id)`
`54`	`54`	`if err != nil {`
`55`		`- return err`
	`55`	`+ return nil, err`
`56`	`56`	`}`
`57`		`- return r.client.Jobs.Reset(ctx, request)`
	`57`	`+ return nil, r.client.Jobs.Reset(ctx, request)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`func (r *ResourceJob) DoDelete(ctx context.Context, id string) error {`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,13 @@ func (r *ResourceModelServingEndpoint) DoRefresh(ctx context.Context, id string)`
`115`	`115`	`}, nil`
`116`	`116`	`}`
`117`	`117`
`118`		`-func (r ResourceModelServingEndpoint) DoCreate(ctx context.Context, config serving.CreateServingEndpoint) (string, error) {`
	`118`	`+func (r ResourceModelServingEndpoint) DoCreate(ctx context.Context, config serving.CreateServingEndpoint) (string, *RefreshOutput, error) {`
`119`	`119`	`waiter, err := r.client.ServingEndpoints.Create(ctx, *config)`
`120`	`120`	`if err != nil {`
`121`		`- return "", err`
	`121`	`+ return "", nil, err`
`122`	`122`	`}`
`123`	`123`
`124`		`- return waiter.Response.Name, nil`
	`124`	`+ return waiter.Response.Name, nil, nil`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`// waitForEndpointReady waits for the serving endpoint to be ready (not updating)`
`@@ -273,7 +273,7 @@ func (r *ResourceModelServingEndpoint) updateTags(ctx context.Context, id string`
`273`	`273`	`return nil`
`274`	`274`	`}`
`275`	`275`
`276`		`-func (r ResourceModelServingEndpoint) DoUpdate(ctx context.Context, id string, config serving.CreateServingEndpoint) error {`
	`276`	`+func (r ResourceModelServingEndpoint) DoUpdate(ctx context.Context, id string, config serving.CreateServingEndpoint) (*RefreshOutput, error) {`
`277`	`277`	`errGroup := errgroup.Group{}`
`278`	`278`	`errGroup.Go(func() error {`
`279`	`279`	`return r.updateAiGateway(ctx, id, config.AiGateway)`
`@@ -287,7 +287,7 @@ func (r *ResourceModelServingEndpoint) DoUpdate(ctx context.Context, id string,`
`287`	`287`	`errGroup.Go(func() error {`
`288`	`288`	`return r.updateTags(ctx, id, config.Tags)`
`289`	`289`	`})`
`290`		`- return errGroup.Wait()`
	`290`	`+ return nil, errGroup.Wait()`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`func (r ResourceModelServingEndpoint) WaitAfterUpdate(ctx context.Context, config serving.CreateServingEndpoint) (*RefreshOutput, error) {`