fixes

andrewnester · andrewnester · commit db34f1075460 · 2025-09-09T13:42:49.000+02:00
diff --git a/acceptance/bundle/refschema/out.fields.txt b/acceptance/bundle/refschema/out.fields.txt
@@ -27,6 +27,8 @@ resources.apps.*.effective_budget_policy_id	string	ALL
 resources.apps.*.effective_user_api_scopes	[]string	ALL
 resources.apps.*.effective_user_api_scopes[*]	string	ALL
 resources.apps.*.id	string	ALL
+resources.apps.*.lifecycle	resources.Lifecycle	INPUT
+resources.apps.*.lifecycle.prevent_destroy	bool	INPUT
 resources.apps.*.modified_status	string	INPUT
 resources.apps.*.name	string	ALL
 resources.apps.*.oauth2_app_client_id	string	ALL
@@ -87,6 +89,8 @@ resources.database_catalogs.*.create_database_if_not_exists	bool	ALL
 resources.database_catalogs.*.database_instance_name	string	ALL
 resources.database_catalogs.*.database_name	string	ALL
 resources.database_catalogs.*.id	string	INPUT
+resources.database_catalogs.*.lifecycle	resources.Lifecycle	INPUT
+resources.database_catalogs.*.lifecycle.prevent_destroy	bool	INPUT
 resources.database_catalogs.*.modified_status	string	INPUT
 resources.database_catalogs.*.name	string	ALL
 resources.database_catalogs.*.uid	string	ALL
@@ -109,6 +113,8 @@ resources.database_instances.*.effective_stopped	bool	ALL
 resources.database_instances.*.enable_pg_native_login	bool	ALL
 resources.database_instances.*.enable_readable_secondaries	bool	ALL
 resources.database_instances.*.id	string	INPUT
+resources.database_instances.*.lifecycle	resources.Lifecycle	INPUT
+resources.database_instances.*.lifecycle.prevent_destroy	bool	INPUT
 resources.database_instances.*.modified_status	string	INPUT
 resources.database_instances.*.name	string	ALL
 resources.database_instances.*.node_count	int	ALL
@@ -294,6 +300,8 @@ resources.jobs.*.job_clusters[*].new_cluster.workload_type.clients	compute.Clien
 resources.jobs.*.job_clusters[*].new_cluster.workload_type.clients.jobs	bool	INPUT	STATE
 resources.jobs.*.job_clusters[*].new_cluster.workload_type.clients.notebooks	bool	INPUT	STATE
 resources.jobs.*.job_id	int64	REMOTE
+resources.jobs.*.lifecycle	resources.Lifecycle	INPUT
+resources.jobs.*.lifecycle.prevent_destroy	bool	INPUT
 resources.jobs.*.max_concurrent_runs	int	INPUT	STATE
 resources.jobs.*.modified_status	string	INPUT
 resources.jobs.*.name	string	INPUT	STATE
@@ -2082,6 +2090,8 @@ resources.pipelines.*.libraries[*].maven.repo	string	INPUT	STATE
 resources.pipelines.*.libraries[*].notebook	*pipelines.NotebookLibrary	INPUT	STATE
 resources.pipelines.*.libraries[*].notebook.path	string	INPUT	STATE
 resources.pipelines.*.libraries[*].whl	string	INPUT	STATE
+resources.pipelines.*.lifecycle	resources.Lifecycle	INPUT
+resources.pipelines.*.lifecycle.prevent_destroy	bool	INPUT
 resources.pipelines.*.modified_status	string	INPUT
 resources.pipelines.*.name	string	ALL
 resources.pipelines.*.notifications	[]pipelines.Notifications	INPUT	STATE
@@ -2389,6 +2399,8 @@ resources.schemas.*.grants[*].principal	string	INPUT
 resources.schemas.*.grants[*].privileges	[]resources.SchemaGrantPrivilege	INPUT
 resources.schemas.*.grants[*].privileges[*]	resources.SchemaGrantPrivilege	INPUT
 resources.schemas.*.id	string	INPUT
+resources.schemas.*.lifecycle	resources.Lifecycle	INPUT
+resources.schemas.*.lifecycle.prevent_destroy	bool	INPUT
 resources.schemas.*.metastore_id	string	REMOTE
 resources.schemas.*.modified_status	string	INPUT
 resources.schemas.*.name	string	ALL
@@ -2422,6 +2434,8 @@ resources.sql_warehouses.*.health.summary	string	REMOTE
 resources.sql_warehouses.*.id	string	INPUT	REMOTE
 resources.sql_warehouses.*.instance_profile_arn	string	ALL
 resources.sql_warehouses.*.jdbc_url	string	REMOTE
+resources.sql_warehouses.*.lifecycle	resources.Lifecycle	INPUT
+resources.sql_warehouses.*.lifecycle.prevent_destroy	bool	INPUT
 resources.sql_warehouses.*.max_num_clusters	int	ALL
 resources.sql_warehouses.*.min_num_clusters	int	ALL
 resources.sql_warehouses.*.modified_status	string	INPUT
@@ -2494,6 +2508,8 @@ resources.synced_database_tables.*.database_instance_name	string	ALL
 resources.synced_database_tables.*.effective_database_instance_name	string	ALL
 resources.synced_database_tables.*.effective_logical_database_name	string	ALL
 resources.synced_database_tables.*.id	string	INPUT
+resources.synced_database_tables.*.lifecycle	resources.Lifecycle	INPUT
+resources.synced_database_tables.*.lifecycle.prevent_destroy	bool	INPUT
 resources.synced_database_tables.*.logical_database_name	string	ALL
 resources.synced_database_tables.*.modified_status	string	INPUT
 resources.synced_database_tables.*.name	string	ALL
@@ -2527,6 +2543,8 @@ resources.volumes.*.grants[*].principal	string	INPUT
 resources.volumes.*.grants[*].privileges	[]resources.VolumeGrantPrivilege	INPUT
 resources.volumes.*.grants[*].privileges[*]	resources.VolumeGrantPrivilege	INPUT
 resources.volumes.*.id	string	INPUT
+resources.volumes.*.lifecycle	resources.Lifecycle	INPUT
+resources.volumes.*.lifecycle.prevent_destroy	bool	INPUT
 resources.volumes.*.metastore_id	string	REMOTE
 resources.volumes.*.modified_status	string	INPUT
 resources.volumes.*.name	string	ALL
diff --git a/bundle/config/resources/apps.go b/bundle/config/resources/apps.go
@@ -24,6 +24,7 @@ type AppPermission struct {
 
 type App struct {
 	BaseResource
+	apps.App // nolint App struct also defines Id and URL field with the same json tag "id" and "url"
 
 	// SourceCodePath is a required field used by DABs to point to Databricks app source code
 	// on local disk and to the corresponding workspace path during app deployment.
@@ -36,9 +37,6 @@ type App struct {
 	Config map[string]any `json:"config,omitempty"`
 
 	Permissions []AppPermission `json:"permissions,omitempty"`
-
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
-	apps.App // nolint App struct also defines Id and URL field with the same json tag "id" and "url"
 }
 
 func (a *App) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/base.go b/bundle/config/resources/base.go
@@ -5,4 +5,5 @@ type BaseResource struct {
 	ID             string         `json:"id,omitempty" bundle:"readonly"`
 	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
 	URL            string         `json:"url,omitempty" bundle:"internal"`
+	Lifecycle      Lifecycle      `json:"lifecycle,omitempty"`
 }
diff --git a/bundle/config/resources/clusters.go b/bundle/config/resources/clusters.go
@@ -24,11 +24,9 @@ type ClusterPermission struct {
 
 type Cluster struct {
 	BaseResource
+	compute.ClusterSpec
 
 	Permissions []ClusterPermission `json:"permissions,omitempty"`
-
-	compute.ClusterSpec
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *Cluster) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/dashboard.go b/bundle/config/resources/dashboard.go
@@ -46,10 +46,9 @@ type DashboardConfig struct {
 
 type Dashboard struct {
 	BaseResource
-	Permissions []DashboardPermission `json:"permissions,omitempty"`
-
 	DashboardConfig
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
+
+	Permissions []DashboardPermission `json:"permissions,omitempty"`
 
 	// FilePath points to the local `.lvdash.json` file containing the dashboard definition.
 	// This is inlined into serialized_dashboard during deployment. The file_path is kept around
diff --git a/bundle/config/resources/database_catalog.go b/bundle/config/resources/database_catalog.go
@@ -12,9 +12,7 @@ import (
 
 type DatabaseCatalog struct {
 	BaseResource
-
 	database.DatabaseCatalog
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (d *DatabaseCatalog) Exists(ctx context.Context, w *databricks.WorkspaceClient, name string) (bool, error) {
diff --git a/bundle/config/resources/database_instance.go b/bundle/config/resources/database_instance.go
@@ -24,11 +24,9 @@ type DatabaseInstancePermission struct {
 
 type DatabaseInstance struct {
 	BaseResource
+	database.DatabaseInstance
 
 	Permissions []DatabaseInstancePermission `json:"permissions,omitempty"`
-
-	database.DatabaseInstance
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (d *DatabaseInstance) Exists(ctx context.Context, w *databricks.WorkspaceClient, name string) (bool, error) {
diff --git a/bundle/config/resources/job.go b/bundle/config/resources/job.go
@@ -25,11 +25,9 @@ type JobPermission struct {
 
 type Job struct {
 	BaseResource
+	jobs.JobSettings
 
 	Permissions []JobPermission `json:"permissions,omitempty"`
-
-	jobs.JobSettings
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (j *Job) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/mlflow_experiment.go b/bundle/config/resources/mlflow_experiment.go
@@ -24,11 +24,9 @@ type MlflowExperimentPermission struct {
 
 type MlflowExperiment struct {
 	BaseResource
+	ml.Experiment
 
 	Permissions []MlflowExperimentPermission `json:"permissions,omitempty"`
-
-	ml.Experiment
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *MlflowExperiment) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/mlflow_model.go b/bundle/config/resources/mlflow_model.go
@@ -24,11 +24,9 @@ type MlflowModelPermission struct {
 
 type MlflowModel struct {
 	BaseResource
+	ml.CreateModelRequest
 
 	Permissions []MlflowModelPermission `json:"permissions,omitempty"`
-
-	ml.CreateModelRequest
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *MlflowModel) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/model_serving_endpoint.go b/bundle/config/resources/model_serving_endpoint.go
@@ -23,17 +23,15 @@ type ModelServingEndpointPermission struct {
 }
 
 type ModelServingEndpoint struct {
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
-
 	BaseResource
 
-	// This is a resource agnostic implementation of permissions for ACLs.
-	// Implementation could be different based on the resource type.
-	Permissions []ModelServingEndpointPermission `json:"permissions,omitempty"`
-
 	// This represents the input args for terraform, and will get converted
 	// to a HCL representation for CRUD
 	serving.CreateServingEndpoint
+
+	// This is a resource agnostic implementation of permissions for ACLs.
+	// Implementation could be different based on the resource type.
+	Permissions []ModelServingEndpointPermission `json:"permissions,omitempty"`
 }
 
 func (s *ModelServingEndpoint) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/pipeline.go b/bundle/config/resources/pipeline.go
@@ -24,10 +24,9 @@ type PipelinePermission struct {
 
 type Pipeline struct {
 	BaseResource
-	Permissions []PipelinePermission `json:"permissions,omitempty"`
-
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 	pipelines.CreatePipeline //nolint CreatePipeline also defines Id field with the same json tag "id"
+
+	Permissions []PipelinePermission `json:"permissions,omitempty"`
 }
 
 func (p *Pipeline) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/quality_monitor.go b/bundle/config/resources/quality_monitor.go
@@ -14,12 +14,11 @@ import (
 type QualityMonitor struct {
 	BaseResource
 
-	// The table name is a required field but not included as a JSON field in [catalog.CreateMonitor].
-	TableName string `json:"table_name"`
-
 	// This struct defines the creation payload for a monitor.
 	catalog.CreateMonitor
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
+
+	// The table name is a required field but not included as a JSON field in [catalog.CreateMonitor].
+	TableName string `json:"table_name"`
 }
 
 func (s *QualityMonitor) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/registered_model.go b/bundle/config/resources/registered_model.go
@@ -14,14 +14,13 @@ import (
 type RegisteredModel struct {
 	BaseResource
 
-	// This is a resource agnostic implementation of grants.
-	// Implementation could be different based on the resource type.
-	Grants []Grant `json:"grants,omitempty"`
-
 	// This represents the input args for terraform, and will get converted
 	// to a HCL representation for CRUD
 	catalog.CreateRegisteredModelRequest
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
+
+	// This is a resource agnostic implementation of grants.
+	// Implementation could be different based on the resource type.
+	Grants []Grant `json:"grants,omitempty"`
 }
 
 func (s *RegisteredModel) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/schema.go b/bundle/config/resources/schema.go
@@ -61,12 +61,9 @@ type SchemaGrant struct {
 
 type Schema struct {
 	BaseResource
-
+	catalog.CreateSchema
 	// List of grants to apply on this schema.
 	Grants []SchemaGrant `json:"grants,omitempty"`
-
-	catalog.CreateSchema
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *Schema) Exists(ctx context.Context, w *databricks.WorkspaceClient, fullName string) (bool, error) {
diff --git a/bundle/config/resources/secret_scope.go b/bundle/config/resources/secret_scope.go
@@ -41,8 +41,6 @@ type SecretScope struct {
 	BackendType workspace.ScopeBackendType `json:"backend_type,omitempty"`
 	// The metadata for the secret scope if the type is `AZURE_KEYVAULT`
 	KeyvaultMetadata *workspace.AzureKeyVaultSecretScopeMetadata `json:"keyvault_metadata,omitempty"`
-
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *SecretScope) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/sql_warehouses.go b/bundle/config/resources/sql_warehouses.go
@@ -22,11 +22,9 @@ type SqlWarehousePermission struct {
 
 type SqlWarehouse struct {
 	BaseResource
+	sql.CreateWarehouseRequest
 
 	Permissions []SqlWarehousePermission `json:"permissions,omitempty"`
-
-	sql.CreateWarehouseRequest
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (sw *SqlWarehouse) UnmarshalJSON(b []byte) error {
diff --git a/bundle/config/resources/synced_database_table.go b/bundle/config/resources/synced_database_table.go
@@ -12,9 +12,7 @@ import (
 
 type SyncedDatabaseTable struct {
 	BaseResource
-
 	database.SyncedDatabaseTable
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (s *SyncedDatabaseTable) Exists(ctx context.Context, w *databricks.WorkspaceClient, name string) (bool, error) {
diff --git a/bundle/config/resources/volume.go b/bundle/config/resources/volume.go
@@ -42,12 +42,10 @@ type VolumeGrant struct {
 
 type Volume struct {
 	BaseResource
+	catalog.CreateVolumeRequestContent
 
 	// List of grants to apply on this volume.
 	Grants []VolumeGrant `json:"grants,omitempty"`
-
-	catalog.CreateVolumeRequestContent
-	Lifecycle Lifecycle `json:"lifecycle,omitempty"`
 }
 
 func (v *Volume) UnmarshalJSON(b []byte) error {
diff --git a/bundle/phases/plan.go b/bundle/phases/plan.go
@@ -57,7 +57,7 @@ func checkForPreventDestroy(b *bundle.Bundle, actions []deployplan.Action, isDes
 	for _, action := range actions {
 		// If the action is not a recreate or a delete as part of destroy - skip checking for prevent destroy
 		// We allow delete as part of deploy though (hence isDestroy check) because we mimic the behavior of terraform which allows such resources to be removed from config.
-		if action.ActionType != deployplan.ActionTypeRecreate && !(isDestroy && action.ActionType == deployplan.ActionTypeDelete) {
+		if action.ActionType != deployplan.ActionTypeRecreate && (!isDestroy || action.ActionType != deployplan.ActionTypeDelete) {
 			continue
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ type BaseResource struct {`
`5`	`5`	ID string `json:"id,omitempty" bundle:"readonly"`
`6`	`6`	ModifiedStatus ModifiedStatus `json:"modified_status,omitempty" bundle:"internal"`
`7`	`7`	URL string `json:"url,omitempty" bundle:"internal"`
	`8`	+ Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`8`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`type DatabaseCatalog struct {`
`14`	`14`	`BaseResource`
`15`		`-`
`16`	`15`	`database.DatabaseCatalog`
`17`		- Lifecycle Lifecycle `json:"lifecycle,omitempty"`
`18`	`16`	`}`
`19`	`17`
`20`	`18`	`func (d DatabaseCatalog) Exists(ctx context.Context, w databricks.WorkspaceClient, name string) (bool, error) {`