Skip to content

direct: New plan format and logic re remote changes #4201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
denik merged 9 commits into from
Jan 7, 2026
Merged

direct: New plan format and logic re remote changes #4201

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
32c16ff
plan v2
denik Jan 2, 2026
abab853
clean up
denik Jan 6, 2026
c86cb78
fix
denik Jan 6, 2026
28eb3e5
cluster fix
denik Jan 6, 2026
3c19eea
dont error when constructing diff
denik Jan 7, 2026
2c47c61
fix Debugf %w
denik Jan 7, 2026
0eb4398
clean up; force 'update' action in migrate
denik Jan 7, 2026
447be83
clean up
denik Jan 7, 2026
86e2561
update NEXT CHangelog
denik Jan 7, 2026
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
60 changes: 31 additions & 29 deletions acceptance/bundle/artifacts/whl_dynamic/out.plan_update.direct.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,36 +150,38 @@
}
},
"changes": {
"local": {
"environments[0].spec.dependencies[0]": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
},
"tasks[task_key='TestTask'].for_each_task.task.libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
},
"tasks[task_key='TestTask'].libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
}
"email_notifications": {
"action": "skip",
"reason": "server_side_default",
"remote": {}
},
"remote": {
"email_notifications": {
"action": "skip",
"reason": "server_side_default"
},
"timeout_seconds": {
"action": "skip",
"reason": "server_side_default"
},
"webhook_notifications": {
"action": "skip",
"reason": "server_side_default"
}
"environments[0].spec.dependencies[0]": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
"remote": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
},
"tasks[task_key='TestTask'].for_each_task.task.libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
"remote": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
},
"tasks[task_key='TestTask'].libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
"remote": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl"
},
"timeout_seconds": {
"action": "skip",
"reason": "server_side_default",
"remote": 0
},
"webhook_notifications": {
"action": "skip",
"reason": "server_side_default",
"remote": {}
}
}
}
Expand Down
27 changes: 14 additions & 13 deletions acceptance/bundle/deploy/readplan/basic/out.plan_skip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,20 @@
}
},
"changes": {
"remote": {
"email_notifications": {
"action": "skip",
"reason": "server_side_default"
},
"timeout_seconds": {
"action": "skip",
"reason": "server_side_default"
},
"webhook_notifications": {
"action": "skip",
"reason": "server_side_default"
}
"email_notifications": {
"action": "skip",
"reason": "server_side_default",
"remote": {}
},
"timeout_seconds": {
"action": "skip",
"reason": "server_side_default",
"remote": 0
},
"webhook_notifications": {
"action": "skip",
"reason": "server_side_default",
"remote": {}
}
}
}
Expand Down
87 changes: 43 additions & 44 deletions acceptance/bundle/migrate/basic/out.plan_update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,30 +61,31 @@
}
},
"changes": {
"local": {
"name": {
"action": "update",
"old": "Test Migration Job",
"new": "Test Migrated Job"
}
"email_notifications": {
"action": "skip",
"reason": "server_side_default",
"remote": {}
},
"remote": {
"email_notifications": {
"action": "skip",
"reason": "server_side_default"
},
"tasks[task_key='main'].notebook_task.source": {
"action": "skip",
"reason": "server_side_default"
},
"timeout_seconds": {
"action": "skip",
"reason": "server_side_default"
},
"webhook_notifications": {
"action": "skip",
"reason": "server_side_default"
}
"name": {
"action": "update",
"old": "Test Migration Job",
"new": "Test Migrated Job",
"remote": "Test Migration Job"
},
"tasks[task_key='main'].notebook_task.source": {
"action": "skip",
"reason": "server_side_default",
"remote": "WORKSPACE"
},
"timeout_seconds": {
"action": "skip",
"reason": "server_side_default",
"remote": 0
},
"webhook_notifications": {
"action": "skip",
"reason": "server_side_default",
"remote": {}
}
}
},
Expand Down Expand Up @@ -177,23 +178,22 @@
"state": "IDLE"
},
"changes": {
"local": {
"name": {
"action": "update",
"old": "Test Migration Pipeline",
"new": "Test Migrated Pipeline"
},
"tags['myjob_name']": {
"action": "update",
"old": "Test Migration Job",
"new": "Test Migrated Job"
}
"name": {
"action": "update",
"old": "Test Migration Pipeline",
"new": "Test Migrated Pipeline",
"remote": "Test Migration Pipeline"
},
"remote": {
"storage": {
"action": "skip",
"reason": "server_side_default"
}
"storage": {
"action": "skip",
"reason": "server_side_default",
"remote": "dbfs:/pipelines/[UUID]"
},
"tags['myjob_name']": {
"action": "update",
"old": "Test Migration Job",
"new": "Test Migrated Job",
"remote": "Test Migration Job"
}
}
},
Expand All @@ -212,11 +212,10 @@
"volume_type": "MANAGED"
},
"changes": {
"remote": {
"storage_location": {
"action": "skip",
"reason": "server_side_default"
}
"storage_location": {
"action": "skip",
"reason": "server_side_default",
"remote": "s3://deco-uc-prod-isolated-aws-us-east-1/metastore/[UUID]/volumes/[UUID]"
}
}
}
Expand Down
20 changes: 9 additions & 11 deletions acceptance/bundle/migrate/dashboards/out.plan_after_migrate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,16 @@
"warehouse_id": "123456"
},
"changes": {
"local": {
"etag": {
"action": "skip",
"old": "[NUMID]"
}
"etag": {
"action": "skip",
"old": "[NUMID]",
"remote": "[NUMID]"
},
"remote": {
"serialized_dashboard": {
"action": "skip",
"old": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\"}]}\n",
"new": "{\"pages\":[{\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"name\":\"02724bf2\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}\n"
}
"serialized_dashboard": {
"action": "skip",
"old": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\"}]}\n",
"new": "{\"pages\":[{\"name\":\"02724bf2\",\"displayName\":\"Dashboard test bundle-deploy-dashboard\"}]}\n",
"remote": "{\"pages\":[{\"displayName\":\"Dashboard test bundle-deploy-dashboard\",\"name\":\"02724bf2\",\"pageType\":\"PAGE_TYPE_CANVAS\"}]}\n"
}
}
}
Expand Down
67 changes: 34 additions & 33 deletions acceptance/bundle/migrate/default-python/out.plan_after_deploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,35 +217,37 @@
}
},
"changes": {
"local": {
"tasks[task_key='notebook_task'].libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
},
"tasks[task_key='python_wheel_task'].libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl"
}
"email_notifications": {
"action": "skip",
"reason": "server_side_default",
"remote": {}
},
"remote": {
"email_notifications": {
"action": "skip",
"reason": "server_side_default"
},
"tasks[task_key='notebook_task'].notebook_task.source": {
"action": "skip",
"reason": "server_side_default"
},
"timeout_seconds": {
"action": "skip",
"reason": "server_side_default"
},
"webhook_notifications": {
"action": "skip",
"reason": "server_side_default"
}
"tasks[task_key='notebook_task'].libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
"remote": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl"
},
"tasks[task_key='notebook_task'].notebook_task.source": {
"action": "skip",
"reason": "server_side_default",
"remote": "WORKSPACE"
},
"tasks[task_key='python_wheel_task'].libraries[0].whl": {
"action": "update",
"old": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl",
"new": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl",
"remote": "/Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/artifacts/.internal/my_default_python-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl"
},
"timeout_seconds": {
"action": "skip",
"reason": "server_side_default",
"remote": 0
},
"webhook_notifications": {
"action": "skip",
"reason": "server_side_default",
"remote": {}
}
}
},
Expand Down Expand Up @@ -289,11 +291,10 @@
"state": "IDLE"
},
"changes": {
"remote": {
"storage": {
"action": "skip",
"reason": "server_side_default"
}
"storage": {
"action": "skip",
"reason": "server_side_default",
"remote": "dbfs:/pipelines/[UUID]"
}
}
}
Expand Down
Loading