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,

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bundle deployment bind increments serial by 2. This PR fixes that - now the increment is 1. That's why the serial goes down here.

"state": {
"resources.dashboards.dashboard1": {
"__id__": "[DASHBOARD_ID]",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ To proceed, use --auto-approve after reviewing the plan above.

Exit code: 1

>>> assert_not_exists.py .databricks/bundle/default/resources.json .databricks/bundle/default/resources.json.wal

=== Deploy bundle:

>>> [CLI] bundle deploy --force-lock
Expand Down
3 changes: 3 additions & 0 deletions acceptance/bundle/deployment/bind/job/job-abort-bind/script
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ title "Expect binding to fail without an auto-approve flag:"
trace errcode $CLI bundle deployment bind foo $JOB_ID &> out.bind-result.txt
sed -n '/^Error:/,$p' out.bind-result.txt
rm out.bind-result.txt
# This bundle starts without state. A rejected bind must leave no committed state
# or pending WAL that a later command could recover.
trace assert_not_exists.py .databricks/bundle/default/resources.json .databricks/bundle/default/resources.json.wal

title "Deploy bundle:"
trace $CLI bundle deploy --force-lock
Expand Down
8 changes: 8 additions & 0 deletions acceptance/bundle/deployment/bind/job/noop-job/output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
Successfully bound job with an id '[JOB_ID]'
Run 'bundle deploy' to deploy changes to your workspace

>>> jq {serial, resource_id: .state["resources.jobs.job_1"].__id__} .databricks/bundle/default/resources.json
{
"serial": 1,
"resource_id": "[JOB_ID]"
}

>>> assert_not_exists.py .databricks/bundle/default/resources.json.wal .databricks/bundle/default/resources.json.temp-bind

>>> [CLI] bundle deploy
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
Updated jobs.job_1
Expand Down
2 changes: 2 additions & 0 deletions acceptance/bundle/deployment/bind/job/noop-job/script
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ job_id=$(trace $CLI jobs create --json '{"name": "My Job"}' | jq -r '.job_id')
add_repl "$job_id" JOB_ID

trace $CLI bundle deployment bind job_1 $job_id --auto-approve
trace jq '{serial, resource_id: .state["resources.jobs.job_1"].__id__}' .databricks/bundle/default/resources.json
trace assert_not_exists.py .databricks/bundle/default/resources.json.wal .databricks/bundle/default/resources.json.temp-bind

trace $CLI bundle deploy

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

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We bind a job and a pipeline in these tests. Because now the serial is only +1 then, the final version goes down by 2 (since 2 binds happened, +4 -> +2)

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
Loading
Loading