Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"state_version": 3,
"cli_version": "[CLI_VERSION]",
"lineage": "[UUID]",
"serial": 2,
"serial": 1,
"state": {
"resources.dashboards.dashboard1": {
"__id__": "[DASHBOARD_ID]",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Run 'bundle deploy' to deploy changes to your workspace

>>> jq {serial, job_1: .state["resources.jobs.job_1"] | {__id__, depends_on, description: .state.description}} .databricks/bundle/default/resources.json
{
"serial": 3,
"serial": 2,
"job_1": {
"__id__": "[EXTERNAL_JOB_ID]",
"depends_on": [
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/complete_version/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-complete_version-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -102,7 +102,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-complete_version-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/delete_deployment/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-delete_deployment-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-delete_deployment-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/get_operation/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-get_operation-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-get_operation-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/get_resource/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-get_resource-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-get_resource-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/get_version/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-get_version-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-get_version-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/heartbeat/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-heartbeat-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-heartbeat-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/list_deployments/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-list_deployments-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-list_deployments-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/list_operations/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-list_operations-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-list_operations-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/list_resources/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-list_resources-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-list_resources-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/list_versions/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-list_versions-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Files: 6 uploaded, 0 deleted
Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
Expand All @@ -100,7 +100,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-list_versions-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Files: 2 uploaded, 0 deleted
Expand Down
4 changes: 2 additions & 2 deletions acceptance/bundle/dms_fault/update_operation/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-update_operation-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=7
Updated pipelines.bar
Warn: Failed to record deployment history: recording operation for [RESOURCE_KEY]: Fault injected by test.
Files: 6 uploaded, 0 deleted
Expand All @@ -102,7 +102,7 @@

>>> bundle deploy --auto-approve
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-fault-update_operation-commands-[UNIQUE_NAME]/files...
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=11
Current Deployment Version: [DATABRICKS_URL]/deployments/[DEPLOYMENT_ID]?version=9
Updated jobs.foo
Updated pipelines.bar
Warn: Failed to record deployment history: recording operation for [RESOURCE_KEY]: Fault injected by test.
Expand Down
5 changes: 4 additions & 1 deletion bundle/deployplan/plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ func LoadPlanFromFile(path string) (*Plan, error) {
type PlanEntry struct {
// ID is set when the resource is at another ID than the one in state: a rename moved it there
// (see findMoved), or a parent renamed in this plan moves it before it is recreated (see
// addParentMoves). Applying the entry addresses the resource at ID.
// addParentMoves), or a bind records it at the ID it was bound to. Applying the entry addresses
// the resource at ID.
ID string `json:"id,omitempty"`
DependsOn []DependsOnEntry `json:"depends_on,omitempty"`
Action ActionType `json:"action,omitempty"`
Expand All @@ -148,6 +149,8 @@ type PlanEntry struct {
// - an Update of an otherwise unchanged resource whose state lacks its internal ID (recorded
// before the ID was, or by bind): applying it records the ID from the remote state. It is
// likewise left out of the textual plan and counted as unchanged.
// - an Update of the resource a bind plan records: applying it saves the config as the
// resource's state at ID, which the state does not have yet.
StateOnly bool `json:"state_only,omitempty"`
NewState *structvar.StructVarJSON `json:"new_state,omitempty"`
RemoteState any `json:"remote_state,omitempty"`
Expand Down
9 changes: 5 additions & 4 deletions bundle/direct/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ func (d *DeploymentUnit) Deploy(ctx context.Context, db *dstate.DeploymentState,
}

oldID := db.GetResourceID(d.ResourceKey)
if oldID == "" {
return errors.New("state entry not found")
}
if planEntry.ID != "" {
// The plan found the resource at the ID its config gives it: a rename moved it.
// The plan found the resource at the ID its config gives it: a rename moved it, or a bind
// records it at the ID it was bound to.
oldID = planEntry.ID
}
if oldID == "" {
return errors.New("state entry not found")
}

switch actionType {
case deployplan.Recreate:
Expand Down
Loading
Loading