diff --git a/.nextchanges/notable-changes/deploy-summary.md b/.nextchanges/notable-changes/deploy-summary.md new file mode 100644 index 00000000000..abd14e95088 --- /dev/null +++ b/.nextchanges/notable-changes/deploy-summary.md @@ -0,0 +1 @@ +* `bundle deploy` now reports the per-resource actions it took, how many files it synced, and a summary of created/changed/deleted/unchanged resources; `bundle destroy` reports how many resources it deleted. `-q` prints only the summaries, `-qq` only warnings and errors. ([#5720](https://github.com/databricks/cli/pull/5720)) diff --git a/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt b/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt index 036b38208b1..fc22c7debd6 100644 --- a/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt +++ b/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt @@ -2,9 +2,9 @@ >>> [CLI] apps deploy --skip-validation --auto-approve --force-lock --fail-on-active-runs Deploying project... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ✓ Getting the status of the app myapp ✓ App is in UNAVAILABLE state ✓ App compute is in STOPPED state @@ -21,5 +21,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/apps/deploy/bundle-no-args/output.txt b/acceptance/apps/deploy/bundle-no-args/output.txt index 01a3c34b5d3..4824cff8d82 100644 --- a/acceptance/apps/deploy/bundle-no-args/output.txt +++ b/acceptance/apps/deploy/bundle-no-args/output.txt @@ -2,9 +2,9 @@ >>> [CLI] apps deploy --skip-validation Deploying project... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged ✓ Getting the status of the app myapp ✓ App is in UNAVAILABLE state ✓ App compute is in STOPPED state @@ -21,5 +21,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/ai_runtime_task/local_code_source/output.txt b/acceptance/bundle/ai_runtime_task/local_code_source/output.txt index 06cdf841c55..584fa164d52 100644 --- a/acceptance/bundle/ai_runtime_task/local_code_source/output.txt +++ b/acceptance/bundle/ai_runtime_task/local_code_source/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/ai-runtime-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.train +Files: 14 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === each task's tarball holds only synced files (both under the repo root .air_snapshots) @@ -110,9 +110,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/ai-runtime-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.train +Files: 4 uploaded, 1 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --sort --del-field raw_body //.air_snapshots/ { @@ -131,5 +131,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/ai-runtime-test/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/apps/app_yaml/output.txt b/acceptance/bundle/apps/app_yaml/output.txt index addb91d683c..20e033c1971 100644 --- a/acceptance/bundle/apps/app_yaml/output.txt +++ b/acceptance/bundle/apps/app_yaml/output.txt @@ -15,9 +15,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> jq select(.path | test("app.yml")) out.requests.txt @@ -27,8 +27,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //apps { diff --git a/acceptance/bundle/apps/compute_size/out.update.direct.txt b/acceptance/bundle/apps/compute_size/out.update.direct.txt index 6e02b630e61..a1bb89ee44d 100644 --- a/acceptance/bundle/apps/compute_size/out.update.direct.txt +++ b/acceptance/bundle/apps/compute_size/out.update.direct.txt @@ -1,9 +1,9 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-compute-size-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.my_app +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] apps get app-[UNIQUE_NAME] { diff --git a/acceptance/bundle/apps/compute_size/out.update.terraform.txt b/acceptance/bundle/apps/compute_size/out.update.terraform.txt index 62a03593a3f..fd4e9aa67ec 100644 --- a/acceptance/bundle/apps/compute_size/out.update.terraform.txt +++ b/acceptance/bundle/apps/compute_size/out.update.terraform.txt @@ -1,7 +1,6 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-compute-size-[UNIQUE_NAME]/files... -Deploying resources... Error: terraform apply: exit status 1 Error: failed to update app @@ -14,7 +13,7 @@ Compute size updates are not supported in this update API. Please use the new update API instead. -Updating deployment state... +Files: 4 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/apps/compute_size/output.txt b/acceptance/bundle/apps/compute_size/output.txt index 3c22e34adbd..297bf99dbd7 100644 --- a/acceptance/bundle/apps/compute_size/output.txt +++ b/acceptance/bundle/apps/compute_size/output.txt @@ -2,9 +2,9 @@ === Deploy bundle >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-compute-size-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.my_app +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Update compute size and redeploy >>> [CLI] bundle destroy --auto-approve @@ -13,5 +13,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/app-compute-size-[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/apps/git_source/output.txt b/acceptance/bundle/apps/git_source/output.txt index a1f17e765d2..4fbf089f0b5 100644 --- a/acceptance/bundle/apps/git_source/output.txt +++ b/acceptance/bundle/apps/git_source/output.txt @@ -18,9 +18,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged === Deploy bundle >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-git-source-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.my_app +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run my_app ✓ Getting the status of the app [APP_NAME] @@ -61,9 +61,8 @@ You can access the app at [APP_NAME]-123.cloud.databricksapps.com === Update git_source branch and redeploy >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-git-source-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged === Verify config update was applied >>> [CLI] apps get [APP_NAME] --output json @@ -78,5 +77,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/app-git-source-[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/apps/job_permissions/databricks.yml.tmpl b/acceptance/bundle/apps/job_permissions/databricks.yml.tmpl index 54739569cd4..9d2e6c079bb 100644 --- a/acceptance/bundle/apps/job_permissions/databricks.yml.tmpl +++ b/acceptance/bundle/apps/job_permissions/databricks.yml.tmpl @@ -1,6 +1,15 @@ bundle: name: test-bundle-$UNIQUE_NAME +# This test deploys several times and reports how many files each deploy uploaded, so +# nothing written between the deploys may end up in the synced tree: the script's own +# out.after_first_deploy.*, and the test runner's output.txt / ACC_REPLS, which it keeps +# appending to while the deploy runs. +sync: + exclude: + - out* + - ACC_REPLS + permissions: - level: CAN_MANAGE user_name: ${workspace.current_user.userName} diff --git a/acceptance/bundle/apps/job_permissions/output.txt b/acceptance/bundle/apps/job_permissions/output.txt index d64fd16fd0c..ec50e4828c6 100644 --- a/acceptance/bundle/apps/job_permissions/output.txt +++ b/acceptance/bundle/apps/job_permissions/output.txt @@ -1,8 +1,8 @@ ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -qq Warning: app "my_app" references jobs "my_job" which has permissions set. To prevent permission override after deploying the app, please add the app service principal to the jobs permissions at resources.apps.my_app - in databricks.yml:24:7 + in databricks.yml:33:7 Add the following section to the jobs permissions: @@ -14,19 +14,15 @@ Add the following section to the jobs permissions: service_principal_name: ${resources.apps.my_app.service_principal_client_id} -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! === After first deploy >>> has_manage_run === After second deploy ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -qq Warning: app "my_app" references jobs "my_job" which has permissions set. To prevent permission override after deploying the app, please add the app service principal to the jobs permissions at resources.apps.my_app - in databricks.yml:24:7 + in databricks.yml:33:7 Add the following section to the jobs permissions: @@ -38,20 +34,12 @@ Add the following section to the jobs permissions: service_principal_name: ${resources.apps.my_app.service_principal_client_id} -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! >>> has_manage_run false === Apply fix and redeploy ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> has_manage_run true @@ -63,5 +51,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/apps/job_permissions/script b/acceptance/bundle/apps/job_permissions/script index df8a6b9e392..50d92015c51 100644 --- a/acceptance/bundle/apps/job_permissions/script +++ b/acceptance/bundle/apps/job_permissions/script @@ -3,7 +3,7 @@ # Issue: https://github.com/databricks/cli/issues/4309 envsubst < databricks.yml.tmpl > databricks.yml -trace $CLI bundle deploy +trace $CLI bundle deploy -qq job_id=$(read_id.py my_job) @@ -27,12 +27,12 @@ trace has_manage_run > out.after_first_deploy.$DATABRICKS_BUNDLE_ENGINE.txt rm -f out.after_first_deploy.direct.txt title "After second deploy" -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace has_manage_run title "Apply fix and redeploy" patch -s --no-backup-if-mismatch databricks.yml < fix.patch -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace has_manage_run trace $CLI bundle destroy --auto-approve diff --git a/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt b/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt index a7ef4a0159f..4126f6f251f 100644 --- a/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt +++ b/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt @@ -3,9 +3,9 @@ Building code_source... Uploading code.tgz... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting code_source_path rewritten to the uploaded artifact remote path >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[].ai_runtime_task out.requests.txt diff --git a/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt b/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt index 021ff6d7556..a4c4982cd32 100644 --- a/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt +++ b/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt @@ -2,9 +2,9 @@ >>> [CLI] bundle deploy Uploading whl/source.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting 2 wheels in libraries section in /jobs/create >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt diff --git a/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt b/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt index dd81ba7de2a..85ab6e9ccb6 100644 --- a/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt +++ b/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt @@ -2,9 +2,9 @@ >>> [CLI] bundle deploy Uploading whl/source.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting 2 wheels in libraries section in /jobs/create >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt diff --git a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt index 6d24880e6c0..9c8b5617190 100644 --- a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt +++ b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt @@ -2,8 +2,8 @@ >>> [CLI] bundle deploy Uploading whl/source.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Deployment complete! +Files: 7 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Expecting wheel to be uploaded >>> jq .path diff --git a/acceptance/bundle/artifacts/build_and_files_whl/output.txt b/acceptance/bundle/artifacts/build_and_files_whl/output.txt index b618de6b89a..be0be958c94 100644 --- a/acceptance/bundle/artifacts/build_and_files_whl/output.txt +++ b/acceptance/bundle/artifacts/build_and_files_whl/output.txt @@ -12,5 +12,5 @@ Validation OK! Building artifact_with_custom_dist... Uploading mydist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Deployment complete! +Files: 17 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/glob_exact_whl/output.txt b/acceptance/bundle/artifacts/glob_exact_whl/output.txt index 3f292b7a0d9..b16cac59eed 100644 --- a/acceptance/bundle/artifacts/glob_exact_whl/output.txt +++ b/acceptance/bundle/artifacts/glob_exact_whl/output.txt @@ -15,6 +15,6 @@ >>> [CLI] bundle deploy Uploading prebuilt/other_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/issue_3109/output.txt b/acceptance/bundle/artifacts/issue_3109/output.txt index ff6b9968ce4..3c9b88daeef 100644 --- a/acceptance/bundle/artifacts/issue_3109/output.txt +++ b/acceptance/bundle/artifacts/issue_3109/output.txt @@ -5,6 +5,6 @@ Warning: required field "entry_point" is not set Building wheels... Uploading dist/my_default_python-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job1 +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/bash/output.txt b/acceptance/bundle/artifacts/shell/bash/output.txt index fa5d7b76bcd..a5881e42dc2 100644 --- a/acceptance/bundle/artifacts/shell/bash/output.txt +++ b/acceptance/bundle/artifacts/shell/bash/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-bash/default/files... -Deploying resources... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/basic/output.txt b/acceptance/bundle/artifacts/shell/basic/output.txt index b5e01c79e67..6dd323fe46c 100644 --- a/acceptance/bundle/artifacts/shell/basic/output.txt +++ b/acceptance/bundle/artifacts/shell/basic/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-basic/default/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/cmd/output.txt b/acceptance/bundle/artifacts/shell/cmd/output.txt index 8ebed9f66d4..7430b232e49 100644 --- a/acceptance/bundle/artifacts/shell/cmd/output.txt +++ b/acceptance/bundle/artifacts/shell/cmd/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-cmd/default/files... -Deploying resources... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/default/output.txt b/acceptance/bundle/artifacts/shell/default/output.txt index fa5d7b76bcd..a5881e42dc2 100644 --- a/acceptance/bundle/artifacts/shell/default/output.txt +++ b/acceptance/bundle/artifacts/shell/default/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-bash/default/files... -Deploying resources... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/shell/sh/output.txt b/acceptance/bundle/artifacts/shell/sh/output.txt index 5117e6e9fc0..358324c6ffd 100644 --- a/acceptance/bundle/artifacts/shell/sh/output.txt +++ b/acceptance/bundle/artifacts/shell/sh/output.txt @@ -2,5 +2,5 @@ >>> [CLI] bundle deploy Building my_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-sh/default/files... -Deploying resources... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/unique_name_libraries/output.txt b/acceptance/bundle/artifacts/unique_name_libraries/output.txt index ca37098f923..4306e96f09b 100644 --- a/acceptance/bundle/artifacts/unique_name_libraries/output.txt +++ b/acceptance/bundle/artifacts/unique_name_libraries/output.txt @@ -5,6 +5,6 @@ Building whl2... Uploading whl1/dist/my_package-0.0.1-py3-none-any.whl... Uploading whl2/dist/my_other_package-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test +Files: 29 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt b/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt index fa725a29d86..5e22def8b11 100644 --- a/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt +++ b/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt @@ -5,9 +5,9 @@ Uploading whl/source2.whl... Uploading whl/source3.whl... Uploading whl/source4.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting 5 wheels in libraries section in /jobs/create >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt diff --git a/acceptance/bundle/artifacts/whl_change_version/output.txt b/acceptance/bundle/artifacts/whl_change_version/output.txt index 60b60eff5d3..4903e437183 100644 --- a/acceptance/bundle/artifacts/whl_change_version/output.txt +++ b/acceptance/bundle/artifacts/whl_change_version/output.txt @@ -3,9 +3,9 @@ Building python_artifact... Uploading dist/my_test_code-0.1.0-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 11 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl dist/my_test_code-0.1.0-py3-none-any.whl @@ -54,9 +54,9 @@ dist/my_test_code-0.1.0-py3-none-any.whl Building python_artifact... Uploading dist/my_test_code-0.2.0-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.test_job +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> find.py --expect 2 whl dist/my_test_code-0.1.0-py3-none-any.whl @@ -86,9 +86,9 @@ Building python_artifact... Uploading dist/my_test_code-0.1.0-py3-none-any.whl... Uploading dist/my_test_code-0.2.0-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.test_job +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> find.py --expect 2 whl dist/my_test_code-0.1.0-py3-none-any.whl diff --git a/acceptance/bundle/artifacts/whl_dbfs/output.txt b/acceptance/bundle/artifacts/whl_dbfs/output.txt index 306de22de1f..2c8ab5f407b 100644 --- a/acceptance/bundle/artifacts/whl_dbfs/output.txt +++ b/acceptance/bundle/artifacts/whl_dbfs/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting to find no wheels >>> errcode find.py --expect 0 whl diff --git a/acceptance/bundle/artifacts/whl_dynamic/output.txt b/acceptance/bundle/artifacts/whl_dynamic/output.txt index c7409f37408..dbce23d3a36 100644 --- a/acceptance/bundle/artifacts/whl_dynamic/output.txt +++ b/acceptance/bundle/artifacts/whl_dynamic/output.txt @@ -30,9 +30,9 @@ Building my_test_code... Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 20 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === There are 2 original wheels and 2 patched ones >>> find.py --expect 4 whl @@ -72,9 +72,9 @@ Building my_test_code... Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.test_job +Files: 12 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Verify contents, it should now have new_module.py >>> find.py --expect 1 .databricks/.*my_test_code.*whl diff --git a/acceptance/bundle/artifacts/whl_explicit/output.txt b/acceptance/bundle/artifacts/whl_explicit/output.txt index 6c1c06c46e0..fc493f3f917 100644 --- a/acceptance/bundle/artifacts/whl_explicit/output.txt +++ b/acceptance/bundle/artifacts/whl_explicit/output.txt @@ -3,9 +3,9 @@ Building my_test_code... Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl diff --git a/acceptance/bundle/artifacts/whl_implicit/output.txt b/acceptance/bundle/artifacts/whl_implicit/output.txt index 698cc20c514..d8b85371f1b 100644 --- a/acceptance/bundle/artifacts/whl_implicit/output.txt +++ b/acceptance/bundle/artifacts/whl_implicit/output.txt @@ -3,9 +3,9 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl dist/my_test_code-0.0.1-py3-none-any.whl diff --git a/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt b/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt index 71f1bffc1df..76bb994774c 100644 --- a/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt +++ b/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt @@ -2,9 +2,9 @@ >>> [CLI] bundle deploy Uploading package/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl package/my_test_code-0.0.1-py3-none-any.whl diff --git a/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt b/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt index 7e393eabc47..3d4006c39d3 100644 --- a/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt +++ b/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt @@ -3,9 +3,9 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 11 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl dist/my_test_code-0.0.1-py3-none-any.whl diff --git a/acceptance/bundle/artifacts/whl_multiple/output.txt b/acceptance/bundle/artifacts/whl_multiple/output.txt index a03025d9103..3b486f7db47 100644 --- a/acceptance/bundle/artifacts/whl_multiple/output.txt +++ b/acceptance/bundle/artifacts/whl_multiple/output.txt @@ -5,9 +5,9 @@ Building my_test_code_2... Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 12 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 2 whl my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl diff --git a/acceptance/bundle/artifacts/whl_no_cleanup/output.txt b/acceptance/bundle/artifacts/whl_no_cleanup/output.txt index a78810dbca9..20d1a1e3ef0 100644 --- a/acceptance/bundle/artifacts/whl_no_cleanup/output.txt +++ b/acceptance/bundle/artifacts/whl_no_cleanup/output.txt @@ -3,9 +3,9 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl dist/my_test_code-0.0.1-py3-none-any.whl @@ -19,9 +19,8 @@ dist/my_test_code-0.0.1-py3-none-any.whl Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged === No calls to delete internal folder expected >>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt diff --git a/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt b/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt index 4fe390e6350..6218560dcc1 100644 --- a/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt +++ b/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt @@ -7,9 +7,9 @@ dist/my_test_code-0.0.1-py3-none-any.whl Uploading dist/lib/other_test_code-0.0.1-py3-none-any.whl... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting to find 2 wheels, same as initially provided >>> find.py --expect 2 whl diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside/output.txt b/acceptance/bundle/artifacts/whl_prebuilt_outside/output.txt index 369db2e47a7..b5cf6bf9ad3 100644 --- a/acceptance/bundle/artifacts/whl_prebuilt_outside/output.txt +++ b/acceptance/bundle/artifacts/whl_prebuilt_outside/output.txt @@ -3,9 +3,9 @@ Uploading other_dab/dist/lib/other_test_code-0.0.1-py3-none-any.whl... Uploading other_dab/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting to find no wheels in current directory >>> find.py --expect 0 whl diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/output.txt b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/output.txt index 570b124a5bd..cdd2b4432d8 100644 --- a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/output.txt +++ b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/output.txt @@ -3,9 +3,9 @@ Uploading this_dab/.databricks/bundle/default/patched_wheels/art1_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... Uploading this_dab/.databricks/bundle/default/patched_wheels/art2_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python-wheel/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Expecting to find two patched wheels in current directory >>> find.py --expect 2 whl diff --git a/acceptance/bundle/artifacts/whl_via_environment_key/output.txt b/acceptance/bundle/artifacts/whl_via_environment_key/output.txt index 8afa59e7d8b..67ed6cc53e0 100644 --- a/acceptance/bundle/artifacts/whl_via_environment_key/output.txt +++ b/acceptance/bundle/artifacts/whl_via_environment_key/output.txt @@ -3,9 +3,9 @@ Building my_test_code... Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> find.py --expect 1 whl my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl diff --git a/acceptance/bundle/bundle_tag/id/output.txt b/acceptance/bundle/bundle_tag/id/output.txt index acfd8c3d1a1..8885e824bbf 100644 --- a/acceptance/bundle/bundle_tag/id/output.txt +++ b/acceptance/bundle/bundle_tag/id/output.txt @@ -35,9 +35,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -76,8 +76,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/bundle_tag/url/output.txt b/acceptance/bundle/bundle_tag/url/output.txt index 76d46c68fa7..b67dac6a4ef 100644 --- a/acceptance/bundle/bundle_tag/url/output.txt +++ b/acceptance/bundle/bundle_tag/url/output.txt @@ -35,9 +35,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -76,8 +76,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt b/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt index 92039fc564a..50c3e802edd 100644 --- a/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt +++ b/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt @@ -2,6 +2,7 @@ Warning: "resources.jobs.foo.url": Terraform-only field; this reference will not in databricks.yml:11:12 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created jobs.foo +Files: 9 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/bundle_tag/url_ref/out.destroy.terraform.txt b/acceptance/bundle/bundle_tag/url_ref/out.destroy.terraform.txt index 1909121883b..34801cda18f 100644 --- a/acceptance/bundle/bundle_tag/url_ref/out.destroy.terraform.txt +++ b/acceptance/bundle/bundle_tag/url_ref/out.destroy.terraform.txt @@ -7,5 +7,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/cli_defaults/output.txt b/acceptance/bundle/config-remote-sync/cli_defaults/output.txt index f3e2372b81a..f8edf431945 100644 --- a/acceptance/bundle/config-remote-sync/cli_defaults/output.txt +++ b/acceptance/bundle/config-remote-sync/cli_defaults/output.txt @@ -1,7 +1,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job1 +Created jobs.job2 +Created pipelines.pipeline1 +Files: 6 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Modify jobs Change max_concurrent_runs, name, change default tag @@ -62,5 +64,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/config-remote-sync/config_edits/output.txt b/acceptance/bundle/config-remote-sync/config_edits/output.txt index ce51b3c7a65..b364ed757c6 100644 --- a/acceptance/bundle/config-remote-sync/config_edits/output.txt +++ b/acceptance/bundle/config-remote-sync/config_edits/output.txt @@ -1,8 +1,8 @@ Uploading dummy.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Case 1: Added locally, updated remotely with different value @@ -59,5 +59,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt b/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt index a0f902fb002..e2cf93d8333 100644 --- a/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt +++ b/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.my_dashboard +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify the dashboard out of band to bump its remote etag { @@ -28,5 +28,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/flushed_cache/output.txt b/acceptance/bundle/config-remote-sync/flushed_cache/output.txt index 32ded320618..b7910beab89 100644 --- a/acceptance/bundle/config-remote-sync/flushed_cache/output.txt +++ b/acceptance/bundle/config-remote-sync/flushed_cache/output.txt @@ -1,9 +1,9 @@ === Deploy bundle Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Get job ID and modify remote resource Modify max_concurrent_runs to 5 @@ -27,5 +27,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt b/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt index 6cba3ca53af..0123261d626 100644 --- a/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt +++ b/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify max_concurrent_runs, description, and add timeout === Detect and save changes @@ -55,5 +55,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/job_fields/output.txt b/acceptance/bundle/config-remote-sync/job_fields/output.txt index 88f32e79196..ffdefaf5dda 100644 --- a/acceptance/bundle/config-remote-sync/job_fields/output.txt +++ b/acceptance/bundle/config-remote-sync/job_fields/output.txt @@ -1,8 +1,8 @@ Uploading dummy.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify job fields remotely @@ -119,5 +119,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt b/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt index 39ea29bf4a5..b4af2341cc0 100644 --- a/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt +++ b/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt @@ -1,7 +1,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Created jobs.no_tasks_job +Created jobs.rename_task_job +Files: 8 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Modify c_task, remove d_task, add e_task === Detect and save changes @@ -71,10 +73,8 @@ Resource: resources.jobs.no_tasks_job + task_key: new_task rename_task_job: -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! + +>>> [CLI] bundle deploy -qq === Rename b_task, replace a_task notebook_path, add synced_task === Detect task key rename @@ -145,5 +145,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/config-remote-sync/job_multiple_tasks/script b/acceptance/bundle/config-remote-sync/job_multiple_tasks/script index f935b4a7564..ff2b7e464ac 100755 --- a/acceptance/bundle/config-remote-sync/job_multiple_tasks/script +++ b/acceptance/bundle/config-remote-sync/job_multiple_tasks/script @@ -66,7 +66,7 @@ envsubst < databricks.yml > databricks.yml.resolved mv databricks.yml.resolved databricks.yml # Deploy the updated configuration to sync state -$CLI bundle deploy +trace $CLI bundle deploy -qq title "Rename b_task, replace a_task notebook_path, add synced_task" rename_job_id="$(read_id.py rename_task_job)" diff --git a/acceptance/bundle/config-remote-sync/job_params_variables/output.txt b/acceptance/bundle/config-remote-sync/job_params_variables/output.txt index 9d440510f83..9de17b128a8 100644 --- a/acceptance/bundle/config-remote-sync/job_params_variables/output.txt +++ b/acceptance/bundle/config-remote-sync/job_params_variables/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add new parameter remotely === Detect and save changes @@ -31,5 +31,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt b/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt index 52e37685043..b7a714f77d2 100644 --- a/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt +++ b/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Created pipelines.my_pipeline +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Modify pipeline_task full_refresh to True === Modify pipeline continuous to True @@ -46,5 +47,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/multiple_files/output.txt b/acceptance/bundle/config-remote-sync/multiple_files/output.txt index 2799e540f41..8b05414a0c7 100644 --- a/acceptance/bundle/config-remote-sync/multiple_files/output.txt +++ b/acceptance/bundle/config-remote-sync/multiple_files/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_one +Created jobs.job_two +Files: 12 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Modify job_one: max_concurrent_runs, rename c_task === Add synced_task to job_one (notebook in sync root, resource in subdirectory) @@ -86,5 +87,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/output.txt b/acceptance/bundle/config-remote-sync/multiple_resources/output.txt index adaa02f27a9..003474d0fbc 100644 --- a/acceptance/bundle/config-remote-sync/multiple_resources/output.txt +++ b/acceptance/bundle/config-remote-sync/multiple_resources/output.txt @@ -1,7 +1,13 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Created experiments.test_experiment +Created jobs.job_one +Created jobs.job_two +Created registered_models.test_model +Created sql_warehouses.test_warehouse +Created volumes.test_volume +Files: 7 uploaded, 0 deleted +Resources: 7 created, 0 changed, 0 deleted, 0 unchanged === Modify both jobs === Detect and save changes @@ -65,5 +71,4 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 7 deleted diff --git a/acceptance/bundle/config-remote-sync/output_json/output.txt b/acceptance/bundle/config-remote-sync/output_json/output.txt index 29ecfec8b71..3239defbd78 100644 --- a/acceptance/bundle/config-remote-sync/output_json/output.txt +++ b/acceptance/bundle/config-remote-sync/output_json/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === JSON output format{ "files": [ @@ -31,5 +31,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/output_no_changes/output.txt b/acceptance/bundle/config-remote-sync/output_no_changes/output.txt index 6aa616cbeee..f1a6e4e5e01 100644 --- a/acceptance/bundle/config-remote-sync/output_no_changes/output.txt +++ b/acceptance/bundle/config-remote-sync/output_no_changes/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Check for changes immediately after deployment No changes detected. @@ -23,5 +23,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt index 19b20f8befa..fc25179d180 100644 --- a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt +++ b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify pipeline fields remotely === Detect and save changes @@ -65,5 +65,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt index b6d44241592..d4967234ef5 100644 --- a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt +++ b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Simulate a cluster policy injecting custom_tags and cluster_log_conf These fields exist only remotely (the user never set them in config). @@ -34,5 +34,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/resolve_variables/output.txt b/acceptance/bundle/config-remote-sync/resolve_variables/output.txt index 3a486c10722..d1d6677f65d 100644 --- a/acceptance/bundle/config-remote-sync/resolve_variables/output.txt +++ b/acceptance/bundle/config-remote-sync/resolve_variables/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Created pipelines.my_pipeline +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Modify pipeline environment dependencies === Add and replace parameters remotely @@ -160,5 +161,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/select_basic/output.txt b/acceptance/bundle/config-remote-sync/select_basic/output.txt index 712ce3e3988..421e5aeab28 100644 --- a/acceptance/bundle/config-remote-sync/select_basic/output.txt +++ b/acceptance/bundle/config-remote-sync/select_basic/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_one +Created jobs.job_two +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Modify both jobs remotely === Sync only job_one, selected by its type and deployed resource id @@ -83,5 +84,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/select_multiple/output.txt b/acceptance/bundle/config-remote-sync/select_multiple/output.txt index c491353879e..96598cf7aa3 100644 --- a/acceptance/bundle/config-remote-sync/select_multiple/output.txt +++ b/acceptance/bundle/config-remote-sync/select_multiple/output.txt @@ -1,7 +1,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_a +Created jobs.job_b +Created jobs.job_c +Files: 6 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Modify all three jobs remotely === Comma-separated selectors preview two of three resources @@ -70,5 +72,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/config-remote-sync/skip_permissions/output.txt b/acceptance/bundle/config-remote-sync/skip_permissions/output.txt index e69b512fdae..5fd10133ff6 100644 --- a/acceptance/bundle/config-remote-sync/skip_permissions/output.txt +++ b/acceptance/bundle/config-remote-sync/skip_permissions/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Created jobs.my_job.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Add a permission remotely (a change on the permissions sub-resource) @@ -34,5 +35,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt b/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt index a5938894b03..9fc2f47b183 100644 --- a/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt +++ b/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.cli_default_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === existing_cluster_id is injected by OverrideCompute; the YAML has none >>> grep -c existing_cluster_id databricks.yml @@ -37,5 +37,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt b/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt index a19a7f4344b..8bbf382c5dc 100644 --- a/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt +++ b/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev.eu/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.dotted_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Edit a field in the override block of a target whose name contains a dot === Sync @@ -29,5 +29,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev.eu -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/isolation/output.txt b/acceptance/bundle/config-remote-sync/split/isolation/output.txt index 20ecba57699..223bc479d58 100644 --- a/acceptance/bundle/config-remote-sync/split/isolation/output.txt +++ b/acceptance/bundle/config-remote-sync/split/isolation/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_a +Created jobs.job_b +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Rename the two-block task on job_a, and edit job_b in the same run === Sync @@ -55,5 +56,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt b/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt index 7bff6aadeca..00806daf3aa 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt +++ b/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.split_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Edit alpha, defined only in the target block === Sync @@ -49,5 +49,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt b/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt index 38be50b81b0..f36b6887561 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt +++ b/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.remove_job +Created jobs.twoblock_remove_job +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Remove gamma from the top-level block and alpha from the target block === Sync @@ -83,5 +84,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt b/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt index 926834b83ef..5cdfb4c23e8 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt +++ b/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.rename_job +Created jobs.shift_job +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Rename a task defined in both blocks and a target-only task === Sync @@ -111,5 +112,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt index 5585baaffb9..e51e8b43ab7 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt +++ b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.twoblock_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Edit omega, whose sibling is defined in two blocks === Sync @@ -60,5 +60,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/multifile/output.txt b/acceptance/bundle/config-remote-sync/split/multifile/output.txt index 1bfe1d0c40b..af54891b9c6 100644 --- a/acceptance/bundle/config-remote-sync/split/multifile/output.txt +++ b/acceptance/bundle/config-remote-sync/split/multifile/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.multifile_job +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Edit a task defined in the second included file === Sync @@ -94,5 +94,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt b/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt index 21182810044..d329d5621dc 100644 --- a/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt +++ b/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.nested_add_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add a task, then depend on it from the split task zzz_shared === Sync @@ -39,5 +39,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt b/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt index 271ddaf0223..1693e562282 100644 --- a/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt +++ b/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.nested_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add a library to a task that is not first after the merge sort === Sync @@ -34,5 +34,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/positional/output.txt b/acceptance/bundle/config-remote-sync/split/positional/output.txt index 5abcd0de88e..3ce7ee71fe2 100644 --- a/acceptance/bundle/config-remote-sync/split/positional/output.txt +++ b/acceptance/bundle/config-remote-sync/split/positional/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.split_pipeline +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Edit num_workers on the top-level cluster and on the target cluster === Sync @@ -70,5 +70,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt b/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt index 9b03d7f9b07..fad1e9c3a7a 100644 --- a/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt +++ b/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.shared_field_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Remove max_retries, which both blocks define === Sync @@ -37,5 +37,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt b/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt index a82e3ecc6e4..f6fc02a52f7 100644 --- a/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt +++ b/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.unrelated_add_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Remove the two-block task AND add an unrelated new task in one run === Sync @@ -49,5 +49,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt index 329919ba9ab..313155ef1f7 100644 --- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt +++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.ambiguous_rename_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === alpha (top-level) -> zzz and beta (target block) -> aaa, bodies identical === Sync @@ -31,5 +31,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt index e67f1d1330c..0166fa256af 100644 --- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt +++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.ambiguous_single_block_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Rename alpha -> zzz and beta -> aaa, and point gamma at the new keys === Sync @@ -81,5 +81,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt index 00cea8dd843..f6c206b667b 100644 --- a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt +++ b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.two_removes_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Two identical tasks, one in each block; DELETE one (remote), RENAME the other === Sync @@ -37,5 +37,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/target_variable/output.txt b/acceptance/bundle/config-remote-sync/split/target_variable/output.txt index 9e138def93b..c98ee7a3dc0 100644 --- a/acceptance/bundle/config-remote-sync/split/target_variable/output.txt +++ b/acceptance/bundle/config-remote-sync/split/target_variable/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.var_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Rename the notebook inside a target-block field that uses a variable === Sync @@ -35,5 +35,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt b/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt index 691c2fa1c90..1a99523b717 100644 --- a/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt +++ b/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.file_order_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Edit aaa, whose file position differs from its merged position === Sync @@ -32,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/target_override/output.txt b/acceptance/bundle/config-remote-sync/target_override/output.txt index fa32ecade2c..0ae30a20ab8 100644 --- a/acceptance/bundle/config-remote-sync/target_override/output.txt +++ b/acceptance/bundle/config-remote-sync/target_override/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Modify fields in target override === Detect and save changes @@ -35,5 +35,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt b/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt index 96ecba2dd2a..681a885d397 100644 --- a/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt +++ b/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Rename task to new_task_2 remotely @@ -53,5 +53,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/validation_errors/output.txt b/acceptance/bundle/config-remote-sync/validation_errors/output.txt index 372e4fa1ae8..d5850d0455b 100644 --- a/acceptance/bundle/config-remote-sync/validation_errors/output.txt +++ b/acceptance/bundle/config-remote-sync/validation_errors/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Created pipelines.my_pipeline +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Set correct paths and add git info remotely === Break local paths to simulate stale config @@ -56,5 +57,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/deploy/empty-bundle/output.txt b/acceptance/bundle/deploy/empty-bundle/output.txt index 919accb661f..8716a80e3f7 100644 --- a/acceptance/bundle/deploy/empty-bundle/output.txt +++ b/acceptance/bundle/deploy/empty-bundle/output.txt @@ -1,11 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted diff --git a/acceptance/bundle/deploy/experimental-python/output.txt b/acceptance/bundle/deploy/experimental-python/output.txt index b3bfef9d4ca..f40d99d1d2e 100644 --- a/acceptance/bundle/deploy/experimental-python/output.txt +++ b/acceptance/bundle/deploy/experimental-python/output.txt @@ -1,9 +1,9 @@ >>> uv run --quiet --with [DATABRICKS_BUNDLES_WHEEL] -- [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs list --output json [ diff --git a/acceptance/bundle/deploy/fail-on-active-runs/output.txt b/acceptance/bundle/deploy/fail-on-active-runs/output.txt index b4ba46f998f..9c10a1e7485 100644 --- a/acceptance/bundle/deploy/fail-on-active-runs/output.txt +++ b/acceptance/bundle/deploy/fail-on-active-runs/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> errcode [CLI] bundle deploy --fail-on-active-runs Error: job [NUMID] is running diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt b/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt index 5ed1d5aa884..ce0f2f59ace 100644 --- a/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt +++ b/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Check that test file is in workspace >>> [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files/test.py @@ -44,9 +44,8 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 8 uploaded, 2 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged === Check that removed files are not in the workspace anymore >>> errcode [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files/test.py @@ -69,5 +68,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/files/out-of-band-delete/output.txt b/acceptance/bundle/deploy/files/out-of-band-delete/output.txt index e769969ddca..65a6c603fd6 100644 --- a/acceptance/bundle/deploy/files/out-of-band-delete/output.txt +++ b/acceptance/bundle/deploy/files/out-of-band-delete/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === After the initial deploy the python_file exists >>> [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py @@ -18,9 +18,8 @@ Deployment complete! === Redeploy reuses the stale snapshot, so the python_file is NOT re-uploaded >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 1 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> musterr [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py Error: Path (/Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py) doesn't exist. @@ -30,9 +29,8 @@ Error: Path (/Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/file >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py { diff --git a/acceptance/bundle/deploy/force-lock-config/output.txt b/acceptance/bundle/deploy/force-lock-config/output.txt index c271f1077d3..cbff83f8baa 100644 --- a/acceptance/bundle/deploy/force-lock-config/output.txt +++ b/acceptance/bundle/deploy/force-lock-config/output.txt @@ -5,6 +5,6 @@ === bundle.deployment.lock.force is set in databricks.yml, so the stale lock is overridden >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-force-lock/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/deploy/immutable-no-artifacts/output.txt b/acceptance/bundle/deploy/immutable-no-artifacts/output.txt index 3fc999917ab..317d6c9dd5e 100644 --- a/acceptance/bundle/deploy/immutable-no-artifacts/output.txt +++ b/acceptance/bundle/deploy/immutable-no-artifacts/output.txt @@ -10,9 +10,9 @@ Validation OK! >>> [CLI] bundle deploy Uploading immutable bundle snapshot... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [NUMID] "/Workspace/Users/[UUID]/.snapshots/[UUID]/[SNAPSHOT_HASH]/files/src/main.py" @@ -29,5 +29,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-immutable-no-artifacts-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/immutable-permissions-change/output.txt b/acceptance/bundle/deploy/immutable-permissions-change/output.txt index 68b79efc831..bfc43defff9 100644 --- a/acceptance/bundle/deploy/immutable-permissions-change/output.txt +++ b/acceptance/bundle/deploy/immutable-permissions-change/output.txt @@ -2,9 +2,9 @@ === Deploy without permissions >>> [CLI] bundle deploy Uploading immutable bundle snapshot... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged First snapshot path: /Workspace/Users/[UUID]/.snapshots/[UUID]/[SNAPSHOT_HASH]/files/src/main.py === Add permissions and redeploy @@ -22,9 +22,10 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more in databricks.yml:22:3 Uploading immutable bundle snapshot... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.my_job +Created jobs.my_job.permissions +Files: 0 uploaded, 0 deleted +Resources: 1 created, 1 changed, 0 deleted, 0 unchanged Second snapshot path: /Workspace/Users/[UUID]/.snapshots/[UUID]/[SNAPSHOT_HASH]/files/src/main.py === Verify snapshot path changed after permissions change @@ -48,5 +49,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-immutable-perms-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/immutable/output.txt b/acceptance/bundle/deploy/immutable/output.txt index dcc78a79103..d02d2cd1d31 100644 --- a/acceptance/bundle/deploy/immutable/output.txt +++ b/acceptance/bundle/deploy/immutable/output.txt @@ -37,9 +37,9 @@ Building python_artifact... >>> [CLI] bundle deploy Building python_artifact... Uploading immutable bundle snapshot... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [NUMID] "/Workspace/Users/[UUID]/.snapshots/[UUID]/[SNAPSHOT_HASH]/files/src/main.py" @@ -58,5 +58,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-immutable-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/mlops-stacks/output.txt b/acceptance/bundle/deploy/mlops-stacks/output.txt index 594a1ab4768..62b2dbcd8f4 100644 --- a/acceptance/bundle/deploy/mlops-stacks/output.txt +++ b/acceptance/bundle/deploy/mlops-stacks/output.txt @@ -82,9 +82,16 @@ Warning: unknown field: description in resources/ml-artifacts-resource.yml:28:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created experiments.experiment +Created experiments.experiment.permissions +Created jobs.batch_inference_job +Created jobs.batch_inference_job.permissions +Created jobs.model_training_job +Created jobs.model_training_job.permissions +Created registered_models.model +Created registered_models.model.grants +Files: 26 uploaded, 0 deleted +Resources: 8 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary --var catalog_name=main -o json Warning: expected a string value, found null @@ -140,8 +147,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 4 deleted >>> [CLI] schemas delete main.project_name_[UNIQUE_NAME] Warning: expected a string value, found null diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/databricks.yml b/acceptance/bundle/deploy/partial-summary-on-push-fail/databricks.yml new file mode 100644 index 00000000000..335123cef20 --- /dev/null +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/databricks.yml @@ -0,0 +1,7 @@ +bundle: + name: test-bundle + +resources: + jobs: + my_job: + name: my-job diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/out.test.toml b/acceptance/bundle/deploy/partial-summary-on-push-fail/out.test.toml new file mode 100644 index 00000000000..0938e678987 --- /dev/null +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/out.test.toml @@ -0,0 +1,2 @@ +Cloud = false +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt new file mode 100644 index 00000000000..bb125634e90 --- /dev/null +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt @@ -0,0 +1,26 @@ + +>>> errcode [CLI] bundle deploy +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Error: access denied: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json (403 INJECTED) + +Endpoint: POST [DATABRICKS_URL]/api/2.0/workspace-files/import-file/Workspace%2FUsers%2F[USERNAME]%2F.bundle%2Ftest-bundle%2Fdefault%2Fstate%2Fresources.json?overwrite=true +HTTP Status: 403 Forbidden +API error_code: INJECTED +API message: Fault injected by test. + +Files: 5 uploaded, 0 deleted + +Exit code: 1 + +>>> [CLI] bundle deploy +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Files: 1 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged + +>>> [CLI] bundle destroy --auto-approve +The following resources will be deleted: + delete resources.jobs.my_job + +All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default + +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/script b/acceptance/bundle/deploy/partial-summary-on-push-fail/script new file mode 100644 index 00000000000..9e11abbe1b6 --- /dev/null +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/script @@ -0,0 +1,14 @@ +cleanup() { + # Second deploy has no fault, so it succeeds and prints both summary lines; this + # both cleans up and shows the contrast with the failed deploy above. + trace $CLI bundle deploy + trace $CLI bundle destroy --auto-approve +} +trap cleanup EXIT + +# Inject a 403 on the resource-state upload (PushResourcesState). The files are +# uploaded by then, so "Files:" still reports them; "Resources:" must NOT print, +# because this fails before planning and there are no resource counts to report. +fault.py "POST /api/2.0/workspace-files/import-file/Workspace/Users/$CURRENT_USER_NAME/.bundle/test-bundle/default/state/resources.json" 403 0 1 + +trace errcode $CLI bundle deploy diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/test.toml b/acceptance/bundle/deploy/partial-summary-on-push-fail/test.toml new file mode 100644 index 00000000000..7ad1225aec5 --- /dev/null +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/test.toml @@ -0,0 +1,8 @@ +# The resource summary must not print when pushing resource state fails, so the +# fault is injected on the state upload (POST import-file). The path is fixed, so +# the bundle name must be stable (test-bundle, not $UNIQUE_NAME). +# +# The injected path is the direct-engine state file (state/resources.json), so +# this runs on the direct engine only. +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] +Ignore = [".databricks", ".gitignore"] diff --git a/acceptance/bundle/deploy/pipeline-config-dots/output.txt b/acceptance/bundle/deploy/pipeline-config-dots/output.txt index 8b338fcfbb3..01804f02186 100644 --- a/acceptance/bundle/deploy/pipeline-config-dots/output.txt +++ b/acceptance/bundle/deploy/pipeline-config-dots/output.txt @@ -10,9 +10,10 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Created schemas.my_schema +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -28,5 +29,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/deploy/python-notebook/output.txt b/acceptance/bundle/deploy/python-notebook/output.txt index 62e9567ccee..5b6e5413596 100644 --- a/acceptance/bundle/deploy/python-notebook/output.txt +++ b/acceptance/bundle/deploy/python-notebook/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs list --output json [ diff --git a/acceptance/bundle/deploy/readplan/basic/output.txt b/acceptance/bundle/deploy/readplan/basic/output.txt index 485488f0904..090efef56b3 100644 --- a/acceptance/bundle/deploy/readplan/basic/output.txt +++ b/acceptance/bundle/deploy/readplan/basic/output.txt @@ -5,9 +5,9 @@ >>> [CLI] bundle deploy --plan out.plan_create.json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --get //jobs { @@ -41,9 +41,8 @@ Deployment complete! >>> [CLI] bundle deploy --plan out.plan_skip.json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py --get //jobs @@ -53,5 +52,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt b/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt index 0be1f7acd1b..a20a3149cb1 100644 --- a/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt +++ b/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt @@ -4,9 +4,9 @@ >>> [CLI] bundle deploy --plan plan.json Warn: Plan was created with CLI version 1.2.3 but current version is [CLI_VERSION] Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "method": "POST", "path": "/api/2.2/jobs/create", @@ -31,5 +31,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt b/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt index f7926fa9fa9..d4023da04eb 100644 --- a/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt +++ b/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.myschema +Created schemas.myschema.grants +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog/permissions --sort { @@ -41,9 +42,9 @@ Deployment complete! "path": "/api/2.1/unity-catalog/permissions/schema/main.myschema" } Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated schemas.myschema.grants +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //unity-catalog/permissions --sort { @@ -77,5 +78,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/readplan/postgres_role/output.txt b/acceptance/bundle/deploy/readplan/postgres_role/output.txt index 1a6d0b7994c..e6079ee49cd 100644 --- a/acceptance/bundle/deploy/readplan/postgres_role/output.txt +++ b/acceptance/bundle/deploy/readplan/postgres_role/output.txt @@ -5,9 +5,11 @@ >>> [CLI] bundle deploy --plan plan.json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.branch +Created postgres_projects.project +Created postgres_roles.role +Files: 8 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //roles { @@ -42,5 +44,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt b/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt index 50f6d7149ca..a2f28170b58 100644 --- a/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt +++ b/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json Error: plan serial 999 does not match state serial 1; the state has been modified since the plan was created. Please run 'bundle plan' again @@ -15,5 +15,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/snapshot-comparison/output.txt b/acceptance/bundle/deploy/snapshot-comparison/output.txt index c908a5fa61a..35c1b7ad43d 100644 --- a/acceptance/bundle/deploy/snapshot-comparison/output.txt +++ b/acceptance/bundle/deploy/snapshot-comparison/output.txt @@ -2,9 +2,10 @@ === Deploy bundle 1 with terraform >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/snapshot-test-1-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Created pipelines.test_pipeline +Files: 3 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Run migrate on bundle 1 >>> [CLI] bundle deployment migrate @@ -20,9 +21,10 @@ To undo the migration, remove [TEST_TMP_DIR]/bundle1/.databricks/bundle/default/ === Deploy bundle 2 with terraform and YamlSync >>> DATABRICKS_BUNDLE_ENABLE_EXPERIMENTAL_YAML_SYNC=true DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/snapshot-test-2-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Created pipelines.test_pipeline +Files: 3 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Normalize bundle names for comparison >>> cp bundle1/.databricks/bundle/default/resources.json tmp.bundle1.json @@ -48,8 +50,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/snapshot-test-1-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted === Cleanup bundle 2 >>> [CLI] bundle destroy --auto-approve @@ -63,5 +64,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/snapshot-test-2-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/deploy/spark-jar-task/output.txt b/acceptance/bundle/deploy/spark-jar-task/output.txt index be85c64ad0a..af6b78b8227 100644 --- a/acceptance/bundle/deploy/spark-jar-task/output.txt +++ b/acceptance/bundle/deploy/spark-jar-task/output.txt @@ -3,9 +3,9 @@ Building my_java_code... Uploading myjar/PrintArgs.jar... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/spark-jar-task-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.jar_job +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run jar_job Run URL: [DATABRICKS_URL]/jobs/[NUMID]/runs/[NUMID]?o=[NUMID] @@ -20,5 +20,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/spark-jar-task-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt b/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt index 7cbc9f31a85..ddba262ca36 100644 --- a/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt +++ b/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt @@ -2,7 +2,6 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-chain-test/default/files... -Deploying resources... [PROCESS_KILLED] Exit code: [KILLED] diff --git a/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt b/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt index b29571ff666..81f0e5090b1 100644 --- a/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt +++ b/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt @@ -9,9 +9,10 @@ Warn: Skipping corrupted WAL entry at [TEST_TMP_DIR]/.databricks/bundle/default/resources.json.wal:4: unexpected end of JSON input Warn: Saved 1 corrupted WAL entries to [TEST_TMP_DIR]/.databricks/bundle/default/resources.json.wal.corrupted Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-corrupted-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.another_valid +Created jobs.valid_job +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary Name: wal-corrupted-test diff --git a/acceptance/bundle/deploy/wal/crash-after-create/output.txt b/acceptance/bundle/deploy/wal/crash-after-create/output.txt index e9e2c19c094..09f5d04a69e 100644 --- a/acceptance/bundle/deploy/wal/crash-after-create/output.txt +++ b/acceptance/bundle/deploy/wal/crash-after-create/output.txt @@ -2,7 +2,6 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-crash-test/default/files... -Deploying resources... [PROCESS_KILLED] Exit code: [KILLED] diff --git a/acceptance/bundle/deploy/wal/empty-wal/output.txt b/acceptance/bundle/deploy/wal/empty-wal/output.txt index bba6d249fce..9f579981955 100644 --- a/acceptance/bundle/deploy/wal/empty-wal/output.txt +++ b/acceptance/bundle/deploy/wal/empty-wal/output.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-empty-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt b/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt index 7d830c172b1..c7cac4b70ca 100644 --- a/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt +++ b/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt @@ -2,9 +2,9 @@ === Deploy 1 (normal: creates the job and the committed state) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Deploy 2 (planning fails, must not leave a WAL) >>> errcode [CLI] bundle deploy @@ -18,6 +18,7 @@ API message: Fault injected by test. Error: planning failed +Files: 1 uploaded, 0 deleted Exit code: 1 @@ -35,6 +36,7 @@ API message: Fault injected by test. Error: planning failed +Files: 1 uploaded, 0 deleted Exit code: 1 @@ -43,6 +45,5 @@ Exit code: 1 === Deploy 4 (fault expired: recovers and succeeds) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 1 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged diff --git a/acceptance/bundle/deploy/wal/header-only-wal/output.txt b/acceptance/bundle/deploy/wal/header-only-wal/output.txt index 88ea1e3c038..807fa926044 100644 --- a/acceptance/bundle/deploy/wal/header-only-wal/output.txt +++ b/acceptance/bundle/deploy/wal/header-only-wal/output.txt @@ -2,7 +2,6 @@ === First deploy (killed before recording the job, leaves a header-only WAL) >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... [PROCESS_KILLED] Exit code: [KILLED] @@ -13,7 +12,6 @@ Exit code: [KILLED] === Second deploy (killed again, leaves another header-only WAL) >>> errcode [CLI] bundle deploy --force-lock Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... [PROCESS_KILLED] Exit code: [KILLED] @@ -24,9 +22,9 @@ Exit code: [KILLED] === Third deploy (must recover and succeed, not blocked by the leftover WAL) >>> errcode [CLI] bundle deploy --force-lock Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 1 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> errcode assert_not_exists.py .databricks/bundle/default/resources.json.wal diff --git a/acceptance/bundle/deploy/wal/stale-wal/output.txt b/acceptance/bundle/deploy/wal/stale-wal/output.txt index 91a7a07643d..eb66dfc8299 100644 --- a/acceptance/bundle/deploy/wal/stale-wal/output.txt +++ b/acceptance/bundle/deploy/wal/stale-wal/output.txt @@ -5,9 +5,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-stale-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.test_job +Files: 8 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Checking WAL file after deploy === Stale WAL deleted (expected) === State file should NOT contain stale_job === diff --git a/acceptance/bundle/deploy/wal/test.toml b/acceptance/bundle/deploy/wal/test.toml index 14e65c59553..2ece38ee428 100644 --- a/acceptance/bundle/deploy/wal/test.toml +++ b/acceptance/bundle/deploy/wal/test.toml @@ -27,7 +27,9 @@ Old = '(\[PROCESS_KILLED\]\n\nExit code: )1' New = '${1}[KILLED]' # On Windows, no bash "Killed" message appears when CLI has produced output before termination. -# Match the raw exit code 1 (Windows never gets 137 or [PROCESS_KILLED] marker first). +# The kill lands during resource apply, right after the "Uploading bundle files" +# line, so that line is immediately followed by "Exit code: 1" (a genuine error +# exit prints an "Error:" line in between and is left untouched). [[Repls]] -Old = '(Deploying resources\.\.\.)\n\nExit code: 1' +Old = '(Uploading bundle files to [^\n]+)\n\nExit code: 1' New = "${1}\n[PROCESS_KILLED]\n\nExit code: [KILLED]" diff --git a/acceptance/bundle/deploy/wal/wal-with-delete/output.txt b/acceptance/bundle/deploy/wal/wal-with-delete/output.txt index 4eb0fb5724a..b5abe8a2e7b 100644 --- a/acceptance/bundle/deploy/wal/wal-with-delete/output.txt +++ b/acceptance/bundle/deploy/wal/wal-with-delete/output.txt @@ -5,9 +5,8 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-delete-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 7 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Final state (should have no jobs) === >>> [CLI] bundle summary diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt b/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt index e037b25fd29..227c86d4525 100644 --- a/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt +++ b/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/yaml-sync-empty-grants/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.schema1 +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/deployment/bind/alert/output.txt b/acceptance/bundle/deployment/bind/alert/output.txt index 27949d29d1e..4473eb83917 100644 --- a/acceptance/bundle/deployment/bind/alert/output.txt +++ b/acceptance/bundle/deployment/bind/alert/output.txt @@ -2,7 +2,6 @@ >>> [CLI] alerts-v2 create-alert --json @alert.json >>> [CLI] bundle deployment bind my_alert [ALERT_ID] --auto-approve -Updating deployment state... Successfully bound alert with an id '[ALERT_ID]' Run 'bundle deploy' to deploy changes to your workspace @@ -19,7 +18,6 @@ Resources: URL: [DATABRICKS_URL]/sql/alerts-v2/[ALERT_ID] >>> [CLI] bundle deployment unbind my_alert -Updating deployment state... >>> [CLI] bundle summary Name: test-bind-alert-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/bind/catalog/output.txt b/acceptance/bundle/deployment/bind/catalog/output.txt index d365080f498..385a5f67b08 100644 --- a/acceptance/bundle/deployment/bind/catalog/output.txt +++ b/acceptance/bundle/deployment/bind/catalog/output.txt @@ -6,16 +6,15 @@ } >>> [CLI] bundle deployment bind foo test-catalog-[UNIQUE_NAME] --auto-approve -Updating deployment state... Successfully bound catalog with an id 'test-catalog-[UNIQUE_NAME]' Run 'bundle deploy' to deploy changes to your workspace === Deploy bundle >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated catalogs.foo +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] catalogs get test-catalog-[UNIQUE_NAME] { @@ -25,14 +24,12 @@ Deployment complete! === Unbind catalog >>> [CLI] bundle deployment unbind foo -Updating deployment state... === Destroy bundle >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted === Read the pre-defined catalog again (expecting it still exists): >>> [CLI] catalogs get test-catalog-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/bind/cluster/output.txt b/acceptance/bundle/deployment/bind/cluster/output.txt index 9c194337e76..d206309df05 100644 --- a/acceptance/bundle/deployment/bind/cluster/output.txt +++ b/acceptance/bundle/deployment/bind/cluster/output.txt @@ -5,9 +5,7 @@ } >>> [CLI] bundle deployment bind cluster1 [TEST_DEFAULT_CLUSTER_ID] --auto-approve -Updating deployment state... Successfully bound cluster with an id '[TEST_DEFAULT_CLUSTER_ID]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deployment unbind cluster1 -Updating deployment state... diff --git a/acceptance/bundle/deployment/bind/dashboard/output.txt b/acceptance/bundle/deployment/bind/dashboard/output.txt index d970d869df8..1d6742cfbc8 100644 --- a/acceptance/bundle/deployment/bind/dashboard/output.txt +++ b/acceptance/bundle/deployment/bind/dashboard/output.txt @@ -1,12 +1,11 @@ >>> [CLI] bundle deployment bind dashboard1 [DASHBOARD_ID] --auto-approve -Updating deployment state... Successfully bound dashboard with an id '[DASHBOARD_ID]' Run 'bundle deploy' to deploy changes to your workspace Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated dashboards.dashboard1 +Files: 14 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] lakeview get [DASHBOARD_ID] { @@ -26,13 +25,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind dashboard1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] lakeview get [DASHBOARD_ID] { diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt index bbaff645113..f076ba2b12f 100644 --- a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt +++ b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt @@ -1,6 +1,5 @@ >>> [CLI] bundle deployment bind dashboard1 [DASHBOARD_ID] --auto-approve -Updating deployment state... Successfully bound dashboard with an id '[DASHBOARD_ID]' Run 'bundle deploy' to deploy changes to your workspace @@ -20,15 +19,15 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. +Files: 9 uploaded, 0 deleted Exit code: 1 >>> [CLI] bundle deployment unbind dashboard1 -Updating deployment state... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] lakeview get [DASHBOARD_ID] { diff --git a/acceptance/bundle/deployment/bind/database_instance/output.txt b/acceptance/bundle/deployment/bind/database_instance/output.txt index 95c9600c488..f147c6eff1e 100644 --- a/acceptance/bundle/deployment/bind/database_instance/output.txt +++ b/acceptance/bundle/deployment/bind/database_instance/output.txt @@ -1,6 +1,5 @@ >>> [CLI] bundle deployment bind database_instance1 [UUID] --auto-approve -Updating deployment state... Successfully bound database_instance with an id '[UUID]' Run 'bundle deploy' to deploy changes to your workspace @@ -17,7 +16,6 @@ Resources: URL: [DATABRICKS_URL]/compute/database-instances/test-instance-02?w=[NUMID] >>> [CLI] bundle deployment unbind database_instance1 -Updating deployment state... >>> [CLI] bundle summary Name: test-bundle diff --git a/acceptance/bundle/deployment/bind/experiment/output.txt b/acceptance/bundle/deployment/bind/experiment/output.txt index 1efb0ddc4dd..3b2f824a54a 100644 --- a/acceptance/bundle/deployment/bind/experiment/output.txt +++ b/acceptance/bundle/deployment/bind/experiment/output.txt @@ -1,14 +1,12 @@ >>> [CLI] bundle deployment bind experiment1 [NUMID] --auto-approve -Updating deployment state... Successfully bound experiment with an id '[NUMID]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] experiments get-experiment [NUMID] { @@ -17,13 +15,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind experiment1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] experiments get-experiment [NUMID] { diff --git a/acceptance/bundle/deployment/bind/external_location/output.txt b/acceptance/bundle/deployment/bind/external_location/output.txt index bc2ad4be800..b4f6fc08d7b 100644 --- a/acceptance/bundle/deployment/bind/external_location/output.txt +++ b/acceptance/bundle/deployment/bind/external_location/output.txt @@ -7,16 +7,15 @@ } >>> [CLI] bundle deployment bind test_location test-location-[UNIQUE_NAME] --auto-approve -Updating deployment state... Successfully bound external_location with an id 'test-location-[UNIQUE_NAME]' Run 'bundle deploy' to deploy changes to your workspace === Deploy bundle >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated external_locations.test_location +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] external-locations get test-location-[UNIQUE_NAME] { @@ -27,14 +26,12 @@ Deployment complete! === Unbind external location >>> [CLI] bundle deployment unbind test_location -Updating deployment state... === Destroy bundle >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted === Read the pre-defined external location again (expecting it still exists): >>> [CLI] external-locations get test-location-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/bind/genie_space/output.txt b/acceptance/bundle/deployment/bind/genie_space/output.txt index 34c6295bb51..9393bba3ec1 100644 --- a/acceptance/bundle/deployment/bind/genie_space/output.txt +++ b/acceptance/bundle/deployment/bind/genie_space/output.txt @@ -1,6 +1,5 @@ >>> [CLI] bundle deployment bind genie_space1 [GENIE_SPACE_ID] --auto-approve -Updating deployment state... Successfully bound genie_space with an id '[GENIE_SPACE_ID]' Run 'bundle deploy' to deploy changes to your workspace @@ -9,9 +8,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] genie get-space [GENIE_SPACE_ID] { @@ -21,13 +19,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind genie_space1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] genie get-space [GENIE_SPACE_ID] { diff --git a/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt b/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt index 9f0d1005cd8..a06a15f8168 100644 --- a/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt +++ b/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt @@ -1,8 +1,8 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs create --json {"name": "My Job"} diff --git a/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt b/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt index 29757521ac0..11f70fb7c43 100644 --- a/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt +++ b/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged diff --git a/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt b/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt index 1e8bb572e8f..61304e69040 100644 --- a/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt +++ b/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt @@ -1,19 +1,17 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/engine-from-config/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === State files after deploy === .databricks/bundle/default/resources.json >>> [CLI] bundle deployment unbind job_1 -Updating deployment state... >>> [CLI] jobs create --json {"name": "My Job"} >>> [CLI] bundle deployment bind job_1 [NUMID] --auto-approve -Updating deployment state... Successfully bound job with an id '[NUMID]' Run 'bundle deploy' to deploy changes to your workspace === State files after bind === diff --git a/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt b/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt index ad92c2d3e0d..5bab49ee88e 100644 --- a/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt +++ b/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt @@ -17,15 +17,14 @@ test.py name: generate-job-[UNIQUE_NAME] >>> [CLI] bundle deployment bind test_job_key [NUMID] --auto-approve -Updating deployment state... Successfully bound job with an id '[NUMID]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-generate-bind-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.test_job_key +Files: 9 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -33,8 +32,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-generate-bind-[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted === Check that job is bound and does not exist after bundle is destroyed: >>> errcode [CLI] jobs get [NUMID] --output json diff --git a/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt b/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt index b4da76ff600..fe661797656 100644 --- a/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt +++ b/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt @@ -12,9 +12,9 @@ Exit code: 1 === Deploy bundle: >>> [CLI] bundle deploy --force-lock Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bind-job-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Check that job is not bound and not updated with config from bundle: >>> [CLI] jobs get [JOB_ID] diff --git a/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt b/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt index 3b68a53f081..2a28051981c 100644 --- a/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt +++ b/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt @@ -4,7 +4,6 @@ Created job with ID: [NUMID] === Bind job: >>> [CLI] bundle deployment bind foo [NUMID] --auto-approve -Updating deployment state... Successfully bound job with an id '[NUMID]' Run 'bundle deploy' to deploy changes to your workspace @@ -14,9 +13,9 @@ Run 'bundle deploy' to deploy changes to your workspace === Deploy bundle: >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bind-job-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Read the pre-defined job: >>> [CLI] jobs get [NUMID] @@ -37,7 +36,6 @@ Deployment complete! === Unbind the job: >>> [CLI] bundle deployment unbind foo -Updating deployment state... === Remove .databricks directory to simulate fresh deployment: >>> rm -rf .databricks @@ -46,8 +44,7 @@ Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bind-job-[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 0 deleted === Read the pre-defined job again (expecting it still exists): >>> [CLI] jobs get [NUMID] diff --git a/acceptance/bundle/deployment/bind/job/noop-job/output.txt b/acceptance/bundle/deployment/bind/job/noop-job/output.txt index 21d3780de6c..c9c15e16051 100644 --- a/acceptance/bundle/deployment/bind/job/noop-job/output.txt +++ b/acceptance/bundle/deployment/bind/job/noop-job/output.txt @@ -2,14 +2,13 @@ >>> [CLI] jobs create --json {"name": "My Job"} >>> [CLI] bundle deployment bind job_1 [NUMID] --auto-approve -Updating deployment state... Successfully bound job with an id '[NUMID]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job_1 +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [NUMID] --output json diff --git a/acceptance/bundle/deployment/bind/job/python-job/output.txt b/acceptance/bundle/deployment/bind/job/python-job/output.txt index 2e327e3b476..44b9f01fe1f 100644 --- a/acceptance/bundle/deployment/bind/job/python-job/output.txt +++ b/acceptance/bundle/deployment/bind/job/python-job/output.txt @@ -2,14 +2,13 @@ >>> [CLI] jobs create --json {"name": "My Job"} >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deployment bind job_1 [NUMID] --auto-approve -Updating deployment state... Successfully bound job with an id '[NUMID]' Run 'bundle deploy' to deploy changes to your workspace >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job_1 +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [NUMID] --output json diff --git a/acceptance/bundle/deployment/bind/job/stale-state/output.txt b/acceptance/bundle/deployment/bind/job/stale-state/output.txt index 815586e6d4a..2da9490586c 100644 --- a/acceptance/bundle/deployment/bind/job/stale-state/output.txt +++ b/acceptance/bundle/deployment/bind/job/stale-state/output.txt @@ -2,17 +2,17 @@ === Step 1: Deploy with job_1 only >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/stale_state_test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Step 2: Save stale local state (has only job_1, serial=1) === Step 3: Add job_2 to config and deploy again >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/stale_state_test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_2 +Files: 3 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged === Step 4: Record deployed job_2 ID from stateDeployed job_2 ID: [JOB_2_ID] diff --git a/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt b/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt index 702a1c17189..ea05d0aa948 100644 --- a/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt +++ b/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt @@ -29,15 +29,13 @@ resources: } >>> [CLI] bundle deployment bind endpoint1 test-endpoint-[UNIQUE_NAME] -Updating deployment state... Successfully bound model_serving_endpoint with an id 'test-endpoint-[UNIQUE_NAME]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] serving-endpoints get test-endpoint-[UNIQUE_NAME] { @@ -51,13 +49,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind endpoint1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] serving-endpoints get test-endpoint-[UNIQUE_NAME] { diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.direct.txt b/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.direct.txt index 6c88a3134b8..670eec7006e 100644 --- a/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.direct.txt +++ b/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.direct.txt @@ -1,5 +1,4 @@ >>> [CLI] bundle deployment bind foo [NEW_PIPELINE_ID] --auto-approve -Updating deployment state... Successfully bound pipeline with an id '[NEW_PIPELINE_ID]' Run 'bundle deploy' to deploy changes to your workspace diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.terraform.txt b/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.terraform.txt index 6c88a3134b8..670eec7006e 100644 --- a/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.terraform.txt +++ b/acceptance/bundle/deployment/bind/pipelines/recreate/out.bind-success.terraform.txt @@ -1,5 +1,4 @@ >>> [CLI] bundle deployment bind foo [NEW_PIPELINE_ID] --auto-approve -Updating deployment state... Successfully bound pipeline with an id '[NEW_PIPELINE_ID]' Run 'bundle deploy' to deploy changes to your workspace diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt b/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt index 4da2a167b7f..934f36e0ce9 100644 --- a/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt +++ b/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt @@ -20,6 +20,7 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. +Files: 14 uploaded, 0 deleted >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-recreate-[UNIQUE_NAME]/default/files... @@ -29,8 +30,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.foo -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated pipelines.foo +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py ^//import-file/ ^//workspace/ ^//telemetry-ext diff --git a/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.direct.txt b/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.direct.txt index 6c88a3134b8..670eec7006e 100644 --- a/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.direct.txt +++ b/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.direct.txt @@ -1,5 +1,4 @@ >>> [CLI] bundle deployment bind foo [NEW_PIPELINE_ID] --auto-approve -Updating deployment state... Successfully bound pipeline with an id '[NEW_PIPELINE_ID]' Run 'bundle deploy' to deploy changes to your workspace diff --git a/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.terraform.txt b/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.terraform.txt index 6c88a3134b8..670eec7006e 100644 --- a/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.terraform.txt +++ b/acceptance/bundle/deployment/bind/pipelines/update/out.bind-success.terraform.txt @@ -1,5 +1,4 @@ >>> [CLI] bundle deployment bind foo [NEW_PIPELINE_ID] --auto-approve -Updating deployment state... Successfully bound pipeline with an id '[NEW_PIPELINE_ID]' Run 'bundle deploy' to deploy changes to your workspace diff --git a/acceptance/bundle/deployment/bind/pipelines/update/output.txt b/acceptance/bundle/deployment/bind/pipelines/update/output.txt index c1f096e648e..507bbb2e414 100644 --- a/acceptance/bundle/deployment/bind/pipelines/update/output.txt +++ b/acceptance/bundle/deployment/bind/pipelines/update/output.txt @@ -15,8 +15,8 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-recreate/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated pipelines.foo +Files: 12 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py ^//import-file/ ^//workspace/delete ^//telemetry-ext diff --git a/acceptance/bundle/deployment/bind/postgres_database/output.txt b/acceptance/bundle/deployment/bind/postgres_database/output.txt index 799751d7e91..86bb47f3eff 100644 --- a/acceptance/bundle/deployment/bind/postgres_database/output.txt +++ b/acceptance/bundle/deployment/bind/postgres_database/output.txt @@ -1,6 +1,5 @@ >>> [CLI] bundle deployment bind database1 projects/test-project/branches/main/databases/test-database --auto-approve -Updating deployment state... Successfully bound postgres_database with an id 'projects/test-project/branches/main/databases/test-database' Run 'bundle deploy' to deploy changes to your workspace @@ -17,7 +16,6 @@ Resources: URL: (not deployed) >>> [CLI] bundle deployment unbind database1 -Updating deployment state... >>> [CLI] bundle summary Name: test-bundle diff --git a/acceptance/bundle/deployment/bind/postgres_role/output.txt b/acceptance/bundle/deployment/bind/postgres_role/output.txt index b439a090ee5..ade277df2ae 100644 --- a/acceptance/bundle/deployment/bind/postgres_role/output.txt +++ b/acceptance/bundle/deployment/bind/postgres_role/output.txt @@ -1,6 +1,5 @@ >>> [CLI] bundle deployment bind role1 projects/test-project/branches/main/roles/test-role --auto-approve -Updating deployment state... Successfully bound postgres_role with an id 'projects/test-project/branches/main/roles/test-role' Run 'bundle deploy' to deploy changes to your workspace @@ -17,7 +16,6 @@ Resources: URL: (not deployed) >>> [CLI] bundle deployment unbind role1 -Updating deployment state... >>> [CLI] bundle summary Name: test-bundle diff --git a/acceptance/bundle/deployment/bind/quality-monitor/output.txt b/acceptance/bundle/deployment/bind/quality-monitor/output.txt index 30e2790c9eb..586d124b90a 100644 --- a/acceptance/bundle/deployment/bind/quality-monitor/output.txt +++ b/acceptance/bundle/deployment/bind/quality-monitor/output.txt @@ -13,12 +13,10 @@ } >>> [CLI] bundle deployment bind monitor1 catalog.schema.table -Updating deployment state... Successfully bound quality_monitor with an id 'catalog.schema.table' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-quality-monitor-test-localonly/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged diff --git a/acceptance/bundle/deployment/bind/registered-model/output.txt b/acceptance/bundle/deployment/bind/registered-model/output.txt index cda82ea075f..64db58ffee2 100644 --- a/acceptance/bundle/deployment/bind/registered-model/output.txt +++ b/acceptance/bundle/deployment/bind/registered-model/output.txt @@ -15,15 +15,13 @@ resources: } >>> [CLI] bundle deployment bind model1 main.test-schema-rmodel-[UNIQUE_NAME].test-registered-model-[UNIQUE_NAME] -Updating deployment state... Successfully bound registered_model with an id 'main.test-schema-rmodel-[UNIQUE_NAME].test-registered-model-[UNIQUE_NAME]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] registered-models get main.test-schema-rmodel-[UNIQUE_NAME].test-registered-model-[UNIQUE_NAME] { @@ -33,13 +31,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind model1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] registered-models get main.test-schema-rmodel-[UNIQUE_NAME].test-registered-model-[UNIQUE_NAME] { diff --git a/acceptance/bundle/deployment/bind/schema/output.txt b/acceptance/bundle/deployment/bind/schema/output.txt index 2e6976fb580..75c2f010766 100644 --- a/acceptance/bundle/deployment/bind/schema/output.txt +++ b/acceptance/bundle/deployment/bind/schema/output.txt @@ -6,14 +6,13 @@ "catalog_name": "main" } -=== Bind schema: Updating deployment state... -Successfully bound schema with an id 'main.test-schema-[UUID]' +=== Bind schema: Successfully bound schema with an id 'main.test-schema-[UUID]' Run 'bundle deploy' to deploy changes to your workspace === Deploy bundle: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated schemas.schema1 +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Read the pre-defined schema: { "full_name": "main.test-schema-[UUID]", @@ -21,12 +20,10 @@ Deployment complete! "comment": "This schema was created from DABs" } -=== Unbind the schema: Updating deployment state... - +=== Unbind the schema: === Destroy the bundle: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted === Read the pre-defined schema again (expecting it still exists): { "full_name": "main.test-schema-[UUID]", diff --git a/acceptance/bundle/deployment/bind/secret-scope/output.txt b/acceptance/bundle/deployment/bind/secret-scope/output.txt index fb0f3ac11f3..20468f6d0e3 100644 --- a/acceptance/bundle/deployment/bind/secret-scope/output.txt +++ b/acceptance/bundle/deployment/bind/secret-scope/output.txt @@ -2,15 +2,10 @@ >>> [CLI] secrets create-scope test-secret-scope-[UNIQUE_NAME] >>> [CLI] bundle deployment bind secret_scope1 test-secret-scope-[UNIQUE_NAME] --auto-approve -Updating deployment state... Successfully bound secret_scope with an id 'test-secret-scope-[UNIQUE_NAME]' Run 'bundle deploy' to deploy changes to your workspace ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-secret-scope-test-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] secrets list-scopes -o json { @@ -19,13 +14,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind secret_scope1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bind-secret-scope-test-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] secrets list-scopes -o json { diff --git a/acceptance/bundle/deployment/bind/secret-scope/script b/acceptance/bundle/deployment/bind/secret-scope/script index c4e80009e64..e67b4f91f9e 100644 --- a/acceptance/bundle/deployment/bind/secret-scope/script +++ b/acceptance/bundle/deployment/bind/secret-scope/script @@ -12,7 +12,7 @@ trap cleanup EXIT trace $CLI bundle deployment bind secret_scope1 "${SECRET_SCOPE_NAME}" --auto-approve -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace $CLI secrets list-scopes -o json | jq --arg value ${SECRET_SCOPE_NAME} '.[] | select(.name == $value)' diff --git a/acceptance/bundle/deployment/bind/sql_warehouse/output.txt b/acceptance/bundle/deployment/bind/sql_warehouse/output.txt index ea7f3945a54..858dec32105 100644 --- a/acceptance/bundle/deployment/bind/sql_warehouse/output.txt +++ b/acceptance/bundle/deployment/bind/sql_warehouse/output.txt @@ -1,6 +1,5 @@ >>> [CLI] bundle deployment bind sql_warehouse1 [SQL-WAREHOUSE-ID] --auto-approve -Updating deployment state... Successfully bound sql_warehouse with an id '[SQL-WAREHOUSE-ID]' Run 'bundle deploy' to deploy changes to your workspace @@ -17,7 +16,6 @@ Resources: URL: [DATABRICKS_URL]/sql/warehouses/[SQL-WAREHOUSE-ID]?w=[NUMID] >>> [CLI] bundle deployment unbind sql_warehouse1 -Updating deployment state... >>> [CLI] bundle summary Name: test-bundle diff --git a/acceptance/bundle/deployment/bind/vector_search_endpoint/output.txt b/acceptance/bundle/deployment/bind/vector_search_endpoint/output.txt index 2a731b4827e..55724bd64b4 100644 --- a/acceptance/bundle/deployment/bind/vector_search_endpoint/output.txt +++ b/acceptance/bundle/deployment/bind/vector_search_endpoint/output.txt @@ -7,15 +7,13 @@ } >>> [CLI] bundle deployment bind endpoint1 test-vs-endpoint-[UNIQUE_NAME] --auto-approve -Updating deployment state... Successfully bound vector_search_endpoint with an id 'test-vs-endpoint-[UNIQUE_NAME]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] vector-search-endpoints get-endpoint test-vs-endpoint-[UNIQUE_NAME] { @@ -25,13 +23,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind endpoint1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] vector-search-endpoints get-endpoint test-vs-endpoint-[UNIQUE_NAME] { diff --git a/acceptance/bundle/deployment/bind/vector_search_index/output.txt b/acceptance/bundle/deployment/bind/vector_search_index/output.txt index a91168a5137..c64f94cc969 100644 --- a/acceptance/bundle/deployment/bind/vector_search_index/output.txt +++ b/acceptance/bundle/deployment/bind/vector_search_index/output.txt @@ -14,15 +14,13 @@ } >>> [CLI] bundle deployment bind index1 main.default.test_vs_index_[UNIQUE_NAME] --auto-approve -Updating deployment state... Successfully bound vector_search_index with an id 'main.default.test_vs_index_[UNIQUE_NAME]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] vector-search-indexes get-index main.default.test_vs_index_[UNIQUE_NAME] { @@ -33,13 +31,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind index1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] vector-search-indexes get-index main.default.test_vs_index_[UNIQUE_NAME] { diff --git a/acceptance/bundle/deployment/bind/volume/output.txt b/acceptance/bundle/deployment/bind/volume/output.txt index b7938df1430..87e7402f6d6 100644 --- a/acceptance/bundle/deployment/bind/volume/output.txt +++ b/acceptance/bundle/deployment/bind/volume/output.txt @@ -7,15 +7,13 @@ === Create a pre-defined volume: >>> [CLI] bundle deployment bind volume1 main.test-schema-[UNIQUE_NAME].volume-[UNIQUE_NAME] --auto-approve -Updating deployment state... Successfully bound volume with an id 'main.test-schema-[UNIQUE_NAME].volume-[UNIQUE_NAME]' Run 'bundle deploy' to deploy changes to your workspace >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] volumes read main.test-schema-[UNIQUE_NAME].volume-[UNIQUE_NAME] { @@ -26,13 +24,11 @@ Deployment complete! } >>> [CLI] bundle deployment unbind volume1 -Updating deployment state... >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> [CLI] volumes read main.test-schema-[UNIQUE_NAME].volume-[UNIQUE_NAME] { diff --git a/acceptance/bundle/deployment/unbind/engine-from-config/output.txt b/acceptance/bundle/deployment/unbind/engine-from-config/output.txt index 9e833d5a0d0..a7c528d65d7 100644 --- a/acceptance/bundle/deployment/unbind/engine-from-config/output.txt +++ b/acceptance/bundle/deployment/unbind/engine-from-config/output.txt @@ -1,13 +1,12 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/engine-from-config/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === State files after deploy === .databricks/bundle/default/resources.json >>> [CLI] bundle deployment unbind job_1 -Updating deployment state... === State files after unbind === .databricks/bundle/default/resources.json diff --git a/acceptance/bundle/deployment/unbind/grants/output.txt b/acceptance/bundle/deployment/unbind/grants/output.txt index 073bad25816..f62fd3f659f 100644 --- a/acceptance/bundle/deployment/unbind/grants/output.txt +++ b/acceptance/bundle/deployment/unbind/grants/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.schema_1 +Created schemas.schema_1.grants +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants get schema main.test-schema-[UNIQUE_NAME] --output json { @@ -15,13 +16,13 @@ Deployment complete! } >>> [CLI] bundle deployment unbind schema_1 -Updating deployment state... >>> [CLI] bundle deploy --var suffix=another Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.schema_1 +Created schemas.schema_1.grants +Files: 1 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Grants should be the same as before unbind >>> [CLI] grants get schema main.test-schema-[UNIQUE_NAME] --output json @@ -42,8 +43,7 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> [CLI] schemas delete main.test-schema-[UNIQUE_NAME] 0 diff --git a/acceptance/bundle/deployment/unbind/job/output.txt b/acceptance/bundle/deployment/unbind/job/output.txt index e1c72de2d4f..3df3d38f8a2 100644 --- a/acceptance/bundle/deployment/unbind/job/output.txt +++ b/acceptance/bundle/deployment/unbind/job/output.txt @@ -1,20 +1,19 @@ >>> [CLI] bundle deploy --var job_name=My Job Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary --var job_name=My Job --output json >>> [CLI] bundle deployment unbind job_1 --var job_name=My Job -Updating deployment state... >>> [CLI] bundle deploy --var job_name=Updated Job Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Files: 1 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [NUMID] --output json { diff --git a/acceptance/bundle/deployment/unbind/permissions/output.txt b/acceptance/bundle/deployment/unbind/permissions/output.txt index a7e824374bf..0db01b55355 100644 --- a/acceptance/bundle/deployment/unbind/permissions/output.txt +++ b/acceptance/bundle/deployment/unbind/permissions/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Created jobs.job_1.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary --output json @@ -19,13 +20,13 @@ Deployment complete! } >>> [CLI] bundle deployment unbind job_1 -Updating deployment state... >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Created jobs.job_1.permissions +Files: 1 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Permissions should be the same as before unbind >>> [CLI] jobs get-permissions [NUMID] --output json @@ -45,8 +46,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> [CLI] jobs delete [NUMID] 0 diff --git a/acceptance/bundle/deployment/unbind/python-job/output.txt b/acceptance/bundle/deployment/unbind/python-job/output.txt index 75ff185b35c..2959b91c2e3 100644 --- a/acceptance/bundle/deployment/unbind/python-job/output.txt +++ b/acceptance/bundle/deployment/unbind/python-job/output.txt @@ -1,20 +1,19 @@ >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deploy --var job_name=My Job Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle summary --var job_name=My Job --output json >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deployment unbind job_1 --var job_name=My Job -Updating deployment state... >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deploy --var job_name=Updated Job Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_1 +Files: 1 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [NUMID] --output json { diff --git a/acceptance/bundle/destroy/all-resources/output.txt b/acceptance/bundle/destroy/all-resources/output.txt index 49bed70e906..1cd64f1d522 100644 --- a/acceptance/bundle/destroy/all-resources/output.txt +++ b/acceptance/bundle/destroy/all-resources/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Created schemas.my_schema +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -19,5 +20,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/destroy/force-lock-node-limit/output.txt b/acceptance/bundle/destroy/force-lock-node-limit/output.txt index 3d44bacdad8..899fcebd2a5 100644 --- a/acceptance/bundle/destroy/force-lock-node-limit/output.txt +++ b/acceptance/bundle/destroy/force-lock-node-limit/output.txt @@ -2,9 +2,9 @@ === Deploy (creates the job and the deployment) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === destroy without --force-lock (lock write hits the node limit: aborts) >>> errcode [CLI] bundle destroy --auto-approve @@ -27,5 +27,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/destroy/jobs-and-pipeline/output.txt b/acceptance/bundle/destroy/jobs-and-pipeline/output.txt index c5f958ff3cf..e1d1e59a230 100644 --- a/acceptance/bundle/destroy/jobs-and-pipeline/output.txt +++ b/acceptance/bundle/destroy/jobs-and-pipeline/output.txt @@ -4,9 +4,10 @@ Directory does not exist >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created pipelines.bar +Files: 10 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the snapshot file exists >>> find.py --expect 1 ^.databricks/bundle/default/sync-snapshots/[a-z0-9]+\.json @@ -58,8 +59,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted === Assert pipeline is deleted >>> errcode [CLI] pipelines get [UUID] diff --git a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt index 8deb98e5931..819ffdddbda 100644 --- a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt +++ b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lineage-mismatch-after-redeploy/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -13,16 +13,15 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lineage-mismatch-after-redeploy/default -Deleting files... -Destroy complete! +Destroy: 1 deleted === Machine B: fresh deploy of the same bundle (mints a new lineage L2 remotely) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lineage-mismatch-after-redeploy/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Machine A: any command that pulls remote state now fails diff --git a/acceptance/bundle/empty_string_dropped/output.txt b/acceptance/bundle/empty_string_dropped/output.txt index 5de16a505a7..a9de43c20b3 100644 --- a/acceptance/bundle/empty_string_dropped/output.txt +++ b/acceptance/bundle/empty_string_dropped/output.txt @@ -1,12 +1,32 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy -t tf Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/tf/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.my_app +Created clusters.my_cluster +Created database_instances.my_db_instance +Created experiments.my_experiment +Created jobs.my_job +Created models.my_model +Created pipelines.my_pipeline +Created registered_models.my_registered_model +Created schemas.my_schema +Created sql_warehouses.my_warehouse +Created volumes.my_volume +Files: 12 uploaded, 0 deleted +Resources: 11 created, 0 changed, 0 deleted, 0 unchanged >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy -t direct Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/direct/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.my_app +Created clusters.my_cluster +Created database_instances.my_db_instance +Created experiments.my_experiment +Created jobs.my_job +Created models.my_model +Created pipelines.my_pipeline +Created registered_models.my_registered_model +Created schemas.my_schema +Created sql_warehouses.my_warehouse +Created volumes.my_volume +Files: 13 uploaded, 0 deleted +Resources: 11 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/environments/dependencies/output.txt b/acceptance/bundle/environments/dependencies/output.txt index da08e74cdb4..3a8eb3452cd 100644 --- a/acceptance/bundle/environments/dependencies/output.txt +++ b/acceptance/bundle/environments/dependencies/output.txt @@ -11,9 +11,10 @@ Validation OK! >>> [CLI] bundle deploy Uploading dist/test.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dependencies/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Created pipelines.test_pipeline +Files: 10 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments out.requests.txt [ diff --git a/acceptance/bundle/generate/auto-bind/output.txt b/acceptance/bundle/generate/auto-bind/output.txt index 32063209b9b..f66522ca705 100644 --- a/acceptance/bundle/generate/auto-bind/output.txt +++ b/acceptance/bundle/generate/auto-bind/output.txt @@ -10,7 +10,6 @@ Created job with ID: [NUMID] >>> [CLI] bundle generate job --key test_job --existing-job-id [NUMID] --config-dir resources --source-dir src --bind File successfully saved to src/test.py Job configuration successfully saved to resources/test_job.job.yml -Updating deployment state... Successfully bound job with an id '[NUMID]' >>> ls src/ @@ -22,9 +21,9 @@ test.py === Deploy the bound job: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.test_job +Files: 9 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Destroy the bundle: >>> [CLI] bundle destroy --auto-approve @@ -33,8 +32,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted === Check that job is bound and does not exist after bundle is destroyed: >>> errcode [CLI] jobs get [NUMID] --output json diff --git a/acceptance/bundle/generate/dashboard-inplace/output.txt b/acceptance/bundle/generate/dashboard-inplace/output.txt index 90d054197aa..97b3ef61b8b 100644 --- a/acceptance/bundle/generate/dashboard-inplace/output.txt +++ b/acceptance/bundle/generate/dashboard-inplace/output.txt @@ -5,9 +5,9 @@ === deploy initial dashboard >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard update inplace/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.test_dashboard +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === update the dashboard >>> [CLI] lakeview update [DASHBOARD_ID] --serialized-dashboard {"a":"b"} diff --git a/acceptance/bundle/generate/genie_space_inplace/output.txt b/acceptance/bundle/generate/genie_space_inplace/output.txt index 9beebf12605..4b2fc1b5939 100644 --- a/acceptance/bundle/generate/genie_space_inplace/output.txt +++ b/acceptance/bundle/generate/genie_space_inplace/output.txt @@ -5,9 +5,9 @@ === deploy initial genie space >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie space update inplace/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.test_genie_space +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === update the genie space >>> [CLI] genie update-space [GENIE_SPACE_ID] --serialized-space {"a":"b"} diff --git a/acceptance/bundle/generate/pipeline_and_deploy/output.txt b/acceptance/bundle/generate/pipeline_and_deploy/output.txt index d6dc43c6f18..976cc03721a 100644 --- a/acceptance/bundle/generate/pipeline_and_deploy/output.txt +++ b/acceptance/bundle/generate/pipeline_and_deploy/output.txt @@ -22,15 +22,14 @@ include: === Deploy the generated bundle >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline_and_deploy-[UNIQUE_NAME]/default/files... -Deploying resources... -Deployment complete! +Files: 12 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Destroy the deployed bundle >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/pipeline_and_deploy-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted === Cleanup: delete the original pipeline and files >>> errcode [CLI] pipelines delete [PIPELINE_ID] diff --git a/acceptance/bundle/generate/python_job_and_deploy/output.txt b/acceptance/bundle/generate/python_job_and_deploy/output.txt index 043ed6a931a..a25b365b14f 100644 --- a/acceptance/bundle/generate/python_job_and_deploy/output.txt +++ b/acceptance/bundle/generate/python_job_and_deploy/output.txt @@ -21,15 +21,14 @@ include: === Deploy the generated bundle >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python_job_and_deploy-[UNIQUE_NAME]/default/files... -Deploying resources... -Deployment complete! +Files: 10 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Destroy the deployed bundle >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/python_job_and_deploy-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted === Cleanup: delete the original job and notebook >>> errcode [CLI] jobs delete [JOB_ID] diff --git a/acceptance/bundle/help/bundle-deploy/output.txt b/acceptance/bundle/help/bundle-deploy/output.txt index 7e9e3ff34dd..57fc11b24cb 100644 --- a/acceptance/bundle/help/bundle-deploy/output.txt +++ b/acceptance/bundle/help/bundle-deploy/output.txt @@ -20,6 +20,7 @@ Flags: --force-lock Force acquisition of deployment lock. -h, --help help for deploy --plan string Path to a JSON plan file to apply instead of planning (direct engine only). + -q, --quiet count Reduce output: -q prints only the summary, -qq prints only warnings and errors. --select strings Deploy only the specified resource (e.g. 'my_job' or 'jobs.my_job'). Can be repeated or comma-separated. Global Flags: diff --git a/acceptance/bundle/help/bundle-destroy/output.txt b/acceptance/bundle/help/bundle-destroy/output.txt index 64aecf7ffe1..73e72c9e4f9 100644 --- a/acceptance/bundle/help/bundle-destroy/output.txt +++ b/acceptance/bundle/help/bundle-destroy/output.txt @@ -20,6 +20,7 @@ Flags: --auto-approve Skip interactive approvals for deleting resources and files --force-lock Force acquisition of deployment lock. -h, --help help for destroy + -q, --quiet count Reduce output: -qq prints only warnings and errors. Global Flags: --debug enable debug logging diff --git a/acceptance/bundle/integration_whl/base/output.txt b/acceptance/bundle/integration_whl/base/output.txt index 3a335ebbe51..2d962e3a4f8 100644 --- a/acceptance/bundle/integration_whl/base/output.txt +++ b/acceptance/bundle/integration_whl/base/output.txt @@ -34,9 +34,9 @@ resources: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.some_other_job +Files: 20 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -52,9 +52,8 @@ Got arguments: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 11 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -71,5 +70,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/custom_params/output.txt b/acceptance/bundle/integration_whl/custom_params/output.txt index 763f169e73f..b0b445fe504 100644 --- a/acceptance/bundle/integration_whl/custom_params/output.txt +++ b/acceptance/bundle/integration_whl/custom_params/output.txt @@ -34,9 +34,9 @@ resources: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.some_other_job +Files: 17 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job --python-params param1,param2 Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -53,5 +53,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/interactive_cluster/output.txt b/acceptance/bundle/integration_whl/interactive_cluster/output.txt index 63ff83e67e4..f5fc5e41c88 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster/output.txt +++ b/acceptance/bundle/integration_whl/interactive_cluster/output.txt @@ -34,9 +34,10 @@ resources: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Created jobs.some_other_job +Files: 17 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -52,9 +53,8 @@ Got arguments: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 11 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -72,5 +72,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt index ea37514510b..e0449c97a7c 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt +++ b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt @@ -1,11 +1,12 @@ >>> [CLI] bundle deploy Building python_artifact... -Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... +Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Created jobs.some_other_job +Files: 17 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -17,13 +18,7 @@ Got arguments: ['my_test_code', 'one', 'two'] === Make a change to code without version change and run the job again ->>> [CLI] bundle deploy -Building python_artifact... -Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl... -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -41,5 +36,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/script b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/script index 987dbef22f3..b30a73ee0d2 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/script +++ b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/script @@ -10,5 +10,5 @@ trace $CLI bundle run some_other_job title "Make a change to code without version change and run the job again" update_file.py my_test_code/__main__.py 'Hello from my func' 'UPDATED MY FUNC' -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace $CLI bundle run some_other_job diff --git a/acceptance/bundle/integration_whl/interactive_single_user/output.txt b/acceptance/bundle/integration_whl/interactive_single_user/output.txt index 35ce77c6df0..e40282aed07 100644 --- a/acceptance/bundle/integration_whl/interactive_single_user/output.txt +++ b/acceptance/bundle/integration_whl/interactive_single_user/output.txt @@ -34,9 +34,10 @@ resources: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Created jobs.some_other_job +Files: 16 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -45,13 +46,7 @@ Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] [TIMESTAMP] "[default] Test Wheel Job [UNIQUE_NAME]" TERMINATED SUCCESS === Make a change to code without version change and run the job again ->>> [CLI] bundle deploy -Building python_artifact... -Uploading dist/my_test_code-0.0.1-py3-none-any.whl... -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -66,5 +61,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/integration_whl/interactive_single_user/script b/acceptance/bundle/integration_whl/interactive_single_user/script index 1fb27126962..25227da81ce 100644 --- a/acceptance/bundle/integration_whl/interactive_single_user/script +++ b/acceptance/bundle/integration_whl/interactive_single_user/script @@ -12,5 +12,5 @@ trace $CLI bundle run some_other_job > out.$DATABRICKS_BUNDLE_ENGINE.txt title "Make a change to code without version change and run the job again" update_file.py my_test_code/__main__.py 'Hello from my func' 'UPDATED MY FUNC' -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace $CLI bundle run some_other_job >> out.$DATABRICKS_BUNDLE_ENGINE.txt diff --git a/acceptance/bundle/integration_whl/serverless/output.txt b/acceptance/bundle/integration_whl/serverless/output.txt index b23c80e491f..32d83db0134 100644 --- a/acceptance/bundle/integration_whl/serverless/output.txt +++ b/acceptance/bundle/integration_whl/serverless/output.txt @@ -5,9 +5,9 @@ Building my_test_code... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.some_other_job +Files: 18 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -23,9 +23,8 @@ Got arguments: Building my_test_code... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 11 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -42,5 +41,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/serverless_custom_params/output.txt b/acceptance/bundle/integration_whl/serverless_custom_params/output.txt index 3bb59861afb..402f949266a 100644 --- a/acceptance/bundle/integration_whl/serverless_custom_params/output.txt +++ b/acceptance/bundle/integration_whl/serverless_custom_params/output.txt @@ -3,9 +3,9 @@ Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.some_other_job +Files: 18 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -31,5 +31,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt b/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt index 30de76035c7..7f52d374817 100644 --- a/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt +++ b/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt @@ -5,9 +5,9 @@ Building my_test_code... Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.some_other_job +Files: 18 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -23,9 +23,9 @@ Got arguments: Building my_test_code... Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.some_other_job +Files: 11 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -42,5 +42,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/wrapper/output.txt b/acceptance/bundle/integration_whl/wrapper/output.txt index 09c0e810248..b5fe844c78d 100644 --- a/acceptance/bundle/integration_whl/wrapper/output.txt +++ b/acceptance/bundle/integration_whl/wrapper/output.txt @@ -34,9 +34,9 @@ resources: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.some_other_job +Files: 19 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job Run URL: [DATABRICKS_URL]/jobs/[SOME_OTHER_JOB_ID]/runs/[NUMID]?o=[NUMID] @@ -53,5 +53,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt b/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt index 6d18ceab9cb..5d0e298c9d6 100644 --- a/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt +++ b/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt @@ -34,9 +34,9 @@ resources: Building python_artifact... Uploading dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.some_other_job +Files: 19 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run some_other_job --python-params param1,param2 Run URL: [DATABRICKS_URL]/jobs/[NUMID]/runs/[NUMID]?o=[NUMID] @@ -53,5 +53,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/libraries/maven/output.txt b/acceptance/bundle/libraries/maven/output.txt index fd72d8d144b..a80e8ad6d3f 100644 --- a/acceptance/bundle/libraries/maven/output.txt +++ b/acceptance/bundle/libraries/maven/output.txt @@ -10,6 +10,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/maven/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.testjob +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/libraries/outside_of_bundle_root/output.txt b/acceptance/bundle/libraries/outside_of_bundle_root/output.txt index e7d6530536a..5dc4456761e 100644 --- a/acceptance/bundle/libraries/outside_of_bundle_root/output.txt +++ b/acceptance/bundle/libraries/outside_of_bundle_root/output.txt @@ -28,9 +28,10 @@ Validation OK! >>> [CLI] bundle deploy Uploading ../lib/test.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/outside_of_bundle_root/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test +Created pipelines.pipeline +Files: 2 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Check that the job libraries are uploaded and the path is correct in the job >>> cat out.requests.txt diff --git a/acceptance/bundle/libraries/pypi/output.txt b/acceptance/bundle/libraries/pypi/output.txt index 002677d64e1..8e4140baf4e 100644 --- a/acceptance/bundle/libraries/pypi/output.txt +++ b/acceptance/bundle/libraries/pypi/output.txt @@ -10,6 +10,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pypi/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.testjob +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/lifecycle/prevent-destroy/out.direct.txt b/acceptance/bundle/lifecycle/prevent-destroy/out.direct.txt index a100c8774f7..ff2dc8c1892 100644 --- a/acceptance/bundle/lifecycle/prevent-destroy/out.direct.txt +++ b/acceptance/bundle/lifecycle/prevent-destroy/out.direct.txt @@ -13,6 +13,7 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/prevent-destroy/default/files... Error: resources.pipelines.my_pipelines has lifecycle.prevent_destroy set, but the plan calls for this resource to be recreated or destroyed. To avoid this error, disable lifecycle.prevent_destroy for resources.pipelines.my_pipelines +Files: 3 uploaded, 0 deleted >>> errcode [CLI] bundle plan recreate pipelines.my_pipelines @@ -25,6 +26,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/prevent-destroy/de Error: resources.pipelines.my_pipelines has lifecycle.prevent_destroy set, but the plan calls for this resource to be recreated or destroyed. To avoid this error, disable lifecycle.prevent_destroy for resources.pipelines.my_pipelines resources.schemas.my_schema has lifecycle.prevent_destroy set, but the plan calls for this resource to be recreated or destroyed. To avoid this error, disable lifecycle.prevent_destroy for resources.schemas.my_schema +Files: 2 uploaded, 0 deleted >>> errcode [CLI] bundle plan recreate pipelines.my_pipelines @@ -43,9 +45,10 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.my_pipelines -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated pipelines.my_pipelines +Recreated schemas.my_schema +Files: 3 uploaded, 0 deleted +Resources: 2 created, 0 changed, 2 deleted, 0 unchanged >>> errcode [CLI] bundle plan delete pipelines.my_pipelines @@ -64,6 +67,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: delete resources.pipelines.my_pipelines -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted pipelines.my_pipelines +Deleted schemas.my_schema +Files: 1 uploaded, 2 deleted +Resources: 0 created, 0 changed, 2 deleted, 0 unchanged diff --git a/acceptance/bundle/lifecycle/prevent-destroy/out.terraform.txt b/acceptance/bundle/lifecycle/prevent-destroy/out.terraform.txt index f36fe5c8f30..59df1bdaf8f 100644 --- a/acceptance/bundle/lifecycle/prevent-destroy/out.terraform.txt +++ b/acceptance/bundle/lifecycle/prevent-destroy/out.terraform.txt @@ -56,6 +56,7 @@ continue with the plan, either disable lifecycle.prevent_destroy or reduce the scope of the plan using the -target flag. +Files: 3 uploaded, 0 deleted >>> errcode [CLI] bundle plan Error: exit status 1 @@ -109,6 +110,7 @@ continue with the plan, either disable lifecycle.prevent_destroy or reduce the scope of the plan using the -target flag. +Files: 2 uploaded, 0 deleted >>> errcode [CLI] bundle plan recreate pipelines.my_pipelines @@ -127,9 +129,10 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.my_pipelines -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated pipelines.my_pipelines +Recreated schemas.my_schema +Files: 3 uploaded, 0 deleted +Resources: 2 created, 0 changed, 2 deleted, 0 unchanged >>> errcode [CLI] bundle plan delete pipelines.my_pipelines @@ -148,6 +151,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: delete resources.pipelines.my_pipelines -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted pipelines.my_pipelines +Deleted schemas.my_schema +Files: 1 uploaded, 2 deleted +Resources: 0 created, 0 changed, 2 deleted, 0 unchanged diff --git a/acceptance/bundle/lifecycle/prevent-destroy/output.txt b/acceptance/bundle/lifecycle/prevent-destroy/output.txt index 6a0f626b376..a56b188331f 100644 --- a/acceptance/bundle/lifecycle/prevent-destroy/output.txt +++ b/acceptance/bundle/lifecycle/prevent-destroy/output.txt @@ -10,9 +10,10 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/prevent-destroy/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipelines +Created schemas.my_schema +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> errcode [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged diff --git a/acceptance/bundle/local_state_staleness/output.txt b/acceptance/bundle/local_state_staleness/output.txt index c22387f85ed..abcc31c9164 100644 --- a/acceptance/bundle/local_state_staleness/output.txt +++ b/acceptance/bundle/local_state_staleness/output.txt @@ -2,23 +2,21 @@ === Step 1: Deploy bundle A >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/local-state-staleness-test-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Step 2: Deploy bundle B >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/local-state-staleness-test-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged === Step 3: Deploy bundle A again (should use remote state) >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/local-state-staleness-test-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged === Step 4: Verify only one job exists { @@ -34,8 +32,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/local-state-staleness-test-[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> rm -rf [TEST_TMP_DIR]/bundle_a diff --git a/acceptance/bundle/migrate/added-direct-only/output.txt b/acceptance/bundle/migrate/added-direct-only/output.txt index 13ddf672f43..ed006cde9b0 100644 --- a/acceptance/bundle/migrate/added-direct-only/output.txt +++ b/acceptance/bundle/migrate/added-direct-only/output.txt @@ -2,9 +2,9 @@ === Deploy with terraform (instance_pools is commented out; terraform cannot deploy it) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_a +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add a direct-only resource to the config without deploying it >>> update_file.py databricks.yml #instance_pools instance_pools @@ -38,9 +38,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged === Deploy creates it; verify via recorded requests >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created instance_pools.pool +Files: 3 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //instance-pools/create { diff --git a/acceptance/bundle/migrate/added/output.txt b/acceptance/bundle/migrate/added/output.txt index d3033f11082..2df3c1e80f8 100644 --- a/acceptance/bundle/migrate/added/output.txt +++ b/acceptance/bundle/migrate/added/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-added-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_a +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate Success! Migrated 1 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/default/resources.json @@ -22,9 +22,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-added-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_b +Files: 3 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs/create { diff --git a/acceptance/bundle/migrate/auto-migrate-clean/output.txt b/acceptance/bundle/migrate/auto-migrate-clean/output.txt index fa148a7ca0d..82dda059ce0 100644 --- a/acceptance/bundle/migrate/auto-migrate-clean/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-clean/output.txt @@ -2,9 +2,9 @@ === Initial deploy uses terraform engine (no bundle.engine set, override via env var) >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry direct_drymigrate_success true @@ -17,11 +17,10 @@ direct_drymigrate_warnings false >>> [CLI] bundle deploy Warn: Direct engine requested in bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11 but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! Migrating state to direct deployment engine (opted in via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)... Migrated 1 resource to direct deployment engine. +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_migration_telemetry direct_migrated_via_config true @@ -47,9 +46,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged === Subsequent deploy under direct is a no-op >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_migration_telemetry @@ -63,9 +61,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged === Deploy picks up the update (with and without --plan) Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.test_job +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt index dcc6efc8264..0e5f017c92f 100644 --- a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt @@ -2,9 +2,9 @@ === Deploy with terraform (instance_pools is commented out; terraform cannot deploy it) >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_a +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add a direct-only resource to the config >>> update_file.py databricks.yml #instance_pools instance_pools @@ -13,11 +13,10 @@ Deployment complete! >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Warn: Direct engine requested in DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! Migrating state to direct deployment engine (opted in via DATABRICKS_BUNDLE_ENGINE environment variable)... Migrated 1 resource to direct deployment engine. +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> print_migration_telemetry direct_migrated_via_env true @@ -30,9 +29,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created instance_pools.pool +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //instance-pools/create { diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt b/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt index 95b2067d012..599be20b90d 100644 --- a/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt @@ -2,9 +2,9 @@ === Deploy with terraform (instance_pools is commented out; terraform cannot deploy it) >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_a +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Add a direct-only resource and opt in to the direct engine via config >>> update_file.py databricks.yml #instance_pools instance_pools @@ -23,11 +23,10 @@ json.plan.resources.instance_pools.pool.action = "skip"; >>> [CLI] bundle deploy Warn: Direct engine requested in bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11 but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! Migrating state to direct deployment engine (opted in via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)... Migrated 1 resource to direct deployment engine. +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> print_migration_telemetry direct_migrated_via_config true @@ -40,9 +39,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created instance_pools.pool +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //instance-pools/create { diff --git a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt index c4dc9f4d8af..ce0b362847b 100644 --- a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt @@ -3,10 +3,9 @@ >>> [CLI] bundle deploy Warn: Direct engine requested in bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11 but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! Removing empty terraform state; direct engine will be used on the next deploy (opted in via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)... +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Terraform state is renamed to .backup; no resources.json (empty state, nothing to persist) @@ -46,7 +45,7 @@ direct_migrated_via_config true === Next deploy uses direct engine by default (no more mismatch warning) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry diff --git a/acceptance/bundle/migrate/auto-migrate-envvar/output.txt b/acceptance/bundle/migrate/auto-migrate-envvar/output.txt index 75c8a9053d8..95b12551347 100644 --- a/acceptance/bundle/migrate/auto-migrate-envvar/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-envvar/output.txt @@ -2,9 +2,9 @@ === Initial deploy uses terraform engine >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry direct_drymigrate_success true @@ -14,11 +14,10 @@ direct_drymigrate_warnings false >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Warn: Direct engine requested in DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! Migrating state to direct deployment engine (opted in via DATABRICKS_BUNDLE_ENGINE environment variable)... Migrated 1 resource to direct deployment engine. +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_migration_telemetry direct_migrated_via_env true diff --git a/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt b/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt index cfdbcc20a39..e71ee7bcd1d 100644 --- a/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt @@ -2,9 +2,9 @@ === Initial deploy on terraform >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry direct_drymigrate_success true @@ -14,11 +14,10 @@ direct_drymigrate_warnings false >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Warn: Direct engine requested in DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! Migrating state to direct deployment engine (opted in via DATABRICKS_BUNDLE_ENGINE environment variable)... Warn: automatic migration to direct engine failed: pushing direct state to workspace: access denied: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_migration_telemetry direct_migrate_commit_error true @@ -34,11 +33,10 @@ direct_migrate_commit_error true >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Warn: Direct engine requested in DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! Migrating state to direct deployment engine (opted in via DATABRICKS_BUNDLE_ENGINE environment variable)... Migrated 1 resource to direct deployment engine. +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_migration_telemetry direct_migrated_via_env true diff --git a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt index c9ea7ce0e17..2a930de6271 100644 --- a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt @@ -2,9 +2,9 @@ === Initial deploy on terraform >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_migration_telemetry direct_drymigrate_success true @@ -14,11 +14,10 @@ direct_drymigrate_warnings false >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Warn: Direct engine requested in DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! Migrating state to direct deployment engine (opted in via DATABRICKS_BUNDLE_ENGINE environment variable)... Warn: automatic migration to direct engine failed: pushing direct state to workspace: deleting remote terraform state: Fault injected by test. +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_migration_telemetry direct_migrate_commit_error true @@ -33,9 +32,8 @@ direct_migrate_commit_error true === Retry recovers: subsequent deploy re-does the backup and completes >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_migration_telemetry diff --git a/acceptance/bundle/migrate/basic/output.txt b/acceptance/bundle/migrate/basic/output.txt index 23bfe7bb538..4ba0f0052e7 100644 --- a/acceptance/bundle/migrate/basic/output.txt +++ b/acceptance/bundle/migrate/basic/output.txt @@ -6,9 +6,11 @@ To start using direct engine, set "engine: direct" under bundle in your databric >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Created pipelines.test_pipeline +Created volumes.test_volume +Files: 8 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate Success! Migrated 3 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/dev/resources.json @@ -30,9 +32,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 4 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 3 unchanged === Should show that it's already migrated >>> musterr [CLI] bundle deployment migrate @@ -73,9 +74,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 3 unchanged >>> print_requests.py --get //jobs/get "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" @@ -110,16 +110,20 @@ Plan: 0 to add, 2 to change, 0 to delete, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.test_job +Updated pipelines.test_pipeline +Files: 4 uploaded, 0 deleted +Resources: 0 created, 2 changed, 0 deleted, 1 unchanged === Different target, still on terraform >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy -t prod Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/prod/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Created pipelines.test_pipeline +Created schemas.test_schema +Created volumes.test_volume +Files: 11 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle debug states -t prod [TEST_TMP_DIR]/.databricks/bundle/prod/terraform/terraform.tfstate: local terraform state serial=5 lineage="[UUID]" diff --git a/acceptance/bundle/migrate/dashboards/output.txt b/acceptance/bundle/migrate/dashboards/output.txt index cfda4350ceb..f57eaf9b01d 100644 --- a/acceptance/bundle/migrate/dashboards/output.txt +++ b/acceptance/bundle/migrate/dashboards/output.txt @@ -1,9 +1,9 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate Success! Migrated 1 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/default/resources.json @@ -20,9 +20,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged @@ -36,9 +35,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py --get //dashboards diff --git a/acceptance/bundle/migrate/default-python/output.txt b/acceptance/bundle/migrate/default-python/output.txt index 6e2b35b49b6..46597c8462e 100644 --- a/acceptance/bundle/migrate/default-python/output.txt +++ b/acceptance/bundle/migrate/default-python/output.txt @@ -16,9 +16,10 @@ To get started, refer to the project README.md file and the documentation at htt Building python_artifact... Uploading .databricks/bundle/dev/patched_wheels/python_artifact_my_default_python/my_default_python-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created pipelines.my_default_python_etl +Files: 21 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_state.py @@ -155,9 +156,9 @@ Building python_artifact... Building python_artifact... Uploading .databricks/bundle/dev/patched_wheels/python_artifact_my_default_python/my_default_python-0.0.1+[UNIX_TIME_NANOS][3]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.sample_job +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_state.py diff --git a/acceptance/bundle/migrate/grants/output.txt b/acceptance/bundle/migrate/grants/output.txt index 86acb6398f5..e1884751982 100644 --- a/acceptance/bundle/migrate/grants/output.txt +++ b/acceptance/bundle/migrate/grants/output.txt @@ -1,9 +1,14 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created registered_models.my_registered_model +Created registered_models.my_registered_model.grants +Created schemas.my_schema +Created schemas.my_schema.grants +Created volumes.my_volume +Created volumes.my_volume.grants +Files: 5 uploaded, 0 deleted +Resources: 6 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate Success! Migrated 6 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/default/resources.json @@ -20,9 +25,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 6 unchanged >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 4 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 6 unchanged >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 6 unchanged @@ -34,9 +38,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 6 unchanged >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 6 unchanged >>> print_requests.py --get //unity-catalog/permissions diff --git a/acceptance/bundle/migrate/permissions/output.txt b/acceptance/bundle/migrate/permissions/output.txt index 72d6906c43f..1c932cfa5d9 100644 --- a/acceptance/bundle/migrate/permissions/output.txt +++ b/acceptance/bundle/migrate/permissions/output.txt @@ -1,9 +1,12 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Created jobs.test_job.permissions +Created pipelines.test_pipeline +Created pipelines.test_pipeline.permissions +Files: 8 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate Success! Migrated 4 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/default/resources.json @@ -49,9 +52,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 4 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 4 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 4 unchanged >>> print_requests.py --get //jobs/get "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" diff --git a/acceptance/bundle/migrate/profile_arg/output.txt b/acceptance/bundle/migrate/profile_arg/output.txt index 082feee15b1..b4c88854cec 100644 --- a/acceptance/bundle/migrate/profile_arg/output.txt +++ b/acceptance/bundle/migrate/profile_arg/output.txt @@ -1,9 +1,9 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate -p non_existent321 Success! Migrated 1 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/dev/resources.json @@ -17,9 +17,10 @@ To undo the migration, remove [TEST_TMP_DIR]/.databricks/bundle/dev/resources.js >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy -t prod Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/prod/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Created schemas.test_schema +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate -p non_existent321 -t prod Success! Migrated 2 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/prod/resources.json diff --git a/acceptance/bundle/migrate/removed/output.txt b/acceptance/bundle/migrate/removed/output.txt index 4144e4ebe63..56f7d77cb70 100644 --- a/acceptance/bundle/migrate/removed/output.txt +++ b/acceptance/bundle/migrate/removed/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-removed-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_a +Created jobs.job_b +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate Success! Migrated 2 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/default/resources.json @@ -22,9 +23,9 @@ Plan: 0 to add, 0 to change, 1 to delete, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-removed-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.job_b +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 1 deleted, 1 unchanged >>> print_requests.py //jobs/delete { diff --git a/acceptance/bundle/migrate/runas/output.txt b/acceptance/bundle/migrate/runas/output.txt index f58deae5c7c..68f59bfddf2 100644 --- a/acceptance/bundle/migrate/runas/output.txt +++ b/acceptance/bundle/migrate/runas/output.txt @@ -31,9 +31,10 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more in databricks.yml:5:3 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dabs_revenue-[UNIQUE_NAME]/production/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //pipelines @@ -143,5 +144,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/dabs_revenue-[UNIQUE_NAME]/production -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/migrate/var_arg/output.txt b/acceptance/bundle/migrate/var_arg/output.txt index 3c20819211d..f607a2d30a3 100644 --- a/acceptance/bundle/migrate/var_arg/output.txt +++ b/acceptance/bundle/migrate/var_arg/output.txt @@ -1,9 +1,9 @@ >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy --var=job_name=Custom Job Name Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate --var=job_name=Custom Job Name Success! Migrated 1 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/dev/resources.json @@ -27,14 +27,13 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy --var job_name=Custom Job Name Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deployment migrate --var job_name=Custom Job Name Success! Migrated 1 resources to direct engine state file: [TEST_TMP_DIR]/.databricks/bundle/dev/resources.json @@ -58,5 +57,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/open/output.txt b/acceptance/bundle/open/output.txt index e2bbd82d4fa..ca78fa926b2 100644 --- a/acceptance/bundle/open/output.txt +++ b/acceptance/bundle/open/output.txt @@ -13,9 +13,9 @@ Exit code: 1 >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Use a fake browser that just prints the URL it would have opened === open after deployment diff --git a/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt b/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt index 20db23925a2..47a15e81023 100644 --- a/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt +++ b/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt @@ -7,6 +7,7 @@ >>> uv run [UV_ARGS] -q [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Created pipelines.my_pipeline.permissions +Files: 10 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/python/script.prepare b/acceptance/bundle/python/script.prepare index c0d9f2b67d1..1f31f0116f2 100644 --- a/acceptance/bundle/python/script.prepare +++ b/acceptance/bundle/python/script.prepare @@ -1,5 +1,8 @@ +# Written in both branches, even though only "current" passes it to uv: the file sits +# in the bundle root, so creating it in just one variant makes that variant sync one +# more file than the other, and both variants share a single output.txt. +echo "$DATABRICKS_BUNDLES_WHEEL" > "requirements-latest.txt" if [ "$PYDAB_VERSION" = "current" ]; then - echo "$DATABRICKS_BUNDLES_WHEEL" > "requirements-latest.txt" UV_ARGS="--with-requirements requirements-latest.txt" else UV_ARGS="--with databricks-bundles==$PYDAB_VERSION" diff --git a/acceptance/bundle/quiet-levels/databricks.yml.tmpl b/acceptance/bundle/quiet-levels/databricks.yml.tmpl new file mode 100644 index 00000000000..5ef156288e8 --- /dev/null +++ b/acceptance/bundle/quiet-levels/databricks.yml.tmpl @@ -0,0 +1,10 @@ +bundle: + name: test-bundle-$UNIQUE_NAME + +# An experiment needs no local files and has no sub-resources, so this bundle has +# nothing to build, no language runtime leaving artifacts behind, and one plan node +# on both engines. That keeps the counts below identical across engines and runs. +resources: + experiments: + my_experiment: + name: /Users/${CURRENT_USER_NAME}/test-experiment-${UNIQUE_NAME} diff --git a/acceptance/bundle/quiet-levels/out.test.toml b/acceptance/bundle/quiet-levels/out.test.toml new file mode 100644 index 00000000000..2a13818c13f --- /dev/null +++ b/acceptance/bundle/quiet-levels/out.test.toml @@ -0,0 +1,2 @@ +Cloud = true +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"] diff --git a/acceptance/bundle/quiet-levels/output.txt b/acceptance/bundle/quiet-levels/output.txt new file mode 100644 index 00000000000..56fcf5f0e5c --- /dev/null +++ b/acceptance/bundle/quiet-levels/output.txt @@ -0,0 +1,58 @@ + +=== plan: actions and summary +>>> [CLI] bundle plan +create experiments.my_experiment + +Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged + +=== plan -q: summary only +>>> [CLI] bundle plan -q +Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged + +=== plan -qq: nothing +>>> [CLI] bundle plan -qq + +=== deploy: per-resource lines, progress and summary +>>> [CLI] bundle deploy +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... +Created experiments.my_experiment +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged + +>>> [CLI] bundle destroy --auto-approve -qq + +=== deploy -q: summary only, no per-resource lines +>>> [CLI] bundle deploy -q +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged + +>>> [CLI] bundle destroy --auto-approve -qq + +=== deploy -qq: nothing +>>> [CLI] bundle deploy -qq + +=== destroy: approval list and summary +>>> [CLI] bundle destroy --auto-approve +The following resources will be deleted: + delete resources.experiments.my_experiment + +All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default + +Destroy: 1 deleted + +=== destroy -q: same as default, there are no per-resource lines to drop +>>> [CLI] bundle deploy -qq + +>>> [CLI] bundle destroy --auto-approve -q +The following resources will be deleted: + delete resources.experiments.my_experiment + +All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default + +Destroy: 1 deleted + +=== destroy --auto-approve -qq: nothing +>>> [CLI] bundle deploy -qq + +>>> [CLI] bundle destroy --auto-approve -qq diff --git a/acceptance/bundle/quiet-levels/script b/acceptance/bundle/quiet-levels/script new file mode 100644 index 00000000000..cfe42aaab5e --- /dev/null +++ b/acceptance/bundle/quiet-levels/script @@ -0,0 +1,45 @@ +envsubst < databricks.yml.tmpl > databricks.yml + +cleanup() { + $CLI bundle destroy --auto-approve -qq +} +trap cleanup EXIT + +# Each level starts from the same state -- nothing deployed -- so the three outputs +# differ only by the flag. Destroying in between costs a little time but makes the +# comparison meaningful: otherwise the second deploy has nothing to create and the +# third nothing to change, and the counts differ for that reason instead. + +title "plan: actions and summary" +trace $CLI bundle plan + +title "plan -q: summary only" +trace $CLI bundle plan -q + +title "plan -qq: nothing" +trace $CLI bundle plan -qq + +title "deploy: per-resource lines, progress and summary" +trace $CLI bundle deploy +trace $CLI bundle destroy --auto-approve -qq + +title "deploy -q: summary only, no per-resource lines" +trace $CLI bundle deploy -q +trace $CLI bundle destroy --auto-approve -qq + +title "deploy -qq: nothing" +trace $CLI bundle deploy -qq + +title "destroy: approval list and summary" +trace $CLI bundle destroy --auto-approve + +title "destroy -q: same as default, there are no per-resource lines to drop" +trace $CLI bundle deploy -qq +trace $CLI bundle destroy --auto-approve -q + +# Only suppressed because --auto-approve makes the listing informational. Without it the +# CLI is about to ask for consent and the listing prints at any -q level; that path needs +# a TTY, so TestApprovalForDestroyQuietWhilePrompting covers it. +title "destroy --auto-approve -qq: nothing" +trace $CLI bundle deploy -qq +trace $CLI bundle destroy --auto-approve -qq diff --git a/acceptance/bundle/quiet-levels/test.toml b/acceptance/bundle/quiet-levels/test.toml new file mode 100644 index 00000000000..c7c6f58ed6e --- /dev/null +++ b/acceptance/bundle/quiet-levels/test.toml @@ -0,0 +1 @@ +Cloud = true diff --git a/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt b/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt index 6bed0296b30..57eae9eebc0 100644 --- a/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt @@ -1,6 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created volumes.bar +Created volumes.foo +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged Unexpected success diff --git a/acceptance/bundle/resource_deps/create_error/out.deploy.direct.txt b/acceptance/bundle/resource_deps/create_error/out.deploy.direct.txt index 40c9dce1038..6dedb23b1e7 100644 --- a/acceptance/bundle/resource_deps/create_error/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/create_error/out.deploy.direct.txt @@ -1,5 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... Error: cannot create resources.jobs.foo: INJECTED (500 UNKNOWN) Endpoint: POST [DATABRICKS_URL]/api/2.2/jobs/create @@ -11,4 +10,4 @@ Error: cannot create resources.jobs.bar: dependency failed: resources.jobs.foo Error: cannot create resources.jobs.baz: dependency failed: resources.jobs.foo -Updating deployment state... +Files: 0 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/create_error/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/create_error/out.deploy.terraform.txt index a09da8f06f1..bc0c317222c 100644 --- a/acceptance/bundle/resource_deps/create_error/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/create_error/out.deploy.terraform.txt @@ -1,5 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... Error: terraform apply: exit status 1 Error: cannot create job: INJECTED @@ -10,4 +9,4 @@ Error: cannot create job: INJECTED -Updating deployment state... +Files: 0 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/create_error/output.txt b/acceptance/bundle/resource_deps/create_error/output.txt index f8f3c819fa0..6a0e7df520a 100644 --- a/acceptance/bundle/resource_deps/create_error/output.txt +++ b/acceptance/bundle/resource_deps/create_error/output.txt @@ -101,8 +101,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resource_deps/duplicate_ref/output.txt b/acceptance/bundle/resource_deps/duplicate_ref/output.txt index 960f349c6bc..1469021a201 100644 --- a/acceptance/bundle/resource_deps/duplicate_ref/output.txt +++ b/acceptance/bundle/resource_deps/duplicate_ref/output.txt @@ -41,9 +41,11 @@ Plan: 3 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.bar +Created pipelines.baz +Created pipelines.foo +Files: 5 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s [.[] | select(.path=="/api/2.0/pipelines" and .method=="POST") | .body.name] | sort out.requests.txt [ diff --git a/acceptance/bundle/resource_deps/grant_ref/output.txt b/acceptance/bundle/resource_deps/grant_ref/output.txt index 47cfaccbcbd..3439c7c5a14 100644 --- a/acceptance/bundle/resource_deps/grant_ref/output.txt +++ b/acceptance/bundle/resource_deps/grant_ref/output.txt @@ -11,6 +11,9 @@ Plan: 4 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.schema_a +Created schemas.schema_a.grants +Created schemas.schema_b +Created schemas.schema_b.grants +Files: 6 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/id_chain/output.txt b/acceptance/bundle/resource_deps/id_chain/output.txt index 62dfb09f18c..3169979dbb2 100644 --- a/acceptance/bundle/resource_deps/id_chain/output.txt +++ b/acceptance/bundle/resource_deps/id_chain/output.txt @@ -14,9 +14,13 @@ Plan: 5 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.a +Created jobs.b +Created jobs.c +Created jobs.d +Created jobs.e +Files: 6 uploaded, 0 deleted +Resources: 5 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests_short "aa" @@ -44,9 +48,13 @@ Plan: 0 to add, 5 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.a +Updated jobs.b +Updated jobs.c +Updated jobs.d +Updated jobs.e +Files: 4 uploaded, 0 deleted +Resources: 0 created, 5 changed, 0 deleted, 0 unchanged >>> print_requests_short "aa" diff --git a/acceptance/bundle/resource_deps/immutable_field_ref/output.txt b/acceptance/bundle/resource_deps/immutable_field_ref/output.txt index 0ce0b280a25..12f0eb065b4 100644 --- a/acceptance/bundle/resource_deps/immutable_field_ref/output.txt +++ b/acceptance/bundle/resource_deps/immutable_field_ref/output.txt @@ -1,9 +1,11 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created schemas.schema +Created volumes.foo +Files: 5 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> update_file.py databricks.yml comment1 comment2 diff --git a/acceptance/bundle/resource_deps/job_id/output.txt b/acceptance/bundle/resource_deps/job_id/output.txt index 89f0656f907..13cb7dcd842 100644 --- a/acceptance/bundle/resource_deps/job_id/output.txt +++ b/acceptance/bundle/resource_deps/job_id/output.txt @@ -9,9 +9,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -61,9 +62,10 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.bar +Deleted jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 2 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -84,7 +86,6 @@ Deployment complete! >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 0 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt index b6c98142421..67e276daa6f 100644 --- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt +++ b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt @@ -1,9 +1,20 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.chain_bottom +Created jobs.chain_mid +Created jobs.chain_top +Created jobs.diamond_bottom +Created jobs.diamond_left +Created jobs.diamond_right +Created jobs.diamond_top +Created jobs.independent1 +Created jobs.independent2 +Created jobs.multi_child +Created jobs.multi_parent1 +Created jobs.multi_parent2 +Files: 0 uploaded, 0 deleted +Resources: 12 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --sort //jobs { @@ -278,12 +289,22 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.chain_bottom +Deleted jobs.chain_mid +Deleted jobs.chain_top +Deleted jobs.diamond_bottom +Deleted jobs.diamond_left +Deleted jobs.diamond_right +Deleted jobs.diamond_top +Deleted jobs.independent1 +Deleted jobs.independent2 +Deleted jobs.multi_child +Deleted jobs.multi_parent1 +Deleted jobs.multi_parent2 +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 12 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 0 deleted diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt index 72b7277ec76..da391a4bb83 100644 --- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt +++ b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt @@ -1,9 +1,20 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.chain_bottom +Created jobs.chain_mid +Created jobs.chain_top +Created jobs.diamond_bottom +Created jobs.diamond_left +Created jobs.diamond_right +Created jobs.diamond_top +Created jobs.independent1 +Created jobs.independent2 +Created jobs.multi_child +Created jobs.multi_parent1 +Created jobs.multi_parent2 +Files: 0 uploaded, 0 deleted +Resources: 12 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --sort //jobs { @@ -291,5 +302,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 12 deleted diff --git a/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt b/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt index fdba7e0c427..c27aec4f27c 100644 --- a/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt +++ b/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -54,9 +55,10 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.bar +Updated jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 1 deleted, 0 unchanged >>> print_requests.py --sort //jobs @@ -66,8 +68,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt b/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt index dd604c51486..0c74679588d 100644 --- a/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt +++ b/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -54,9 +55,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 1 deleted, 1 unchanged >>> print_requests.py //jobs { @@ -73,8 +74,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resource_deps/job_tasks/output.txt b/acceptance/bundle/resource_deps/job_tasks/output.txt index a7a53ff621c..475f011a04b 100644 --- a/acceptance/bundle/resource_deps/job_tasks/output.txt +++ b/acceptance/bundle/resource_deps/job_tasks/output.txt @@ -2,9 +2,10 @@ >>> [CLI] bundle deploy Uploading hello.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.test_job +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true diff --git a/acceptance/bundle/resource_deps/jobs_update/output.txt b/acceptance/bundle/resource_deps/jobs_update/output.txt index e37e9f115c1..195da809b6a 100644 --- a/acceptance/bundle/resource_deps/jobs_update/output.txt +++ b/acceptance/bundle/resource_deps/jobs_update/output.txt @@ -7,9 +7,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs @@ -26,9 +27,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs @@ -70,8 +71,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resource_deps/jobs_update_remote/output.txt b/acceptance/bundle/resource_deps/jobs_update_remote/output.txt index 8cd27e9c352..e38eebee2cc 100644 --- a/acceptance/bundle/resource_deps/jobs_update_remote/output.txt +++ b/acceptance/bundle/resource_deps/jobs_update_remote/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -73,8 +74,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt index a700abc4986..82828082ccd 100644 --- a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt @@ -1,3 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Error: cycle detected: resources.jobs.foo refers to resources.jobs.bar via ${resources.jobs.bar.id} which refers to resources.jobs.foo via ${resources.jobs.foo.id} +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt index a60ee46bda7..49083a83364 100644 --- a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt @@ -5,3 +5,4 @@ Error: Cycle: databricks_job.foo, databricks_job.bar +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt b/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt index 5e7b406d2ec..f2b2279ff86 100644 --- a/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt @@ -1,3 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... Error: cycle detected: resources.jobs.foo refers to itself via ${resources.jobs.foo.id} +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt index 74773003d19..cc92844a624 100644 --- a/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt @@ -16,3 +16,4 @@ Error: Self-referential block Configuration for databricks_job.foo may not refer to itself. +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt index ca94099d2e5..dcde9fa1799 100644 --- a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt @@ -1,7 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... Error: cannot create resources.pipelines.bar: cannot resolve "${resources.pipelines.foo.ingestion_definition.connection_name}": ingestion_definition: cannot access nil value -Updating deployment state... +Files: 8 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt index 6c234ec40ed..0b0e79267be 100644 --- a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt @@ -12,5 +12,6 @@ The given key does not identify an element in this collection value: the collection has no elements. +Files: 8 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt index fce4ba9d5ab..e270503c5e3 100644 --- a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt @@ -1,5 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files... -Deploying resources... Error: cannot create resources.jobs.bar: cannot resolve "${resources.jobs.test.tasks[0].new_cluster.custom_tags.missing_tag}": tasks[0].new_cluster.custom_tags.missing_tag: key "missing_tag" not found in map -Updating deployment state... +Files: 8 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt index aa9cbb3d6aa..915f19c7883 100644 --- a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt @@ -11,3 +11,4 @@ Error: Missing map element This map does not have an element with the key "missing_tag". +Files: 8 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/missing_string_field/output.txt b/acceptance/bundle/resource_deps/missing_string_field/output.txt index 83bf6f7168d..460fe265a18 100644 --- a/acceptance/bundle/resource_deps/missing_string_field/output.txt +++ b/acceptance/bundle/resource_deps/missing_string_field/output.txt @@ -32,9 +32,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.bar +Created pipelines.foo +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //pipeline { diff --git a/acceptance/bundle/resource_deps/model_id_ref/output.txt b/acceptance/bundle/resource_deps/model_id_ref/output.txt index 3a6306babf8..e8927308176 100644 --- a/acceptance/bundle/resource_deps/model_id_ref/output.txt +++ b/acceptance/bundle/resource_deps/model_id_ref/output.txt @@ -9,9 +9,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged === after deploy, registered_model_id is resolved to the model's numeric id >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.consumer +Created models.my_model +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //mlflow/registered-models/create //jobs/create --sort { diff --git a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt index 841f33c1d2f..df616964628 100644 --- a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt @@ -3,3 +3,4 @@ Error: cannot plan resources.volumes.foo: cannot resolve "${resources.volumes.ba Error: planning failed +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt index f8f7c004ba5..e6395be1220 100644 --- a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt @@ -10,3 +10,4 @@ This object has no argument, nested block, or exported attribute named "non_existent". +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/permission_ref/output.txt b/acceptance/bundle/resource_deps/permission_ref/output.txt index f6c17f880b9..098650dae0a 100644 --- a/acceptance/bundle/resource_deps/permission_ref/output.txt +++ b/acceptance/bundle/resource_deps/permission_ref/output.txt @@ -11,6 +11,9 @@ Plan: 4 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_a +Created jobs.job_a.permissions +Created jobs.job_b +Created jobs.job_b.permissions +Files: 6 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/pipelines_recreate/output.txt b/acceptance/bundle/resource_deps/pipelines_recreate/output.txt index 0d338041e65..cf1d62686ff 100644 --- a/acceptance/bundle/resource_deps/pipelines_recreate/output.txt +++ b/acceptance/bundle/resource_deps/pipelines_recreate/output.txt @@ -7,9 +7,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created pipelines.foo +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs //pipelines @@ -33,9 +34,10 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.foo -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.bar +Recreated pipelines.foo +Files: 0 uploaded, 0 deleted +Resources: 1 created, 1 changed, 1 deleted, 0 unchanged >>> print_requests.py //jobs //pipelines @@ -96,9 +98,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> print_requests.py //jobs //pipelines @@ -113,8 +114,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> print_requests.py //jobs //pipelines { diff --git a/acceptance/bundle/resource_deps/remote_app_url/output.txt b/acceptance/bundle/resource_deps/remote_app_url/output.txt index 7f0ed6a6975..84d8da92e35 100644 --- a/acceptance/bundle/resource_deps/remote_app_url/output.txt +++ b/acceptance/bundle/resource_deps/remote_app_url/output.txt @@ -25,9 +25,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Created pipelines.mypipeline +Files: 1 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py ^//import-file/ { @@ -95,8 +96,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> print_requests.py --sort ^//import-file/ { diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt index 5a4539339c5..20c9e6a23aa 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt @@ -1,6 +1,8 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.my +Created volumes.bar +Created volumes.foo +Files: 8 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt index ae9fe8af8ed..60a10d9b195 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt @@ -1,7 +1,6 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default/files... -Deploying resources... Error: terraform apply: exit status 1 Error: Provider produced inconsistent final plan @@ -16,6 +15,6 @@ This is a bug in the provider, which should be reported in the provider's own issue tracker. -Updating deployment state... +Files: 8 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.direct.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.direct.txt index b4d427d4853..e850f627d51 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.direct.txt +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.direct.txt @@ -15,5 +15,4 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.terraform.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.terraform.txt index 8f89cda64c2..d3bc5027d4e 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.terraform.txt +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.terraform.txt @@ -13,5 +13,4 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resource_deps/remote_pipeline/output.txt b/acceptance/bundle/resource_deps/remote_pipeline/output.txt index 1f86775154e..f3f62827075 100644 --- a/acceptance/bundle/resource_deps/remote_pipeline/output.txt +++ b/acceptance/bundle/resource_deps/remote_pipeline/output.txt @@ -1,9 +1,12 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo1 +Created pipelines.foo2 +Created pipelines.foo3 +Created pipelines.foo4 +Files: 7 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests "foo1 name" diff --git a/acceptance/bundle/resource_deps/resources_var/out.deploy.txt b/acceptance/bundle/resource_deps/resources_var/out.deploy.txt index 6fc3bc4ae11..6b5d0c86b46 100644 --- a/acceptance/bundle/resource_deps/resources_var/out.deploy.txt +++ b/acceptance/bundle/resource_deps/resources_var/out.deploy.txt @@ -1,6 +1,8 @@ >>> errcode [CLI] bundle deploy -t dev Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.mypipeline +Created volumes.bar +Created volumes.foo +Files: 7 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/resources_var_presets/output.txt b/acceptance/bundle/resource_deps/resources_var_presets/output.txt index 2b92bc9b097..7d3b3eb0e4a 100644 --- a/acceptance/bundle/resource_deps/resources_var_presets/output.txt +++ b/acceptance/bundle/resource_deps/resources_var_presets/output.txt @@ -30,9 +30,11 @@ >>> [CLI] bundle deploy -t dev Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.mypipeline +Created schemas.bar +Created schemas.foo +Files: 5 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name out.requests.txt "[dev [USERNAME]] pipeline for mycatalog.dev_[USERNAME]_dev_[USERNAME]_myschema" diff --git a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt index 08dbf899f70..3afabb9bc98 100644 --- a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt +++ b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt @@ -35,9 +35,11 @@ >>> [CLI] bundle deploy -t dev Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.mypipeline +Created schemas.bar +Created volumes.foo +Files: 6 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name out.requests.txt "[dev [USERNAME]] pipeline for mycatalog.dev_[USERNAME]_myschema.myname" diff --git a/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt index 3b45e3f34c2..53f91a853eb 100644 --- a/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt @@ -2,6 +2,7 @@ Warning: "resources.jobs.src.always_running": Terraform-only field; this referen in databricks.yml:10:13 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.dst +Created jobs.src +Files: 9 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/tf_path_renames/output.txt b/acceptance/bundle/resource_deps/tf_path_renames/output.txt index fd94b123f3e..670784a2c3d 100644 --- a/acceptance/bundle/resource_deps/tf_path_renames/output.txt +++ b/acceptance/bundle/resource_deps/tf_path_renames/output.txt @@ -3,9 +3,14 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.dst_git +Created jobs.dst_pipeline +Created jobs.dst_tasks +Created jobs.src_git +Created jobs.src_tasks +Created pipelines.src_pipeline +Files: 6 uploaded, 0 deleted +Resources: 6 created, 0 changed, 0 deleted, 0 unchanged /path/to/wheel.whl main mycluster diff --git a/acceptance/bundle/resource_deps/unicode_reference/output.txt b/acceptance/bundle/resource_deps/unicode_reference/output.txt index 45b14f0ddbb..d8cc2a87a64 100644 --- a/acceptance/bundle/resource_deps/unicode_reference/output.txt +++ b/acceptance/bundle/resource_deps/unicode_reference/output.txt @@ -17,9 +17,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.变量 +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary Name: test-bundle diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt index 0fd05668156..2baedf814d5 100644 --- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.direct.txt @@ -1,6 +1,8 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created volumes.bar +Created volumes.baz +Created volumes.foo +Files: 7 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt index 0fd05668156..2baedf814d5 100644 --- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt +++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.terraform.txt @@ -1,6 +1,8 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created volumes.bar +Created volumes.baz +Created volumes.foo +Files: 7 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.direct.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.direct.txt index a60dfafafad..7e9a4dd2263 100644 --- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.direct.txt +++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.direct.txt @@ -13,5 +13,4 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.terraform.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.terraform.txt index a60dfafafad..7e9a4dd2263 100644 --- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.terraform.txt +++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.terraform.txt @@ -13,5 +13,4 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt b/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt index 5a4539339c5..545d759b84a 100644 --- a/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt @@ -1,6 +1,8 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.process +Created volumes.data +Files: 9 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/alerts/basic/output.txt b/acceptance/bundle/resources/alerts/basic/output.txt index 3a0c3cb7e37..51adf5c18a9 100644 --- a/acceptance/bundle/resources/alerts/basic/output.txt +++ b/acceptance/bundle/resources/alerts/basic/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alerts-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created alerts.myalert +Created alerts.myalert.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] alerts-v2 get-alert [ALERT_ID] { @@ -58,8 +59,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/alerts-basic-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> [CLI] alerts-v2 get-alert [ALERT_ID] Error: Alert with ID '[ALERT_ID]' does not exist. diff --git a/acceptance/bundle/resources/alerts/with_file/output.txt b/acceptance/bundle/resources/alerts/with_file/output.txt index 18adbb6527d..311db9a476d 100644 --- a/acceptance/bundle/resources/alerts/with_file/output.txt +++ b/acceptance/bundle/resources/alerts/with_file/output.txt @@ -33,9 +33,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alerts-with-file-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created alerts.myalert +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] alerts-v2 get-alert [ALERT_ID] { @@ -96,5 +96,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/alerts-with-file-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/config-drift-stopped/output.txt b/acceptance/bundle/resources/apps/config-drift-stopped/output.txt index f26277b5804..0453689386c 100644 --- a/acceptance/bundle/resources/apps/config-drift-stopped/output.txt +++ b/acceptance/bundle/resources/apps/config-drift-stopped/output.txt @@ -2,10 +2,10 @@ === Deploy with started=true so the app has an active deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-drift-stopped-[UNIQUE_NAME]/default/files... -Deploying resources... ✓ Deployment succeeded -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Change config while running: drift is detected (active deployment present) >>> update_file.py databricks.yml original_value changed_value @@ -69,5 +69,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/config-drift-stopped-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/config-drift/output.txt b/acceptance/bundle/resources/apps/config-drift/output.txt index 6ad4310b318..5cab6a0a0be 100644 --- a/acceptance/bundle/resources/apps/config-drift/output.txt +++ b/acceptance/bundle/resources/apps/config-drift/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-drift-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Verify no drift after deploy >>> [CLI] bundle plan -o json @@ -20,9 +20,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged === Redeploy to fix drift >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-drift-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.myapp +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Verify no drift after fix >>> [CLI] bundle plan -o json @@ -33,5 +33,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/config-drift-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/config-no-deployment/output.txt b/acceptance/bundle/resources/apps/config-no-deployment/output.txt index 9b158ea51fd..81a1f6c8677 100644 --- a/acceptance/bundle/resources/apps/config-no-deployment/output.txt +++ b/acceptance/bundle/resources/apps/config-no-deployment/output.txt @@ -2,9 +2,9 @@ === Deploy: app created with no_compute; config is not deployed until the app starts >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-config-no-deployment/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan is a no-op: config/source_code_path drift is skipped while the app has no active deployment >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/apps/create_already_exists/output.txt b/acceptance/bundle/resources/apps/create_already_exists/output.txt index 82deb4ab43a..a0cef829192 100644 --- a/acceptance/bundle/resources/apps/create_already_exists/output.txt +++ b/acceptance/bundle/resources/apps/create_already_exists/output.txt @@ -29,7 +29,6 @@ >>> musterr [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-app-already-exists/default/files... -Deploying resources... Error: cannot create resources.apps.myapp: An app with the same name already exists: test-app-already-exists (409 RESOURCE_ALREADY_EXISTS) Endpoint: POST [DATABRICKS_URL]/api/2.0/apps?no_compute=true @@ -37,6 +36,7 @@ HTTP Status: 409 Conflict API error_code: RESOURCE_ALREADY_EXISTS API message: An app with the same name already exists: test-app-already-exists +Files: 6 uploaded, 0 deleted >>> [CLI] apps delete test-app-already-exists { diff --git a/acceptance/bundle/resources/apps/default_description/output.txt b/acceptance/bundle/resources/apps/default_description/output.txt index 89859e46ee1..4dc01f110b9 100644 --- a/acceptance/bundle/resources/apps/default_description/output.txt +++ b/acceptance/bundle/resources/apps/default_description/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.mykey +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps { diff --git a/acceptance/bundle/resources/apps/git-source-no-deployment/output.txt b/acceptance/bundle/resources/apps/git-source-no-deployment/output.txt index 77e8df548da..7b6337e33dd 100644 --- a/acceptance/bundle/resources/apps/git-source-no-deployment/output.txt +++ b/acceptance/bundle/resources/apps/git-source-no-deployment/output.txt @@ -2,9 +2,9 @@ === Deploy: app created with no_compute; git_source is not deployed until the app starts >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-git-source-no-deployment/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan is a no-op: git_source drift is skipped while the app has no active deployment >>> [CLI] bundle plan diff --git a/acceptance/bundle/resources/apps/immutable/output.txt b/acceptance/bundle/resources/apps/immutable/output.txt index e7ae9f1ba23..4b25ae82b8b 100644 --- a/acceptance/bundle/resources/apps/immutable/output.txt +++ b/acceptance/bundle/resources/apps/immutable/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading immutable bundle snapshot... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.my_app +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run my_app ✓ Getting the status of the app my-immutable-app diff --git a/acceptance/bundle/resources/apps/inline_config/output.txt b/acceptance/bundle/resources/apps/inline_config/output.txt index 3df45fb89c7..1aa82a88dc1 100644 --- a/acceptance/bundle/resources/apps/inline_config/output.txt +++ b/acceptance/bundle/resources/apps/inline_config/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-inline-config-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] apps get-deployment [UNIQUE_NAME] [DEPLOYMENT_ID] { @@ -29,5 +29,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/app-inline-config-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt index 66fe33bfacd..7809cfb4e18 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt @@ -2,9 +2,9 @@ === (started omitted) -> deploy: app created with no_compute=true, no start/stop requests >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.mykey +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_app_requests { @@ -22,27 +22,25 @@ Deployment complete! === (started omitted) -> started: false -> deploy: no start/stop requests >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_app_requests === started: false -> (started omitted) -> deploy: no start/stop requests >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_app_requests === (started omitted) -> started: true -> deploy: app started >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.mykey +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_app_requests { @@ -62,9 +60,9 @@ Deployment complete! === started: true -> (started omitted) -> deploy: no start/stop requests (compute stays as-is) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.mykey +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_app_requests @@ -76,5 +74,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt index 2f7ea7c2a84..37fd111532d 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt @@ -2,9 +2,9 @@ === Deploy with started=false: app created without compute (no_compute=true) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.mykey +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_app_requests { @@ -27,9 +27,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.mykey +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_app_requests { @@ -54,9 +54,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.mykey +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_app_requests { @@ -74,5 +74,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/lifecycle-started/output.txt b/acceptance/bundle/resources/apps/lifecycle-started/output.txt index 4562a6b9b22..7f81bd5d6c5 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started/output.txt @@ -2,9 +2,9 @@ === Deploy with started=true: app created with compute running >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps { @@ -32,9 +32,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.myapp +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //deployments { @@ -58,9 +58,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged === Deploy fixes the drift: compute restarted >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.myapp +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Stop app externally, then deploy with started=false: app stays stopped >>> errcode [CLI] apps stop [UNIQUE_NAME] @@ -72,9 +72,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.myapp +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps { @@ -104,9 +104,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.myapp +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps { @@ -143,5 +143,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt b/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt index 5f2234fb675..0909a007e3b 100644 --- a/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt +++ b/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt @@ -2,18 +2,18 @@ === Initial deploy: app created and started >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps/myapp/start === Change description and deploy from plan: no extra start >>> update_file.py databricks.yml description: initial description: updated Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.myapp +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //apps/myapp/start The following resources will be deleted: @@ -21,5 +21,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/resource-refs/output.txt b/acceptance/bundle/resources/apps/resource-refs/output.txt index 27081a1d296..3a03367812f 100644 --- a/acceptance/bundle/resources/apps/resource-refs/output.txt +++ b/acceptance/bundle/resources/apps/resource-refs/output.txt @@ -1,9 +1,11 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/resource-refs/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.data_app +Created jobs.example_job +Created schemas.example +Files: 6 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run data_app ✓ Getting the status of the app data-app diff --git a/acceptance/bundle/resources/apps/update/output.txt b/acceptance/bundle/resources/apps/update/output.txt index 021b10a9cdc..2b8920020a9 100644 --- a/acceptance/bundle/resources/apps/update/output.txt +++ b/acceptance/bundle/resources/apps/update/output.txt @@ -6,9 +6,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.mykey +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests @@ -34,9 +34,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated apps.mykey +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests @@ -74,9 +74,9 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated apps.mykey +Files: 4 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests @@ -101,7 +101,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests diff --git a/acceptance/bundle/resources/catalogs/auto-approve/output.txt b/acceptance/bundle/resources/catalogs/auto-approve/output.txt index e0576f1b9e5..eaf7c8034a0 100644 --- a/acceptance/bundle/resources/catalogs/auto-approve/output.txt +++ b/acceptance/bundle/resources/catalogs/auto-approve/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created catalogs.bar +Created schemas.foo +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the catalog is created >>> [CLI] catalogs get test-catalog-[UNIQUE_NAME] @@ -41,6 +42,7 @@ Error: cannot plan resources.schemas.foo: cannot resolve "${resources.catalogs.b Error: planning failed +Files: 2 uploaded, 1 deleted === Test cleanup >>> [CLI] bundle destroy --auto-approve @@ -53,8 +55,7 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted === Assert the catalog is deleted Exit code: 1 diff --git a/acceptance/bundle/resources/catalogs/basic/output.txt b/acceptance/bundle/resources/catalogs/basic/output.txt index 1e703092424..c9d91075034 100644 --- a/acceptance/bundle/resources/catalogs/basic/output.txt +++ b/acceptance/bundle/resources/catalogs/basic/output.txt @@ -2,9 +2,9 @@ === Deploy bundle with catalog >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created catalogs.test_catalog +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Assert the catalog is created >>> [CLI] catalogs get test_catalog_[UNIQUE_NAME] @@ -20,9 +20,9 @@ Deployment complete! === Redeploy with updated comment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated catalogs.test_catalog +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Assert the catalog comment is updated >>> [CLI] catalogs get test_catalog_[UNIQUE_NAME] @@ -38,7 +38,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted === Assert the catalog is deleted \ No newline at end of file diff --git a/acceptance/bundle/resources/catalogs/drift/managed_properties/output.txt b/acceptance/bundle/resources/catalogs/drift/managed_properties/output.txt index d9fcdef0691..149273ebc54 100644 --- a/acceptance/bundle/resources/catalogs/drift/managed_properties/output.txt +++ b/acceptance/bundle/resources/catalogs/drift/managed_properties/output.txt @@ -2,9 +2,9 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created catalogs.catalog1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan is a no-op despite UC auto-populating managed properties >>> [CLI] bundle plan @@ -31,9 +31,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged === Redeploy is a no-op (no UpdateCatalog call) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //unity json.method = "POST"; diff --git a/acceptance/bundle/resources/catalogs/empty-name/output.txt b/acceptance/bundle/resources/catalogs/empty-name/output.txt index 0a21066c99b..3a2434e87c7 100644 --- a/acceptance/bundle/resources/catalogs/empty-name/output.txt +++ b/acceptance/bundle/resources/catalogs/empty-name/output.txt @@ -1,7 +1,6 @@ >>> musterr [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/catalog-empty-name-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.catalogs.mycatalog: Invalid input: RPC CreateCatalog Field managedcatalog.CatalogInfo.name: name "" is not a valid name. Valid names cannot contain spaces, periods, forward slashes, or control characters. (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.1/unity-catalog/catalogs @@ -9,3 +8,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Invalid input: RPC CreateCatalog Field managedcatalog.CatalogInfo.name: name "" is not a valid name. Valid names cannot contain spaces, periods, forward slashes, or control characters. +Files: 6 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/catalogs/with-schemas/output.txt b/acceptance/bundle/resources/catalogs/with-schemas/output.txt index 8034f5eb2fa..b3d6c8f0041 100644 --- a/acceptance/bundle/resources/catalogs/with-schemas/output.txt +++ b/acceptance/bundle/resources/catalogs/with-schemas/output.txt @@ -2,9 +2,10 @@ === Deploy bundle with catalog and schema >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created catalogs.test_catalog +Created schemas.test_schema +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the catalog is created >>> [CLI] catalogs get test_catalog_[UNIQUE_NAME] @@ -29,9 +30,9 @@ Deployment complete! === Redeploy with updated catalog >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated catalogs.test_catalog +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged === Assert catalog comment is updated >>> [CLI] catalogs get test_catalog_[UNIQUE_NAME] @@ -57,8 +58,7 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted === Assert schema is deleted === Assert the catalog is deleted \ No newline at end of file diff --git a/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt b/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt index 9a6773a7548..b42e273b7f2 100644 --- a/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt @@ -1,18 +1,17 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 1 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -20,5 +19,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt b/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt index 40aff9189c0..86b455b44cb 100644 --- a/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt @@ -1,9 +1,11 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-instance-pool/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.cluster1 +Created clusters.cluster2 +Created clusters.cluster3 +Files: 6 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/create { diff --git a/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt b/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt index a1ddbdcf7db..95b69c22eac 100644 --- a/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt @@ -1,9 +1,9 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-instance-pool/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.cluster1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/create { diff --git a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt index 02285a52479..8ca1aa5b3ff 100644 --- a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-ssd-count-0-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist after bundle deployment: @@ -13,5 +13,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-ssd-count-0-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt b/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt index 28a1183e6dc..e5244efc726 100644 --- a/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt @@ -1,9 +1,10 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-num-workers-absent/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.cluster1 +Created clusters.cluster2 +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/create { diff --git a/acceptance/bundle/resources/clusters/deploy/simple/output.txt b/acceptance/bundle/resources/clusters/deploy/simple/output.txt index e1f1168c24d..78d604a8b6e 100644 --- a/acceptance/bundle/resources/clusters/deploy/simple/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/simple/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist after bundle deployment: { @@ -18,5 +19,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt b/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt index fe0c9b0f9e1..f0b51f72104 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist after bundle deployment: { @@ -20,9 +20,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated clusters.test_cluster +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -30,5 +30,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt index 2dd9f2084d3..89f5656cc94 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt @@ -1,9 +1,8 @@ ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist with num_workers after bundle deployment: { @@ -19,11 +18,10 @@ Deployment complete! === Adding autoscale section should call update API on stopped cluster ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt { @@ -54,11 +52,10 @@ Deployment complete! === Changing autoscale should call update API on stopped cluster ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt { @@ -109,11 +106,10 @@ Deployment complete! === Changing autoscale should call resize API on running cluster ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) out.requests.txt { @@ -140,11 +136,10 @@ Deployment complete! === Removing autoscale section should call resize API ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) out.requests.txt { @@ -169,5 +164,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script index 1370846fe4b..2acfdbefa55 100755 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script @@ -6,9 +6,12 @@ cleanup() { } trap cleanup EXIT +# Deploy with -q throughout: the engines name this action differently (direct reports +# resize, terraform update), so the per-resource line would diverge. The Resources: +# summary agrees, so it is kept rather than using -qq. $CLI bundle plan > out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json > out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q title "Cluster should exist with num_workers after bundle deployment:\n" CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.test_cluster.id') @@ -24,7 +27,7 @@ update_file.py databricks.yml " num_workers: 2" " autoscale: max_workers: 4" $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' out.requests.txt rm out.requests.txt @@ -36,7 +39,7 @@ update_file.py databricks.yml "min_workers: 2" "min_workers: 3" update_file.py databricks.yml "max_workers: 4" "max_workers: 5" $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' out.requests.txt rm out.requests.txt @@ -51,7 +54,7 @@ update_file.py databricks.yml "min_workers: 3" "min_workers: 4" update_file.py databricks.yml "max_workers: 5" "max_workers: 6" $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' out.requests.txt rm out.requests.txt @@ -64,7 +67,7 @@ update_file.py databricks.yml " autoscale: max_workers: 6" " num_workers: 3" $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' out.requests.txt rm out.requests.txt diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt b/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt index 45a1b0bc486..1bd3827f220 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt @@ -1,9 +1,8 @@ ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Cluster should exist after bundle deployment: { @@ -13,11 +12,10 @@ Deployment complete! === Changing num_workers should call update API on stopped cluster ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt @@ -48,11 +46,10 @@ Deployment complete! === Changing num_workers should call resize API on running cluster ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) out.requests.txt { @@ -72,11 +69,10 @@ Deployment complete! === Changing num_workers and spark_conf should call update API ->>> [CLI] bundle deploy +>>> [CLI] bundle deploy -q Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt { @@ -110,5 +106,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script index f2d80d05de0..b81605b92e1 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script @@ -6,9 +6,12 @@ cleanup() { } trap cleanup EXIT +# Deploy with -q throughout: the engines name this action differently (direct reports +# resize, terraform update), so the per-resource line would diverge. The Resources: +# summary agrees, so it is kept rather than using -qq. $CLI bundle plan > out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json > out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q title "Cluster should exist after bundle deployment:\n" CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.test_cluster.id') @@ -19,7 +22,7 @@ title "Changing num_workers should call update API on stopped cluster\n" update_file.py databricks.yml "num_workers: 2" "num_workers: 3" $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' out.requests.txt rm out.requests.txt @@ -33,7 +36,7 @@ title "Changing num_workers should call resize API on running cluster\n" update_file.py databricks.yml "num_workers: 3" "num_workers: 4" $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' out.requests.txt rm out.requests.txt @@ -45,7 +48,7 @@ update_file.py databricks.yml "num_workers: 4" "num_workers: 5" update_file.py databricks.yml '"spark.executor.memory": "2g"' '"spark.executor.memory": "4g"' $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -q trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' out.requests.txt rm out.requests.txt diff --git a/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt b/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt index 10e8896fac8..3ed9703bcbe 100644 --- a/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt @@ -1,9 +1,9 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-workload-type/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.cluster1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/create { diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt index 23eb2e0c243..edcea9477b6 100644 --- a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt @@ -2,9 +2,9 @@ === Deploy with started=false: cluster created and then stopped >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.mycluster +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters { @@ -34,9 +34,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated clusters.mycluster +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters { @@ -55,9 +55,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated clusters.mycluster +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters { @@ -77,5 +77,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/lifecycle-started/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started/output.txt index 18bf2cca857..63d2d81a9fa 100644 --- a/acceptance/bundle/resources/clusters/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/clusters/lifecycle-started/output.txt @@ -2,9 +2,9 @@ === Deploy with started=true: cluster created and running >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.mycluster +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters { @@ -34,9 +34,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged === Deploy fixes the drift: cluster restarted >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated clusters.mycluster +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters { @@ -65,9 +65,8 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //clusters { @@ -86,9 +85,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated clusters.mycluster +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters { @@ -108,5 +107,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt b/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt index d0651891f34..35408ddaa4a 100644 --- a/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt +++ b/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt @@ -2,18 +2,18 @@ === Initial deploy: cluster created and running >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.mycluster +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/start === Change tags and deploy from plan: no extra start >>> update_file.py databricks.yml env: original env: updated Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated clusters.mycluster +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/start The following resources will be deleted: @@ -21,5 +21,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt b/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt index 61c620e223e..c2e82e86635 100644 --- a/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt +++ b/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Create a plan while cluster is running: should show resize @@ -22,9 +22,9 @@ Deployment complete! >>> [CLI] bundle deploy --plan plan.json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Resized clusters.test_cluster +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters/resize //clusters/edit { @@ -62,5 +62,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt b/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt index 1d40fae8de9..6432efdf050 100644 --- a/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt +++ b/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt @@ -5,9 +5,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.test_cluster +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run foo Run URL: [DATABRICKS_URL]/jobs/[FOO_ID]/runs/[NUMID]?o=[NUMID] @@ -23,5 +24,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt b/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt index e3305521177..530bd99e144 100644 --- a/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt +++ b/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt @@ -6,9 +6,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-embed-credentials-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.my_dashboard +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "display_name": "test dashboard", "lifecycle_state": "ACTIVE", @@ -31,9 +31,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-embed-credentials-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated dashboards.my_dashboard +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged { "display_name": "test dashboard", "lifecycle_state": "ACTIVE", @@ -55,5 +55,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/change-embed-credentials-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/change-name/output.txt b/acceptance/bundle/resources/dashboards/change-name/output.txt index 81513fea4e7..d0df918de66 100644 --- a/acceptance/bundle/resources/dashboards/change-name/output.txt +++ b/acceptance/bundle/resources/dashboards/change-name/output.txt @@ -6,9 +6,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-name-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.my_dashboard +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "display_name": "dashboard1", "lifecycle_state": "ACTIVE", @@ -25,9 +25,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-name-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated dashboards.my_dashboard +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged { "display_name": "dashboard2", "lifecycle_state": "ACTIVE", @@ -43,5 +43,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/change-name-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/output.txt b/acceptance/bundle/resources/dashboards/change-parent-path/output.txt index 1196e658a4f..cc8d44a5902 100644 --- a/acceptance/bundle/resources/dashboards/change-parent-path/output.txt +++ b/acceptance/bundle/resources/dashboards/change-parent-path/output.txt @@ -6,9 +6,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-parent-path-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.my_dashboard +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> retry [CLI] lakeview get [ORIGINAL_DASHBOARD_ID] { @@ -31,9 +31,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-parent-path This action will result in the deletion or recreation of the following dashboards. This will result in changed IDs and permanent URLs of the dashboards that will be recreated: recreate resources.dashboards.my_dashboard -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated dashboards.my_dashboard +Files: 4 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> retry [CLI] lakeview get [NEW_DASHBOARD_ID] { @@ -51,5 +51,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/change-parent-path-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt index 80bbfe68b2f..ad227d4c799 100644 --- a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt +++ b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt @@ -4,9 +4,9 @@ create dashboards.my_dashboard Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-serialized-dashboard-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.my_dashboard +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "display_name": "test dashboard", "lifecycle_state": "ACTIVE", @@ -25,9 +25,9 @@ update dashboards.my_dashboard Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-serialized-dashboard-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated dashboards.my_dashboard +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged { "display_name": "test dashboard", "lifecycle_state": "ACTIVE", @@ -47,5 +47,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/change-serialized-dashboard-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt index 44bd4dd224b..c924ff8fdc1 100644 --- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt +++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-dataset-test-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "lifecycle_state": "ACTIVE", "parent_path": "/Users/[USERNAME]", @@ -22,5 +22,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-dataset-test-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt index 7d381190a87..f960675080a 100644 --- a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt +++ b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/delete-trashed-out-of-band-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "lifecycle_state": "ACTIVE", "parent_path": "/Users/[USERNAME]/.bundle/delete-trashed-out-of-band-[UNIQUE_NAME]/default/resources" @@ -18,8 +18,4 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle plan -o json ->>> [CLI] bundle destroy --auto-approve -All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/delete-trashed-out-of-band-[UNIQUE_NAME]/default - -Deleting files... -Destroy complete! +>>> [CLI] bundle destroy --auto-approve -qq diff --git a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script index f5ef99d0e60..648ee0dd0b7 100755 --- a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script +++ b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script @@ -27,5 +27,7 @@ trace $CLI bundle plan trace $CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json -# Run destroy - should succeed even though dashboard is already trashed -trace $CLI bundle destroy --auto-approve +# Run destroy - should succeed even though dashboard is already trashed. +# -qq drops the summary: terraform refreshes the trashed dashboard away and reports +# "0 deleted" while direct still counts it as "1 deleted". +trace $CLI bundle destroy --auto-approve -qq diff --git a/acceptance/bundle/resources/dashboards/destroy/output.txt b/acceptance/bundle/resources/dashboards/destroy/output.txt index a9b8ed102bf..15d387546d1 100644 --- a/acceptance/bundle/resources/dashboards/destroy/output.txt +++ b/acceptance/bundle/resources/dashboards/destroy/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/destroy-dashboard-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> retry [CLI] lakeview get [DASHBOARD_ID] { @@ -17,8 +17,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/destroy-dashboard-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> [CLI] lakeview get [DASHBOARD_ID] { diff --git a/acceptance/bundle/resources/dashboards/detect-change/output.txt b/acceptance/bundle/resources/dashboards/detect-change/output.txt index fe3f8962ec7..7f9a778a308 100644 --- a/acceptance/bundle/resources/dashboards/detect-change/output.txt +++ b/acceptance/bundle/resources/dashboards/detect-change/output.txt @@ -12,9 +12,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.file_reference +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Assert that the dashboard exists at the expected path and is, indeed, a dashboard: >>> [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/resources/test-dashboard-[UNIQUE_NAME].lvdash.json @@ -102,9 +102,9 @@ Exit code: 1 === Redeploy the bundle with the --force flag and confirm that the out of band modification is ignored: >>> errcode [CLI] bundle deploy --force Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated dashboards.file_reference +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -112,5 +112,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/generate_inplace/output.txt b/acceptance/bundle/resources/dashboards/generate_inplace/output.txt index 1e38d3d5a1c..29fed483346 100644 --- a/acceptance/bundle/resources/dashboards/generate_inplace/output.txt +++ b/acceptance/bundle/resources/dashboards/generate_inplace/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard-replace-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.already_exists +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Get current dashboard "{\n \"uiSettings\": {\n \"theme\": {\n \"widgetHeaderAlignment\": \"ALIGNMENT_UNSPECIFIED\"\n }\n }\n}\n" @@ -44,5 +44,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/dashboard-replace-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/nested-folders/output.txt b/acceptance/bundle/resources/dashboards/nested-folders/output.txt index a9fa8b918fe..7fc15e4439b 100644 --- a/acceptance/bundle/resources/dashboards/nested-folders/output.txt +++ b/acceptance/bundle/resources/dashboards/nested-folders/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-nested-folders-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> retry [CLI] lakeview get [DASHBOARD_ID] { @@ -25,5 +25,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-nested-folders-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt index c1e4c6fd7fd..c8659f4cdb5 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt +++ b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt @@ -1,5 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/publish-failure-cleans-up-dashboard/default/files... -Deploying resources... Error: cannot create resources.dashboards.dashboard1: Warehouse doesnotexist does not exist (400 RESOURCE_DOES_NOT_EXIST) Endpoint: POST [DATABRICKS_URL]/api/2.0/lakeview/dashboards/[DASHBOARD_ID]/published @@ -7,5 +6,6 @@ HTTP Status: 400 Bad Request API error_code: RESOURCE_DOES_NOT_EXIST API message: Warehouse doesnotexist does not exist +Files: 10 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt index 7450e39b092..0acd6cd56f1 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt @@ -1,5 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/publish-failure-cleans-up-dashboard/default/files... -Deploying resources... Error: terraform apply: exit status 1 Error: cannot create dashboard: Warehouse doesnotexist does not exist @@ -10,6 +9,6 @@ Error: cannot create dashboard: Warehouse doesnotexist does not exist -Updating deployment state... +Files: 10 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt index a88b5057bc6..a9fdc3929d8 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt +++ b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "display_name": "my dashboard", "etag": "[ETAG_1]" @@ -25,7 +25,6 @@ json.plan.resources.dashboards.dashboard1.changes.serialized_dashboard.reason = >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default/files... -Deploying resources... Error: cannot update resources.dashboards.dashboard1: updating id=[DASHBOARD1_ID]: Fault injected by test. (400 INJECTED) Endpoint: POST [DATABRICKS_URL]/api/2.0/lakeview/dashboards/[DASHBOARD1_ID]/published @@ -33,7 +32,7 @@ HTTP Status: 400 Bad Request API error_code: INJECTED API message: Fault injected by test. -Updating deployment state... +Files: 4 uploaded, 0 deleted Exit code: 1 @@ -126,9 +125,9 @@ Exit code: 1 >>> [CLI] bundle deploy --force Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated dashboards.dashboard1 +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //lakeview/dashboards { @@ -170,5 +169,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt b/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt index 3593cbf24ba..55e2aa4df44 100644 --- a/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt +++ b/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan right after deploy -- published is current, no change: >>> [CLI] bundle plan -o json @@ -37,5 +37,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/simple/output.txt b/acceptance/bundle/resources/dashboards/simple/output.txt index 193ae477ce6..797ebd3411f 100644 --- a/acceptance/bundle/resources/dashboards/simple/output.txt +++ b/acceptance/bundle/resources/dashboards/simple/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-test-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "lifecycle_state": "ACTIVE", "parent_path": "/Users/[USERNAME]", @@ -19,5 +19,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-test-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/output.txt b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/output.txt index 46ed1c72646..fe8dbd54dff 100644 --- a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/output.txt +++ b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-outside-bundle-root-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> retry [CLI] lakeview get [DASHBOARD_ID] { @@ -19,5 +19,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-outside-bundle-root-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/simple_syncroot/output.txt b/acceptance/bundle/resources/dashboards/simple_syncroot/output.txt index 07b8b8efde5..6727337d830 100644 --- a/acceptance/bundle/resources/dashboards/simple_syncroot/output.txt +++ b/acceptance/bundle/resources/dashboards/simple_syncroot/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-test-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.dashboard1 +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> retry [CLI] lakeview get [DASHBOARD_ID] { @@ -19,5 +19,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-test-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/output.txt b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/output.txt index d99c59e81be..5639bb2a465 100644 --- a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/output.txt +++ b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/output.txt @@ -1,11 +1,7 @@ >>> [CLI] bundle plan -o json ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/unpublish-out-of-band-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> print_state.py @@ -18,8 +14,4 @@ Deployment complete! >>> [CLI] bundle plan ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/unpublish-out-of-band-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq diff --git a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script index 8631b921342..6a1a11e4236 100644 --- a/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script +++ b/acceptance/bundle/resources/dashboards/unpublish-out-of-band/script @@ -9,7 +9,7 @@ trap cleanup EXIT trace $CLI bundle plan -o json > out.plan_initial.$DATABRICKS_BUNDLE_ENGINE.json # Deploy the dashboard -trace $CLI bundle deploy +trace $CLI bundle deploy -qq DASHBOARD_ID=$(read_id.py dashboard1) add_repl.py "$(retry $CLI lakeview get $DASHBOARD_ID | jq -r '.etag')" ETAG @@ -28,6 +28,6 @@ trace $CLI bundle plan > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt $CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json json_in_json_normalize.py out.plan.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace errcode $CLI lakeview get-published $DASHBOARD_ID &> out.get_published.$DATABRICKS_BUNDLE_ENGINE.txt diff --git a/acceptance/bundle/resources/database_catalogs/basic/output.txt b/acceptance/bundle/resources/database_catalogs/basic/output.txt index ce8eb0746eb..f2322862be1 100644 --- a/acceptance/bundle/resources/database_catalogs/basic/output.txt +++ b/acceptance/bundle/resources/database_catalogs/basic/output.txt @@ -24,9 +24,10 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created database_catalogs.my_catalog +Created database_instances.my_instance +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary Name: deploy-lakebase-catalog-[UNIQUE_NAME] @@ -53,5 +54,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/database_catalogs/recreate/output.txt b/acceptance/bundle/resources/database_catalogs/recreate/output.txt index e63cb50093d..ffa21ef2223 100644 --- a/acceptance/bundle/resources/database_catalogs/recreate/output.txt +++ b/acceptance/bundle/resources/database_catalogs/recreate/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created database_catalogs.my_catalog +Created database_instances.my_instance +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Change an immutable catalog field: no update API, so the plan recreates it >>> [CLI] bundle plan @@ -13,9 +14,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated database_catalogs.my_catalog +Files: 3 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 1 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -28,5 +29,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-recreate-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/database_instances/recreate/output.txt b/acceptance/bundle/resources/database_instances/recreate/output.txt index 3d40bbc5b09..dc6c194d76f 100644 --- a/acceptance/bundle/resources/database_instances/recreate/output.txt +++ b/acceptance/bundle/resources/database_instances/recreate/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created database_instances.my_database +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Rename the instance: name is immutable, so the plan recreates it >>> [CLI] bundle plan @@ -17,9 +17,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-re This action will result in the deletion or recreation of the following Lakebase database instances. All data stored in them will be permanently lost: recreate resources.database_instances.my_database -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated database_instances.my_database +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +31,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-recreate-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/database_instances/single-instance/output.txt b/acceptance/bundle/resources/database_instances/single-instance/output.txt index e6b8b506a71..08f7d0f3fb6 100644 --- a/acceptance/bundle/resources/database_instances/single-instance/output.txt +++ b/acceptance/bundle/resources/database_instances/single-instance/output.txt @@ -22,9 +22,9 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-single-instance-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created database_instances.my_database +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] database get-database-instance test-db-instance-single-[UNIQUE_NAME] { @@ -65,5 +65,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-single-instance-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/experiments/basic/output.txt b/acceptance/bundle/resources/experiments/basic/output.txt index 4b5fd591dfe..9c1cf620c81 100644 --- a/acceptance/bundle/resources/experiments/basic/output.txt +++ b/acceptance/bundle/resources/experiments/basic/output.txt @@ -11,11 +11,7 @@ create experiments.my_experiment Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/experiment-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] experiments get-experiment [NUMID] { @@ -59,11 +55,7 @@ update experiments.my_experiment Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/experiment-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] experiments get-experiment [NUMID] { @@ -107,11 +99,7 @@ recreate experiments.my_experiment Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/experiment-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] experiments get-experiment [NUMID] { @@ -150,11 +138,7 @@ Deployment complete! >>> [CLI] bundle plan ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/experiment-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] experiments get-experiment [NUMID] { @@ -194,5 +178,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/experiment-basic-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/experiments/basic/script b/acceptance/bundle/resources/experiments/basic/script index 6bb96db86db..3513bf00cbd 100755 --- a/acceptance/bundle/resources/experiments/basic/script +++ b/acceptance/bundle/resources/experiments/basic/script @@ -9,7 +9,7 @@ trace export EXPERIMENT_ARTIFACT_LOCATION="s3://original-${UNIQUE_NAME}" trace export EXPERIMENT_NAME_PREFIX="original" trace envsubst < templates/one_tag.tmpl > databricks.yml trace $CLI bundle plan -trace $CLI bundle deploy +trace $CLI bundle deploy -qq experiment_id=$($CLI bundle summary --output json | jq -r '.resources.experiments.my_experiment.id') trace $CLI experiments get-experiment $experiment_id | jq '.experiment | {name, artifact_location, tags}' @@ -17,7 +17,7 @@ title "update the name" trace export EXPERIMENT_NAME_PREFIX="new-name" trace envsubst < templates/one_tag.tmpl > databricks.yml trace $CLI bundle plan -trace $CLI bundle deploy +trace $CLI bundle deploy -qq experiment_id=$($CLI bundle summary --output json | jq -r '.resources.experiments.my_experiment.id') trace $CLI experiments get-experiment $experiment_id | jq '.experiment | {name, artifact_location, tags}' @@ -25,13 +25,13 @@ title "updating the artifact location should cause a recreation" trace export EXPERIMENT_ARTIFACT_LOCATION="s3://new-${UNIQUE_NAME}" trace envsubst < templates/one_tag.tmpl > databricks.yml trace $CLI bundle plan -trace $CLI bundle deploy +trace $CLI bundle deploy -qq experiment_id=$($CLI bundle summary --output json | jq -r '.resources.experiments.my_experiment.id') trace $CLI experiments get-experiment $experiment_id | jq '.experiment | {name, artifact_location, tags}' title "adding a new tag should be a no-op" trace envsubst < templates/two_tag.tmpl > databricks.yml trace $CLI bundle plan > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq experiment_id=$($CLI bundle summary --output json | jq -r '.resources.experiments.my_experiment.id') trace $CLI experiments get-experiment $experiment_id | jq '.experiment | {name, artifact_location, tags}' diff --git a/acceptance/bundle/resources/external_locations/output.txt b/acceptance/bundle/resources/external_locations/output.txt index c69c74e2c76..ef682987c5c 100644 --- a/acceptance/bundle/resources/external_locations/output.txt +++ b/acceptance/bundle/resources/external_locations/output.txt @@ -10,9 +10,12 @@ Plan: 4 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created catalogs.test_catalog +Created catalogs.test_catalog.grants +Created external_locations.test_location +Created external_locations.test_location.grants +Files: 6 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged === Assert the catalog is created with grants >>> [CLI] catalogs get test_catalog_[UNIQUE_NAME] @@ -68,9 +71,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 3 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated external_locations.test_location +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 3 unchanged === Assert the external location comment is updated >>> [CLI] external-locations get test_ext_location_[UNIQUE_NAME] @@ -88,9 +91,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 3 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated catalogs.test_catalog +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 3 unchanged === Assert the catalog comment is updated >>> [CLI] catalogs get test_catalog_[UNIQUE_NAME] @@ -107,5 +110,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt b/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt index af06207c169..f90cdbaee1b 100644 --- a/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt +++ b/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-delete-warning-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.sales_analytics +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Deploying without the genie space warns before deleting it (chat history loss) >>> [CLI] bundle deploy --auto-approve @@ -12,12 +12,11 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-delete-warni This action will result in the deletion or recreation of the following Genie spaces. The conversation history attached to a deleted space is permanently lost: delete resources.genie_spaces.sales_analytics -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted genie_spaces.sales_analytics +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 1 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/genie-delete-warning-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 0 deleted diff --git a/acceptance/bundle/resources/genie_spaces/inline/output.txt b/acceptance/bundle/resources/genie_spaces/inline/output.txt index 3c0e8e9592d..b7b0feebfc8 100644 --- a/acceptance/bundle/resources/genie_spaces/inline/output.txt +++ b/acceptance/bundle/resources/genie_spaces/inline/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-inline-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.sales_analytics +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json @@ -17,5 +17,4 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-inline-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt b/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt index b299530f589..7174106dd97 100644 --- a/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt +++ b/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-genie-space-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.update_target +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan after changing parent_path should show update >>> [CLI] bundle plan @@ -21,5 +21,4 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-genie-space-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt index aeaa5d7964d..70d963e4829 100644 --- a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt +++ b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-gone-genie-space-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.sales_analytics +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] genie trash-space [GENIE_SPACE_ID] @@ -16,5 +16,4 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-gone-genie-space-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt b/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt index ed1a5d8c214..300832361f5 100644 --- a/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt +++ b/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-serialized-space-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.from_file +Created genie_spaces.from_inline +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -17,5 +18,4 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/genie-serialized-space-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/genie_spaces/simple/output.txt b/acceptance/bundle/resources/genie_spaces/simple/output.txt index afc7e13a63c..87f1d84a66c 100644 --- a/acceptance/bundle/resources/genie_spaces/simple/output.txt +++ b/acceptance/bundle/resources/genie_spaces/simple/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-test-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.sales_analytics +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] genie get-space [GENIE_SPACE_ID] { @@ -25,5 +25,4 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-test-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/genie_spaces/version_migration/output.txt b/acceptance/bundle/resources/genie_spaces/version_migration/output.txt index e554b79825c..02726ea439a 100644 --- a/acceptance/bundle/resources/genie_spaces/version_migration/output.txt +++ b/acceptance/bundle/resources/genie_spaces/version_migration/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-version-migration-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan after deploy is drift-free despite the version 1 -> version 2 migration >>> [CLI] bundle plan @@ -26,5 +26,4 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/genie-version-migration-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/catalogs/output.txt b/acceptance/bundle/resources/grants/catalogs/output.txt index 067bd10a705..9c690083eba 100644 --- a/acceptance/bundle/resources/grants/catalogs/output.txt +++ b/acceptance/bundle/resources/grants/catalogs/output.txt @@ -11,9 +11,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/catalog-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created catalogs.grants_catalog +Created catalogs.grants_catalog.grants +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions @@ -51,9 +52,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/catalog-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated catalogs.grants_catalog.grants +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //permissions @@ -76,7 +77,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/catalog-grants-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/registered_models/output.txt b/acceptance/bundle/resources/grants/registered_models/output.txt index cac10d76919..7fcd4c9ae19 100644 --- a/acceptance/bundle/resources/grants/registered_models/output.txt +++ b/acceptance/bundle/resources/grants/registered_models/output.txt @@ -5,9 +5,11 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created registered_models.my_registered_model +Created registered_models.my_registered_model.grants +Created schemas.my_schema +Files: 7 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions @@ -33,7 +35,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt b/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt index e88c30715f3..7184e32d03c 100644 --- a/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt +++ b/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.apps_schema +Created schemas.apps_schema.grants +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -12,5 +13,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt index 8c6cc0fcd0d..187d4976248 100644 --- a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt +++ b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt @@ -1,17 +1,14 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-all-privileges-coexist-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.grants_schema +Created schemas.grants_schema.grants +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants update schema main.schema_all_priv_coexist_[UNIQUE_NAME] --json @update.resolved.json ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-all-privileges-coexist-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged @@ -25,5 +22,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-all-privileges-coexist-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/script b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/script index bf04258675f..073de9a99f2 100644 --- a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/script +++ b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/script @@ -22,5 +22,8 @@ trace $CLI grants update schema "$SCHEMA_FULL_NAME" --json @update.resolved.json trace $CLI bundle plan > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1 # After deploying, both engines converge: the follow-up plan reports no changes. -trace $CLI bundle deploy +# The deploy summary itself still diverges here (terraform revokes the extra +# privilege and reports 1 changed; direct sees no drift and reports it as +# unchanged), so deploy with -qq to keep the output engine-stable. +trace $CLI bundle deploy -qq trace $CLI bundle plan diff --git a/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt b/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt index eb8ee21d641..476c73c3a87 100644 --- a/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt +++ b/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt @@ -11,9 +11,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.grants_schema +Created schemas.grants_schema.grants +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions @@ -51,9 +52,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated schemas.grants_schema.grants +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //permissions @@ -79,7 +80,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt b/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt index 3b1393adf5b..45783da8081 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt +++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.apps_schema +Created schemas.apps_schema.grants +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json @@ -16,5 +17,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt index a537487dbd7..507d3a3d83c 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt +++ b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.apps_schema +Created schemas.apps_schema.grants +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -14,5 +15,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt index 269907e2fd0..357f48273ba 100644 --- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt +++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-out-of-band-principal-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.grants_schema +Created schemas.grants_schema.grants +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants update schema main.schema_out_of_band_principal_[UNIQUE_NAME] --json @update.json @@ -11,9 +12,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-out-of-band-principal-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated schemas.grants_schema.grants +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> [CLI] bundle plan -o json @@ -26,5 +27,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-out-of-band-principal-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/out.plan.txt b/acceptance/bundle/resources/grants/schemas/remove_all/out.plan.txt index 52a44d17f5a..6d9c506d164 100644 --- a/acceptance/bundle/resources/grants/schemas/remove_all/out.plan.txt +++ b/acceptance/bundle/resources/grants/schemas/remove_all/out.plan.txt @@ -4,9 +4,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-all-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/output.txt b/acceptance/bundle/resources/grants/schemas/remove_all/output.txt index b2d5da5dca4..cf9b411eb62 100644 --- a/acceptance/bundle/resources/grants/schemas/remove_all/output.txt +++ b/acceptance/bundle/resources/grants/schemas/remove_all/output.txt @@ -1,19 +1,16 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-all-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.grants_schema +Created schemas.grants_schema.grants +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants get schema main.schema_remove_all_[UNIQUE_NAME] json.privilege_assignments[].principal = "deco-test-user@databricks.com"; json.privilege_assignments[].privileges[] = "USE_SCHEMA"; ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-all-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] grants get schema main.schema_remove_all_[UNIQUE_NAME] json = {}; @@ -27,5 +24,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-all-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/script b/acceptance/bundle/resources/grants/schemas/remove_all/script index 8d8c2f55e92..6a16dafff30 100644 --- a/acceptance/bundle/resources/grants/schemas/remove_all/script +++ b/acceptance/bundle/resources/grants/schemas/remove_all/script @@ -14,7 +14,10 @@ trace $CLI grants get schema main.schema_remove_all_$UNIQUE_NAME | gron.py --noi # DoDelete silently keeps the grant. update_file.py databricks.yml 'grants: [{ principal: deco-test-user@databricks.com, privileges: [USE_SCHEMA] }]' 'grants: []' -trace $CLI bundle deploy +# The engines classify emptying the grants list differently: terraform reports the +# grants node as deleted, direct as updated. Deploy with -qq to keep this output +# engine-stable; the grants read below is what this asserts. +trace $CLI bundle deploy -qq trace $CLI grants get schema main.schema_remove_all_$UNIQUE_NAME | gron.py --noindex | sort_lines.py --repl | contains.py '!deco-test-user@databricks.com' # The revoking deploy drops the emptied grants node from state, so from here on both diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt b/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt index 83a506e161a..2b6750d4145 100644 --- a/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt +++ b/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.grants_schema +Created schemas.grants_schema.grants +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] grants get schema main.schema_remove_principal_[UNIQUE_NAME] json.privilege_assignments[].principal = "[USERNAME]"; @@ -13,9 +14,9 @@ json.privilege_assignments[].privileges[] = "USE_SCHEMA"; >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated schemas.grants_schema.grants +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> [CLI] grants get schema main.schema_remove_principal_[UNIQUE_NAME] @@ -24,9 +25,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged @@ -40,5 +40,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/volumes/output.txt b/acceptance/bundle/resources/grants/volumes/output.txt index 4cd3f2f7495..9dd4d184402 100644 --- a/acceptance/bundle/resources/grants/volumes/output.txt +++ b/acceptance/bundle/resources/grants/volumes/output.txt @@ -3,9 +3,11 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.grants_schema +Created volumes.grants_volume +Created volumes.grants_volume.grants +Files: 8 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions @@ -26,9 +28,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated volumes.grants_volume.grants +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py //permissions @@ -61,7 +63,6 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/independent/output.txt b/acceptance/bundle/resources/independent/output.txt index 56e08e87b22..c8e08dc9191 100644 --- a/acceptance/bundle/resources/independent/output.txt +++ b/acceptance/bundle/resources/independent/output.txt @@ -1,4 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created pipelines.my +Created volumes.volume1 +Files: 6 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/instance_pools/output.txt b/acceptance/bundle/resources/instance_pools/output.txt index 30381ea5b70..b21953f0f40 100644 --- a/acceptance/bundle/resources/instance_pools/output.txt +++ b/acceptance/bundle/resources/instance_pools/output.txt @@ -33,9 +33,9 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_instance_pool/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created instance_pools.test_instance_pool +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Verify the create request >>> jq select(.method == "POST" and (.path | contains("/instance-pools/create"))) out.requests.txt @@ -68,9 +68,9 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_instance_pool/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated instance_pools.test_instance_pool +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Verify the update request >>> jq select(.method == "POST" and (.path | contains("/instance-pools/edit"))) out.requests.txt @@ -106,8 +106,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test_instance_pool/default -Deleting files... -Destroy complete! +Destroy: 1 deleted === Verify the destroy request >>> jq select(.method == "POST" and (.path | contains("/instance-pools/delete"))) out.requests.txt diff --git a/acceptance/bundle/resources/job_runs/basic/output.txt b/acceptance/bundle/resources/job_runs/basic/output.txt index ec091495cb0..d34d8d0f3c7 100644 --- a/acceptance/bundle/resources/job_runs/basic/output.txt +++ b/acceptance/bundle/resources/job_runs/basic/output.txt @@ -33,17 +33,17 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-basic/default/files... -Deploying resources... job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] job run [MY_RUN_ID]: SUCCESS -Updating deployment state... -Deployment complete! +Created job_runs.my_run +Created jobs.my_job +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-basic/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged @@ -86,8 +86,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-basic/default -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> print_requests.py //jobs/runs/delete { diff --git a/acceptance/bundle/resources/job_runs/failed_run/output.txt b/acceptance/bundle/resources/job_runs/failed_run/output.txt index c4e18e5c04a..8535abcc6e9 100644 --- a/acceptance/bundle/resources/job_runs/failed_run/output.txt +++ b/acceptance/bundle/resources/job_runs/failed_run/output.txt @@ -2,7 +2,6 @@ === a run that finishes FAILED fails the deploy >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... job run [MY_RUN_ID]: Run URL: [RUN_URL] Error: cannot create resources.job_runs.my_run: waiting after creating id=[MY_RUN_ID]: run did not succeed: FAILED: Task main failed with message: Workload failed, see run output for details. task "main": RuntimeError: intentional failure @@ -10,7 +9,7 @@ run page: [RUN_URL] Error: cannot create resources.jobs.downstream_job: dependency failed: resources.job_runs.my_run -Updating deployment state... +Files: 8 uploaded, 0 deleted === the failed run is recorded, and not having succeeded is drift >>> read_id.py my_run @@ -57,7 +56,6 @@ Updating deployment state... === so a redeploy runs the job again, and fails again >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... job run [MY_RUN_ID_2]: Run URL: [RUN_URL] Error: cannot recreate resources.job_runs.my_run: waiting after creating id=[MY_RUN_ID_2]: run did not succeed: FAILED: Task main failed with message: Workload failed, see run output for details. task "main": RuntimeError: intentional failure @@ -65,7 +63,7 @@ run page: [RUN_URL] Error: cannot create resources.jobs.downstream_job: dependency failed: resources.job_runs.my_run -Updating deployment state... +Files: 3 uploaded, 0 deleted === run-now was issued once per deploy, and the recreate deleted the failed run >>> print_requests.py --keep //jobs/run-now @@ -102,5 +100,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt index 4aed52de21f..b77471cb56f 100644 --- a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt +++ b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt @@ -2,7 +2,6 @@ === the deploy stops waiting before the run finishes >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-interrupted-run/default/files... -Deploying resources... Error: cannot create resources.job_runs.my_run: waiting after creating id=[MY_RUN_ID]: Fault injected by test. (403 INJECTED) Endpoint: GET [DATABRICKS_URL]/api/2.2/jobs/runs/get?run_id=[MY_RUN_ID] @@ -10,7 +9,7 @@ HTTP Status: 403 Forbidden API error_code: INJECTED API message: Fault injected by test. -Updating deployment state... +Files: 6 uploaded, 0 deleted Exit code: 1 @@ -69,11 +68,11 @@ Exit code: 1 === the deploy adopts that run and waits for it to finish >>> [CLI] bundle deploy --plan tmp.plan.json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-interrupted-run/default/files... -Deploying resources... job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] job run [MY_RUN_ID]: SUCCESS -Updating deployment state... -Deployment complete! +Updated job_runs.my_run +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged === the same run finished, and nothing was cancelled, deleted or triggered >>> read_state.py job_runs my_run id result_state @@ -88,5 +87,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-interrupted-run/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/job_parameters/output.txt b/acceptance/bundle/resources/job_runs/job_parameters/output.txt index d213b254d90..2520c8c4f11 100644 --- a/acceptance/bundle/resources/job_runs/job_parameters/output.txt +++ b/acceptance/bundle/resources/job_runs/job_parameters/output.txt @@ -2,11 +2,12 @@ === deploy triggers the run with only the overridden parameter >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-job-parameters/default/files... -Deploying resources... job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] job run [MY_RUN_ID]: SUCCESS -Updating deployment state... -Deployment complete! +Created job_runs.my_run +Created jobs.my_job +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs/run-now { @@ -48,5 +49,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-job-parameters/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/redeploy/output.txt b/acceptance/bundle/resources/job_runs/redeploy/output.txt index d75f19efb40..ae0babb43cf 100644 --- a/acceptance/bundle/resources/job_runs/redeploy/output.txt +++ b/acceptance/bundle/resources/job_runs/redeploy/output.txt @@ -2,11 +2,12 @@ === initial deploy triggers the first run >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-redeploy/default/files... -Deploying resources... job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] job run [MY_RUN_ID]: SUCCESS -Updating deployment state... -Deployment complete! +Created job_runs.my_run +Created jobs.my_job +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary Name: job-runs-redeploy @@ -95,11 +96,11 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-redeploy/default/files... -Deploying resources... job run [MY_RUN_ID_2]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_2]?o=[NUMID] job run [MY_RUN_ID_2]: SUCCESS -Updating deployment state... -Deployment complete! +Recreated job_runs.my_run +Files: 4 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 1 unchanged >>> [CLI] bundle summary Name: job-runs-redeploy @@ -147,5 +148,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-redeploy/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt index 2811de8bb90..b529da143c5 100644 --- a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt +++ b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt @@ -2,11 +2,12 @@ === the deploy succeeds, though its run-now was answered with a 503 >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-retried-run-now/default/files... -Deploying resources... job run [MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] job run [MY_RUN_ID]: SUCCESS -Updating deployment state... -Deployment complete! +Created job_runs.my_run +Created jobs.my_job +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === run-now was sent twice, both times with the same token >>> read_id.py my_job @@ -44,5 +45,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-retried-run-now/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/wait/output.txt b/acceptance/bundle/resources/job_runs/wait/output.txt index b96624932a1..ba32e44a2e0 100644 --- a/acceptance/bundle/resources/job_runs/wait/output.txt +++ b/acceptance/bundle/resources/job_runs/wait/output.txt @@ -2,11 +2,13 @@ === the deploy waits for the run to finish >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... job run [MY_RUN_ID]: Run URL: [RUN_URL] job run [MY_RUN_ID]: SUCCESS -Updating deployment state... -Deployment complete! +Created job_runs.my_run +Created jobs.downstream_job +Created jobs.my_job +Files: 7 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> read_id.py my_run [MY_RUN_ID] @@ -23,9 +25,8 @@ resources.jobs.my_job skip >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 3 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -35,5 +36,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/jobs/alert-task/output.txt b/acceptance/bundle/resources/jobs/alert-task/output.txt index 569e0f98454..34109f22369 100644 --- a/acceptance/bundle/resources/jobs/alert-task/output.txt +++ b/acceptance/bundle/resources/jobs/alert-task/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alert-task-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs get [JOB_ID] { @@ -17,5 +17,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/alert-task-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/big_id/output.txt b/acceptance/bundle/resources/jobs/big_id/output.txt index 82ec469ca83..37f1306a3bd 100644 --- a/acceptance/bundle/resources/jobs/big_id/output.txt +++ b/acceptance/bundle/resources/jobs/big_id/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle plan -o json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -67,8 +67,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resources/jobs/check-metadata/output.txt b/acceptance/bundle/resources/jobs/check-metadata/output.txt index c73e8e6f326..999e0488115 100644 --- a/acceptance/bundle/resources/jobs/check-metadata/output.txt +++ b/acceptance/bundle/resources/jobs/check-metadata/output.txt @@ -8,9 +8,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created jobs.foo +Files: 10 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Second summary, should have id and modified status should be absent >>> [CLI] bundle summary -o json @@ -91,5 +92,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/jobs/create-error/output.txt b/acceptance/bundle/resources/jobs/create-error/output.txt index 4211f239d91..706898ae668 100644 --- a/acceptance/bundle/resources/jobs/create-error/output.txt +++ b/acceptance/bundle/resources/jobs/create-error/output.txt @@ -1,7 +1,27 @@ >>> musterr [CLI] bundle deploy --force-lock Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... +Error: cannot create resources.jobs.foo: Shared job cluster feature is only supported in multi-task jobs. (400 INVALID_PARAMETER_VALUE) + +Endpoint: POST [DATABRICKS_URL]/api/2.2/jobs/create +HTTP Status: 400 Bad Request +API error_code: INVALID_PARAMETER_VALUE +API message: Shared job cluster feature is only supported in multi-task jobs. + +Files: 5 uploaded, 0 deleted + +>>> musterr [CLI] bundle deploy --force-lock -q +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Error: cannot create resources.jobs.foo: Shared job cluster feature is only supported in multi-task jobs. (400 INVALID_PARAMETER_VALUE) + +Endpoint: POST [DATABRICKS_URL]/api/2.2/jobs/create +HTTP Status: 400 Bad Request +API error_code: INVALID_PARAMETER_VALUE +API message: Shared job cluster feature is only supported in multi-task jobs. + +Files: 1 uploaded, 0 deleted + +>>> musterr [CLI] bundle deploy --force-lock -qq Error: cannot create resources.jobs.foo: Shared job cluster feature is only supported in multi-task jobs. (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.2/jobs/create diff --git a/acceptance/bundle/resources/jobs/create-error/script b/acceptance/bundle/resources/jobs/create-error/script index 156bf21d730..9cd800ced67 100644 --- a/acceptance/bundle/resources/jobs/create-error/script +++ b/acceptance/bundle/resources/jobs/create-error/script @@ -1 +1,5 @@ trace musterr $CLI bundle deploy --force-lock + +# -q and -qq reduce the summary but must not hide the create error. +trace musterr $CLI bundle deploy --force-lock -q +trace musterr $CLI bundle deploy --force-lock -qq diff --git a/acceptance/bundle/resources/jobs/delete_job/output.txt b/acceptance/bundle/resources/jobs/delete_job/output.txt index 0fc5fc36e61..ec1b5e362bd 100644 --- a/acceptance/bundle/resources/jobs/delete_job/output.txt +++ b/acceptance/bundle/resources/jobs/delete_job/output.txt @@ -1,15 +1,15 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.job +Files: 4 uploaded, 0 deleted +Resources: 0 created, 0 changed, 1 deleted, 0 unchanged { "method": "POST", "path": "/api/2.2/jobs/create", diff --git a/acceptance/bundle/resources/jobs/delete_task/output.txt b/acceptance/bundle/resources/jobs/delete_task/output.txt index eebf003d74b..6f00835b839 100644 --- a/acceptance/bundle/resources/jobs/delete_task/output.txt +++ b/acceptance/bundle/resources/jobs/delete_task/output.txt @@ -1,7 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> cat databricks.yml bundle: @@ -23,6 +23,6 @@ resources: libraries: - whl: /Workspace/Users/foo@bar.test/mywheel.whl Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt b/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt index 62f7afddc82..4b2f476c950 100644 --- a/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt +++ b/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt @@ -10,9 +10,10 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-test-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo__bar +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -21,5 +22,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-test-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt b/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt index cb83417dd70..fc3b869b5b0 100644 --- a/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt +++ b/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt @@ -11,17 +11,16 @@ Validation OK! === deploy empty bundle >>> [CLI] bundle deploy --fail-on-active-runs Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-active-runs-test-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Remove .databricks directory to simulate a fresh deployment === deploy empty bundle again >>> [CLI] bundle deploy --fail-on-active-runs Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-active-runs-test-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 7 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -29,5 +28,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-active-runs-test-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt index fb2387e9e72..41965d66f5a 100644 --- a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt +++ b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt @@ -43,9 +43,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.some_other_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt [ diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt index eab8c861805..fd3b20ce920 100644 --- a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt +++ b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt @@ -5,7 +5,6 @@ Warning: required field "git_provider" is not set in databricks.yml:12:9 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... Error: cannot create resources.jobs.foo: git_source.git_provider must be one of: github,gitlab,bitbucketcloud,gitlabenterpriseedition,bitbucketserver,azuredevopsservices,githubenterprise,awscodecommit (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.2/jobs/create @@ -13,5 +12,6 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: git_source.git_provider must be one of: github,gitlab,bitbucketcloud,gitlabenterpriseedition,bitbucketserver,azuredevopsservices,githubenterprise,awscodecommit +Files: 7 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt index 852d5161eae..48676c3316a 100644 --- a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt @@ -5,6 +5,6 @@ Warning: required field "git_provider" is not set in databricks.yml:12:9 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.direct.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.direct.txt index ec2c1b08a3e..55ac39f3b69 100644 --- a/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.direct.txt +++ b/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.direct.txt @@ -6,5 +6,4 @@ Warning: required field "git_provider" is not set All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 0 deleted diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.terraform.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.terraform.txt index cf938a19d2e..a3e25190f3e 100644 --- a/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.terraform.txt +++ b/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.terraform.txt @@ -9,5 +9,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/num_workers/output.txt b/acceptance/bundle/resources/jobs/num_workers/output.txt index 16e4d600cd2..7677cd915ac 100644 --- a/acceptance/bundle/resources/jobs/num_workers/output.txt +++ b/acceptance/bundle/resources/jobs/num_workers/output.txt @@ -17,9 +17,9 @@ are correctly set in the cluster specification: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt b/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt index 35870e42c3e..0a38ee5c4d6 100644 --- a/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt +++ b/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt @@ -6,8 +6,8 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/usage_logs/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.refresh_usage_logs +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json diff --git a/acceptance/bundle/resources/jobs/remote_add_tag/output.txt b/acceptance/bundle/resources/jobs/remote_add_tag/output.txt index 545c3e6de38..db2552423d7 100644 --- a/acceptance/bundle/resources/jobs/remote_add_tag/output.txt +++ b/acceptance/bundle/resources/jobs/remote_add_tag/output.txt @@ -3,9 +3,9 @@ create jobs.foo Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading hello.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged update jobs.foo Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt b/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt index 372a1c82f77..dfe215771ba 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt @@ -6,9 +6,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs delete [NUMID] @@ -17,6 +17,6 @@ create jobs.foo Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt index 1cea8f06419..cbbde0249f1 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt @@ -2,5 +2,4 @@ >>> errcode [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.terraform.txt b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.terraform.txt index 1cea8f06419..ea08bea2059 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.terraform.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.terraform.txt @@ -2,5 +2,4 @@ >>> errcode [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 0 deleted diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt b/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt index 22db73b5b5b..889244cc637 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt @@ -6,8 +6,8 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs delete [NUMID] diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt index 0a628d4cb69..caad3eb16bc 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt @@ -1,6 +1,7 @@ >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.foo +Deleted pipelines.bar +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 2 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt index 0a628d4cb69..7d9f83ba8ae 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt @@ -1,6 +1,5 @@ >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt index c97c93273cb..4ea192744cd 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created pipelines.bar +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] jobs delete [NUMID] @@ -16,9 +17,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === No delete API calls for resources that are already gone remotely >>> print_requests.py //jobs/delete //pipelines/ diff --git a/acceptance/bundle/resources/jobs/remote_matches_config/output.txt b/acceptance/bundle/resources/jobs/remote_matches_config/output.txt index a067a141773..260235a0500 100644 --- a/acceptance/bundle/resources/jobs/remote_matches_config/output.txt +++ b/acceptance/bundle/resources/jobs/remote_matches_config/output.txt @@ -4,9 +4,9 @@ create jobs.my_job Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged @@ -19,8 +19,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs diff --git a/acceptance/bundle/resources/jobs/shared-root-path/output.txt b/acceptance/bundle/resources/jobs/shared-root-path/output.txt index b485c092416..c702b9beb23 100644 --- a/acceptance/bundle/resources/jobs/shared-root-path/output.txt +++ b/acceptance/bundle/resources/jobs/shared-root-path/output.txt @@ -5,9 +5,24 @@ Warning: the bundle root path /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME] The bundle is configured to use /Workspace/Shared, which will give read/write access to all users. If this is intentional, add CAN_MANAGE for 'group_name: users' permission to your bundle configuration. If the deployment should be restricted, move it to a restricted folder such as /Workspace/Users/. Uploading bundle files to /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged + +>>> [CLI] bundle deploy -q +Warning: the bundle root path /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME] is writable by all workspace users + +The bundle is configured to use /Workspace/Shared, which will give read/write access to all users. If this is intentional, add CAN_MANAGE for 'group_name: users' permission to your bundle configuration. If the deployment should be restricted, move it to a restricted folder such as /Workspace/Users/. + +Uploading bundle files to /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME]/files... +Files: 1 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged + +>>> [CLI] bundle deploy -qq +Warning: the bundle root path /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME] is writable by all workspace users + +The bundle is configured to use /Workspace/Shared, which will give read/write access to all users. If this is intentional, add CAN_MANAGE for 'group_name: users' permission to your bundle configuration. If the deployment should be restricted, move it to a restricted folder such as /Workspace/Users/. + >>> [CLI] bundle destroy --auto-approve Warning: the bundle root path /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME] is writable by all workspace users @@ -19,5 +34,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/shared-root-path/script b/acceptance/bundle/resources/jobs/shared-root-path/script index ac679ac5049..4e3e46c9300 100644 --- a/acceptance/bundle/resources/jobs/shared-root-path/script +++ b/acceptance/bundle/resources/jobs/shared-root-path/script @@ -6,3 +6,7 @@ cleanup() { trap cleanup EXIT trace $CLI bundle deploy + +# -q and -qq reduce the summary but must not hide the root-path warning. +trace $CLI bundle deploy -q +trace $CLI bundle deploy -qq diff --git a/acceptance/bundle/resources/jobs/tags_empty_map/output.txt b/acceptance/bundle/resources/jobs/tags_empty_map/output.txt index 8ad5b060216..efc81dd6961 100644 --- a/acceptance/bundle/resources/jobs/tags_empty_map/output.txt +++ b/acceptance/bundle/resources/jobs/tags_empty_map/output.txt @@ -6,8 +6,8 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/tags_empty_map/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json diff --git a/acceptance/bundle/resources/jobs/task-source/output.txt b/acceptance/bundle/resources/jobs/task-source/output.txt index 1815edbc0eb..f3dcc71e32b 100644 --- a/acceptance/bundle/resources/jobs/task-source/output.txt +++ b/acceptance/bundle/resources/jobs/task-source/output.txt @@ -5,9 +5,10 @@ Warning: invalid value "github" for enum field. Valid values are [awsCodeCommit in databricks.yml:8:19 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/task-source/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.git_job +Created jobs.workspace_job +Files: 9 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body out.requests.txt @@ -20,9 +21,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/task-source/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.git_job +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body out.requests.txt diff --git a/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt b/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt index 66ef56be745..56f4171b15b 100644 --- a/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt +++ b/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt @@ -6,9 +6,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged @@ -18,9 +18,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt b/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt index 518e459e07d..4106d022cda 100644 --- a/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt +++ b/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt @@ -5,6 +5,6 @@ Warning: unknown field: autotermination_minutes at task[0].new_cluster in databricks.yml:14:13 -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/jobs/update/output.txt b/acceptance/bundle/resources/jobs/update/output.txt index eea83d272d5..0fecb880fc3 100644 --- a/acceptance/bundle/resources/jobs/update/output.txt +++ b/acceptance/bundle/resources/jobs/update/output.txt @@ -4,9 +4,9 @@ create jobs.foo Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs @@ -15,9 +15,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle plan -o json Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs @@ -29,9 +28,9 @@ update jobs.foo Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs @@ -86,8 +85,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resources/jobs/update_single_node/output.txt b/acceptance/bundle/resources/jobs/update_single_node/output.txt index aca783207f3..2f3e61786f9 100644 --- a/acceptance/bundle/resources/jobs/update_single_node/output.txt +++ b/acceptance/bundle/resources/jobs/update_single_node/output.txt @@ -6,9 +6,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs @@ -22,9 +22,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.foo +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs @@ -86,8 +86,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs { diff --git a/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt b/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt index e8c0f8a022a..bab472fefff 100644 --- a/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt +++ b/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt @@ -4,9 +4,9 @@ create jobs.my_job Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/output.txt b/acceptance/bundle/resources/model_serving_endpoints/basic/output.txt index 0455fad681a..d4e80df1f81 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/basic/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/basic/output.txt @@ -1,11 +1,7 @@ >>> [CLI] bundle plan -o json ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq === Print the GET endpoint details { @@ -15,11 +11,7 @@ Deployment complete! >>> [CLI] bundle plan -o json ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq === Print the GET endpoint details { @@ -33,5 +25,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/script b/acceptance/bundle/resources/model_serving_endpoints/basic/script index 3fc875f5f58..5fb845ccfd1 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/basic/script +++ b/acceptance/bundle/resources/model_serving_endpoints/basic/script @@ -15,7 +15,7 @@ trap cleanup EXIT # stable across runs. Same approach as secret_scopes/basic and the requests # sorting below. trace $CLI bundle plan -o json | gron.py --sort-arrays __embed__ > out.first-plan.$DATABRICKS_BUNDLE_ENGINE.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq # Sort access_control_list: the terraform engine stores it as a set whose order # depends on the (unmasked) principal value, so it differs between the local fake # SP and the real cloud SP. Sorting makes the recorded request stable across both. @@ -34,7 +34,7 @@ echo "$get_output" | jq '{name, creator}' export ENDPOINT_NAME="test-endpoint-$UNIQUE_NAME-2" envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle plan -o json | gron.py --sort-arrays __embed__ > out.second-plan.$DATABRICKS_BUNDLE_ENGINE.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq print_requests.py //serving-endpoints | gron.py --sort-arrays access_control_list > out.second-requests.$DATABRICKS_BUNDLE_ENGINE.txt echo "$ENDPOINT_NAME:ENDPOINT_NAME_2" >> ACC_REPLS diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/output.txt b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/output.txt index fea354c1f8a..fdeba3e5dc4 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/output.txt @@ -2,9 +2,10 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-mse-recreated-same-name-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.my_endpoint +Created model_serving_endpoints.my_endpoint.permissions +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get mse-endpoint-[UNIQUE_NAME] { @@ -37,9 +38,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-mse-recreated-same-name-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated model_serving_endpoints.my_endpoint.permissions +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> [CLI] serving-endpoints get mse-endpoint-[UNIQUE_NAME] { @@ -59,5 +60,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-mse-recreated-same-name-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/output.txt b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/output.txt index f6924643628..f4c7bbac418 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/output.txt @@ -2,9 +2,9 @@ === Deploy without telemetry_config >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.endpoint1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Configure telemetry out of band === Remote-only telemetry_config is not drift @@ -22,9 +22,8 @@ Deployment complete! === Deploy does not remove it >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] api get /api/2.0/serving-endpoints/test-endpoint { diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/output.txt b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/output.txt index c0f25ba86f1..fd06fd3f80b 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/output.txt @@ -2,16 +2,16 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.endpoint1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Update config and telemetry_config >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated model_serving_endpoints.endpoint1 +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Plan converges >>> [CLI] bundle plan @@ -29,9 +29,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged === Remove telemetry_config >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated model_serving_endpoints.endpoint1 +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] api get /api/2.0/serving-endpoints/test-endpoint null diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/output.txt b/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/output.txt index 86d967ec80f..066ee507f61 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/output.txt @@ -2,9 +2,9 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.endpoint1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan is a no-op despite write-only secret and burst_scaling_enabled not round-tripping >>> [CLI] bundle plan @@ -42,9 +42,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged === Redeploy is a no-op (no config/ai-gateway/tags update calls) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //serving-endpoints { diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt index 8193de57d94..dda08054a22 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -45,9 +45,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -91,5 +91,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt index bb27a231f8d..7f6da2ad58c 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -40,9 +40,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -81,5 +81,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt index 68e28ba5053..1e38b644e6a 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ORIGINAL_ENDPOINT_ID] @@ -15,9 +15,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated model_serving_endpoints.test_endpoint +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -86,5 +86,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt index a248664401e..373e3c9bf3f 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -45,9 +45,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -91,5 +91,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt index ec4ac2934d6..0f71b028159 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -45,9 +45,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -91,5 +91,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt index 470af7f02df..520e9642008 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.my_endpoint +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -43,5 +43,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt index a9be82769c7..9fb1ea87ae5 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] { @@ -18,9 +18,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -73,5 +73,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt index 94c2b5ef2e1..0fda89bf636 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] { @@ -39,9 +39,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -131,5 +131,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt index 701acd1de73..fd0104efb0f 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] { @@ -36,9 +36,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -130,5 +130,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt index 1bb4647dc00..df2c35e9a68 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] { @@ -18,9 +18,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === There a bug in TF where it does not actually update the email notifications for a serving endpoint. >>> print_requests.py //serving-endpoints @@ -33,5 +33,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt index c651dfa5cc4..bd895436e0b 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created model_serving_endpoints.test_endpoint +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] serving-endpoints get [ENDPOINT_ID] [ @@ -19,9 +19,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated model_serving_endpoints.test_endpoint +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //serving-endpoints { @@ -79,5 +79,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/models/basic/output.txt b/acceptance/bundle/resources/models/basic/output.txt index 929a8a4cdfb..6727e0d9d9e 100644 --- a/acceptance/bundle/resources/models/basic/output.txt +++ b/acceptance/bundle/resources/models/basic/output.txt @@ -9,11 +9,7 @@ create models.my_model Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] model-registry get-model original-name-[UNIQUE_NAME] { @@ -35,11 +31,7 @@ update models.my_model Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] model-registry get-model original-name-[UNIQUE_NAME] { @@ -61,11 +53,7 @@ recreate models.my_model Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] model-registry get-model new-name-[UNIQUE_NAME] { @@ -82,11 +70,7 @@ Deployment complete! === add a new tag, this should be a no-op; terraform does make an update request but since update request has no tags in it, it does nothing; direct skips request completely >>> [CLI] bundle plan ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] model-registry get-model new-name-[UNIQUE_NAME] { @@ -106,5 +90,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-models-basic-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/models/basic/script b/acceptance/bundle/resources/models/basic/script index 175f546340a..f14cc0a2261 100644 --- a/acceptance/bundle/resources/models/basic/script +++ b/acceptance/bundle/resources/models/basic/script @@ -8,25 +8,25 @@ trace export MODEL_DESCRIPTION=original-description-$UNIQUE_NAME envsubst < templates/one_tag.tmpl > databricks.yml title "create a model" trace $CLI bundle plan -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace $CLI model-registry get-model $MODEL_NAME | jq '.registered_model_databricks | {name, description, tags}' trace export MODEL_DESCRIPTION=new-description-$UNIQUE_NAME envsubst < templates/one_tag.tmpl > databricks.yml title "update the description, this should update the description remotely as well" trace $CLI bundle plan -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace $CLI model-registry get-model $MODEL_NAME | jq '.registered_model_databricks | {name, description, tags}' trace export MODEL_NAME=new-name-$UNIQUE_NAME envsubst < templates/one_tag.tmpl > databricks.yml title "update the name, this should recreate the model with the new name" trace $CLI bundle plan -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace $CLI model-registry get-model $MODEL_NAME | jq '.registered_model_databricks | {name, description, tags}' title "add a new tag, this should be a no-op; terraform does make an update request but since update request has no tags in it, it does nothing; direct skips request completely" envsubst < templates/two_tag.tmpl > databricks.yml trace $CLI bundle plan > out.plan_update_tag.$DATABRICKS_BUNDLE_ENGINE.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace $CLI model-registry get-model $MODEL_NAME | jq '.registered_model_databricks | {name, description, tags}' diff --git a/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt b/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt index ee04aaab7dc..debee2b5a89 100644 --- a/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt +++ b/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt @@ -1,7 +1,6 @@ >>> musterr [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/model-empty-name-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.models.mymodel: Got an invalid name ''. Registered Model names cannot be empty strings. (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.0/mlflow/registered-models/create @@ -9,3 +8,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Got an invalid name ''. Registered Model names cannot be empty strings. +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt b/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt index 80c84c93bf3..f6ab2b9c11f 100644 --- a/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt @@ -1,7 +1,6 @@ >>> musterr [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/model-empty-name-[UNIQUE_NAME]/default/files... -Deploying resources... Error: terraform apply: exit status 1 Error: cannot create mlflow model: Got an invalid name ''. Registered Model names cannot be empty strings. @@ -12,4 +11,4 @@ Error: cannot create mlflow model: Got an invalid name ''. Registered Model name -Updating deployment state... +Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/models/readplan-permissions/output.txt b/acceptance/bundle/resources/models/readplan-permissions/output.txt index 307313f6059..9ff1818524c 100644 --- a/acceptance/bundle/resources/models/readplan-permissions/output.txt +++ b/acceptance/bundle/resources/models/readplan-permissions/output.txt @@ -2,9 +2,10 @@ === Initial deploy: model created with permissions >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created models.mymodel +Created models.mymodel.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions/registered-models { @@ -29,9 +30,10 @@ Deployment complete! } === Remove manager permission and description, deploy from planUploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated models.mymodel +Updated models.mymodel.permissions +Files: 5 uploaded, 0 deleted +Resources: 0 created, 2 changed, 0 deleted, 0 unchanged >>> print_requests.py //permissions/registered-models { @@ -57,5 +59,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt index bb226ca3f90..32d70c57a68 100644 --- a/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.foo +Created apps.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt index bb226ca3f90..32d70c57a68 100644 --- a/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.foo +Created apps.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt index 09a0645407b..b466f6d2c90 100644 --- a/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.foo +Created clusters.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/clusters/target/output.txt b/acceptance/bundle/resources/permissions/clusters/target/output.txt index 66a79a8d830..8145a604191 100644 --- a/acceptance/bundle/resources/permissions/clusters/target/output.txt +++ b/acceptance/bundle/resources/permissions/clusters/target/output.txt @@ -59,8 +59,9 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more in databricks.yml:9:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created clusters.cluster1 +Created clusters.cluster1.permissions +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //clusters diff --git a/acceptance/bundle/resources/permissions/dashboards/create/output.txt b/acceptance/bundle/resources/permissions/dashboards/create/output.txt index a6765b13c6e..61a664570e5 100644 --- a/acceptance/bundle/resources/permissions/dashboards/create/output.txt +++ b/acceptance/bundle/resources/permissions/dashboards/create/output.txt @@ -13,9 +13,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard-perm-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created dashboards.foo +Created dashboards.foo.permissions +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -23,5 +24,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/dashboard-perm-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt index 87a9a4f993c..24e30c0166c 100644 --- a/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt @@ -45,9 +45,10 @@ Warning: unknown field: instance_profile_arn in databricks.yml:9:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created database_instances.foo +Created database_instances.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve Warning: unknown field: catalog_name @@ -67,5 +68,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt index 02c1a3930fb..4582b2969ee 100644 --- a/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created experiments.foo +Created experiments.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/factcheck/output.txt b/acceptance/bundle/resources/permissions/factcheck/output.txt index a3ffd49498f..ef910ba70f5 100644 --- a/acceptance/bundle/resources/permissions/factcheck/output.txt +++ b/acceptance/bundle/resources/permissions/factcheck/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_bundle_[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job +Created sql_warehouses.warehouse +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Permissions API simply takes the latest level in the request for a given principal jobs CAN_VIEW,CAN_MANAGE_RUN => CAN_MANAGE_RUN @@ -29,5 +30,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test_bundle_[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt index 7929e68f7d7..bffd772765f 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.foo +Created genie_spaces.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -35,5 +36,4 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt index cb3d61398b8..81d435189da 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt +++ b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created genie_spaces.foo +Created genie_spaces.foo.permissions +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Permissions are set on the live space >>> [CLI] api get /api/2.0/permissions/genie/[GENIE_SPACE_ID] @@ -74,5 +75,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt index c55126ce725..575ff097ee1 100644 --- a/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt @@ -7,9 +7,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_with_permissions +Created jobs.job_with_permissions.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged @@ -113,9 +114,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job_with_permissions.permissions +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt index 8d21073e1c8..df4aecbf495 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt index 91420fa9528..d9809ba8dc5 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt @@ -26,9 +26,10 @@ >>> errcode [CLI] bundle deploy -t green Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.interim_gold_layer_job +Created jobs.interim_gold_layer_job.permissions +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -o json -t green @@ -38,5 +39,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt b/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt index 1e0de881407..a29eb495cbf 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt @@ -9,9 +9,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -19,5 +20,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt b/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt index 007d1a8c942..60754b83910 100644 --- a/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt @@ -3,9 +3,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_with_permissions +Created jobs.job_with_permissions.permissions +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged @@ -14,9 +15,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job_with_permissions.permissions +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> errcode [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -24,5 +25,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt index a9d817fec27..97dd0f4aae8 100644 --- a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt @@ -3,9 +3,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-deleted-remotely/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_with_permissions +Created jobs.job_with_permissions.permissions +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs/ @@ -107,9 +108,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-deleted-remotely/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job_with_permissions.permissions +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs/ diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.destroy.direct.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.destroy.direct.txt index e3028ebd90b..4e47b717bce 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.destroy.direct.txt +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.destroy.direct.txt @@ -8,5 +8,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default Warn: destroying resources.jobs.foo: Ignoring permission error when deleting resources.jobs.foo id=[NUMID]: User [TEST_SP_APPLICATION_ID] does not have Admin or Owner permissions on job [NUMID] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt index 334bde4d380..bdcc12f9893 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt @@ -12,9 +12,10 @@ No active deployment found to destroy! >>> as-test-sp [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 9 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] permissions set jobs [NUMID] --json @take_ownership.json diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.destroy.direct.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.destroy.direct.txt index bb756576388..45b95472392 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.destroy.direct.txt +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.destroy.direct.txt @@ -7,5 +7,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default Warn: destroying resources.jobs.foo: Ignoring permission error when deleting resources.jobs.foo id=[NUMID]: User [TEST_SP_APPLICATION_ID] does not have Admin or Owner permissions on job [NUMID] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt index 334bde4d380..fb8537a0faf 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt @@ -12,9 +12,9 @@ No active deployment found to destroy! >>> as-test-sp [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] permissions set jobs [NUMID] --json @take_ownership.json diff --git a/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt b/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt index ec71aa04be9..0028bfe6fbc 100644 --- a/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt @@ -4,9 +4,9 @@ null >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -14,5 +14,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt index 8d21073e1c8..df4aecbf495 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt index d4faa3048fe..d355595bf6e 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt @@ -30,9 +30,10 @@ >>> errcode [CLI] bundle deploy -t green Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.interim_gold_layer_job +Created jobs.interim_gold_layer_job.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> errcode [CLI] bundle destroy -t green --auto-approve The following resources will be deleted: @@ -40,5 +41,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt b/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt index 3c6e9775156..c23e777f8dd 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt @@ -13,9 +13,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -23,5 +24,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt b/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt index 73bedc7d337..623b149bacb 100644 --- a/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt @@ -1,18 +1,18 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged diff --git a/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt index b6052360bf7..adaa6c3ee68 100644 --- a/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged diff --git a/acceptance/bundle/resources/permissions/jobs/update/output.txt b/acceptance/bundle/resources/permissions/jobs/update/output.txt index 24f9debf98c..b1adcc8b6dc 100644 --- a/acceptance/bundle/resources/permissions/jobs/update/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/update/output.txt @@ -9,9 +9,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_with_permissions +Created jobs.job_with_permissions.permissions +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs/ @@ -75,9 +76,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job_with_permissions.permissions +Files: 7 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs/ @@ -90,9 +91,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job_with_permissions.permissions +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs/ @@ -105,9 +106,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.job_with_permissions.permissions +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 1 deleted, 1 unchanged >>> print_requests.py //jobs/ @@ -133,9 +134,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_with_permissions.permissions +Files: 4 uploaded, 1 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //jobs/ @@ -148,9 +149,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted jobs.job_with_permissions.permissions +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 1 deleted, 1 unchanged >>> print_requests.py //jobs/ @@ -160,7 +161,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //jobs/ diff --git a/acceptance/bundle/resources/permissions/jobs/viewers/output.txt b/acceptance/bundle/resources/permissions/jobs/viewers/output.txt index a880e3e813c..2c3084c7e67 100644 --- a/acceptance/bundle/resources/permissions/jobs/viewers/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/viewers/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt b/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt index 0fd05668156..1e5e92acc14 100644 --- a/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt +++ b/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt @@ -1,6 +1,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created models.foo +Created models.foo.permissions +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/models/current_can_manage/output.txt index fc2daa5fa4a..f65983f32d9 100644 --- a/acceptance/bundle/resources/permissions/models/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/models/current_can_manage/output.txt @@ -25,5 +25,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt index 72ac55e7006..c7207d98b64 100644 --- a/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt @@ -1,8 +1,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... Warn: deploying resources.pipelines.foo.permissions: retrying after 504 Gateway Timeout from PUT /api/2.0/permissions/pipelines/[UUID] -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.0/permissions/pipelines "PUT /api/2.0/permissions/pipelines/[UUID]" diff --git a/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt index 6588ab497c6..f1e0a780be7 100644 --- a/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Warn: planning resources.pipelines.foo.permissions: retrying after 504 Gateway Timeout from GET /api/2.0/permissions/pipelines/[UUID] diff --git a/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt index 5c4d07448f6..d95062bb47a 100644 --- a/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt @@ -1,16 +1,17 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 5 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... Warn: deploying resources.pipelines.foo.permissions: retrying after 504 Gateway Timeout from PUT /api/2.0/permissions/pipelines/[UUID] -Updating deployment state... -Deployment complete! +Updated pipelines.foo.permissions +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //api/2.0/permissions/pipelines "PUT /api/2.0/permissions/pipelines/[UUID]" diff --git a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt index f5b15b7345e..736f0ca95ee 100644 --- a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -35,5 +36,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt index 6508649dd4c..53126dd76a0 100644 --- a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt @@ -9,9 +9,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -23,5 +24,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt b/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt index cedb5f75f0d..8140ffb6aaa 100644 --- a/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt @@ -4,9 +4,9 @@ null >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -18,5 +18,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt index f5b15b7345e..736f0ca95ee 100644 --- a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -35,5 +36,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt index e512edbbf53..0207f067ae0 100644 --- a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt @@ -13,9 +13,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -27,5 +28,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/update/output.txt b/acceptance/bundle/resources/permissions/pipelines/update/output.txt index 4c576ab4d1c..5c48f2d4203 100644 --- a/acceptance/bundle/resources/permissions/pipelines/update/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/update/output.txt @@ -3,9 +3,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created pipelines.foo.permissions +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //pipeline @@ -55,9 +56,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated pipelines.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //pipeline @@ -70,9 +71,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated pipelines.foo.permissions +Files: 5 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py //pipeline @@ -94,9 +95,9 @@ resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted pipelines.foo.permissions +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 1 deleted, 1 unchanged >>> print_requests.py //pipeline --sort @@ -109,9 +110,9 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo.permissions +Files: 4 uploaded, 1 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //pipeline @@ -128,5 +129,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/permissions-test/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt index 876d077e601..41200518b78 100644 --- a/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_projects.foo +Created postgres_projects.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -35,5 +36,4 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt index 1f057533795..fca933a501a 100644 --- a/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created sql_warehouses.foo +Created sql_warehouses.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/target_permissions/output.txt b/acceptance/bundle/resources/permissions/target_permissions/output.txt index 05faf19c98e..f6d1a9a4424 100644 --- a/acceptance/bundle/resources/permissions/target_permissions/output.txt +++ b/acceptance/bundle/resources/permissions/target_permissions/output.txt @@ -7,9 +7,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/test-bundle/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created jobs.foo.permissions +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -17,5 +18,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/test-bundle -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt index 4e848ac23e6..7a6fb05a4bc 100644 --- a/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt @@ -21,9 +21,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.foo +Created vector_search_endpoints.foo.permissions +Files: 6 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -31,5 +32,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt index 2ff2983a465..da135a4525e 100644 --- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt +++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-bundle-deploy-pipeline-duplicate-names-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.pipeline_one +Files: 10 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //pipelines { @@ -52,7 +52,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-bundle-deploy-pipeline-duplicate-names-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> [CLI] pipelines delete [UUID] diff --git a/acceptance/bundle/resources/pipelines/auto-approve/output.txt b/acceptance/bundle/resources/pipelines/auto-approve/output.txt index 3f793420787..45542945a99 100644 --- a/acceptance/bundle/resources/pipelines/auto-approve/output.txt +++ b/acceptance/bundle/resources/pipelines/auto-approve/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Created pipelines.bar +Files: 10 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the pipeline is created >>> [CLI] pipelines get [UUID] @@ -54,6 +55,7 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. +Files: 1 uploaded, 1 deleted Exit code: 1 @@ -68,5 +70,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/pipelines/drift/parameters/output.txt b/acceptance/bundle/resources/pipelines/drift/parameters/output.txt index 9043ddc35b5..6a03f536d1e 100644 --- a/acceptance/bundle/resources/pipelines/drift/parameters/output.txt +++ b/acceptance/bundle/resources/pipelines/drift/parameters/output.txt @@ -2,9 +2,9 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline-parameters/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan is a no-op: pipeline parameters round-trip on read >>> [CLI] bundle plan @@ -13,9 +13,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged === Redeploy is a no-op (no update call) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline-parameters/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //api/2.0/pipelines json.method = "POST"; diff --git a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt index be82456d7c1..a88997ac09c 100644 --- a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt +++ b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt @@ -10,9 +10,9 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-lakeflow-pipeline-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> jq -s .[] | select(.path=="/api/2.0/pipelines" and .method == "POST") | .body out.requests.txt { @@ -48,5 +48,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-lakeflow-pipeline-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt index a2a2a872e76..02520cda18e 100644 --- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt +++ b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.direct.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/num-workers-zero/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt index a2a2a872e76..02520cda18e 100644 --- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.terraform.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/num-workers-zero/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/pipelines/photon-true/output.txt b/acceptance/bundle/resources/pipelines/photon-true/output.txt index dc771134389..fc51f9dcef8 100644 --- a/acceptance/bundle/resources/pipelines/photon-true/output.txt +++ b/acceptance/bundle/resources/pipelines/photon-true/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/photon-true/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged { "method": "POST", "path": "/api/2.0/pipelines", diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt b/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt index cb839853340..d3f6d3984cf 100644 --- a/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt @@ -21,9 +21,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests { @@ -68,9 +68,9 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.my -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated pipelines.my +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests { @@ -155,8 +155,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests { diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt index 43fc3727d26..488e525377c 100644 --- a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt @@ -21,9 +21,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests { @@ -63,9 +63,9 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.my -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated pipelines.my +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests { @@ -139,8 +139,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests { diff --git a/acceptance/bundle/resources/pipelines/recreate/output.txt b/acceptance/bundle/resources/pipelines/recreate/output.txt index bd1304b9fdf..b6d9c59bdb1 100644 --- a/acceptance/bundle/resources/pipelines/recreate/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created schemas.bar +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the pipeline is created with catalog >>> [CLI] pipelines get [UUID] @@ -53,6 +54,7 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. +Files: 2 uploaded, 0 deleted Exit code: 1 @@ -70,5 +72,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt b/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt index 19ee7fce845..3007b241b1e 100644 --- a/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt +++ b/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Make local change: run_as user -> changed@example.test === Force remote run_as to match the new config value diff --git a/acceptance/bundle/resources/pipelines/update/output.txt b/acceptance/bundle/resources/pipelines/update/output.txt index 3cd4c3a9736..46283c46a28 100644 --- a/acceptance/bundle/resources/pipelines/update/output.txt +++ b/acceptance/bundle/resources/pipelines/update/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my +Files: 9 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests { @@ -32,9 +32,9 @@ pipelines my id='[MY_ID]' name='test-pipeline-[UNIQUE_NAME]' >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated pipelines.my +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Fetch pipeline ID and verify remote state >>> [CLI] pipelines get [MY_ID] @@ -77,8 +77,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests { diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt b/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt index e6f9d14858a..c694b8f6e68 100644 --- a/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt +++ b/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/postgres_branches/basic/output.txt b/acceptance/bundle/resources/postgres_branches/basic/output.txt index 3dc758224fc..e06e2d8413b 100644 --- a/acceptance/bundle/resources/postgres_branches/basic/output.txt +++ b/acceptance/bundle/resources/postgres_branches/basic/output.txt @@ -26,9 +26,10 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/main { @@ -81,5 +82,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.destroy.txt b/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.destroy.txt index 90c4cff4ada..1f456f888a5 100644 --- a/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.destroy.txt @@ -14,5 +14,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-purge-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete/output.txt b/acceptance/bundle/resources/postgres_branches/purge_on_delete/output.txt index 6e5d1339e69..b38d10cd744 100644 --- a/acceptance/bundle/resources/postgres_branches/purge_on_delete/output.txt +++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete/output.txt @@ -10,9 +10,11 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-purge-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.hard_delete +Created postgres_branches.soft_delete +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/test-pg-branch-hard-[UNIQUE_NAME] { diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.destroy.txt b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.destroy.txt index fe24a0edf04..0d7119fe189 100644 --- a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.destroy.txt @@ -12,5 +12,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/pg-branch-purge-transitions-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/output.txt b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/output.txt index 24b99e5a9a4..82e423e6ffc 100644 --- a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/output.txt +++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/output.txt @@ -2,9 +2,10 @@ === Step 1: deploy with purge_on_delete unset >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pg-branch-purge-transitions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.branch +Created postgres_projects.proj +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> get_purge (unset) @@ -12,9 +13,9 @@ Deployment complete! === Step 2: set purge_on_delete: true >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pg-branch-purge-transitions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_branches.branch +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> get_purge json.state.resources.postgres_branches.branch.state.purge_on_delete = true; @@ -22,9 +23,9 @@ json.state.resources.postgres_branches.branch.state.purge_on_delete = true; === Step 3: flip to purge_on_delete: false >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pg-branch-purge-transitions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_branches.branch +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> get_purge json.state.resources.postgres_branches.branch.state.purge_on_delete = false; @@ -32,9 +33,8 @@ json.state.resources.postgres_branches.branch.state.purge_on_delete = false; === Step 4: remove the line again >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pg-branch-purge-transitions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> get_purge json.state.resources.postgres_branches.branch.state.purge_on_delete = false; diff --git a/acceptance/bundle/resources/postgres_branches/recreate/output.txt b/acceptance/bundle/resources/postgres_branches/recreate/output.txt index bcc1528946b..78cf8d611dc 100644 --- a/acceptance/bundle/resources/postgres_branches/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_branches/recreate/output.txt @@ -32,9 +32,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Change branch_id (should trigger recreation in direct, update in terraform) >>> cat databricks.yml @@ -68,9 +69,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-br This action will result in the deletion or recreation of the following Lakebase branches. All data stored in them will be permanently lost: recreate resources.postgres_branches.main -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated postgres_branches.main +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 1 unchanged === Fetch new branch ID === Destroy and verify cleanup @@ -89,8 +90,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-recreate-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> [CLI] bundle destroy --auto-approve No active deployment found to destroy! diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.direct.txt b/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.direct.txt index 03109f9364d..100e0a9a4b6 100644 --- a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.direct.txt +++ b/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.direct.txt @@ -12,5 +12,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-branch-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.terraform.txt b/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.terraform.txt index 03109f9364d..100e0a9a4b6 100644 --- a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.terraform.txt +++ b/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.terraform.txt @@ -12,5 +12,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-branch-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/output.txt b/acceptance/bundle/resources/postgres_branches/replace_existing/output.txt index 7f3f76ab3e3..5f8d6a0823f 100644 --- a/acceptance/bundle/resources/postgres_branches/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_branches/replace_existing/output.txt @@ -10,9 +10,10 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-branch-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.production +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-branch projects/test-pg-proj-[UNIQUE_NAME]/branches/production { diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/output.txt b/acceptance/bundle/resources/postgres_branches/update_protected/output.txt index e14d52f3537..1a2eadd2c68 100644 --- a/acceptance/bundle/resources/postgres_branches/update_protected/output.txt +++ b/acceptance/bundle/resources/postgres_branches/update_protected/output.txt @@ -19,9 +19,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-branch-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.dev_branch +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -51,9 +52,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-branch-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -95,9 +95,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-branch-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_branches.dev_branch +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -131,9 +131,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-branch-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_branches.dev_branch +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 1 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -170,5 +170,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-branch-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.direct.txt b/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.direct.txt index 44e75d1da0d..9d65ab09313 100644 --- a/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.direct.txt +++ b/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.direct.txt @@ -3,7 +3,6 @@ Warning: required field "branch_id" is not set in databricks.yml:21:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-no-id-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.postgres_branches.main: Field 'branch_id' is required, expected non-default value (not "")! (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches @@ -11,4 +10,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Field 'branch_id' is required, expected non-default value (not "")! -Updating deployment state... +Files: 0 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.terraform.txt b/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.terraform.txt index 661a2b02862..169f720c9eb 100644 --- a/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.terraform.txt @@ -13,3 +13,4 @@ Error: Missing required argument The argument "branch_id" is required, but no definition was found. +Files: 0 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/postgres_catalogs/basic/output.txt b/acceptance/bundle/resources/postgres_catalogs/basic/output.txt index c5eed407fe9..3d0adb7dd20 100644 --- a/acceptance/bundle/resources/postgres_catalogs/basic/output.txt +++ b/acceptance/bundle/resources/postgres_catalogs/basic/output.txt @@ -26,9 +26,10 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-catalog-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_catalogs.my_catalog +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-catalog catalogs/lakebase_test_[UNIQUE_NAME] { @@ -70,5 +71,4 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-catalog-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_catalogs/recreate/output.txt b/acceptance/bundle/resources/postgres_catalogs/recreate/output.txt index 1f6bb621987..97ce24003be 100644 --- a/acceptance/bundle/resources/postgres_catalogs/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_catalogs/recreate/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-postgres-catalog-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_catalogs.my_catalog +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan recreate postgres_catalogs.my_catalog @@ -12,9 +13,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-postgres-catalog-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated postgres_catalogs.my_catalog +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 1 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -27,5 +28,4 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-postgres-catalog-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_databases/basic/output.txt b/acceptance/bundle/resources/postgres_databases/basic/output.txt index c316a1c6c98..defd7cfdd1e 100644 --- a/acceptance/bundle/resources/postgres_databases/basic/output.txt +++ b/acceptance/bundle/resources/postgres_databases/basic/output.txt @@ -34,9 +34,12 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-database-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_databases.my_database +Created postgres_projects.my_project +Created postgres_roles.owner +Files: 0 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-database projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases/my-database { @@ -97,5 +100,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-database-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 4 deleted diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt index f4d984a0e12..c0c02c1c82a 100644 --- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt +++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt @@ -1,5 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bad-database-id-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.postgres_databases.my_database: Field database_id must match pattern ^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$, got 'Invalid_DB_ID'. (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases?database_id=Invalid_DB_ID @@ -7,7 +6,7 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Field database_id must match pattern ^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$, got 'Invalid_DB_ID'. -Updating deployment state... +Files: 0 uploaded, 0 deleted >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -25,5 +24,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bad-database-id-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt index 0b19de889b2..1f95583baca 100644 --- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt +++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt @@ -1,5 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bad-role-ref-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.postgres_databases.my_database: role not found; role_id:"does-not-exist" [TraceId: [TRACE_ID]] (404 NOT_FOUND) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases?database_id=my-database @@ -7,7 +6,7 @@ HTTP Status: 404 Not Found API error_code: NOT_FOUND API message: role not found; role_id:"does-not-exist" [TraceId: [TRACE_ID]] -Updating deployment state... +Files: 0 uploaded, 0 deleted >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -24,5 +23,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bad-role-ref-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_databases/recreate/output.txt b/acceptance/bundle/resources/postgres_databases/recreate/output.txt index 73034cb4931..2619af86a8b 100644 --- a/acceptance/bundle/resources/postgres_databases/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_databases/recreate/output.txt @@ -43,9 +43,12 @@ Plan: 4 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-database-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_databases.my_database +Created postgres_projects.my_project +Created postgres_roles.owner +Files: 0 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { @@ -150,6 +153,7 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. +Files: 0 uploaded, 0 deleted >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-database-recreate-[UNIQUE_NAME]/default/files... @@ -157,9 +161,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-da This action will result in the deletion or recreation of the following Lakebase databases. All data stored in them will be permanently lost: recreate resources.postgres_databases.my_database -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated postgres_databases.my_database +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 3 unchanged >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { @@ -215,8 +219,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-database-recreate-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 4 deleted >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { diff --git a/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt b/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt index af920827cb3..944668621bf 100644 --- a/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt @@ -2,13 +2,15 @@ === Deploy project, branch, role, and database >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/replace-existing-database-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_databases.my_database +Created postgres_projects.my_project +Created postgres_roles.owner +Files: 0 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged === Unbind the database: it now exists on the branch but is no longer tracked by the bundle >>> [CLI] bundle deployment unbind my_database -Updating deployment state... === Plan after unbind: the bundle wants to (re-)create the database >>> [CLI] bundle plan @@ -19,9 +21,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 3 unchanged === Re-deploy: replace_existing adopts the already-existing database instead of erroring >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/replace-existing-database-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_databases.my_database +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 3 unchanged === Confirm the database is under management again >>> [CLI] postgres get-database projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases/my-database @@ -59,5 +61,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/replace-existing-database-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 4 deleted diff --git a/acceptance/bundle/resources/postgres_databases/update/output.txt b/acceptance/bundle/resources/postgres_databases/update/output.txt index b99033643a4..b94e0180d7e 100644 --- a/acceptance/bundle/resources/postgres_databases/update/output.txt +++ b/acceptance/bundle/resources/postgres_databases/update/output.txt @@ -21,9 +21,12 @@ Plan: 4 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-database-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_databases.my_database +Created postgres_projects.my_project +Created postgres_roles.owner +Files: 0 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -47,9 +50,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 4 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-database-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 4 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -99,9 +101,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 3 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-database-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_databases.my_database +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 3 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -129,9 +131,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 3 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-database-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_databases.my_database +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 3 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -168,5 +170,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-database-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 4 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/output.txt b/acceptance/bundle/resources/postgres_endpoints/basic/output.txt index 788bab14fa9..cef82784922 100644 --- a/acceptance/bundle/resources/postgres_endpoints/basic/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/basic/output.txt @@ -30,9 +30,11 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_endpoints.custom +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints/custom { @@ -87,5 +89,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt b/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt index 0c001d75449..7ff6430ff42 100644 --- a/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt @@ -41,9 +41,11 @@ Plan: 3 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_endpoints.my_endpoint +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { @@ -132,9 +134,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 2 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated postgres_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 2 unchanged >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { @@ -177,8 +179,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-recreate-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.direct.txt b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.direct.txt index 2ac6d613c05..58f199c143a 100644 --- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.direct.txt +++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.direct.txt @@ -13,5 +13,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-endpoint-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.terraform.txt b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.terraform.txt index 2ac6d613c05..58f199c143a 100644 --- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.terraform.txt +++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.terraform.txt @@ -13,5 +13,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-endpoint-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/output.txt b/acceptance/bundle/resources/postgres_endpoints/replace_existing/output.txt index 1591068c481..61ae1fbba07 100644 --- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/output.txt @@ -10,9 +10,11 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.develop +Created postgres_endpoints.primary +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-endpoint projects/test-pg-proj-[UNIQUE_NAME]/branches/develop/endpoints/primary { diff --git a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt index 6715b73a611..1a613bbb5b8 100644 --- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt @@ -20,9 +20,11 @@ Plan: 3 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_endpoints.my_endpoint +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -49,9 +51,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 3 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -97,9 +98,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -130,9 +131,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -167,5 +168,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-endpoint-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.direct.txt b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.direct.txt index 615af8b12bb..e2137454122 100644 --- a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.direct.txt +++ b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.direct.txt @@ -3,7 +3,6 @@ Warning: required field "endpoint_id" is not set in databricks.yml:27:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-no-id-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.postgres_endpoints.primary: Field 'endpoint_id' is required, expected non-default value (not "")! (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints @@ -11,4 +10,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Field 'endpoint_id' is required, expected non-default value (not "")! -Updating deployment state... +Files: 0 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.terraform.txt b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.terraform.txt index 5ae324b74eb..1b6eb357abf 100644 --- a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.terraform.txt @@ -13,3 +13,4 @@ Error: Missing required argument The argument "endpoint_id" is required, but no definition was found. +Files: 0 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/postgres_projects/basic/output.txt b/acceptance/bundle/resources/postgres_projects/basic/output.txt index 75db034d543..8290600440e 100644 --- a/acceptance/bundle/resources/postgres_projects/basic/output.txt +++ b/acceptance/bundle/resources/postgres_projects/basic/output.txt @@ -22,9 +22,9 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-single-project-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-project projects/test-pg-proj-[UNIQUE_NAME] { @@ -73,5 +73,4 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-single-project-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.destroy.txt b/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.destroy.txt index 24950b29d98..4945b3240dd 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.destroy.txt @@ -9,5 +9,4 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-purge-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt b/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt index 67152cf13cd..96e64343201 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/output.txt @@ -10,9 +10,10 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-purge-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_projects.hard_delete +Created postgres_projects.soft_delete +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-project projects/test-pg-proj-hard-[UNIQUE_NAME] { diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.destroy.txt b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.destroy.txt index ca4b0f6893c..8af80c7c83b 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.destroy.txt @@ -7,5 +7,4 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/pg-purge-transitions-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/output.txt b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/output.txt index 825405222ef..d1beaefef40 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/output.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/output.txt @@ -2,9 +2,9 @@ === Step 1: deploy with purge_on_delete unset >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pg-purge-transitions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_projects.proj +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> get_purge (unset) @@ -12,9 +12,9 @@ Deployment complete! === Step 2: set purge_on_delete: true >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pg-purge-transitions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_projects.proj +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> get_purge json.state.resources.postgres_projects.proj.state.purge_on_delete = true; @@ -22,9 +22,9 @@ json.state.resources.postgres_projects.proj.state.purge_on_delete = true; === Step 3: flip to purge_on_delete: false >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pg-purge-transitions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_projects.proj +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> get_purge json.state.resources.postgres_projects.proj.state.purge_on_delete = false; @@ -32,9 +32,8 @@ json.state.resources.postgres_projects.proj.state.purge_on_delete = false; === Step 4: remove the line again >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pg-purge-transitions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> get_purge json.state.resources.postgres_projects.proj.state.purge_on_delete = false; diff --git a/acceptance/bundle/resources/postgres_projects/recreate/output.txt b/acceptance/bundle/resources/postgres_projects/recreate/output.txt index dad581aa51e..c731c8a3f2f 100644 --- a/acceptance/bundle/resources/postgres_projects/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_projects/recreate/output.txt @@ -25,9 +25,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Change project_id (should trigger recreation in direct, update in terraform) >>> cat databricks.yml @@ -55,9 +55,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-re This action will result in the deletion or recreation of the following Lakebase projects along with all their branches, databases, and endpoints. All data stored in them will be permanently lost: recreate resources.postgres_projects.my_project -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged === Fetch new project ID === Destroy and verify cleanup @@ -71,8 +71,7 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-recreate-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> [CLI] bundle destroy --auto-approve No active deployment found to destroy! diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt b/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt index 2ff3ae1cb04..edb088c3a45 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt @@ -18,9 +18,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-project-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -55,9 +55,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-project-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -92,9 +91,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-project-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -133,9 +132,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-project-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_projects.my_project +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -172,5 +171,4 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-project-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/postgres_projects/without_project_id/out.deploy.direct.txt b/acceptance/bundle/resources/postgres_projects/without_project_id/out.deploy.direct.txt index 8103b944c46..53dd9bc68f4 100644 --- a/acceptance/bundle/resources/postgres_projects/without_project_id/out.deploy.direct.txt +++ b/acceptance/bundle/resources/postgres_projects/without_project_id/out.deploy.direct.txt @@ -3,7 +3,6 @@ Warning: required field "project_id" is not set in databricks.yml:10:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-no-id-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.postgres_projects.my_project: Field 'project_id' is required, expected non-default value (not "")! (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects @@ -11,3 +10,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: Field 'project_id' is required, expected non-default value (not "")! +Files: 0 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/postgres_projects/without_project_id/out.deploy.terraform.txt b/acceptance/bundle/resources/postgres_projects/without_project_id/out.deploy.terraform.txt index 4527016d6ea..8068586bd85 100644 --- a/acceptance/bundle/resources/postgres_projects/without_project_id/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/postgres_projects/without_project_id/out.deploy.terraform.txt @@ -13,3 +13,4 @@ Error: Missing required argument The argument "project_id" is required, but no definition was found. +Files: 0 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/postgres_roles/basic/output.txt b/acceptance/bundle/resources/postgres_roles/basic/output.txt index 4ec6544d2e3..7b292070dfb 100644 --- a/acceptance/bundle/resources/postgres_roles/basic/output.txt +++ b/acceptance/bundle/resources/postgres_roles/basic/output.txt @@ -30,9 +30,11 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Created postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role { @@ -90,5 +92,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/output.txt b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/output.txt index de5850234a1..f3f4318a653 100644 --- a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/output.txt +++ b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/output.txt @@ -2,26 +2,25 @@ === Deploy project, branch, and role >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/inherited-role-bind-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Created postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Unbind the role: it now exists on the branch but is untracked >>> [CLI] bundle deployment unbind my_role -Updating deployment state... === Bind the existing role to take explicit ownership of it >>> [CLI] bundle deployment bind my_role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role --auto-approve -Updating deployment state... Successfully bound postgres_role with an id 'projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role' Run 'bundle deploy' to deploy changes to your workspace === Re-deploy now succeeds: the role is managed, not re-created >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/inherited-role-bind-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 3 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -39,5 +38,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/inherited-role-bind-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/output.txt b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/output.txt index 7db7aa88af0..f6f94cb232d 100644 --- a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/output.txt +++ b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/output.txt @@ -2,13 +2,14 @@ === Deploy project, branch, and role >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/inherited-role-conflict-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Created postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Unbind the role: it now exists on the branch but is no longer tracked by the bundle >>> [CLI] bundle deployment unbind my_role -Updating deployment state... === Plan after unbind: the bundle wants to (re-)create the role >>> [CLI] bundle plan @@ -19,7 +20,6 @@ Plan: 1 to add, 0 to change, 0 to delete, 2 unchanged === Re-deploy: creating the already-existing role fails >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/inherited-role-conflict-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.postgres_roles.my_role: role with that name already exists (400 BAD_REQUEST) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles?role_id=test-role @@ -27,7 +27,7 @@ HTTP Status: 400 Bad Request API error_code: BAD_REQUEST API message: role with that name already exists -Updating deployment state... +Files: 0 uploaded, 0 deleted >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -44,7 +44,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/inherited-role-conflict-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt index c548dbd6361..8743a283141 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt +++ b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt @@ -35,9 +35,11 @@ Plan: 3 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-recreate-postgres-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Created postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { @@ -113,9 +115,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 2 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-recreate-postgres-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 2 unchanged >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { @@ -171,8 +173,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-recreate-postgres-role-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { diff --git a/acceptance/bundle/resources/postgres_roles/recreate/output.txt b/acceptance/bundle/resources/postgres_roles/recreate/output.txt index a9a964e0485..dc0c7e73f6d 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_roles/recreate/output.txt @@ -35,9 +35,11 @@ Plan: 3 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Created postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { @@ -113,9 +115,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 2 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 2 unchanged >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { @@ -171,8 +173,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-recreate-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ { diff --git a/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt b/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt index 3579054ce40..4073ac96ab0 100644 --- a/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt @@ -2,13 +2,14 @@ === Deploy project, branch, and role >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/replace-existing-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Created postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Unbind the role: it now exists on the branch but is no longer tracked by the bundle >>> [CLI] bundle deployment unbind my_role -Updating deployment state... === Plan after unbind: the bundle wants to (re-)create the role >>> [CLI] bundle plan @@ -19,9 +20,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 2 unchanged === Re-deploy: replace_existing adopts the already-existing role instead of erroring >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/replace-existing-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 2 unchanged === Confirm the role is under management again >>> [CLI] postgres get-role projects/test-pg-proj-[UNIQUE_NAME]/branches/main/roles/test-role @@ -60,5 +61,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/replace-existing-role-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_roles/update/output.txt b/acceptance/bundle/resources/postgres_roles/update/output.txt index 098d20ca766..f95c6c0118e 100644 --- a/acceptance/bundle/resources/postgres_roles/update/output.txt +++ b/acceptance/bundle/resources/postgres_roles/update/output.txt @@ -20,9 +20,11 @@ Plan: 3 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_branches.main +Created postgres_projects.my_project +Created postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -52,9 +54,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 3 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -99,9 +100,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -135,9 +136,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 2 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-postgres-role-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated postgres_roles.my_role +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 2 unchanged >>> print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ @@ -175,5 +176,4 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-role-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt b/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt index 9eef01a742a..e752198edcf 100644 --- a/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt +++ b/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt @@ -38,9 +38,12 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-synced-table-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_catalogs.my_catalog +Created postgres_projects.my_project +Created postgres_synced_tables.my_table +Created schemas.pipeline_storage +Files: 0 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] postgres get-synced-table synced_tables/lakebase_test_[UNIQUE_NAME].public.trips_synced { @@ -90,6 +93,5 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-synced-table-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 4 deleted Cleaning up temporary source table diff --git a/acceptance/bundle/resources/postgres_synced_tables/recreate/output.txt b/acceptance/bundle/resources/postgres_synced_tables/recreate/output.txt index 7e2924062df..9f76f730db0 100644 --- a/acceptance/bundle/resources/postgres_synced_tables/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_synced_tables/recreate/output.txt @@ -5,9 +5,12 @@ Creating temporary source table: main.source_[UNIQUE_NAME].trips_source >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-postgres-synced-table-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created postgres_catalogs.my_catalog +Created postgres_projects.my_project +Created postgres_synced_tables.my_table +Created schemas.pipeline_storage +Files: 0 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan recreate postgres_synced_tables.my_table @@ -16,9 +19,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 3 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-postgres-synced-table-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated postgres_synced_tables.my_table +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 3 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -36,6 +39,5 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-postgres-synced-table-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 4 deleted Cleaning up temporary source table diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.direct.txt b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.direct.txt index 1268e736e17..1df75fb382e 100644 --- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.direct.txt +++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.direct.txt @@ -1,6 +1,6 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated quality_monitors.monitor1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.terraform.txt b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.terraform.txt index 99c0d7d2d86..7f8eac349e8 100644 --- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.terraform.txt @@ -1,7 +1,6 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... Error: terraform apply: exit status 1 Error: Provider produced inconsistent result after apply @@ -17,6 +16,6 @@ This is a bug in the provider, which should be reported in the provider's own issue tracker. -Updating deployment state... +Files: 6 uploaded, 0 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt b/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt index 08f6c53ae17..75b330950c9 100644 --- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt @@ -16,9 +16,9 @@ Table main.qm_test_[UNIQUE_NAME].test_table is now visible (catalog_name=main) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created quality_monitors.monitor1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged @@ -31,5 +31,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt index d67ee41975f..b9a97693857 100644 --- a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt @@ -16,9 +16,9 @@ Table main.qm_test_[UNIQUE_NAME].test_table is now visible (catalog_name=main) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created quality_monitors.monitor1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged @@ -32,9 +32,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated quality_monitors.monitor1 +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py ^//import-file/ ^//workspace/ ^//telemetry-ext @@ -47,5 +47,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/out.deploy.direct.txt b/acceptance/bundle/resources/quality_monitors/change_table_name/out.deploy.direct.txt index 1268e736e17..1df75fb382e 100644 --- a/acceptance/bundle/resources/quality_monitors/change_table_name/out.deploy.direct.txt +++ b/acceptance/bundle/resources/quality_monitors/change_table_name/out.deploy.direct.txt @@ -1,6 +1,6 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated quality_monitors.monitor1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt b/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt index 879222aa8a4..64f792fe194 100644 --- a/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt @@ -16,9 +16,9 @@ Table main.qm_test_[UNIQUE_NAME].test_table_2 is now visible (catalog_name=main) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created quality_monitors.monitor1 +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged @@ -31,5 +31,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt b/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt index af5c31de3b1..4a3d2df0a38 100644 --- a/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt +++ b/acceptance/bundle/resources/quality_monitors/create/out.deploy.direct.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created quality_monitors.monitor1 +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt b/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt index af5c31de3b1..4a3d2df0a38 100644 --- a/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/quality_monitors/create/out.deploy.terraform.txt @@ -1,6 +1,6 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created quality_monitors.monitor1 +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/quality_monitors/create/output.txt b/acceptance/bundle/resources/quality_monitors/create/output.txt index 8037d5ec9cc..d1a8e3b14ff 100644 --- a/acceptance/bundle/resources/quality_monitors/create/output.txt +++ b/acceptance/bundle/resources/quality_monitors/create/output.txt @@ -26,5 +26,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/registered_models/aliases_converge/output.txt b/acceptance/bundle/resources/registered_models/aliases_converge/output.txt index f1ac429ace8..3f201aa8149 100644 --- a/acceptance/bundle/resources/registered_models/aliases_converge/output.txt +++ b/acceptance/bundle/resources/registered_models/aliases_converge/output.txt @@ -4,9 +4,9 @@ === Initial deployment with aliases set >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-aliases-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created registered_models.my_registered_model +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan is a no-op: GET never echoes aliases, so they must not drift >>> [CLI] bundle plan @@ -39,9 +39,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-aliases-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated registered_models.my_registered_model +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Re-plan after the edit converges: no further changes >>> [CLI] bundle plan @@ -53,5 +53,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-aliases-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/registered_models/basic/output.txt b/acceptance/bundle/resources/registered_models/basic/output.txt index 8ba7d5758bd..987a05bf42e 100644 --- a/acceptance/bundle/resources/registered_models/basic/output.txt +++ b/acceptance/bundle/resources/registered_models/basic/output.txt @@ -26,9 +26,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created registered_models.my_registered_model +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] registered-models get main.default.my-registered-model-[UNIQUE_NAME] { @@ -46,9 +46,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated registered_models.my_registered_model +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> [CLI] registered-models get main.default.my-registered-model-[UNIQUE_NAME] { @@ -66,9 +66,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated registered_models.my_registered_model +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> [CLI] registered-models get main.default.my-registered-model-updated-[UNIQUE_NAME] { @@ -86,9 +86,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated registered_models.my_registered_model +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> [CLI] registered-models get mycatalog-[UNIQUE_NAME].default.my-registered-model-updated-[UNIQUE_NAME] { @@ -106,9 +106,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated registered_models.my_registered_model +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> [CLI] registered-models get mycatalog-[UNIQUE_NAME].myschema-[UNIQUE_NAME].my-registered-model-updated-[UNIQUE_NAME] { @@ -124,8 +124,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> [CLI] schemas delete mycatalog-[UNIQUE_NAME].myschema-[UNIQUE_NAME] --force diff --git a/acceptance/bundle/resources/registered_models/drift/browse_only/output.txt b/acceptance/bundle/resources/registered_models/drift/browse_only/output.txt index e71b4e4fd2b..7254f7b1f0f 100644 --- a/acceptance/bundle/resources/registered_models/drift/browse_only/output.txt +++ b/acceptance/bundle/resources/registered_models/drift/browse_only/output.txt @@ -2,9 +2,9 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created registered_models.model1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan is a no-op despite the backend computing browse_only >>> [CLI] bundle plan @@ -21,9 +21,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged === Redeploy is a no-op (no UpdateRegisteredModel call) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //unity json.method = "POST"; diff --git a/acceptance/bundle/resources/schemas/auto-approve/output.txt b/acceptance/bundle/resources/schemas/auto-approve/output.txt index d27e9a6a6c7..d8329158bbf 100644 --- a/acceptance/bundle/resources/schemas/auto-approve/output.txt +++ b/acceptance/bundle/resources/schemas/auto-approve/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Created schemas.bar +Files: 9 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Assert the schema is created >>> [CLI] schemas get main.test-schema-[UNIQUE_NAME] @@ -61,6 +62,7 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. +Files: 2 uploaded, 1 deleted === Test cleanup >>> [CLI] bundle destroy --auto-approve @@ -77,8 +79,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted === Assert the schema is deleted Exit code: 1 diff --git a/acceptance/bundle/resources/schemas/drift/managed_properties/output.txt b/acceptance/bundle/resources/schemas/drift/managed_properties/output.txt index 19c0b23928b..53d54f1357c 100644 --- a/acceptance/bundle/resources/schemas/drift/managed_properties/output.txt +++ b/acceptance/bundle/resources/schemas/drift/managed_properties/output.txt @@ -2,9 +2,9 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.schema1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Plan is a no-op despite UC auto-populating managed properties >>> [CLI] bundle plan @@ -31,9 +31,8 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged === Redeploy is a no-op (no UpdateSchema call) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //unity json.method = "POST"; diff --git a/acceptance/bundle/resources/schemas/recreate/output.txt b/acceptance/bundle/resources/schemas/recreate/output.txt index 9942c2f267e..696f9785fce 100644 --- a/acceptance/bundle/resources/schemas/recreate/output.txt +++ b/acceptance/bundle/resources/schemas/recreate/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.schema1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity { @@ -40,9 +40,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul This action will result in the deletion or recreation of the following UC schemas. Any underlying data may be lost: recreate resources.schemas.schema1 -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated schemas.schema1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //unity { diff --git a/acceptance/bundle/resources/schemas/update/output.txt b/acceptance/bundle/resources/schemas/update/output.txt index d8d35b6bf4a..f41957f0f78 100644 --- a/acceptance/bundle/resources/schemas/update/output.txt +++ b/acceptance/bundle/resources/schemas/update/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.schema1 +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity { @@ -22,9 +22,9 @@ schemas schema1 id='main.myschema' name='myschema' catalog_name='main' comment=' >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated schemas.schema1 +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity json.method = "PATCH"; @@ -37,9 +37,9 @@ schemas schema1 id='main.myschema' name='myschema' catalog_name='main' comment=' >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated schemas.schema1 +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity json.method = "PATCH"; diff --git a/acceptance/bundle/resources/secret_scopes/backend-type/output.txt b/acceptance/bundle/resources/secret_scopes/backend-type/output.txt index 732a5db3602..f54bb54b247 100644 --- a/acceptance/bundle/resources/secret_scopes/backend-type/output.txt +++ b/acceptance/bundle/resources/secret_scopes/backend-type/output.txt @@ -1,9 +1,5 @@ ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-secret-scope-azure-backend/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> print_requests.py //secrets { diff --git a/acceptance/bundle/resources/secret_scopes/backend-type/script b/acceptance/bundle/resources/secret_scopes/backend-type/script index 571f95bc0c9..7a0c9fc19ea 100644 --- a/acceptance/bundle/resources/secret_scopes/backend-type/script +++ b/acceptance/bundle/resources/secret_scopes/backend-type/script @@ -1,2 +1,2 @@ -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace print_requests.py //secrets diff --git a/acceptance/bundle/resources/secret_scopes/basic/output.txt b/acceptance/bundle/resources/secret_scopes/basic/output.txt index 9b6f7f340a5..c432f2996de 100644 --- a/acceptance/bundle/resources/secret_scopes/basic/output.txt +++ b/acceptance/bundle/resources/secret_scopes/basic/output.txt @@ -2,11 +2,7 @@ === create the secret scope >>> [CLI] bundle plan -o json ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] secrets list-scopes -o json { @@ -58,11 +54,7 @@ Deployment complete! === update the name of the scope (should recreate) >>> [CLI] bundle plan -o json ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> print_requests.py //secrets @@ -105,5 +97,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/secret-scope-basic-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/secret_scopes/basic/script b/acceptance/bundle/resources/secret_scopes/basic/script index ad967e1ba27..e8aebc1853f 100755 --- a/acceptance/bundle/resources/secret_scopes/basic/script +++ b/acceptance/bundle/resources/secret_scopes/basic/script @@ -10,7 +10,7 @@ trap cleanup EXIT title "create the secret scope" trace $CLI bundle plan -o json | gron.py --sort-arrays acls > out.plan1.$DATABRICKS_BUNDLE_ENGINE.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq scope_name=$($CLI bundle summary --output json | jq -r '.resources.secret_scopes.my_scope.name') trace $CLI secrets list-scopes -o json | jq ".[] | select(.name == \"$scope_name\")" @@ -27,7 +27,7 @@ export SECRET_SCOPE_NAME="test-scope-$UNIQUE_NAME-2" envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle plan -o json | gron.py --sort-arrays acls > out.plan2.$DATABRICKS_BUNDLE_ENGINE.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq # Capture API requests for verification. Terraform cleans up ACLs before deleting the scope, but direct does not, hence the difference in requests. trace print_requests.py //secrets > out.recreate-requests.$DATABRICKS_BUNDLE_ENGINE.txt diff --git a/acceptance/bundle/resources/secret_scopes/delete_scope/output.txt b/acceptance/bundle/resources/secret_scopes/delete_scope/output.txt index 18025f0a0fd..8540e39661a 100644 --- a/acceptance/bundle/resources/secret_scopes/delete_scope/output.txt +++ b/acceptance/bundle/resources/secret_scopes/delete_scope/output.txt @@ -1,16 +1,8 @@ === create the secret scope ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-basic-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -18,5 +10,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/secret-scope-basic-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/secret_scopes/delete_scope/script b/acceptance/bundle/resources/secret_scopes/delete_scope/script index b12e98775a3..5e42e2af4be 100755 --- a/acceptance/bundle/resources/secret_scopes/delete_scope/script +++ b/acceptance/bundle/resources/secret_scopes/delete_scope/script @@ -7,12 +7,12 @@ cleanup() { trap cleanup EXIT title "create the secret scope" -trace $CLI bundle deploy +trace $CLI bundle deploy -qq grep -v DELETE < databricks.yml > databricks.yml.tmp && mv databricks.yml.tmp databricks.yml trace $CLI bundle plan &> out.plan.$DATABRICKS_BUNDLE_ENGINE.txt rm out.requests.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace print_requests.py '^//import-file/' '^//workspace/' '^//telemetry-ext' &> out.deploy.requests.txt diff --git a/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt b/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt index b487f27076f..097a997b839 100644 --- a/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt +++ b/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt @@ -4,9 +4,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-collapse-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created secret_scopes.my_scope +Created secret_scopes.my_scope.permissions +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] secrets list-scopes -o json { @@ -26,5 +27,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/secret-scope-collapse-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/secret_scopes/permissions/output.txt b/acceptance/bundle/resources/secret_scopes/permissions/output.txt index 8ea0a7cfe8e..998becfd22f 100644 --- a/acceptance/bundle/resources/secret_scopes/permissions/output.txt +++ b/acceptance/bundle/resources/secret_scopes/permissions/output.txt @@ -5,11 +5,7 @@ === create secret scope with permissions >>> [CLI] bundle plan ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-permissions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] secrets list-scopes -o json { @@ -26,11 +22,7 @@ Deployment complete! === update permissions (remove sp, change permission for user, add users and remove deco-test-group) >>> [CLI] bundle plan ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-permissions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] secrets list-acls test-scope-permissions-[UNIQUE_NAME] {"permission":"MANAGE","principal":"[USERNAME]"} @@ -40,11 +32,7 @@ Deployment complete! === change scope name (should recreate scope and update permissions) >>> [CLI] bundle plan ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-permissions-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq >>> [CLI] secrets list-scopes -o json { @@ -63,5 +51,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/secret-scope-permissions-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/secret_scopes/permissions/script b/acceptance/bundle/resources/secret_scopes/permissions/script index 2b866baa75b..86dcc53e9ff 100755 --- a/acceptance/bundle/resources/secret_scopes/permissions/script +++ b/acceptance/bundle/resources/secret_scopes/permissions/script @@ -37,7 +37,7 @@ trap cleanup EXIT title "create secret scope with permissions" trace $CLI bundle plan > out.plan.create.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq scope_name=$($CLI bundle summary --output json | jq -r '.resources.secret_scopes.my_scope.name') trace $CLI secrets list-scopes -o json | jq ".[] | select(.name == \"$scope_name\")" @@ -61,14 +61,14 @@ resources: EOF envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle plan > out.plan.update.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq trace $CLI secrets list-acls $scope_name | jq -c '.[]' | sort title "change scope name (should recreate scope and update permissions)" export SECRET_SCOPE_NAME="test-scope-permissions-$UNIQUE_NAME-2" envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle plan > out.plan.recreate.$DATABRICKS_BUNDLE_ENGINE.txt -trace $CLI bundle deploy +trace $CLI bundle deploy -qq scope_name=$($CLI bundle summary --output json | jq -r '.resources.secret_scopes.my_scope.name') trace $CLI secrets list-scopes -o json | jq ".[] | select(.name == \"$scope_name\")" trace $CLI secrets list-acls $scope_name | jq -c '.[]' | sort diff --git a/acceptance/bundle/resources/secrets/basic/output.txt b/acceptance/bundle/resources/secrets/basic/output.txt index d1e25bdf8cf..06bb48daf11 100644 --- a/acceptance/bundle/resources/secrets/basic/output.txt +++ b/acceptance/bundle/resources/secrets/basic/output.txt @@ -34,9 +34,9 @@ Resources: >>> [CLI] bundle deploy --var secret_value=initial-secret-value Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created secrets.secret1 +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog { @@ -57,9 +57,9 @@ secrets secret1 catalog_name='main' schema_name='default' name='test_secret_[UNI >>> [CLI] bundle deploy --var secret_value=initial-secret-value Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated secrets.secret1 +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog { @@ -83,9 +83,9 @@ secrets secret1 catalog_name='main' schema_name='default' name='test_secret_[UNI >>> [CLI] bundle deploy --var secret_value=initial-secret-value Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated secrets.secret1 +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog { @@ -110,5 +110,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/secrets/update-value/output.txt b/acceptance/bundle/resources/secrets/update-value/output.txt index 3af0d0e46b0..74d1dbb4f8c 100644 --- a/acceptance/bundle/resources/secrets/update-value/output.txt +++ b/acceptance/bundle/resources/secrets/update-value/output.txt @@ -21,9 +21,9 @@ >>> [CLI] bundle deploy --var secret_value=initial-secret-value Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created secrets.secret1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog { @@ -93,9 +93,9 @@ secrets secret1 catalog_name='main' schema_name='default' name='test_secret' com >>> [CLI] bundle deploy --var secret_value=updated-secret-value Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated secrets.secret1 +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity-catalog { diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt index b6f0e4b538f..da88ff1e116 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt @@ -2,9 +2,9 @@ === Deploy with started=false: warehouse created and then stopped >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created sql_warehouses.mywarehouse +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses { @@ -33,9 +33,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated sql_warehouses.mywarehouse +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses { @@ -65,5 +65,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt index 002a36777dd..ff03140066a 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt @@ -2,9 +2,9 @@ === Deploy with started=false: warehouse created and then stopped >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created sql_warehouses.mywarehouse +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses { @@ -33,9 +33,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated sql_warehouses.mywarehouse +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses { @@ -52,9 +52,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated sql_warehouses.mywarehouse +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses { @@ -72,5 +72,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt index 21c9214f16b..704350d635e 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt @@ -2,9 +2,9 @@ === Deploy with started=true: warehouse created and running >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created sql_warehouses.mywarehouse +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses { @@ -35,9 +35,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged === Deploy fixes the drift: warehouse restarted >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated sql_warehouses.mywarehouse +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses { @@ -62,9 +62,8 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 3 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py //sql/warehouses { @@ -81,9 +80,9 @@ Deployment complete! >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated sql_warehouses.mywarehouse +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //sql/warehouses { @@ -101,5 +100,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/sql_warehouses/output.txt b/acceptance/bundle/resources/sql_warehouses/output.txt index b751bc3c0b0..79ac42b55f8 100644 --- a/acceptance/bundle/resources/sql_warehouses/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/output.txt @@ -36,9 +36,9 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_sql_warehouse/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created sql_warehouses.test_sql_warehouse +Files: 22 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Verify the create request >>> jq select(.method == "POST" and (.path | contains("/sql/warehouses"))) out.requests.txt @@ -74,9 +74,9 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_sql_warehouse/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated sql_warehouses.test_sql_warehouse +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged === Verify the update request >>> jq select(.method == "POST" and (.path | contains("/sql/warehouses")) and (.body."name" == "sql_warehouse_name_2")) | del(.body.creator_name, .body.warehouse_type) out.requests.txt @@ -114,8 +114,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test_sql_warehouse/default -Deleting files... -Destroy complete! +Destroy: 1 deleted === Verify the destroy request >>> jq select(.method == "DELETE" and (.path | contains("/sql/warehouses"))) out.requests.txt diff --git a/acceptance/bundle/resources/synced_database_tables/basic/output.txt b/acceptance/bundle/resources/synced_database_tables/basic/output.txt index b1fac3c7678..5847369f118 100644 --- a/acceptance/bundle/resources/synced_database_tables/basic/output.txt +++ b/acceptance/bundle/resources/synced_database_tables/basic/output.txt @@ -34,9 +34,11 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-table-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created database_catalogs.my_catalog +Created database_instances.my_instance +Created synced_database_tables.my_synced_table +Files: 6 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary @@ -60,6 +62,5 @@ The synced data in the destination database will be lost (the source table is pr All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-table-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted Cleaning up temporary source table diff --git a/acceptance/bundle/resources/synced_database_tables/recreate/output.txt b/acceptance/bundle/resources/synced_database_tables/recreate/output.txt index 49b3db00e4e..3b82b6ac3f3 100644 --- a/acceptance/bundle/resources/synced_database_tables/recreate/output.txt +++ b/acceptance/bundle/resources/synced_database_tables/recreate/output.txt @@ -1,9 +1,11 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-recreate-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created database_catalogs.my_catalog +Created database_instances.my_instance +Created synced_database_tables.my_synced_table +Files: 7 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged === Change an immutable synced-table field: no update API, so the plan recreates it >>> [CLI] bundle plan @@ -17,9 +19,9 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-sy This action will result in the deletion or recreation of the following synced database tables. The synced data in the destination database will be lost (the source table is preserved): recreate resources.synced_database_tables.my_synced_table -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated synced_database_tables.my_synced_table +Files: 3 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 2 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -37,5 +39,4 @@ The synced data in the destination database will be lost (the source table is pr All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-recreate-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/basic/output.txt b/acceptance/bundle/resources/vector_search_endpoints/basic/output.txt index e9f27f65eb5..937623f7b77 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/basic/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/basic/output.txt @@ -22,9 +22,9 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-vs-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] vector-search-endpoints get-endpoint vs-endpoint-[UNIQUE_NAME] { @@ -52,5 +52,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-endpoint-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/output.txt b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/output.txt index eab9faca1b0..4c2d7b3ddeb 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/output.txt @@ -2,9 +2,9 @@ === Initial deployment (no budget_policy_id) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-budget-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Simulate remote drift: set budget_policy_id outside the bundle >>> [CLI] vector-search-endpoints update-endpoint-budget-policy vs-endpoint-[UNIQUE_NAME] remote-policy @@ -22,5 +22,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-budget-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/output.txt b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/output.txt index dece842119f..844b2b19aeb 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/output.txt @@ -2,9 +2,10 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-recreated-same-name-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_endpoints.my_endpoint.permissions +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] vector-search-endpoints get-endpoint vs-endpoint-[UNIQUE_NAME] { @@ -40,9 +41,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-recreated-same-name-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint.permissions +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] vector-search-endpoints get-endpoint vs-endpoint-[UNIQUE_NAME] { @@ -61,5 +62,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-recreated-same-name-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/output.txt b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/output.txt index 61502f2d894..8e7a03dce0d 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/output.txt @@ -2,9 +2,9 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-target-qps-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Simulate remote drift: change target_qps to 5 outside the bundle >>> [CLI] vector-search-endpoints patch-endpoint vs-endpoint-[UNIQUE_NAME] --target-qps 5 @@ -33,9 +33,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged === Deploy restores target_qps to 1 >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-target-qps-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //vector-search/endpoints { @@ -58,5 +58,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-target-qps-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/output.txt b/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/output.txt index 67b3cb6182c..c2ae0b7a92a 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/output.txt @@ -2,9 +2,10 @@ === Initial deploy creates two endpoints with distinct names >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-create-fails-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.blocker_endpoint +Created vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Edit my_endpoint: rename onto blocker_endpoint's name and switch endpoint_type to trigger Recreate >>> update_file.py databricks.yml vs-endpoint-a-[UNIQUE_NAME] vs-endpoint-b-[UNIQUE_NAME] @@ -14,7 +15,6 @@ Deployment complete! === Deploy: Recreate of my_endpoint runs Delete (ok) then Create (409, name taken by blocker) >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-create-fails-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot recreate resources.vector_search_endpoints.my_endpoint: Vector search endpoint with name vs-endpoint-b-[UNIQUE_NAME] already exists (409 RESOURCE_ALREADY_EXISTS) Endpoint: POST [DATABRICKS_URL]/api/2.0/vector-search/endpoints @@ -22,7 +22,7 @@ HTTP Status: 409 Conflict API error_code: RESOURCE_ALREADY_EXISTS API message: Vector search endpoint with name vs-endpoint-b-[UNIQUE_NAME] already exists -Updating deployment state... +Files: 0 uploaded, 0 deleted Exit code: 1 @@ -38,5 +38,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-create-fails-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/output.txt b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/output.txt index c86cd5a682b..22ca8a55cf6 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/output.txt @@ -2,9 +2,9 @@ === Initial deployment with STANDARD endpoint_type >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-vs-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --keep //vector-search/endpoints @@ -18,9 +18,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-vs-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py --keep //vector-search/endpoints @@ -36,5 +36,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-vs-endpoint-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/output.txt b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/output.txt index 3b2bb7bf1cf..017c9052b9b 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/output.txt @@ -2,9 +2,9 @@ === Initial deployment (no budget policy) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-vs-endpoint-budget-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --keep //vector-search/endpoints @@ -19,9 +19,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-vs-endpoint-budget-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py --keep //vector-search/endpoints @@ -31,5 +31,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-vs-endpoint-budget-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/output.txt b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/output.txt index 5402cefc3af..44bbd77a910 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/output.txt @@ -2,9 +2,10 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-vs-endpoint-target-qps-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_endpoints.my_endpoint.permissions +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //vector-search/endpoints //permissions @@ -25,9 +26,10 @@ Plan: 0 to add, 2 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-vs-endpoint-target-qps-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated vector_search_endpoints.my_endpoint +Updated vector_search_endpoints.my_endpoint.permissions +Files: 0 uploaded, 0 deleted +Resources: 0 created, 2 changed, 0 deleted, 0 unchanged >>> print_requests.py //vector-search/endpoints //permissions @@ -43,5 +45,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-vs-endpoint-target-qps-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/basic/output.txt b/acceptance/bundle/resources/vector_search_indexes/basic/output.txt index 8edb3be964e..71713fedfae 100644 --- a/acceptance/bundle/resources/vector_search_indexes/basic/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/basic/output.txt @@ -26,9 +26,10 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] vector-search-indexes get-index main.default.vs_index_[UNIQUE_NAME] { @@ -68,5 +69,4 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/output.txt b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/output.txt index 9b3d7aab90b..b5aed53ad30 100644 --- a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/output.txt @@ -2,9 +2,10 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-vs-index-deleted-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Simulate remote deletion >>> [CLI] vector-search-indexes delete-index main.default.vs_index_[UNIQUE_NAME] @@ -18,9 +19,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged === Deploy recreates the index >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-vs-index-deleted-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 1 unchanged >>> [CLI] vector-search-indexes get-index main.default.vs_index_[UNIQUE_NAME] { @@ -42,5 +43,4 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-index-deleted-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/output.txt b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/output.txt index 7d865eb14ea..2f0118a9743 100644 --- a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/output.txt @@ -2,9 +2,10 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/drift-vs-index-orphaned-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.vs_endpoint +Created vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Simulate remote endpoint deletion (index is orphaned, still exists by name) >>> [CLI] vector-search-endpoints delete-endpoint vs-endpoint-[UNIQUE_NAME] @@ -24,9 +25,10 @@ This action will result in the deletion or recreation of the following Vector Se Recreating a Delta Sync index re-runs the full embedding pipeline; recreating a Direct Access index drops all upserted vectors. Both can be expensive to rebuild: recreate resources.vector_search_indexes.my_index -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.vs_endpoint +Recreated vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 1 deleted, 0 unchanged >>> [CLI] vector-search-indexes get-index main.default.vs_index_[UNIQUE_NAME] { @@ -48,5 +50,4 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-index-orphaned-endpoint-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/grants/select/output.txt b/acceptance/bundle/resources/vector_search_indexes/grants/select/output.txt index a425110276d..14fa8a3d48b 100644 --- a/acceptance/bundle/resources/vector_search_indexes/grants/select/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/grants/select/output.txt @@ -8,9 +8,11 @@ Plan: 3 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/vs-index-grants-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_indexes.my_index +Created vector_search_indexes.my_index.grants +Files: 0 uploaded, 0 deleted +Resources: 3 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged @@ -41,5 +43,4 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/vs-index-grants-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/output.txt b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/output.txt index ebc663c33e7..cdb909152fd 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/output.txt @@ -2,9 +2,10 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --get --unique //vector-search/indexes @@ -23,9 +24,9 @@ This action will result in the deletion or recreation of the following Vector Se Recreating a Delta Sync index re-runs the full embedding pipeline; recreating a Direct Access index drops all upserted vectors. Both can be expensive to rebuild: recreate resources.vector_search_indexes.my_index -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 1 unchanged >>> print_requests.py --get --unique //vector-search/indexes @@ -49,5 +50,4 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/output.txt b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/output.txt index 9b8476f667d..a175c2dcae3 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/output.txt @@ -2,9 +2,10 @@ === Initial deployment >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Change embedding_dimension (recreate: DELETE then CREATE the same name) >>> update_file.py databricks.yml embedding_dimension: 768 embedding_dimension: 384 @@ -16,9 +17,9 @@ This action will result in the deletion or recreation of the following Vector Se Recreating a Delta Sync index re-runs the full embedding pipeline; recreating a Direct Access index drops all upserted vectors. Both can be expensive to rebuild: recreate resources.vector_search_indexes.my_index -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 1 unchanged >>> print_requests.py --get //vector-search/indexes { @@ -88,5 +89,4 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt index 5272e7695c5..9f3980b3e80 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt @@ -2,9 +2,10 @@ === Initial deployment with STANDARD endpoint_type >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-with-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === Change endpoint_type (recreates endpoint; index recreate cascade is not yet implemented) >>> update_file.py databricks.yml endpoint_type: STANDARD endpoint_type: STORAGE_OPTIMIZED @@ -108,9 +109,9 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged >>> [CLI] bundle deploy --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-with-endpoint-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated vector_search_endpoints.my_endpoint +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 1 unchanged >>> [CLI] vector-search-endpoints get-endpoint vs-endpoint-[UNIQUE_NAME] { @@ -139,9 +140,9 @@ This action will result in the deletion or recreation of the following Vector Se Recreating a Delta Sync index re-runs the full embedding pipeline; recreating a Direct Access index drops all upserted vectors. Both can be expensive to rebuild: recreate resources.vector_search_indexes.my_index -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 1 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -155,5 +156,4 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-with-endpoint-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/output.txt b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/output.txt index 6e46bc6c8bf..596c188baa7 100644 --- a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/output.txt @@ -1,9 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/vs-index-schema-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created vector_search_endpoints.my_endpoint +Created vector_search_indexes.my_index +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] vector-search-indexes get-index main.default.vs_index_[UNIQUE_NAME] {"count":"bigint","id":"int","label":"string","score":"float","small":"smallint","tags":"array","tiny":"tinyint","vector":"array"} @@ -23,5 +24,4 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/vs-index-schema-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/resources/volumes/change-comment/output.txt b/acceptance/bundle/resources/volumes/change-comment/output.txt index 4b6d668532a..a87fdf66b8d 100644 --- a/acceptance/bundle/resources/volumes/change-comment/output.txt +++ b/acceptance/bundle/resources/volumes/change-comment/output.txt @@ -17,9 +17,9 @@ Error: Volume 'main.myschema.myvolume' does not exist. >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created volumes.volume1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity { @@ -72,9 +72,9 @@ Deployment complete! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated volumes.volume1 +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity { @@ -101,8 +101,7 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //unity { diff --git a/acceptance/bundle/resources/volumes/change-name/output.txt b/acceptance/bundle/resources/volumes/change-name/output.txt index 9844eba8466..cf299c15b8d 100644 --- a/acceptance/bundle/resources/volumes/change-name/output.txt +++ b/acceptance/bundle/resources/volumes/change-name/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created volumes.volume1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity { @@ -44,9 +44,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated volumes.volume1 +Files: 4 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity { diff --git a/acceptance/bundle/resources/volumes/change-schema-name/output.txt b/acceptance/bundle/resources/volumes/change-schema-name/output.txt index 3e36fc14348..c15f8562060 100644 --- a/acceptance/bundle/resources/volumes/change-schema-name/output.txt +++ b/acceptance/bundle/resources/volumes/change-schema-name/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created volumes.volume1 +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //unity { @@ -50,9 +50,9 @@ For managed volumes, the files stored in the volume are also deleted from your cloud tenant within 30 days. For external volumes, the metadata about the volume is removed from the catalog, but the underlying files are not deleted: recreate resources.volumes.volume1 -Deploying resources... -Updating deployment state... -Deployment complete! +Recreated volumes.volume1 +Files: 3 uploaded, 0 deleted +Resources: 1 created, 0 changed, 1 deleted, 0 unchanged >>> print_requests.py //unity { diff --git a/acceptance/bundle/resources/volumes/recreate/output.txt b/acceptance/bundle/resources/volumes/recreate/output.txt index 5714559a602..fc94847412b 100644 --- a/acceptance/bundle/resources/volumes/recreate/output.txt +++ b/acceptance/bundle/resources/volumes/recreate/output.txt @@ -8,11 +8,7 @@ Workspace: Validation OK! ->>> [CLI] bundle deploy -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-uc-volumes-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +>>> [CLI] bundle deploy -qq === Assert the volume is created successfully >>> [CLI] volumes read main.schema1-[UNIQUE_NAME].my_volume @@ -49,21 +45,18 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. +Files: 1 uploaded, 0 deleted Exit code: 1 === Successfully recreate the volume with --auto-approve ->>> [CLI] bundle deploy --var=schema_name=${resources.schemas.schema2.name} --auto-approve -Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-uc-volumes-[UNIQUE_NAME]/default/files... +>>> [CLI] bundle deploy --var=schema_name=${resources.schemas.schema2.name} --auto-approve -qq This action will result in the deletion or recreation of the following volumes. For managed volumes, the files stored in the volume are also deleted from your cloud tenant within 30 days. For external volumes, the metadata about the volume is removed from the catalog, but the underlying files are not deleted: recreate resources.volumes.foo -Deploying resources... -Updating deployment state... -Deployment complete! >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -83,5 +76,4 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-uc-volumes-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/resources/volumes/recreate/script b/acceptance/bundle/resources/volumes/recreate/script index 79f51d7d49f..5e1b2e779ee 100644 --- a/acceptance/bundle/resources/volumes/recreate/script +++ b/acceptance/bundle/resources/volumes/recreate/script @@ -6,7 +6,7 @@ cleanup() { trap cleanup EXIT trace $CLI bundle validate -trace $CLI bundle deploy +trace $CLI bundle deploy -qq title "Assert the volume is created successfully" CATALOG_NAME="main" @@ -22,4 +22,4 @@ title "Recreation of the volume without --auto-approve should fail since prompti trace errcode $CLI bundle deploy --var=schema_name='${resources.schemas.schema2.name}' title "Successfully recreate the volume with --auto-approve" -trace $CLI bundle deploy --var=schema_name='${resources.schemas.schema2.name}' --auto-approve +trace $CLI bundle deploy --var=schema_name='${resources.schemas.schema2.name}' --auto-approve -qq diff --git a/acceptance/bundle/resources/volumes/remote-change-name/output.txt b/acceptance/bundle/resources/volumes/remote-change-name/output.txt index fb8551f5bc4..94671d64c2a 100644 --- a/acceptance/bundle/resources/volumes/remote-change-name/output.txt +++ b/acceptance/bundle/resources/volumes/remote-change-name/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created volumes.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] volumes update mycatalog.myschema.myname --json {"new_name": "my_new_name"} { diff --git a/acceptance/bundle/resources/volumes/remote-delete/output.txt b/acceptance/bundle/resources/volumes/remote-delete/output.txt index 5758e143d18..9fd2391787f 100644 --- a/acceptance/bundle/resources/volumes/remote-delete/output.txt +++ b/acceptance/bundle/resources/volumes/remote-delete/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created volumes.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] volumes delete mycatalog.myschema.myname diff --git a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt index 00fd1cddacd..a71b01710a8 100644 --- a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt +++ b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt @@ -1,7 +1,6 @@ >>> musterr [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default/files... -Deploying resources... Error: cannot create resources.volumes.volume1: CreateVolume storage_location can not be provided. (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.1/unity-catalog/volumes @@ -9,4 +8,4 @@ HTTP Status: 400 Bad Request API error_code: INVALID_PARAMETER_VALUE API message: CreateVolume storage_location can not be provided. -Updating deployment state... +Files: 8 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt index c79e8d6843c..6db0622e224 100644 --- a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt @@ -1,7 +1,6 @@ >>> musterr [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default/files... -Deploying resources... Error: terraform apply: exit status 1 Error: cannot create volume: CreateVolume storage_location can not be provided. @@ -12,4 +11,4 @@ Error: cannot create volume: CreateVolume storage_location can not be provided. -Updating deployment state... +Files: 8 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/volumes/set-storage-location/output.txt b/acceptance/bundle/resources/volumes/set-storage-location/output.txt index d9bfc92f065..620b16f3859 100644 --- a/acceptance/bundle/resources/volumes/set-storage-location/output.txt +++ b/acceptance/bundle/resources/volumes/set-storage-location/output.txt @@ -38,8 +38,7 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //unity { diff --git a/acceptance/bundle/resources/volumes/uppercase-name/out.deploy.direct.txt b/acceptance/bundle/resources/volumes/uppercase-name/out.deploy.direct.txt index 3f9698ea13a..b45157ecec0 100644 --- a/acceptance/bundle/resources/volumes/uppercase-name/out.deploy.direct.txt +++ b/acceptance/bundle/resources/volumes/uppercase-name/out.deploy.direct.txt @@ -1,7 +1,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.schema1 +Created volumes.vol1 +Files: 0 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged { "method": "POST", "path": "/api/2.1/unity-catalog/schemas", @@ -56,6 +57,5 @@ Deployment complete! ] === Redeploy without changes - should be a no-op Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 0 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged diff --git a/acceptance/bundle/resources/volumes/uppercase-name/out.deploy.terraform.txt b/acceptance/bundle/resources/volumes/uppercase-name/out.deploy.terraform.txt index 6c056acd2cb..175ce4eeb33 100644 --- a/acceptance/bundle/resources/volumes/uppercase-name/out.deploy.terraform.txt +++ b/acceptance/bundle/resources/volumes/uppercase-name/out.deploy.terraform.txt @@ -1,5 +1,4 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files... -Deploying resources... Error: terraform apply: exit status 1 Error: Provider produced inconsistent final plan @@ -14,7 +13,7 @@ This is a bug in the provider, which should be reported in the provider's own issue tracker. -Updating deployment state... +Files: 0 uploaded, 0 deleted Exit code: 1 { diff --git a/acceptance/bundle/run/app-with-job/output.txt b/acceptance/bundle/run/app-with-job/output.txt index 19594302a86..c874e659243 100644 --- a/acceptance/bundle/run/app-with-job/output.txt +++ b/acceptance/bundle/run/app-with-job/output.txt @@ -10,9 +10,10 @@ Validation OK! >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-with-job-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created apps.test_app +Created jobs.foo +Files: 9 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged === App should exist after bundle deployment >>> [CLI] apps get app-[UNIQUE_NAME] @@ -84,9 +85,8 @@ env: === Redeploy it again just to check that it can be redeployed >>> [CLI] bundle deploy --force-lock --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-with-job-[UNIQUE_NAME]/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 2 unchanged >>> [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -95,5 +95,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/app-with-job-[UNIQUE_NAME] -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/run/basic/output.txt b/acceptance/bundle/run/basic/output.txt index 77a6a923e1d..20a2758e4dd 100644 --- a/acceptance/bundle/run/basic/output.txt +++ b/acceptance/bundle/run/basic/output.txt @@ -8,9 +8,9 @@ Exit code: 1 === deploy and run resource >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run foo Run URL: [DATABRICKS_URL]/jobs/[NUMID]/runs/[NUMID]?o=[NUMID] diff --git a/acceptance/bundle/run/jobs/partial_run/output.txt b/acceptance/bundle/run/jobs/partial_run/output.txt index 3927923c5d3..b2e120a5d2e 100644 --- a/acceptance/bundle/run/jobs/partial_run/output.txt +++ b/acceptance/bundle/run/jobs/partial_run/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/partial_run/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run my_job --only task_1 Run URL: [DATABRICKS_URL]/jobs/[NUMID]/runs/[NUMID]?o=[NUMID] diff --git a/acceptance/bundle/run/refresh-flags/output.txt b/acceptance/bundle/run/refresh-flags/output.txt index b2686733f3f..107ac101006 100644 --- a/acceptance/bundle/run/refresh-flags/output.txt +++ b/acceptance/bundle/run/refresh-flags/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-run-flags/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Running pipeline with --refresh flag and specific tables >>> [CLI] bundle run my_pipeline --refresh table1,table2 diff --git a/acceptance/bundle/run/state-wiped/output.txt b/acceptance/bundle/run/state-wiped/output.txt index ff2f702bf28..8ed724f9980 100644 --- a/acceptance/bundle/run/state-wiped/output.txt +++ b/acceptance/bundle/run/state-wiped/output.txt @@ -5,9 +5,9 @@ Error: resource not found or not yet deployed. Did you forget to run 'databricks >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle run foo Run URL: [DATABRICKS_URL]/jobs/[NUMID]/runs/[NUMID]?o=[NUMID] diff --git a/acceptance/bundle/run_as/job_default/output.txt b/acceptance/bundle/run_as/job_default/output.txt index 137a49cbd82..1360ce1b1b8 100644 --- a/acceptance/bundle/run_as/job_default/output.txt +++ b/acceptance/bundle/run_as/job_default/output.txt @@ -2,9 +2,9 @@ === Deploy with run_as >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as_job_default_[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_with_run_as +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -54,9 +54,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as_job_default_[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated jobs.job_with_run_as +Files: 2 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged >>> print_requests.py //jobs { @@ -104,5 +104,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/run_as_job_default_[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/bundle/run_as/pipelines/regular_user/output.txt b/acceptance/bundle/run_as/pipelines/regular_user/output.txt index 6baedcbb908..925fc155c23 100644 --- a/acceptance/bundle/run_as/pipelines/regular_user/output.txt +++ b/acceptance/bundle/run_as/pipelines/regular_user/output.txt @@ -18,9 +18,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy -t t_user_name Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.nyc_taxi_pipeline +Created pipelines.nyc_taxi_pipeline.permissions +Files: 7 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_user_name_different >>> [CLI] bundle validate -t t_user_name_different @@ -40,9 +41,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy -t t_user_name_different Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name_different/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.nyc_taxi_pipeline +Created pipelines.nyc_taxi_pipeline.permissions +Files: 9 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_service_principal_name >>> [CLI] bundle validate -t t_service_principal_name @@ -62,9 +64,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy -t t_service_principal_name Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.nyc_taxi_pipeline +Created pipelines.nyc_taxi_pipeline.permissions +Files: 11 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_service_principal_name_different >>> [CLI] bundle validate -t t_service_principal_name_different @@ -84,6 +87,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy -t t_service_principal_name_different Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name_different/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.nyc_taxi_pipeline +Created pipelines.nyc_taxi_pipeline.permissions +Files: 13 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/run_as/pipelines/service_principal/output.txt b/acceptance/bundle/run_as/pipelines/service_principal/output.txt index 6baedcbb908..b1e3ade10ab 100644 --- a/acceptance/bundle/run_as/pipelines/service_principal/output.txt +++ b/acceptance/bundle/run_as/pipelines/service_principal/output.txt @@ -18,9 +18,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy -t t_user_name Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.nyc_taxi_pipeline +Created pipelines.nyc_taxi_pipeline.permissions +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_user_name_different >>> [CLI] bundle validate -t t_user_name_different @@ -40,9 +41,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy -t t_user_name_different Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name_different/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.nyc_taxi_pipeline +Created pipelines.nyc_taxi_pipeline.permissions +Files: 10 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_service_principal_name >>> [CLI] bundle validate -t t_service_principal_name @@ -62,9 +64,10 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy -t t_service_principal_name Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.nyc_taxi_pipeline +Created pipelines.nyc_taxi_pipeline.permissions +Files: 12 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged \nProcessing target: t_service_principal_name_different >>> [CLI] bundle validate -t t_service_principal_name_different @@ -84,6 +87,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy -t t_service_principal_name_different Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name_different/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.nyc_taxi_pipeline +Created pipelines.nyc_taxi_pipeline.permissions +Files: 14 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/scripts/databricks.yml b/acceptance/bundle/scripts/databricks.yml index 6421e2b5941..b545b0e208b 100644 --- a/acceptance/bundle/scripts/databricks.yml +++ b/acceptance/bundle/scripts/databricks.yml @@ -8,4 +8,4 @@ experimental: prebuild: "python3 ./myscript.py 0 prebuild" postbuild: "python3 ./myscript.py 0 postbuild" predeploy: "python3 ./myscript.py 0 predeploy" - postdeploy: "python3 ./myscript.py 0 postdeploy" + postdeploy: "python3 ./myscript.py $POSTDEPLOY_EXITCODE postdeploy" diff --git a/acceptance/bundle/scripts/output.txt b/acceptance/bundle/scripts/output.txt index 68afb2feccb..e3ca4fd7d76 100644 --- a/acceptance/bundle/scripts/output.txt +++ b/acceptance/bundle/scripts/output.txt @@ -26,7 +26,7 @@ Found 1 error Exit code: 1 ->>> EXITCODE=0 errcode [CLI] bundle deploy +>>> EXITCODE=0 POSTDEPLOY_EXITCODE=0 errcode [CLI] bundle deploy Executing 'preinit' script from myscript.py 0 preinit: hello stdout! from myscript.py 0 preinit: hello stderr! @@ -43,8 +43,35 @@ Executing 'predeploy' script from myscript.py 0 predeploy: hello stdout! from myscript.py 0 predeploy: hello stderr! Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/scripts/default/files... -Deploying resources... -Deployment complete! Executing 'postdeploy' script from myscript.py 0 postdeploy: hello stdout! from myscript.py 0 postdeploy: hello stderr! +Files: 12 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged + +>>> EXITCODE=0 POSTDEPLOY_EXITCODE=1 errcode [CLI] bundle deploy +Executing 'preinit' script +from myscript.py 0 preinit: hello stdout! +from myscript.py 0 preinit: hello stderr! +Executing 'postinit' script +from myscript.py 0 postinit: hello stdout! +from myscript.py 0 postinit: hello stderr! +Executing 'prebuild' script +from myscript.py 0 prebuild: hello stdout! +from myscript.py 0 prebuild: hello stderr! +Executing 'postbuild' script +from myscript.py 0 postbuild: hello stdout! +from myscript.py 0 postbuild: hello stderr! +Executing 'predeploy' script +from myscript.py 0 predeploy: hello stdout! +from myscript.py 0 predeploy: hello stderr! +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/scripts/default/files... +Executing 'postdeploy' script +from myscript.py 1 postdeploy: hello stdout! +from myscript.py 1 postdeploy: hello stderr! +Error: failed to execute script: exit status 1 + +Files: 1 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged + +Exit code: 1 diff --git a/acceptance/bundle/scripts/restricted-execution/output.txt b/acceptance/bundle/scripts/restricted-execution/output.txt index f377edba7cb..e54241bc90a 100644 --- a/acceptance/bundle/scripts/restricted-execution/output.txt +++ b/acceptance/bundle/scripts/restricted-execution/output.txt @@ -12,10 +12,10 @@ postbuild value_from_env Executing 'predeploy' script predeploy value_from_env Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/scripts_with_restricted_execution/default/files... -Deploying resources... -Deployment complete! Executing 'postdeploy' script postdeploy value_from_env +Files: 4 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === With DATABRICKS_BUNDLE_RESTRICTED_CODE_EXECUTION=1, no envs are accessible >>> DATABRICKS_BUNDLE_RESTRICTED_CODE_EXECUTION=1 errcode [CLI] bundle deploy diff --git a/acceptance/bundle/scripts/script b/acceptance/bundle/scripts/script index de07d277ea9..59e7a0f4dba 100644 --- a/acceptance/bundle/scripts/script +++ b/acceptance/bundle/scripts/script @@ -1,3 +1,7 @@ trace EXITCODE=0 errcode $CLI bundle validate trace EXITCODE=1 errcode $CLI bundle validate -trace EXITCODE=0 errcode $CLI bundle deploy +trace EXITCODE=0 POSTDEPLOY_EXITCODE=0 errcode $CLI bundle deploy + +# A failing postdeploy script still reports the deploy summary (the resources were +# already applied), and the script's failure still propagates as a nonzero exit. +trace EXITCODE=0 POSTDEPLOY_EXITCODE=1 errcode $CLI bundle deploy diff --git a/acceptance/bundle/select/basic/output.txt b/acceptance/bundle/select/basic/output.txt index 56c20a404d4..dfd8beec3fd 100644 --- a/acceptance/bundle/select/basic/output.txt +++ b/acceptance/bundle/select/basic/output.txt @@ -2,31 +2,32 @@ >>> [CLI] bundle plan --select bar create jobs.bar -Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged +Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged, 2 not selected >>> [CLI] bundle plan --select jobs.bar --select jobs.baz create jobs.bar create jobs.baz -Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged +Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged, 1 not selected >>> [CLI] bundle plan --select jobs.bar,jobs.baz create jobs.bar create jobs.baz -Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged +Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged, 1 not selected >>> [CLI] bundle plan --select jobs.foo create jobs.bar create jobs.foo -Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged +Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged, 1 not selected === bundle deploy --select jobs.foo Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.bar +Created jobs.foo +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 1 not selected === Telemetry: select_used true @@ -101,9 +102,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 2 unchanged === Full deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.baz +Files: 3 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 2 unchanged >>> print_requests.py --sort //jobs { @@ -137,5 +138,4 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/select-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/bundle/select/grants_permissions/output.txt b/acceptance/bundle/select/grants_permissions/output.txt index 0575ed2a26c..45e993bed28 100644 --- a/acceptance/bundle/select/grants_permissions/output.txt +++ b/acceptance/bundle/select/grants_permissions/output.txt @@ -3,13 +3,13 @@ create jobs.my_job create jobs.my_job.permissions -Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged +Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged, 2 not selected >>> [CLI] bundle plan --select schemas.my_schema create schemas.my_schema create schemas.my_schema.grants -Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged +Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged, 2 not selected >>> [CLI] bundle plan --select jobs.my_job.permissions Error: no such resource: jobs.my_job.permissions @@ -21,15 +21,17 @@ Error: no such resource: schemas.my_schema.grants === bundle deploy --select jobs.my_job Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-subnodes-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Created jobs.my_job.permissions +Files: 8 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected === bundle deploy --select schemas.my_schema Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-subnodes-[UNIQUE_NAME]/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.my_schema +Created schemas.my_schema.grants +Files: 3 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected >>> print_requests.py --sort //permissions { @@ -74,5 +76,4 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/select-subnodes-[UNIQUE_NAME]/default -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/databricks.yml.tmpl b/acceptance/bundle/select/plan_file_survives_not_selected/databricks.yml.tmpl new file mode 100644 index 00000000000..d67074e8d1d --- /dev/null +++ b/acceptance/bundle/select/plan_file_survives_not_selected/databricks.yml.tmpl @@ -0,0 +1,13 @@ +bundle: + name: select-plan-$UNIQUE_NAME + +resources: + jobs: + foo: + name: foo-$UNIQUE_NAME + + bar: + name: bar-$UNIQUE_NAME + + baz: + name: baz-$UNIQUE_NAME diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/out.test.toml b/acceptance/bundle/select/plan_file_survives_not_selected/out.test.toml new file mode 100644 index 00000000000..0938e678987 --- /dev/null +++ b/acceptance/bundle/select/plan_file_survives_not_selected/out.test.toml @@ -0,0 +1,2 @@ +Cloud = false +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/output.txt b/acceptance/bundle/select/plan_file_survives_not_selected/output.txt new file mode 100644 index 00000000000..4e6ce7d7c12 --- /dev/null +++ b/acceptance/bundle/select/plan_file_survives_not_selected/output.txt @@ -0,0 +1,16 @@ + +=== bundle deploy --plan (no --select) + +>>> [CLI] bundle deploy --plan plan.json +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-plan-[UNIQUE_NAME]/default/files... +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected + +>>> [CLI] bundle destroy --auto-approve +The following resources will be deleted: + delete resources.jobs.foo + +All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/select-plan-[UNIQUE_NAME]/default + +Destroy: 1 deleted diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/script b/acceptance/bundle/select/plan_file_survives_not_selected/script new file mode 100644 index 00000000000..908aeb6ad1d --- /dev/null +++ b/acceptance/bundle/select/plan_file_survives_not_selected/script @@ -0,0 +1,16 @@ +envsubst < databricks.yml.tmpl > databricks.yml + +cleanup() { + trace $CLI bundle destroy --auto-approve +} +trap cleanup EXIT + +# Filter to one of three jobs and serialize the plan. The plan file records +# not_selected=2. (Kept out of recorded output: the JSON embeds remote state.) +$CLI bundle plan --select jobs.foo -o json > plan.json + +# Deploy from the plan file WITHOUT re-passing --select. b.Select is empty here, +# so the ", 2 not selected" suffix must come from the serialized plan.NotSelected, +# not from the flag. This is the regression guard for that wiring. +title "bundle deploy --plan (no --select)\n" +trace $CLI bundle deploy --plan plan.json diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/test.toml b/acceptance/bundle/select/plan_file_survives_not_selected/test.toml new file mode 100644 index 00000000000..bd3bae37d8f --- /dev/null +++ b/acceptance/bundle/select/plan_file_survives_not_selected/test.toml @@ -0,0 +1,3 @@ +# --select is only supported by the direct engine. +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] +Ignore = [".databricks", ".gitignore", "databricks.yml", "plan.json"] diff --git a/acceptance/bundle/state/basic/output.txt b/acceptance/bundle/state/basic/output.txt index ac13a7ba417..b6b1540e18c 100644 --- a/acceptance/bundle/state/basic/output.txt +++ b/acceptance/bundle/state/basic/output.txt @@ -1,12 +1,11 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged diff --git a/acceptance/bundle/state/engine_default/output.txt b/acceptance/bundle/state/engine_default/output.txt index 1f4452597f9..a067f5658a0 100644 --- a/acceptance/bundle/state/engine_default/output.txt +++ b/acceptance/bundle/state/engine_default/output.txt @@ -3,9 +3,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-engine-default/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.1/unity-catalog/schemas "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" diff --git a/acceptance/bundle/state/feature_flags/output.txt b/acceptance/bundle/state/feature_flags/output.txt index f9ce8212ec0..fa2c94b058f 100644 --- a/acceptance/bundle/state/feature_flags/output.txt +++ b/acceptance/bundle/state/feature_flags/output.txt @@ -14,9 +14,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> gron.py .databricks/bundle/default/resources.json json.state_version = 3; diff --git a/acceptance/bundle/state/force_pull_commands/output.txt b/acceptance/bundle/state/force_pull_commands/output.txt index b5ecce5e26a..b1c245da77c 100644 --- a/acceptance/bundle/state/force_pull_commands/output.txt +++ b/acceptance/bundle/state/force_pull_commands/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/force-pull-commands/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Use a fake browser that just prints the URL it would have opened === bundle summary without --force-pull: no remote state read diff --git a/acceptance/bundle/state/permission_level_migration/output.txt b/acceptance/bundle/state/permission_level_migration/output.txt index d6d2e3f71ca..8fabc1b1a46 100644 --- a/acceptance/bundle/state/permission_level_migration/output.txt +++ b/acceptance/bundle/state/permission_level_migration/output.txt @@ -5,9 +5,10 @@ === Deploy (migrates state) >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Updated jobs.my_job.permissions +Files: 7 uploaded, 0 deleted +Resources: 1 created, 1 changed, 0 deleted, 0 unchanged === Print state after deploy >>> print_state.py diff --git a/acceptance/bundle/state/state_present/output.txt b/acceptance/bundle/state/state_present/output.txt index 52b2afe5b30..6b524cb1730 100644 --- a/acceptance/bundle/state/state_present/output.txt +++ b/acceptance/bundle/state/state_present/output.txt @@ -3,9 +3,9 @@ >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.1/unity-catalog/schemas "databricks-tf-provider/[TF_PROVIDER_VERSION] databricks-sdk-go/[SDK_VERSION] go/1.25.8 os/[OS] cli/[CLI_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat" @@ -34,9 +34,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.foo +Files: 2 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle destroy --auto-approve The following resources will be deleted: @@ -47,14 +47,13 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py //api/2.1/unity-catalog/schemas "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" @@ -65,15 +64,13 @@ Deployment complete! >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Files: 2 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged >>> print_requests.py --get //api/2.1/unity-catalog/schemas "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_deploy cmd-exec-id/[UUID] interactive/none engine/direct auth/pat" diff --git a/acceptance/bundle/summary/modified_status/output.txt b/acceptance/bundle/summary/modified_status/output.txt index 9cb3e7b0517..7f9656a20b3 100644 --- a/acceptance/bundle/summary/modified_status/output.txt +++ b/acceptance/bundle/summary/modified_status/output.txt @@ -69,9 +69,12 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created alerts.my_alert +Created pipelines.my_pipeline +Created schemas.my_schema +Created sql_warehouses.my_sql_warehouse +Files: 8 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged === Post-deployment view of resources with id and without modified_status >>> [CLI] bundle summary -o json @@ -194,8 +197,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 4 deleted >>> [CLI] bundle summary -o json {} diff --git a/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt b/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt index cd4b55cd992..d70237a828c 100644 --- a/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt +++ b/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-recreate/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle config-remote-sync Detected changes in 1 resource(s): diff --git a/acceptance/bundle/telemetry/config-remote-sync-save/output.txt b/acceptance/bundle/telemetry/config-remote-sync-save/output.txt index 6b15aa03063..ce93941675c 100644 --- a/acceptance/bundle/telemetry/config-remote-sync-save/output.txt +++ b/acceptance/bundle/telemetry/config-remote-sync-save/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-save/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle config-remote-sync --save Detected changes in 1 resource(s): diff --git a/acceptance/bundle/telemetry/config-remote-sync/output.txt b/acceptance/bundle/telemetry/config-remote-sync/output.txt index ea1949a9058..c8525b0f72d 100644 --- a/acceptance/bundle/telemetry/config-remote-sync/output.txt +++ b/acceptance/bundle/telemetry/config-remote-sync/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-telemetry/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle config-remote-sync Detected changes in 1 resource(s): diff --git a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt index 3663f140db9..4e31891f05d 100644 --- a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt +++ b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt @@ -1,10 +1,10 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... ✓ Deployment succeeded -Updating deployment state... -Deployment complete! +Created apps.myapp +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt { diff --git a/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt b/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt index a03920c3fdc..b0f4bc0f69f 100644 --- a/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt +++ b/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt @@ -1,13 +1,13 @@ >>> [CLI] bundle deploy -t one Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files... -Deploying resources... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -t two Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/two/files... -Deploying resources... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt { diff --git a/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt b/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt index ec277538c50..f8a336b0e05 100644 --- a/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt +++ b/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt @@ -3,9 +3,9 @@ Building test_artifact... Uploading databricks.yml... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-artifacts-variables/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test-job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === No artifact metrics expected >>> cat out.requests.txt @@ -14,9 +14,9 @@ Deployment complete! Building test_artifact... Uploading databricks.yml... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-artifacts-variables/prod/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test-job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged === Artifact metrics expected >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-compute-type/output.txt b/acceptance/bundle/telemetry/deploy-compute-type/output.txt index 754948595ff..39e5ea8516e 100644 --- a/acceptance/bundle/telemetry/deploy-compute-type/output.txt +++ b/acceptance/bundle/telemetry/deploy-compute-type/output.txt @@ -1,15 +1,15 @@ >>> [CLI] bundle deploy -t one Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-compute-type/one/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -t two Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-compute-type/two/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.my_job +Files: 8 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true diff --git a/acceptance/bundle/telemetry/deploy-config-file-count/output.txt b/acceptance/bundle/telemetry/deploy-config-file-count/output.txt index 909e8d6c705..d15ac847210 100644 --- a/acceptance/bundle/telemetry/deploy-config-file-count/output.txt +++ b/acceptance/bundle/telemetry/deploy-config-file-count/output.txt @@ -1,8 +1,8 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Deployment complete! +Files: 8 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt { diff --git a/acceptance/bundle/telemetry/deploy-experimental/output.txt b/acceptance/bundle/telemetry/deploy-experimental/output.txt index e8c847cd617..7a0ea9086e6 100644 --- a/acceptance/bundle/telemetry/deploy-experimental/output.txt +++ b/acceptance/bundle/telemetry/deploy-experimental/output.txt @@ -5,9 +5,9 @@ Warning: You are using the legacy mode of run_as. The support for this mode is e in databricks.yml:5:22 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true diff --git a/acceptance/bundle/telemetry/deploy-mode/output.txt b/acceptance/bundle/telemetry/deploy-mode/output.txt index 99e7fbb699a..28a34151103 100644 --- a/acceptance/bundle/telemetry/deploy-mode/output.txt +++ b/acceptance/bundle/telemetry/deploy-mode/output.txt @@ -1,8 +1,8 @@ >>> [CLI] bundle deploy -t dev Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -t prod Recommendation: target with 'mode: production' should set 'workspace.root_path' to make sure only one copy is deployed @@ -12,8 +12,8 @@ A common practice is to use a username or principal name in this path, i.e. use root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target} Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/prod/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt { diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt b/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt index 4f5630089f2..676fbc2fe65 100644 --- a/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt +++ b/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/custom-prefix/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt index 3122ad1ee9a..c68ee2ed430 100644 --- a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt +++ b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/development-prefix/development/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true diff --git a/acceptance/bundle/telemetry/deploy-no-uuid/output.txt b/acceptance/bundle/telemetry/deploy-no-uuid/output.txt index 7f14a3bdd74..5675d73cd58 100644 --- a/acceptance/bundle/telemetry/deploy-no-uuid/output.txt +++ b/acceptance/bundle/telemetry/deploy-no-uuid/output.txt @@ -1,8 +1,8 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_one +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-run-as/output.txt b/acceptance/bundle/telemetry/deploy-run-as/output.txt index 9dc650550cc..9d9bc9cf7c5 100644 --- a/acceptance/bundle/telemetry/deploy-run-as/output.txt +++ b/acceptance/bundle/telemetry/deploy-run-as/output.txt @@ -1,9 +1,9 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.test_job +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/telemetry/deploy-target-count/output.txt b/acceptance/bundle/telemetry/deploy-target-count/output.txt index 31581169f2c..67187dc8a3b 100644 --- a/acceptance/bundle/telemetry/deploy-target-count/output.txt +++ b/acceptance/bundle/telemetry/deploy-target-count/output.txt @@ -1,8 +1,8 @@ >>> [CLI] bundle deploy -t one Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt { diff --git a/acceptance/bundle/telemetry/deploy-variable-count/output.txt b/acceptance/bundle/telemetry/deploy-variable-count/output.txt index be4840e69ef..bacf52bf1e5 100644 --- a/acceptance/bundle/telemetry/deploy-variable-count/output.txt +++ b/acceptance/bundle/telemetry/deploy-variable-count/output.txt @@ -1,8 +1,8 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Deployment complete! +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt { diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt b/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt index 95776306d7e..2f23d2089da 100644 --- a/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt +++ b/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt @@ -3,15 +3,15 @@ Building test... Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files... -Deploying resources... -Deployment complete! +Files: 11 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle deploy -t two Building test... Uploading .databricks/bundle/two/patched_wheels/test_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/two/files... -Deploying resources... -Deployment complete! +Files: 11 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values artifact_build_command_is_set false diff --git a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt index faeda1df1fd..31ec43ca52b 100644 --- a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt +++ b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt @@ -1,8 +1,8 @@ >>> [CLI] bundle deploy -t no_permissions Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/no_permissions/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true @@ -18,8 +18,8 @@ state_path_other false >>> [CLI] bundle deploy -t user_declared Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/user_declared/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true @@ -47,8 +47,8 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more in databricks.yml:23:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/user_not_declared/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_only_self_undeclared true @@ -64,8 +64,8 @@ state_path_other false >>> [CLI] bundle deploy -t other_user_not_declared Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/other_user_not_declared/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_not true @@ -81,8 +81,8 @@ state_path_other false >>> [CLI] bundle deploy -t workspace_other Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/workspace_other/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true @@ -110,8 +110,8 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more in databricks.yml:47:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/shared_users_can_manage/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_auto true @@ -127,8 +127,8 @@ state_path_other false >>> [CLI] bundle deploy -t shared_not_declared Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/shared_not_declared/files... -Deploying resources... -Deployment complete! +Files: 5 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values dms_compat_not true diff --git a/acceptance/bundle/telemetry/deploy/output.txt b/acceptance/bundle/telemetry/deploy/output.txt index e99a645bfa5..9d3553b1adb 100644 --- a/acceptance/bundle/telemetry/deploy/output.txt +++ b/acceptance/bundle/telemetry/deploy/output.txt @@ -1,9 +1,13 @@ >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.job_one +Created jobs.job_three +Created jobs.job_two +Created pipelines.pipeline_one +Created pipelines.pipeline_two +Files: 4 uploaded, 0 deleted +Resources: 5 created, 0 changed, 0 deleted, 0 unchanged >>> cat out.requests.txt diff --git a/acceptance/bundle/templates/default-python/classic/output.txt b/acceptance/bundle/templates/default-python/classic/output.txt index 2a301801d86..6cd8fec5544 100644 --- a/acceptance/bundle/templates/default-python/classic/output.txt +++ b/acceptance/bundle/templates/default-python/classic/output.txt @@ -50,9 +50,10 @@ Plan: 4 to add, 0 to change, 0 to delete, 0 unchanged Building python_artifact... Building python_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created pipelines.my_default_python_etl +Files: 21 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -t dev Building python_artifact... @@ -63,9 +64,12 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged >>> [CLI] bundle plan -t dev -o json Building python_artifact... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_default_python/prod/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created jobs.sample_job.permissions +Created pipelines.my_default_python_etl +Created pipelines.my_default_python_etl.permissions +Files: 21 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -t prod Building python_artifact... diff --git a/acceptance/bundle/templates/default-python/combinations/classic/output.txt b/acceptance/bundle/templates/default-python/combinations/classic/output.txt index 634b857f961..6310c512a36 100644 --- a/acceptance/bundle/templates/default-python/combinations/classic/output.txt +++ b/acceptance/bundle/templates/default-python/combinations/classic/output.txt @@ -34,12 +34,18 @@ Workspace: Validation OK! Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/X[UNIQUE_NAME]/dev/files... -Deploying resources... -Deployment complete! -Deleting files... -Destroy complete! +Created jobs.sample_job +Created pipelines.X[UNIQUE_NAME]_etl +Files: 23 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged + +Destroy: 2 deleted Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/X[UNIQUE_NAME]/prod/files... -Deploying resources... -Deployment complete! -Deleting files... -Destroy complete! +Created jobs.sample_job +Created jobs.sample_job.permissions +Created pipelines.X[UNIQUE_NAME]_etl +Created pipelines.X[UNIQUE_NAME]_etl.permissions +Files: 25 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged + +Destroy: 2 deleted diff --git a/acceptance/bundle/templates/default-python/combinations/serverless/output.txt b/acceptance/bundle/templates/default-python/combinations/serverless/output.txt index 634b857f961..6310c512a36 100644 --- a/acceptance/bundle/templates/default-python/combinations/serverless/output.txt +++ b/acceptance/bundle/templates/default-python/combinations/serverless/output.txt @@ -34,12 +34,18 @@ Workspace: Validation OK! Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/X[UNIQUE_NAME]/dev/files... -Deploying resources... -Deployment complete! -Deleting files... -Destroy complete! +Created jobs.sample_job +Created pipelines.X[UNIQUE_NAME]_etl +Files: 23 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged + +Destroy: 2 deleted Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/X[UNIQUE_NAME]/prod/files... -Deploying resources... -Deployment complete! -Deleting files... -Destroy complete! +Created jobs.sample_job +Created jobs.sample_job.permissions +Created pipelines.X[UNIQUE_NAME]_etl +Created pipelines.X[UNIQUE_NAME]_etl.permissions +Files: 25 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged + +Destroy: 2 deleted diff --git a/acceptance/bundle/templates/default-python/integration_classic/output.txt b/acceptance/bundle/templates/default-python/integration_classic/output.txt index cc0c54574dc..6511805177c 100644 --- a/acceptance/bundle/templates/default-python/integration_classic/output.txt +++ b/acceptance/bundle/templates/default-python/integration_classic/output.txt @@ -32,9 +32,10 @@ Building python_artifact... Building python_artifact... Uploading .databricks/bundle/dev/patched_wheels/python_artifact_project_name_[UNIQUE_NAME]/project_name_[UNIQUE_NAME]-0.0.1+[NUMID]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created pipelines.project_name_[UNIQUE_NAME]_etl +Files: 21 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary -t dev Name: project_name_[UNIQUE_NAME] @@ -98,8 +99,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/dev -Deleting files... -Destroy complete! +Destroy: 2 deleted >>> [CLI] bundle validate -t prod Name: project_name_[UNIQUE_NAME] @@ -290,9 +290,12 @@ Building python_artifact... Building python_artifact... Uploading dist/project_name_[UNIQUE_NAME]-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/prod/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created jobs.sample_job.permissions +Created pipelines.project_name_[UNIQUE_NAME]_etl +Created pipelines.project_name_[UNIQUE_NAME]_etl.permissions +Files: 21 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle summary -t prod Name: project_name_[UNIQUE_NAME] @@ -496,5 +499,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/prod -Deleting files... -Destroy complete! +Destroy: 2 deleted diff --git a/acceptance/bundle/templates/default-python/serverless/output.txt b/acceptance/bundle/templates/default-python/serverless/output.txt index 1b8abcf31ff..b30ddf740f9 100644 --- a/acceptance/bundle/templates/default-python/serverless/output.txt +++ b/acceptance/bundle/templates/default-python/serverless/output.txt @@ -54,9 +54,10 @@ Building python_artifact... Building python_artifact... Uploading dist/my_default_python-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_default_python/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created pipelines.my_default_python_etl +Files: 21 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -t dev Building python_artifact... @@ -69,9 +70,12 @@ Building python_artifact... Building python_artifact... Uploading dist/my_default_python-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_default_python/prod/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created jobs.sample_job.permissions +Created pipelines.my_default_python_etl +Created pipelines.my_default_python_etl.permissions +Files: 21 uploaded, 0 deleted +Resources: 4 created, 0 changed, 0 deleted, 0 unchanged >>> [CLI] bundle plan -t prod Building python_artifact... diff --git a/acceptance/bundle/templates/lakeflow-integrations/output.txt b/acceptance/bundle/templates/lakeflow-integrations/output.txt index c1a6278eb5c..2a4e773c907 100644 --- a/acceptance/bundle/templates/lakeflow-integrations/output.txt +++ b/acceptance/bundle/templates/lakeflow-integrations/output.txt @@ -34,6 +34,7 @@ Uploading __generated__/my_lakeflow_integrations.examples.slack.send_slack_messa Uploading __generated__/my_lakeflow_integrations.examples.wait_for_run_sensor.WaitForRunSensor.yml... Uploading dist/my_lakeflow_integrations-0.0.1-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_lakeflow_integrations/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.send_slack_message +Created jobs.wait_for_run_sensor +Files: 11 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/templates/pydabs/deploy-classic/output.txt b/acceptance/bundle/templates/pydabs/deploy-classic/output.txt index f79f8337c74..b927e571beb 100644 --- a/acceptance/bundle/templates/pydabs/deploy-classic/output.txt +++ b/acceptance/bundle/templates/pydabs/deploy-classic/output.txt @@ -20,6 +20,7 @@ To get started, refer to the project README.md file and the documentation at htt Building python_artifact... Uploading .databricks/bundle/dev/patched_wheels/python_artifact_my_pydabs/my_pydabs-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl... Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_pydabs/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created pipelines.my_pydabs_etl +Files: 22 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/user_agent/simple/output.txt b/acceptance/bundle/user_agent/simple/output.txt index 493c4f9f8f5..cd0e2103dad 100644 --- a/acceptance/bundle/user_agent/simple/output.txt +++ b/acceptance/bundle/user_agent/simple/output.txt @@ -33,9 +33,9 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created schemas.foo +Files: 1 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged >>> print_requests.py --sort --get ^//telemetry-ext @@ -58,7 +58,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py --sort --get diff --git a/acceptance/bundle/validate/sync_patterns/output.txt b/acceptance/bundle/validate/sync_patterns/output.txt index b35859d86a9..519ea366385 100644 --- a/acceptance/bundle/validate/sync_patterns/output.txt +++ b/acceptance/bundle/validate/sync_patterns/output.txt @@ -23,5 +23,5 @@ Validation OK! >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Deploying resources... -Deployment complete! +Files: 7 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/cache/simple/output.txt b/acceptance/cache/simple/output.txt index 2206ffdbc71..7c707dfe0aa 100644 --- a/acceptance/cache/simple/output.txt +++ b/acceptance/cache/simple/output.txt @@ -17,8 +17,8 @@ >>> [CLI] bundle deploy -p dogfood Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/exploratory-cache-test/default/files... -Deploying resources... -Deployment complete! +Files: 8 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged >>> print_telemetry_bool_values local.cache.attempt true diff --git a/acceptance/pipelines/deploy/auto-approve/output.txt b/acceptance/pipelines/deploy/auto-approve/output.txt index a38e8d77d80..8daf35b0b58 100644 --- a/acceptance/pipelines/deploy/auto-approve/output.txt +++ b/acceptance/pipelines/deploy/auto-approve/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-auto-approve/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Remove resources from configuration to test auto-approve @@ -22,6 +22,7 @@ Error: the deployment requires destructive actions, but the current console does Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed. To proceed, use --auto-approve after reviewing the plan above. +Files: 1 uploaded, 1 deleted Exit code: 1 @@ -34,6 +35,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: delete resources.pipelines.foo -Deploying resources... -Updating deployment state... -Deployment complete! +Deleted pipelines.foo +Files: 1 uploaded, 0 deleted +Resources: 0 created, 0 changed, 1 deleted, 0 unchanged diff --git a/acceptance/pipelines/deploy/create-pipeline/output.txt b/acceptance/pipelines/deploy/create-pipeline/output.txt index 6d873c67f2e..cae62e4d516 100644 --- a/acceptance/pipelines/deploy/create-pipeline/output.txt +++ b/acceptance/pipelines/deploy/create-pipeline/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-create-pipeline/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> [CLI] pipelines get [UUID] @@ -27,3 +27,8 @@ View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] "storage": "dbfs:/pipelines/[UUID]" } } + +>>> [CLI] pipelines deploy --quiet +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-create-pipeline/default/files... +Files: 1 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 1 unchanged diff --git a/acceptance/pipelines/deploy/create-pipeline/script b/acceptance/pipelines/deploy/create-pipeline/script index 2f571804bba..041bb3fbcd8 100644 --- a/acceptance/pipelines/deploy/create-pipeline/script +++ b/acceptance/pipelines/deploy/create-pipeline/script @@ -1,3 +1,6 @@ trace $CLI pipelines deploy PIPELINE_ID=$($CLI bundle summary -o json | jq -r '.resources.pipelines.foo.id') trace $CLI pipelines get "${PIPELINE_ID}" | jq "{spec}" + +# --quiet prints only the summary line: no per-resource line, no "View your ... here". +trace $CLI pipelines deploy --quiet diff --git a/acceptance/pipelines/deploy/fail-on-active-runs/output.txt b/acceptance/pipelines/deploy/fail-on-active-runs/output.txt index 14277d8c7fa..0c2ab19415c 100644 --- a/acceptance/pipelines/deploy/fail-on-active-runs/output.txt +++ b/acceptance/pipelines/deploy/fail-on-active-runs/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline-fail-on-active-runs/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> [CLI] pipelines deploy --fail-on-active-runs diff --git a/acceptance/pipelines/deploy/force-lock/output.txt b/acceptance/pipelines/deploy/force-lock/output.txt index 392fa58954b..52b007c8928 100644 --- a/acceptance/pipelines/deploy/force-lock/output.txt +++ b/acceptance/pipelines/deploy/force-lock/output.txt @@ -17,7 +17,7 @@ Exit code: 1 === test deployment with force-lock (should succeed) >>> [CLI] pipelines deploy --force-lock Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-force-lock/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt b/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt index b1fdcf752a5..a64595f5f54 100644 --- a/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt +++ b/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt @@ -5,8 +5,8 @@ Warning: unknown field: unknown_property in databricks.yml:8:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/render-diagnostics-warning-pipeline/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.test-pipeline +Files: 4 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline test-pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] diff --git a/acceptance/pipelines/deploy/var-flag/output.txt b/acceptance/pipelines/deploy/var-flag/output.txt index 6fe3c7a3873..5b44b3c5169 100644 --- a/acceptance/pipelines/deploy/var-flag/output.txt +++ b/acceptance/pipelines/deploy/var-flag/output.txt @@ -2,9 +2,9 @@ === Test --var flag usage >>> [CLI] pipelines deploy --var=catalog=custom_catalog --var=schema=custom_schema --auto-approve Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-var-flag/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Files: 4 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Verify: Check that variables were substituted correctly diff --git a/acceptance/pipelines/destroy/auto-approve/output.txt b/acceptance/pipelines/destroy/auto-approve/output.txt index 8ab0e6e1eb9..e7ce7c81a1e 100644 --- a/acceptance/pipelines/destroy/auto-approve/output.txt +++ b/acceptance/pipelines/destroy/auto-approve/output.txt @@ -2,9 +2,9 @@ === Test auto-approve pipelines destroy >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 4 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> errcode [CLI] pipelines destroy @@ -24,5 +24,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt b/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt index 0446e46b40f..d6e07df900d 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt @@ -2,9 +2,9 @@ === Deploy a pipeline with cascade_on_destroy: true (state records true) >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade-divergence/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> print_requests.py //api/2.0/pipelines @@ -34,8 +34,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade-divergence/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //api/2.0/pipelines { diff --git a/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt b/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt index 7d405350746..39247ee62e4 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt @@ -2,9 +2,9 @@ === Deploy a pipeline configured with cascade_on_destroy: false >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> print_requests.py //api/2.0/pipelines @@ -25,9 +25,9 @@ View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Change only cascade_on_destroy (false -> true): expect a state-only update, no pipeline update API call >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated pipelines.my_pipeline +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> print_requests.py //api/2.0/pipelines @@ -35,9 +35,9 @@ View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Set cascade_on_destroy back to false and deploy so state reflects it before destroy >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated pipelines.my_pipeline +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> print_requests.py //api/2.0/pipelines @@ -45,9 +45,9 @@ View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Unset cascade_on_destroy entirely: expect a state-only update that persists nil to state >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Updated pipelines.my_pipeline +Files: 3 uploaded, 0 deleted +Resources: 0 created, 1 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> print_requests.py //api/2.0/pipelines @@ -63,8 +63,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default -Deleting files... -Destroy complete! +Destroy: 1 deleted >>> print_requests.py //api/2.0/pipelines { diff --git a/acceptance/pipelines/destroy/destroy-pipeline/output.txt b/acceptance/pipelines/destroy/destroy-pipeline/output.txt index 70cf60cff61..6f5f4172629 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline/output.txt @@ -2,9 +2,9 @@ === Test basic pipelines destroy >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 4 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> [CLI] pipelines destroy --auto-approve @@ -17,8 +17,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default -Deleting files... -Destroy complete! +Destroy: 1 deleted === Assert pipeline is deleted >>> errcode [CLI] pipelines get [UUID] diff --git a/acceptance/pipelines/destroy/force-lock/output.txt b/acceptance/pipelines/destroy/force-lock/output.txt index f7cf597f67b..9eced6e8e48 100644 --- a/acceptance/pipelines/destroy/force-lock/output.txt +++ b/acceptance/pipelines/destroy/force-lock/output.txt @@ -1,9 +1,9 @@ >>> errcode [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-force-lock/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.foo +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === upload lock file @@ -32,5 +32,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-force-lock/default -Deleting files... -Destroy complete! +Destroy: 1 deleted diff --git a/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt b/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt index c9799262bdd..c2918e4a7fc 100644 --- a/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt +++ b/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Dry running pipeline, should have validate_only set to true diff --git a/acceptance/pipelines/dry-run/no-wait/output.txt b/acceptance/pipelines/dry-run/no-wait/output.txt index 853ee8f7b00..8944b38b7b7 100644 --- a/acceptance/pipelines/dry-run/no-wait/output.txt +++ b/acceptance/pipelines/dry-run/no-wait/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 4 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Dry running pipeline with --no-wait flag diff --git a/acceptance/pipelines/dry-run/restart/output.txt b/acceptance/pipelines/dry-run/restart/output.txt index da3bae74a67..b58ce0cc3e4 100644 --- a/acceptance/pipelines/dry-run/restart/output.txt +++ b/acceptance/pipelines/dry-run/restart/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Dry running pipeline with --restart flag, should stop the current pipeline and start a new run diff --git a/acceptance/pipelines/e2e/output.txt b/acceptance/pipelines/e2e/output.txt index 8148765cd12..e72dbfeb1fb 100644 --- a/acceptance/pipelines/e2e/output.txt +++ b/acceptance/pipelines/e2e/output.txt @@ -17,9 +17,10 @@ Please refer to the README.md file for "getting started" instructions. === Deploy pipeline >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lakeflow_project/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created jobs.sample_job +Created pipelines.lakeflow_project_etl +Files: 14 uploaded, 0 deleted +Resources: 2 created, 0 changed, 0 deleted, 0 unchanged View your job sample_job here: [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID] View your pipeline lakeflow_project_etl here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] @@ -41,9 +42,9 @@ Pipeline configurations for this update: === Edit project by creating and running a new second pipeline >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lakeflow_project/dev/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.lakeflow_project_etl_2 +Files: 1 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 2 unchanged View your job sample_job here: [DATABRICKS_URL]/jobs/[NUMID]?w=[NUMID] View your pipeline lakeflow_project_etl here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] View your pipeline lakeflow_project_etl_2 here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] @@ -112,5 +113,4 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lakeflow_project/dev -Deleting files... -Destroy complete! +Destroy: 3 deleted diff --git a/acceptance/pipelines/open/open-after-deployment/output.txt b/acceptance/pipelines/open/open-after-deployment/output.txt index ff6a660e626..e5000117d36 100644 --- a/acceptance/pipelines/open/open-after-deployment/output.txt +++ b/acceptance/pipelines/open/open-after-deployment/output.txt @@ -7,9 +7,9 @@ Exit code: 1 >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipelines-open/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.test-pipelines-open +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline test-pipelines-open here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Modify PATH so that real open is not run diff --git a/acceptance/pipelines/run/no-wait/output.txt b/acceptance/pipelines/run/no-wait/output.txt index 2ceb291d0dd..8bf97b32855 100644 --- a/acceptance/pipelines/run/no-wait/output.txt +++ b/acceptance/pipelines/run/no-wait/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 5 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === test --no-wait flag diff --git a/acceptance/pipelines/run/refresh-flags/output.txt b/acceptance/pipelines/run/refresh-flags/output.txt index 04c585fe044..6181f2a9bce 100644 --- a/acceptance/pipelines/run/refresh-flags/output.txt +++ b/acceptance/pipelines/run/refresh-flags/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Running pipeline with --refresh flag and specific tables diff --git a/acceptance/pipelines/run/restart/output.txt b/acceptance/pipelines/run/restart/output.txt index ed36af4d67a..4ad48265c8a 100644 --- a/acceptance/pipelines/run/restart/output.txt +++ b/acceptance/pipelines/run/restart/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Running pipeline with --restart flag diff --git a/acceptance/pipelines/run/run-info/output.txt b/acceptance/pipelines/run/run-info/output.txt index ddbbe6a9d6e..af7ae65fbfa 100644 --- a/acceptance/pipelines/run/run-info/output.txt +++ b/acceptance/pipelines/run/run-info/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 6 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] === Run pipeline and display pipeline configuration summary and events durations diff --git a/acceptance/pipelines/stop/output.txt b/acceptance/pipelines/stop/output.txt index 9c8cd6f57a6..85323e7dc27 100644 --- a/acceptance/pipelines/stop/output.txt +++ b/acceptance/pipelines/stop/output.txt @@ -1,9 +1,9 @@ >>> [CLI] pipelines deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-stop/default/files... -Deploying resources... -Updating deployment state... -Deployment complete! +Created pipelines.my_pipeline +Files: 7 uploaded, 0 deleted +Resources: 1 created, 0 changed, 0 deleted, 0 unchanged View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID] >>> [CLI] pipelines run diff --git a/bundle/artifacts/build.go b/bundle/artifacts/build.go index 38b42dd1ab6..f54ad43b576 100644 --- a/bundle/artifacts/build.go +++ b/bundle/artifacts/build.go @@ -82,7 +82,7 @@ func (m *build) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { } func doBuild(ctx context.Context, artifactName string, a *config.Artifact) error { - cmdio.LogString(ctx, fmt.Sprintf("Building %s...", artifactName)) + cmdio.LogProgress(ctx, fmt.Sprintf("Building %s...", artifactName)) var executor *exec.Executor if a.Executable != "" { diff --git a/bundle/bundle.go b/bundle/bundle.go index 8ce12211c3d..bcceb752088 100644 --- a/bundle/bundle.go +++ b/bundle/bundle.go @@ -37,6 +37,28 @@ import ( const internalFolder = ".internal" +// QuietLevel is how much of the informational output to suppress, controlled by +// repeating -q. Warnings and errors are never suppressed. +type QuietLevel int + +const ( + // QuietNone prints everything. + QuietNone QuietLevel = iota + + // QuietSummary (-q) drops the per-resource action lines, keeping the summary. + QuietSummary + + // QuietAll (-qq) also drops the summary and the progress lines ("Uploading + // bundle files to ...", "Building ...", "Executing 'postdeploy' script"), so + // only warnings and errors remain. + QuietAll +) + +// SuppressProgress reports whether progress and summary output should be skipped. +func (b *Bundle) SuppressProgress() bool { + return b.Quiet >= QuietAll +} + // AiCodeSnapshotDir is the sync-relative dir the aicode mutator writes AI Runtime // code snapshots into. Force-included in sync (see GetSyncIncludePatterns) so user // ignore rules can't filter the deployed job's code_source_path archives out. @@ -149,6 +171,10 @@ type Bundle struct { // Files that are synced to the workspace.file_path Files []fileset.File + // FileCounts is how many files the deploy uploaded and deleted. Unlike Files, + // which lists everything tracked, this counts only what actually changed. + FileCounts libsync.FileCounts + // Stores an initialized copy of this bundle's Terraform wrapper. Terraform *tfexec.Terraform @@ -180,6 +206,11 @@ type Bundle struct { // which runs on the migrated state, creates them. MigratingToDirect bool + // Quiet is the output verbosity reduction requested via -q/--quiet, which is + // repeatable: QuietSummary drops the per-resource lines, QuietAll additionally + // drops the summary and progress lines, leaving warnings and errors. + Quiet QuietLevel + // SkipLocalFileValidation makes path translation tolerant of missing local files. // When set, TranslatePaths computes workspace paths without verifying files exist. // Used by config-remote-sync: a user may modify resource paths remotely (e.g., diff --git a/bundle/deploy/files/delete.go b/bundle/deploy/files/delete.go index aab6cca9acc..562437e5432 100644 --- a/bundle/deploy/files/delete.go +++ b/bundle/deploy/files/delete.go @@ -8,7 +8,6 @@ import ( "os" "github.com/databricks/cli/bundle" - "github.com/databricks/cli/libs/cmdio" "github.com/databricks/cli/libs/diag" "github.com/databricks/cli/libs/sync" "github.com/databricks/databricks-sdk-go/service/workspace" @@ -21,8 +20,6 @@ func (m *delete) Name() string { } func (m *delete) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { - cmdio.LogString(ctx, "Deleting files...") - err := b.WorkspaceClient(ctx).Workspace.Delete(ctx, workspace.Delete{ Path: b.Config.Workspace.RootPath, Recursive: true, diff --git a/bundle/deploy/files/upload.go b/bundle/deploy/files/upload.go index bb46c97c999..a74876ba4d1 100644 --- a/bundle/deploy/files/upload.go +++ b/bundle/deploy/files/upload.go @@ -25,11 +25,11 @@ func (m *upload) Name() string { func (m *upload) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { if config.IsExplicitlyEnabled(b.Config.Presets.SourceLinkedDeployment) { - cmdio.LogString(ctx, "Source-linked deployment is enabled. Deployed resources reference the source files in your working tree instead of separate copies.") + cmdio.LogProgress(ctx, "Source-linked deployment is enabled. Deployed resources reference the source files in your working tree instead of separate copies.") return nil } - cmdio.LogString(ctx, fmt.Sprintf("Uploading bundle files to %s...", b.Config.Workspace.FilePath)) + cmdio.LogProgress(ctx, fmt.Sprintf("Uploading bundle files to %s...", b.Config.Workspace.FilePath)) opts, err := GetSyncOptions(ctx, b) if err != nil { return diag.FromErr(err) @@ -49,6 +49,7 @@ func (m *upload) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { } return diag.FromErr(err) } + b.FileCounts = sync.FileCounts() log.Infof(ctx, "Uploaded bundle files") return nil diff --git a/bundle/deploy/snapshot/upload.go b/bundle/deploy/snapshot/upload.go index 8ec7a215d03..4a73e63b35a 100644 --- a/bundle/deploy/snapshot/upload.go +++ b/bundle/deploy/snapshot/upload.go @@ -40,7 +40,7 @@ func (m *snapshotUpload) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagn } } - cmdio.LogString(ctx, "Uploading immutable bundle snapshot...") + cmdio.LogProgress(ctx, "Uploading immutable bundle snapshot...") zipContent, fileCount, err := BundleZip(ctx, b) if err != nil { diff --git a/bundle/deployplan/plan.go b/bundle/deployplan/plan.go index bb1b0d77bff..c9f5bec3516 100644 --- a/bundle/deployplan/plan.go +++ b/bundle/deployplan/plan.go @@ -22,10 +22,47 @@ type Plan struct { Serial int `json:"serial,omitempty"` Plan map[string]*PlanEntry `json:"plan,omitzero"` + // NotSelected is the number of resources removed by FilterToSelected via the + // --select flag. Serialized so the summary survives a deploy from a plan file + // (--plan); used only for summary reporting. + NotSelected int `json:"not_selected,omitempty"` + mutex sync.Mutex `json:"-"` lockmap lockmap `json:"-"` } +// ActionCounts summarizes a plan's actions by category. A recreate counts as +// both a create and a delete, matching how plan and deploy report changes. +type ActionCounts struct { + Create int + Change int + Delete int + Unchanged int +} + +// CountActions tallies the plan's actions by category. Order is irrelevant to a +// tally, so it iterates the plan map directly rather than the sorted GetActions. +func (p *Plan) CountActions() ActionCounts { + var c ActionCounts + for _, entry := range p.Plan { + switch entry.Action { + case Create: + c.Create++ + case Update, UpdateWithID, Resize: + c.Change++ + case Delete: + c.Delete++ + case Recreate: + // A recreate counts as both a delete and a create. + c.Delete++ + c.Create++ + case Skip, Undefined: + c.Unchanged++ + } + } + return c +} + // NewPlanDirect creates a new Plan for direct engine with plan_version set. func NewPlanDirect() *Plan { return &Plan{ @@ -211,6 +248,8 @@ func (p *Plan) ReadUnlockEntry(resourceKey string) { // e.g. "jobs.my_job") plus their transitive dependencies as recorded in each // entry's DependsOn field. Nodes not reachable from the selected set are removed. func (p *Plan) FilterToSelected(selected []string) { + before := len(p.Plan) + // Convert "type.name" → "resources.type.name" (plan key format). queue := make([]string, 0, len(selected)) reachable := make(map[string]struct{}, len(selected)) @@ -240,6 +279,8 @@ func (p *Plan) FilterToSelected(selected []string) { delete(p.Plan, key) } } + + p.NotSelected = before - len(p.Plan) } // enqueueReachable marks key as reachable and appends it to queue, if key exists diff --git a/bundle/deployplan/plan_filter_test.go b/bundle/deployplan/plan_filter_test.go index 18767e826d8..c5451f470b1 100644 --- a/bundle/deployplan/plan_filter_test.go +++ b/bundle/deployplan/plan_filter_test.go @@ -44,6 +44,7 @@ func TestFilterToSelected_Direct(t *testing.T) { assert.Contains(t, p.Plan, "resources.jobs.bar") assert.Contains(t, p.Plan, "resources.jobs.baz") assert.NotContains(t, p.Plan, "resources.jobs.independent") + assert.Equal(t, 1, p.NotSelected) } func TestFilterToSelected_NoDeps(t *testing.T) { @@ -53,6 +54,7 @@ func TestFilterToSelected_NoDeps(t *testing.T) { assert.NotContains(t, p.Plan, "resources.jobs.foo") assert.NotContains(t, p.Plan, "resources.jobs.bar") assert.NotContains(t, p.Plan, "resources.jobs.independent") + assert.Equal(t, 3, p.NotSelected) } func TestFilterToSelected_Multiple(t *testing.T) { @@ -62,6 +64,7 @@ func TestFilterToSelected_Multiple(t *testing.T) { assert.Contains(t, p.Plan, "resources.jobs.independent") assert.NotContains(t, p.Plan, "resources.jobs.foo") assert.NotContains(t, p.Plan, "resources.jobs.bar") + assert.Equal(t, 2, p.NotSelected) } func TestFilterToSelected_IncludesGrantsAndPermissions(t *testing.T) { diff --git a/bundle/libraries/upload.go b/bundle/libraries/upload.go index b292fe43b79..66feae0addc 100644 --- a/bundle/libraries/upload.go +++ b/bundle/libraries/upload.go @@ -64,7 +64,7 @@ func (u *upload) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { } else { relPath = filepath.ToSlash(relPath) } - cmdio.LogString(ctx, fmt.Sprintf("Uploading %s...", relPath)) + cmdio.LogProgress(ctx, fmt.Sprintf("Uploading %s...", relPath)) errs.Go(func() error { return UploadFile(errCtx, source, u.client) }) diff --git a/bundle/phases/deploy.go b/bundle/phases/deploy.go index e585fe51609..bc06575baf3 100644 --- a/bundle/phases/deploy.go +++ b/bundle/phases/deploy.go @@ -3,7 +3,9 @@ package phases import ( "context" "errors" + "fmt" "slices" + "strings" "github.com/databricks/cli/bundle" "github.com/databricks/cli/bundle/artifacts" @@ -76,10 +78,6 @@ func approvalForDeploy(ctx context.Context, b *bundle.Bundle, plan *deployplan.P } func deployCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, stateEngine engine.EngineType, requestedEngine engine.EngineSetting) { - // Core mutators that CRUD resources and modify deployment state. These - // mutators need informed consent if they are potentially destructive. - cmdio.LogString(ctx, "Deploying resources...") - // Apply resources and capture post-apply state. // For direct: Finalize flushes the WAL to disk and returns the state; // called even if Apply failed so partial progress is saved. @@ -119,10 +117,6 @@ func deployCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, st statemgmt.UploadStateForYamlSync(stateEngine), ) - if !logdiag.HasError(ctx) { - cmdio.LogString(ctx, "Deployment complete!") - } - // Once the deploy is complete, dry-run the migration to the direct engine // and record the outcome in telemetry. If the user has opted in to the // direct engine (via bundle.engine or DATABRICKS_BUNDLE_ENGINE) and the @@ -133,6 +127,52 @@ func deployCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, st } } +// logFileSummary reports what the file sync did. Separate from the resource summary +// because a deploy that only changes business logic (a .py or .sql file) leaves every +// resource unchanged, so without this line its summary is all zeros and looks like a +// no-op. Called on the failure paths too: the files were uploaded before whatever +// failed afterwards, so the count is accurate even then. +func logFileSummary(ctx context.Context, b *bundle.Bundle) { + if b.Quiet >= bundle.QuietAll { + return + } + cmdio.LogString(ctx, fmt.Sprintf("Files: %d uploaded, %d deleted", b.FileCounts.Uploaded, b.FileCounts.Deleted)) +} + +// logDeploySummary prints the per-resource actions that were applied followed by the +// resource summary line. -q drops the per-resource lines, -qq drops the summary too. +// The past-tense verb is the short action name plus "d" (create→Created, +// delete→Deleted, ...), capitalized to match the sentence case of other output. +// "bundle plan" keeps the lower-case present tense, so the two are still +// distinguishable at a glance. +func logDeploySummary(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan) { + if b.Quiet >= bundle.QuietAll { + return + } + + if b.Quiet < bundle.QuietSummary { + for _, action := range plan.GetActions() { + if action.ActionType == deployplan.Skip || action.ActionType == deployplan.Undefined { + continue + } + verb := action.ActionType.StringShort() + "d" + cmdio.LogString(ctx, strings.ToUpper(verb[:1])+verb[1:]+" "+strings.TrimPrefix(action.ResourceKey, "resources.")) + } + } + + logFileSummary(ctx, b) + + counts := plan.CountActions() + summary := fmt.Sprintf("Resources: %d created, %d changed, %d deleted, %d unchanged", counts.Create, counts.Change, counts.Delete, counts.Unchanged) + // Gate on the plan's own NotSelected (not b.Select) so the suffix survives a + // deploy from a --plan file, where --select was applied at plan time and + // b.Select is empty here. NotSelected is only ever set by FilterToSelected. + if plan.NotSelected > 0 { + summary += fmt.Sprintf(", %d not selected", plan.NotSelected) + } + cmdio.LogString(ctx, summary) +} + // uploadLibraries uploads libraries to the workspace. // It also cleans up the artifacts directory and transforms wheel tasks. // It is called by only "bundle deploy". @@ -203,6 +243,18 @@ func Deploy(ctx context.Context, b *bundle.Bundle, outputHandler sync.OutputHand } } + // From here on the files are uploaded, so report them however the rest of the + // deploy turns out. Deferred rather than repeated at each of the returns below, so + // that a new early return cannot silently drop it. On success logDeploySummary + // prints this line itself, between the per-resource lines and the resource summary, + // and sets the flag so the defer does not print it twice. + filesReported := false + defer func() { + if !filesReported { + logFileSummary(ctx, b) + } + }() + bundle.ApplySeqContext(ctx, b, deploy.StateUpdate(), deploy.StatePush(), @@ -269,6 +321,15 @@ func Deploy(ctx context.Context, b *bundle.Bundle, outputHandler sync.OutputHand } bundle.ApplyContext(ctx, b, scripts.Execute(config.ScriptPostDeploy)) + + // Report what was deployed, mirroring "bundle plan". Printed last so it does not + // precede (and appear to vouch for) the postdeploy script's output. Printed even + // if that script fails: the resources were already applied successfully by then, + // so the counts are accurate, and the script's error still propagates. Earlier + // failures report the files only, since the plan counts would then describe what + // was intended rather than what was applied. + filesReported = true + logDeploySummary(ctx, b, plan) } func RunPlan(ctx context.Context, b *bundle.Bundle, engine engine.EngineType) *deployplan.Plan { diff --git a/bundle/phases/destroy.go b/bundle/phases/destroy.go index bed07e121a4..e19dd11fb56 100644 --- a/bundle/phases/destroy.go +++ b/bundle/phases/destroy.go @@ -3,6 +3,7 @@ package phases import ( "context" "errors" + "fmt" "net/http" "slices" @@ -48,7 +49,7 @@ var destroyApprovalGroups = []approvalGroup{ // logPipelineDeleteApproval prints the pipeline deletions. If cascade_on_destroy is true, we will include // a note that datasets will be deleted as well. -func logPipelineDeleteApproval(ctx context.Context, b *bundle.Bundle, actions []deployplan.Action, engine engine.EngineType) error { +func logPipelineDeleteApproval(ctx context.Context, b *bundle.Bundle, actions []deployplan.Action, engine engine.EngineType, quiet bool) error { pipelineDeletes := filterGroup(actions, "pipelines", deployplan.Delete) var cascading, retaining []deployplan.Action @@ -71,7 +72,7 @@ func logPipelineDeleteApproval(ctx context.Context, b *bundle.Bundle, actions [] {deletePipelineWithCascadeMessage, cascading}, {deletePipelineNoCascadeMessage, retaining}, } { - if len(grp.actions) == 0 { + if len(grp.actions) == 0 || quiet { continue } cmdio.LogString(ctx, grp.message) @@ -95,7 +96,14 @@ func approvalForDestroy(ctx context.Context, b *bundle.Bundle, plan *deployplan. return false, err } - if len(deleteActions) > 0 { + // With --auto-approve there is no prompt, so this listing is informational and -qq + // suppresses it. Without --auto-approve we are about to ask for consent and the user + // must see what they are consenting to, so it prints at any -q level. The approval + // helpers below still run either way: they also validate (e.g. pipeline cascade + // lookups can fail), so skipping them would skip that. + quiet := b.AutoApprove && b.Quiet >= bundle.QuietAll + + if len(deleteActions) > 0 && !quiet { cmdio.LogString(ctx, "The following resources will be deleted:") for _, a := range deleteActions { if a.IsChildResource() { @@ -106,13 +114,18 @@ func approvalForDestroy(ctx context.Context, b *bundle.Bundle, plan *deployplan. cmdio.LogString(ctx, "") } - logApprovalGroups(ctx, deleteActions, destroyApprovalGroups, true, deployplan.Delete) - if err := logPipelineDeleteApproval(ctx, b, deleteActions, engine); err != nil { + if !quiet { + logApprovalGroups(ctx, deleteActions, destroyApprovalGroups, true, deployplan.Delete) + } + // Called even when quiet: the cascade lookup can fail, and that error must surface. + if err := logPipelineDeleteApproval(ctx, b, deleteActions, engine, quiet); err != nil { return false, err } - cmdio.LogString(ctx, "All files and directories at the following location will be deleted: "+b.Config.Workspace.RootPath) - cmdio.LogString(ctx, "") + if !quiet { + cmdio.LogString(ctx, "All files and directories at the following location will be deleted: "+b.Config.Workspace.RootPath) + cmdio.LogString(ctx, "") + } if b.AutoApprove { return true, nil @@ -147,8 +160,19 @@ func destroyCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, e bundle.ApplyContext(ctx, b, files.Delete()) - if !logdiag.HasError(ctx) { - cmdio.LogString(ctx, "Destroy complete!") + if !logdiag.HasError(ctx) && b.Quiet < bundle.QuietAll { + // Count top-level resources only, matching the approval list above (which + // skips children); this also keeps the count stable across engines. Gone + // resources are included: they are excluded from the approval prompt because + // they are not destructive, but destroying them does remove them from state, + // and "bundle deploy" likewise counts them as deleted. + deleted := 0 + for _, a := range plan.GetActions() { + if a.ActionType == deployplan.Delete && !a.IsChildResource() { + deleted++ + } + } + cmdio.LogString(ctx, fmt.Sprintf("Destroy: %d deleted", deleted)) } } @@ -163,7 +187,7 @@ func Destroy(ctx context.Context, b *bundle.Bundle, engine engine.EngineType) { } if !ok { - cmdio.LogString(ctx, "No active deployment found to destroy!") + cmdio.LogProgress(ctx, "No active deployment found to destroy!") return } diff --git a/bundle/phases/destroy_test.go b/bundle/phases/destroy_test.go new file mode 100644 index 00000000000..2455b4e12b2 --- /dev/null +++ b/bundle/phases/destroy_test.go @@ -0,0 +1,45 @@ +package phases + +import ( + "bytes" + "io" + "strings" + "testing" + + "github.com/databricks/cli/bundle" + "github.com/databricks/cli/bundle/config/engine" + "github.com/databricks/cli/bundle/deployplan" + "github.com/databricks/cli/libs/cmdio" + "github.com/databricks/cli/libs/flags" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +// -qq hides the listing of resources about to be deleted only because --auto-approve +// makes it informational. Without --auto-approve the user is about to consent to the +// deletion and must see it, at any -q level. Prompting requires a TTY, which acceptance +// tests do not have (destroy errors out before this point), so it is covered here; the +// --auto-approve levels are covered by acceptance/bundle/deploy/quiet-levels. +func TestApprovalForDestroyQuietWhilePrompting(t *testing.T) { + plan := &deployplan.Plan{ + Plan: map[string]*deployplan.PlanEntry{ + "resources.jobs.my_job": {ID: "1", Action: deployplan.Delete}, + }, + } + + stderr := &bytes.Buffer{} + // "y" answers the prompt; cmdio panics reading from a nil stdin. + ctx := cmdio.InContext(t.Context(), + cmdio.NewIO(t.Context(), flags.OutputText, strings.NewReader("y\n"), io.Discard, stderr, "", "")) + + b := &bundle.Bundle{Quiet: bundle.QuietAll} + b.Config.Workspace.RootPath = "/Workspace/Users/me/.bundle/x" + + approved, err := approvalForDestroy(ctx, b, plan, engine.EngineTerraform) + require.NoError(t, err) + assert.True(t, approved) + + assert.Contains(t, stderr.String(), "The following resources will be deleted:") + assert.Contains(t, stderr.String(), "resources.jobs.my_job") + assert.Contains(t, stderr.String(), b.Config.Workspace.RootPath) +} diff --git a/bundle/scripts/scripts.go b/bundle/scripts/scripts.go index 4efcd22a4fd..cca108ec514 100644 --- a/bundle/scripts/scripts.go +++ b/bundle/scripts/scripts.go @@ -49,7 +49,7 @@ func (m *script) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { return diag.FromErr(fmt.Errorf("failed to execute script: %w", err)) } - cmdio.LogString(ctx, fmt.Sprintf("Executing '%s' script", m.scriptHook)) + cmdio.LogProgress(ctx, fmt.Sprintf("Executing '%s' script", m.scriptHook)) // Reading the pipes sequentially deadlocks once the script fills the ~64KiB // stderr pipe buffer while stdout is still open, so drain stderr concurrently. diff --git a/bundle/statemgmt/state_push.go b/bundle/statemgmt/state_push.go index 9be3968b431..c7e43d277e0 100644 --- a/bundle/statemgmt/state_push.go +++ b/bundle/statemgmt/state_push.go @@ -9,7 +9,6 @@ import ( "github.com/databricks/cli/bundle" "github.com/databricks/cli/bundle/config/engine" "github.com/databricks/cli/bundle/deploy" - "github.com/databricks/cli/libs/cmdio" "github.com/databricks/cli/libs/filer" "github.com/databricks/cli/libs/log" "github.com/databricks/cli/libs/logdiag" @@ -45,7 +44,6 @@ func PushResourcesState(ctx context.Context, b *bundle.Bundle, engine engine.Eng defer local.Close() // Upload state file from local cache directory to filer. - cmdio.LogString(ctx, "Updating deployment state...") err = f.Write(ctx, remotePath, local, filer.CreateParentDirectories, filer.OverwriteIfExists) if err != nil { logdiag.LogError(ctx, err) diff --git a/cmd/bundle/deploy.go b/cmd/bundle/deploy.go index 32c7b5715ac..f248111e8b0 100644 --- a/cmd/bundle/deploy.go +++ b/cmd/bundle/deploy.go @@ -30,6 +30,7 @@ See https://docs.databricks.com/en/dev-tools/bundles/index.html for more informa var clusterId string var autoApprove bool var verbose bool + var quiet int var readPlanPath string var selectResources []string cmd.Flags().BoolVar(&force, "force", false, "Force-override Git branch validation.") @@ -40,6 +41,7 @@ See https://docs.databricks.com/en/dev-tools/bundles/index.html for more informa cmd.Flags().BoolVar(&autoApprove, "auto-approve", false, "Skip interactive approvals that might be required for deployment.") cmd.Flags().MarkDeprecated("compute-id", "use --cluster-id instead") cmd.Flags().BoolVar(&verbose, "verbose", false, "Enable verbose output.") + cmd.Flags().CountVarP(&quiet, "quiet", "q", "Reduce output: -q prints only the summary, -qq prints only warnings and errors.") cmd.Flags().StringVar(&readPlanPath, "plan", "", "Path to a JSON plan file to apply instead of planning (direct engine only).") cmd.Flags().StringSliceVar(&selectResources, "select", nil, "Deploy only the specified resource (e.g. 'my_job' or 'jobs.my_job'). Can be repeated or comma-separated.") // Verbose flag currently only affects file sync output, it's used by the vscode extension @@ -52,6 +54,7 @@ See https://docs.databricks.com/en/dev-tools/bundles/index.html for more informa utils.SetForceLock(cmd, b, forceLock) b.AutoApprove = autoApprove b.Select = selectResources + b.Quiet = bundle.QuietLevel(quiet) if cmd.Flag("compute-id").Changed { b.Config.Bundle.ClusterId = clusterId diff --git a/cmd/bundle/destroy.go b/cmd/bundle/destroy.go index 5bd86a69a68..40669c663ee 100644 --- a/cmd/bundle/destroy.go +++ b/cmd/bundle/destroy.go @@ -38,8 +38,10 @@ Typical use cases: var autoApprove bool var forceDestroy bool + var quiet int cmd.Flags().BoolVar(&autoApprove, "auto-approve", false, "Skip interactive approvals for deleting resources and files") cmd.Flags().BoolVar(&forceDestroy, "force-lock", false, "Force acquisition of deployment lock.") + cmd.Flags().CountVarP(&quiet, "quiet", "q", "Reduce output: -qq prints only warnings and errors.") cmd.RunE = func(cmd *cobra.Command, args []string) error { return CommandBundleDestroy(cmd, args, autoApprove, forceDestroy) @@ -67,6 +69,13 @@ func CommandBundleDestroy(cmd *cobra.Command, args []string, autoApprove, forceD // If `--auto-approve`` is specified, we skip confirmation checks b.AutoApprove = autoApprove + + // Read --quiet off the command rather than taking it as a parameter, since + // other commands reuse this function ("apps delete") without defining it. + if cmd.Flags().Lookup("quiet") != nil { + n, _ := cmd.Flags().GetCount("quiet") + b.Quiet = bundle.QuietLevel(n) + } }, // Skip context initialization if already initialized by parent command SkipInitContext: skipInitContext, diff --git a/cmd/bundle/plan.go b/cmd/bundle/plan.go index 20df8cb5f0f..cb151856d67 100644 --- a/cmd/bundle/plan.go +++ b/cmd/bundle/plan.go @@ -27,9 +27,11 @@ It is useful for previewing changes before running 'bundle deploy'.`, } var force bool + var quiet int var clusterId string var selectResources []string cmd.Flags().BoolVar(&force, "force", false, "Force-override Git branch validation.") + cmd.Flags().CountVarP(&quiet, "quiet", "q", "Reduce output: -q prints only the summary, -qq prints nothing on success.") cmd.Flags().StringVar(&clusterId, "compute-id", "", "Override cluster in the deployment with the given compute ID.") cmd.Flags().StringVarP(&clusterId, "cluster-id", "c", "", "Override cluster in the deployment with the given cluster ID.") cmd.Flags().MarkDeprecated("compute-id", "use --cluster-id instead") @@ -66,36 +68,15 @@ It is useful for previewing changes before running 'bundle deploy'.`, return root.ErrAlreadyPrinted } - // Count actions by type and collect formatted actions - createCount := 0 - updateCount := 0 - deleteCount := 0 - unchangedCount := 0 - - for _, change := range plan.GetActions() { - switch change.ActionType { - case deployplan.Create: - createCount++ - case deployplan.Update, deployplan.UpdateWithID, deployplan.Resize: - updateCount++ - case deployplan.Delete: - deleteCount++ - case deployplan.Recreate: - // A recreate counts as both a delete and a create - deleteCount++ - createCount++ - case deployplan.Skip, deployplan.Undefined: - unchangedCount++ - } - } + counts := plan.CountActions() out := cmd.OutOrStdout() switch root.OutputType(cmd) { case flags.OutputText: // Print summary line and actions to stdout - totalChanges := createCount + updateCount + deleteCount - if totalChanges > 0 { + totalChanges := counts.Create + counts.Change + counts.Delete + if totalChanges > 0 && bundle.QuietLevel(quiet) < bundle.QuietSummary { // Print all actions in the order they were processed for _, action := range plan.GetActions() { if action.ActionType == deployplan.Skip { @@ -106,8 +87,15 @@ It is useful for previewing changes before running 'bundle deploy'.`, } fmt.Fprintln(out) } + if bundle.QuietLevel(quiet) >= bundle.QuietAll { + break + } // Note, this string should not be changed, "bundle deployment migrate" depends on this format: - fmt.Fprintf(out, "Plan: %d to add, %d to change, %d to delete, %d unchanged\n", createCount, updateCount, deleteCount, unchangedCount) + fmt.Fprintf(out, "Plan: %d to add, %d to change, %d to delete, %d unchanged", counts.Create, counts.Change, counts.Delete, counts.Unchanged) + if len(selectResources) > 0 { + fmt.Fprintf(out, ", %d not selected", plan.NotSelected) + } + fmt.Fprintln(out) case flags.OutputJSON: buf, err := json.MarshalIndent(plan, "", " ") if err != nil { diff --git a/cmd/bundle/utils/process.go b/cmd/bundle/utils/process.go index 8bbe98bd1a0..ef88889bb78 100644 --- a/cmd/bundle/utils/process.go +++ b/cmd/bundle/utils/process.go @@ -19,6 +19,7 @@ import ( "github.com/databricks/cli/bundle/statemgmt" "github.com/databricks/cli/cmd/root" "github.com/databricks/cli/internal/build" + "github.com/databricks/cli/libs/cmdio" "github.com/databricks/cli/libs/diag" "github.com/databricks/cli/libs/dyn" "github.com/databricks/cli/libs/log" @@ -139,6 +140,14 @@ func ProcessBundleRet(cmd *cobra.Command, opts ProcessOptions) (b *bundle.Bundle bundle.ApplyFuncContext(ctx, b, func(context.Context, *bundle.Bundle) { opts.InitFunc(b) }) } + // InitFunc is where -q is applied, so the quiet context can only be derived + // afterwards. Progress messages are emitted from mutators that receive only a + // context, not the bundle, so the level has to travel on the context too. + if b != nil && b.SuppressProgress() { + ctx = cmdio.WithQuiet(ctx) + cmd.SetContext(ctx) + } + if !opts.SkipInitialize { t0 := time.Now() phases.Initialize(ctx, b) diff --git a/cmd/pipelines/deploy.go b/cmd/pipelines/deploy.go index 8896a84b8b6..53af02c55a4 100644 --- a/cmd/pipelines/deploy.go +++ b/cmd/pipelines/deploy.go @@ -28,10 +28,12 @@ func deployCommand() *cobra.Command { var failOnActiveRuns bool var autoApprove bool var verbose bool + var quiet int cmd.Flags().BoolVar(&forceLock, "force-lock", false, "Force acquisition of deployment lock.") cmd.Flags().BoolVar(&failOnActiveRuns, "fail-on-active-runs", false, "Fail if there are running pipelines in the deployment.") cmd.Flags().BoolVar(&autoApprove, "auto-approve", false, "Skip interactive approvals that might be required for deployment.") cmd.Flags().BoolVar(&verbose, "verbose", false, "Enable verbose output.") + cmd.Flags().CountVarP(&quiet, "quiet", "q", "Reduce output: -q prints only the summary, -qq prints only warnings and errors.") // Verbose flag currently only affects file sync output, it's used by the vscode extension cmd.Flags().MarkHidden("verbose") @@ -40,6 +42,7 @@ func deployCommand() *cobra.Command { InitFunc: func(b *bundle.Bundle) { utils.SetForceLock(cmd, b, forceLock) b.AutoApprove = autoApprove + b.Quiet = bundle.QuietLevel(quiet) if cmd.Flag("fail-on-active-runs").Changed { b.Config.Bundle.Deployment.FailOnActiveRuns = failOnActiveRuns @@ -58,6 +61,11 @@ func deployCommand() *cobra.Command { } ctx := cmd.Context() + // --quiet suppresses the per-resource lines, matching bundle deploy. + if b.Quiet >= bundle.QuietSummary { + return nil + } + bundle.ApplyContext(ctx, b, mutator.InitializeURLs()) if logdiag.HasError(ctx) { return root.ErrAlreadyPrinted diff --git a/libs/cmdio/log.go b/libs/cmdio/log.go index cdf33171f3e..8b61664c945 100644 --- a/libs/cmdio/log.go +++ b/libs/cmdio/log.go @@ -16,3 +16,28 @@ func LogString(ctx context.Context, str string) { c := fromContext(ctx) _, _ = io.WriteString(c.err, str+"\n") } + +type quietKey struct{} + +// WithQuiet returns a context in which [LogProgress] writes nothing. Only +// progress output is affected: diagnostics go through libs/logdiag, and command +// results go through [LogString], so neither is suppressed. +func WithQuiet(ctx context.Context) context.Context { + return context.WithValue(ctx, quietKey{}, true) +} + +// IsQuiet reports whether progress output is suppressed on this context. +func IsQuiet(ctx context.Context) bool { + quiet, ok := ctx.Value(quietKey{}).(bool) + return ok && quiet +} + +// LogProgress writes str like [LogString], unless the context is marked quiet by +// [WithQuiet]. Use it for messages that only report what the command is doing +// ("Uploading ...", "Building ..."), not for results the user asked for. +func LogProgress(ctx context.Context, str string) { + if IsQuiet(ctx) { + return + } + LogString(ctx, str) +} diff --git a/libs/cmdio/log_test.go b/libs/cmdio/log_test.go new file mode 100644 index 00000000000..c3873444572 --- /dev/null +++ b/libs/cmdio/log_test.go @@ -0,0 +1,41 @@ +package cmdio_test + +import ( + "testing" + + "github.com/databricks/cli/libs/cmdio" + "github.com/stretchr/testify/assert" +) + +func TestLogProgressWritesWhenNotQuiet(t *testing.T) { + ctx, stderr := cmdio.NewTestContextWithStderr(t.Context()) + + cmdio.LogProgress(ctx, "Uploading bundle files") + + assert.Contains(t, stderr.String(), "Uploading bundle files") +} + +func TestLogProgressSuppressedWhenQuiet(t *testing.T) { + ctx, stderr := cmdio.NewTestContextWithStderr(t.Context()) + ctx = cmdio.WithQuiet(ctx) + + cmdio.LogProgress(ctx, "Uploading bundle files") + + assert.Empty(t, stderr.String()) +} + +// LogString is for results the user asked for, so -qq must not silence it. +func TestLogStringNotAffectedByQuiet(t *testing.T) { + ctx, stderr := cmdio.NewTestContextWithStderr(t.Context()) + ctx = cmdio.WithQuiet(ctx) + + cmdio.LogString(ctx, "Resources: 1 created") + + assert.Contains(t, stderr.String(), "Resources: 1 created") +} + +func TestIsQuiet(t *testing.T) { + ctx := t.Context() + assert.False(t, cmdio.IsQuiet(ctx)) + assert.True(t, cmdio.IsQuiet(cmdio.WithQuiet(ctx))) +} diff --git a/libs/sync/sync.go b/libs/sync/sync.go index f57ba105939..71c106d4875 100644 --- a/libs/sync/sync.go +++ b/libs/sync/sync.go @@ -17,6 +17,14 @@ import ( type OutputHandler func(context.Context, <-chan Event) +// FileCounts reports how many files a sync run uploaded and deleted. A file +// whose remote name changed (e.g. a script converted to a notebook) is counted +// as both an upload and a delete, because that is what the sync performs. +type FileCounts struct { + Uploaded int + Deleted int +} + type SyncOptions struct { WorktreeRoot vfs.Path LocalRoot vfs.Path @@ -55,6 +63,11 @@ type Sync struct { notifier EventNotifier seq int + // fileCounts holds the counts from the most recent run. Kept here rather than + // derived from the event stream because the notifier is a no-op unless the + // caller supplies an OutputHandler. + fileCounts FileCounts + // WaitGroup is automatically created when an output handler is provided in the SyncOptions. // Close call is required to ensure the output handler goroutine handles all events in time. outputWaitGroup *stdsync.WaitGroup @@ -171,6 +184,7 @@ func (s *Sync) RunOnce(ctx context.Context) ([]fileset.File, error) { if err != nil { return files, err } + s.fileCounts = FileCounts{Uploaded: len(change.put), Deleted: len(change.delete)} s.notifyStart(ctx, change) if change.IsEmpty() { @@ -195,6 +209,11 @@ func (s *Sync) RunOnce(ctx context.Context) ([]fileset.File, error) { return files, nil } +// FileCounts returns the upload and delete counts from the most recent run. +func (s *Sync) FileCounts() FileCounts { + return s.fileCounts +} + // GetFileList returns the local files selected for sync, without syncing them. func (s *Sync) GetFileList(ctx context.Context) ([]fileset.File, error) { return s.fileList.Files(ctx)