From 937ecbc6cb2ae55898766dac659b286cc5ec1537 Mon Sep 17 00:00:00 2001 From: Shreyas Goenka Date: Wed, 19 Aug 2026 10:05:28 +0000 Subject: [PATCH 1/4] acceptance: add destroy-bundle to clean up the bundle directory `bundle destroy` removes `~/.bundle//` but not the `` parent, and it does not run at all when a script fails before reaching it. Acceptance tests use a unique bundle name per run, so nothing reuses what is left behind: the shared CI workspace accumulates the leftovers until they hit its child-node limit. Add a `destroy-bundle` helper that destroys the bundle and then removes the `~/.bundle/` directory it was deployed under. The cleanup runs even when destroy fails, which is when a deployment is most likely to be left behind, and the destroy exit code is still propagated so `set -e` behaves as before. The `bundle destroy` call is traced exactly as a direct invocation would be and the cleanup only runs against a real workspace, so no expected output changes. Cleanup failures are ignored: they must never turn a passing test red. Only the `~/.bundle//` layout is touched, since `root_path` is configurable and the parent of an arbitrary path is not ours to remove. Converted the 58 scripts whose single destroy is the plain form and that use no `-t` target, leaving the shapes where a rewrite could change behaviour (`errcode`, `musterr`, `trap`, several destroys in one script) for a follow-up. Co-authored-by: Isaac --- .agents/rules/testing.md | 1 + .../deploy/bundle-no-args-with-flags/script | 2 +- acceptance/apps/deploy/bundle-no-args/script | 2 +- .../ai_runtime_task/local_code_source/script | 2 +- acceptance/bundle/apps/app_yaml/script | 2 +- acceptance/bundle/apps/job_permissions/script | 2 +- acceptance/bundle/bundle_tag/id/script | 2 +- acceptance/bundle/bundle_tag/url/script | 2 +- .../deploy/immutable-no-artifacts/script | 2 +- .../bundle/deploy/readplan/basic/script | 2 +- .../readplan/cli-version-mismatch/script | 2 +- .../deploy/readplan/postgres_role/script | 2 +- .../deploy/readplan/serial-mismatch/script | 2 +- .../bundle/deployment/bind/catalog/script | 2 +- .../bundle/deployment/bind/dashboard/script | 2 +- .../bundle/deployment/bind/experiment/script | 2 +- .../deployment/bind/external_location/script | 2 +- .../bundle/deployment/bind/genie_space/script | 2 +- .../bind/job/generate-and-bind/script | 2 +- .../bind/job/job-spark-python-task/script | 2 +- .../bind/model-serving-endpoint/script | 2 +- .../deployment/bind/registered-model/script | 2 +- .../deployment/bind/secret-scope/script | 2 +- .../bind/vector_search_endpoint/script | 2 +- .../bind/vector_search_index/script | 2 +- .../bundle/deployment/bind/volume/script | 2 +- .../bundle/destroy/all-resources/script | 2 +- acceptance/bundle/generate/auto-bind/script | 2 +- .../generate/pipeline_and_deploy/script | 2 +- .../generate/python_job_and_deploy/script | 2 +- .../bundle/resource_deps/create_error/script | 2 +- acceptance/bundle/resource_deps/job_id/script | 2 +- .../job_id_big_graph/delete_all/script | 2 +- .../resource_deps/job_id_delete_bar/script | 2 +- .../resource_deps/job_id_delete_foo/script | 2 +- .../bundle/resource_deps/jobs_update/script | 2 +- .../resource_deps/jobs_update_remote/script | 2 +- .../resource_deps/pipelines_recreate/script | 2 +- .../resource_deps/remote_app_url/script | 2 +- .../bundle/resources/alerts/basic/script | 2 +- .../bundle/resources/apps/update/script | 2 +- .../resources/dashboards/destroy/script | 2 +- .../bundle/resources/grants/catalogs/script | 2 +- .../resources/grants/registered_models/script | 2 +- .../grants/schemas/change_privilege/script | 2 +- .../bundle/resources/grants/volumes/script | 2 +- .../bundle/resources/jobs/big_id/script | 2 +- .../bundle/resources/jobs/update/script | 2 +- .../resources/jobs/update_single_node/script | 2 +- .../permissions/dashboards/create/script | 2 +- .../genie_spaces/current_can_manage/script | 2 +- .../resources/permissions/jobs/update/script | 2 +- .../models/current_can_manage/script | 2 +- .../permissions/pipelines/update/script | 2 +- .../permissions/target_permissions/script | 2 +- .../bundle/resources/pipelines/update/script | 2 +- .../resources/volumes/change-comment/script | 2 +- .../bundle/summary/modified_status/script | 2 +- acceptance/bundle/user_agent/simple/script | 2 +- acceptance/script.prepare | 29 +++++++++++++++++++ 60 files changed, 88 insertions(+), 58 deletions(-) diff --git a/.agents/rules/testing.md b/.agents/rules/testing.md index bbfd1ce5e50..39f551e5975 100644 --- a/.agents/rules/testing.md +++ b/.agents/rules/testing.md @@ -146,6 +146,7 @@ Ignore = ["databricks.yml"] # parsed as EnvMatrix.Ignore, not top-level Ignore - `errcode CMD...`: run CMD; if it exits non-zero, append `Exit code: N` to the output but let the script continue (scripts run under `bash -e`, which would otherwise abort). Use when a command is *allowed* to fail and later steps must still run. - `musterr CMD...`: run CMD and fail the whole test if it *succeeds*; on the expected failure the script continues. Use to assert a command must error. - `withdir DIR CMD...`: run CMD with the working directory set to DIR, restoring it afterwards. +- `destroy-bundle [ARGS...]`: run `bundle destroy --auto-approve` (traced, so output is identical to calling it directly) and then remove the `~/.bundle/` directory the bundle was deployed under. Prefer it over a bare `trace $CLI bundle destroy --auto-approve` when the test is done with the bundle: on a real workspace a leftover directory is never reused, and they accumulate against the workspace's child-node limit. It removes the directory recursively, so do not use it to destroy one target while another target of the same bundle must stay deployed. - `git-repo-init`: initialize a deterministic git repo (fixed user/email, no hooks) and commit `databricks.yml`. - `uuid`, `sethome DIR`, `venv_activate`, `as-test-sp CMD...`, `readplanarg FILE`, `envsubst`: see `acceptance/script.prepare` for the full list and exact semantics. diff --git a/acceptance/apps/deploy/bundle-no-args-with-flags/script b/acceptance/apps/deploy/bundle-no-args-with-flags/script index 559a1859522..e3e9f716e4c 100644 --- a/acceptance/apps/deploy/bundle-no-args-with-flags/script +++ b/acceptance/apps/deploy/bundle-no-args-with-flags/script @@ -3,4 +3,4 @@ trace $CLI apps deploy --skip-validation --auto-approve --force-lock --fail-on-active-runs -trace $CLI bundle destroy --auto-approve +destroy-bundle diff --git a/acceptance/apps/deploy/bundle-no-args/script b/acceptance/apps/deploy/bundle-no-args/script index dd17862224a..0d276026183 100644 --- a/acceptance/apps/deploy/bundle-no-args/script +++ b/acceptance/apps/deploy/bundle-no-args/script @@ -4,4 +4,4 @@ trace $CLI apps deploy --skip-validation -trace $CLI bundle destroy --auto-approve +destroy-bundle diff --git a/acceptance/bundle/ai_runtime_task/local_code_source/script b/acceptance/bundle/ai_runtime_task/local_code_source/script index fe5e707ce01..3a194dec9ab 100644 --- a/acceptance/bundle/ai_runtime_task/local_code_source/script +++ b/acceptance/bundle/ai_runtime_task/local_code_source/script @@ -25,5 +25,5 @@ trace $CLI bundle deploy trace print_requests.py --sort --del-field raw_body '//.air_snapshots/' title "destroy removes the deployed bundle (including the synced snapshots)\n" -trace $CLI bundle destroy --auto-approve +destroy-bundle rm out.requests.txt diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script index d0dd8d5f800..2e5489cbaca 100644 --- a/acceptance/bundle/apps/app_yaml/script +++ b/acceptance/bundle/apps/app_yaml/script @@ -5,5 +5,5 @@ trace jq 'select(.path | test("app.yml"))' out.requests.txt | sed 's/\\r//g' > #trace print_requests.py //apps # currently fails due to TF inserting description="" rm out.requests.txt -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //apps diff --git a/acceptance/bundle/apps/job_permissions/script b/acceptance/bundle/apps/job_permissions/script index 50d92015c51..d5eb8176656 100644 --- a/acceptance/bundle/apps/job_permissions/script +++ b/acceptance/bundle/apps/job_permissions/script @@ -35,4 +35,4 @@ patch -s --no-backup-if-mismatch databricks.yml < fix.patch trace $CLI bundle deploy -qq trace has_manage_run -trace $CLI bundle destroy --auto-approve +destroy-bundle diff --git a/acceptance/bundle/bundle_tag/id/script b/acceptance/bundle/bundle_tag/id/script index dbc595a277f..ff688e96f23 100644 --- a/acceptance/bundle/bundle_tag/id/script +++ b/acceptance/bundle/bundle_tag/id/script @@ -4,5 +4,5 @@ trace $CLI bundle plan trace $CLI bundle deploy trace print_requests.py //jobs trace $CLI bundle summary -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs diff --git a/acceptance/bundle/bundle_tag/url/script b/acceptance/bundle/bundle_tag/url/script index dbc595a277f..ff688e96f23 100644 --- a/acceptance/bundle/bundle_tag/url/script +++ b/acceptance/bundle/bundle_tag/url/script @@ -4,5 +4,5 @@ trace $CLI bundle plan trace $CLI bundle deploy trace print_requests.py //jobs trace $CLI bundle summary -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs diff --git a/acceptance/bundle/deploy/immutable-no-artifacts/script b/acceptance/bundle/deploy/immutable-no-artifacts/script index a7aad718750..2e4b83ec066 100644 --- a/acceptance/bundle/deploy/immutable-no-artifacts/script +++ b/acceptance/bundle/deploy/immutable-no-artifacts/script @@ -15,4 +15,4 @@ trace $CLI jobs get $JOB_ID | jq '.settings.tasks' | jq '.[] | select(.spark_pyt trace $CLI jobs get $JOB_ID | jq '.settings.tasks' | jq '.[] | select(.notebook_task != null) | .notebook_task.notebook_path' trace $CLI jobs get $JOB_ID | jq '.settings.tasks' | jq '.[] | select(.notebook_task != null) | .notebook_task.base_parameters.path' -trace $CLI bundle destroy --auto-approve +destroy-bundle diff --git a/acceptance/bundle/deploy/readplan/basic/script b/acceptance/bundle/deploy/readplan/basic/script index 89bf2487b86..dcd3bc704a3 100644 --- a/acceptance/bundle/deploy/readplan/basic/script +++ b/acceptance/bundle/deploy/readplan/basic/script @@ -14,5 +14,5 @@ trace $CLI bundle deploy --plan out.plan_skip.json # Show what requests were made (should not create/update job again; should not read remote state) trace print_requests.py --get //jobs | contains.py "!GET" "!POST" -trace $CLI bundle destroy --auto-approve +destroy-bundle rm out.requests.txt diff --git a/acceptance/bundle/deploy/readplan/cli-version-mismatch/script b/acceptance/bundle/deploy/readplan/cli-version-mismatch/script index b7fe9ee268d..1310b6ac62e 100644 --- a/acceptance/bundle/deploy/readplan/cli-version-mismatch/script +++ b/acceptance/bundle/deploy/readplan/cli-version-mismatch/script @@ -5,5 +5,5 @@ jq '.cli_version = "1.2.3"' plan.json > plan.json.tmp && mv plan.json.tmp plan.j trace $CLI bundle deploy --plan plan.json rm plan.json print_requests.py //jobs -trace $CLI bundle destroy --auto-approve +destroy-bundle rm out.requests.txt diff --git a/acceptance/bundle/deploy/readplan/postgres_role/script b/acceptance/bundle/deploy/readplan/postgres_role/script index efade4e2789..726b2d3fa7f 100644 --- a/acceptance/bundle/deploy/readplan/postgres_role/script +++ b/acceptance/bundle/deploy/readplan/postgres_role/script @@ -19,5 +19,5 @@ trace print_requests.py //roles # A follow-up plan must show no drift. trace $CLI bundle plan -trace $CLI bundle destroy --auto-approve +destroy-bundle rm out.requests.txt diff --git a/acceptance/bundle/deploy/readplan/serial-mismatch/script b/acceptance/bundle/deploy/readplan/serial-mismatch/script index 170f44a4c87..05e4c344ff0 100644 --- a/acceptance/bundle/deploy/readplan/serial-mismatch/script +++ b/acceptance/bundle/deploy/readplan/serial-mismatch/script @@ -11,4 +11,4 @@ jq '.serial = 999' plan.json > plan.json.tmp && mv plan.json.tmp plan.json musterr $CLI bundle deploy --plan plan.json rm plan.json -trace $CLI bundle destroy --auto-approve +destroy-bundle diff --git a/acceptance/bundle/deployment/bind/catalog/script b/acceptance/bundle/deployment/bind/catalog/script index f00c7819e45..d25f1943ab1 100644 --- a/acceptance/bundle/deployment/bind/catalog/script +++ b/acceptance/bundle/deployment/bind/catalog/script @@ -20,7 +20,7 @@ title "Unbind catalog" trace $CLI bundle deployment unbind foo title "Destroy bundle" -trace $CLI bundle destroy --auto-approve +destroy-bundle title "Read the pre-defined catalog again (expecting it still exists): " trace $CLI catalogs get "test-catalog-$UNIQUE_NAME" | jq '{comment, name}' diff --git a/acceptance/bundle/deployment/bind/dashboard/script b/acceptance/bundle/deployment/bind/dashboard/script index 3d4163a947f..34f10ab826e 100644 --- a/acceptance/bundle/deployment/bind/dashboard/script +++ b/acceptance/bundle/deployment/bind/dashboard/script @@ -22,7 +22,7 @@ trace $CLI lakeview get "${DASHBOARD_ID}" | jq --sort-keys '{display_name, lifec trace $CLI bundle deployment unbind dashboard1 -trace $CLI bundle destroy --auto-approve +destroy-bundle # Read the pre-defined dashboard again (expecting it still exists and is not deleted): trace $CLI lakeview get "${DASHBOARD_ID}" | jq --sort-keys '{display_name, lifecycle_state, path, parent_path, serialized_dashboard} | .serialized_dashboard |= fromjson' diff --git a/acceptance/bundle/deployment/bind/experiment/script b/acceptance/bundle/deployment/bind/experiment/script index 70cf1933811..d2658a0fe29 100644 --- a/acceptance/bundle/deployment/bind/experiment/script +++ b/acceptance/bundle/deployment/bind/experiment/script @@ -33,6 +33,6 @@ $CLI bundle plan --output json | jq '{plan: .plan | map_values({action, name_cha trace $CLI bundle deployment unbind experiment1 -trace $CLI bundle destroy --auto-approve +destroy-bundle trace $CLI experiments get-experiment ${EXPERIMENT_ID} | jq '{name: .experiment.name, lifecycle_stage: .experiment.lifecycle_stage}' diff --git a/acceptance/bundle/deployment/bind/external_location/script b/acceptance/bundle/deployment/bind/external_location/script index 6f91ac1169f..01070882bd9 100644 --- a/acceptance/bundle/deployment/bind/external_location/script +++ b/acceptance/bundle/deployment/bind/external_location/script @@ -20,7 +20,7 @@ title "Unbind external location" trace $CLI bundle deployment unbind test_location title "Destroy bundle" -trace $CLI bundle destroy --auto-approve +destroy-bundle title "Read the pre-defined external location again (expecting it still exists): " trace $CLI external-locations get "test-location-$UNIQUE_NAME" | jq '{name, url, credential_name}' diff --git a/acceptance/bundle/deployment/bind/genie_space/script b/acceptance/bundle/deployment/bind/genie_space/script index 896685a2311..b7c75fd55f1 100644 --- a/acceptance/bundle/deployment/bind/genie_space/script +++ b/acceptance/bundle/deployment/bind/genie_space/script @@ -24,7 +24,7 @@ trace $CLI genie get-space "${GENIE_SPACE_ID}" | jq --sort-keys '{title, parent_ trace $CLI bundle deployment unbind genie_space1 -trace $CLI bundle destroy --auto-approve +destroy-bundle # Read the Genie space again (expecting it still exists and is not deleted): trace $CLI genie get-space "${GENIE_SPACE_ID}" | jq --sort-keys '{title, parent_path, warehouse_id}' diff --git a/acceptance/bundle/deployment/bind/job/generate-and-bind/script b/acceptance/bundle/deployment/bind/job/generate-and-bind/script index a1f6e2c34e2..9a902cdb52c 100644 --- a/acceptance/bundle/deployment/bind/job/generate-and-bind/script +++ b/acceptance/bundle/deployment/bind/job/generate-and-bind/script @@ -47,7 +47,7 @@ trace cat resources/test_job_key.job.yml | grep "name: generate-job-${UNIQUE_NAM trace $CLI bundle deployment bind test_job_key $JOB_ID --auto-approve trace $CLI bundle deploy -trace $CLI bundle destroy --auto-approve +destroy-bundle title "Check that job is bound and does not exist after bundle is destroyed:" trace errcode $CLI jobs get "${JOB_ID}" --output json diff --git a/acceptance/bundle/deployment/bind/job/job-spark-python-task/script b/acceptance/bundle/deployment/bind/job/job-spark-python-task/script index c0831899416..7414610b14e 100644 --- a/acceptance/bundle/deployment/bind/job/job-spark-python-task/script +++ b/acceptance/bundle/deployment/bind/job/job-spark-python-task/script @@ -50,7 +50,7 @@ title "Remove .databricks directory to simulate fresh deployment:" trace rm -rf .databricks title "Destroy the bundle:" -trace $CLI bundle destroy --auto-approve +destroy-bundle title "Read the pre-defined job again (expecting it still exists):" trace $CLI jobs get ${JOB_ID} | jq '{job_id, settings: {name: .settings.name, tasks: [.settings.tasks[] | {task_key, spark_python_task: {python_file: .spark_python_task.python_file}}]}}' diff --git a/acceptance/bundle/deployment/bind/model-serving-endpoint/script b/acceptance/bundle/deployment/bind/model-serving-endpoint/script index 100b70b29ec..f07db3240cf 100644 --- a/acceptance/bundle/deployment/bind/model-serving-endpoint/script +++ b/acceptance/bundle/deployment/bind/model-serving-endpoint/script @@ -21,7 +21,7 @@ trace $CLI serving-endpoints get "${ENDPOINT_NAME}" | jq '{name, permission_leve trace $CLI bundle deployment unbind endpoint1 -trace $CLI bundle destroy --auto-approve +destroy-bundle # Read the pre-defined serving-endpoint again (expecting it still exists and is not deleted): trace $CLI serving-endpoints get "${ENDPOINT_NAME}" | jq '{name, permission_level, route_optimized, state}' diff --git a/acceptance/bundle/deployment/bind/registered-model/script b/acceptance/bundle/deployment/bind/registered-model/script index 2229197247b..211e493090c 100644 --- a/acceptance/bundle/deployment/bind/registered-model/script +++ b/acceptance/bundle/deployment/bind/registered-model/script @@ -26,7 +26,7 @@ trace $CLI registered-models get "${MODEL_FULL_NAME}" | jq '{full_name, schema_n trace $CLI bundle deployment unbind model1 -trace $CLI bundle destroy --auto-approve +destroy-bundle # Read the pre-defined model again (expecting it still exists and is not deleted): trace $CLI registered-models get "${MODEL_FULL_NAME}" | jq '{full_name, schema_name, name}' diff --git a/acceptance/bundle/deployment/bind/secret-scope/script b/acceptance/bundle/deployment/bind/secret-scope/script index e67b4f91f9e..f907da576c2 100644 --- a/acceptance/bundle/deployment/bind/secret-scope/script +++ b/acceptance/bundle/deployment/bind/secret-scope/script @@ -18,6 +18,6 @@ trace $CLI secrets list-scopes -o json | jq --arg value ${SECRET_SCOPE_NAME} '.[ trace $CLI bundle deployment unbind secret_scope1 -trace $CLI bundle destroy --auto-approve +destroy-bundle trace $CLI secrets list-scopes -o json | jq --arg value ${SECRET_SCOPE_NAME} '.[] | select(.name == $value)' diff --git a/acceptance/bundle/deployment/bind/vector_search_endpoint/script b/acceptance/bundle/deployment/bind/vector_search_endpoint/script index bf45cbea784..45802397f48 100644 --- a/acceptance/bundle/deployment/bind/vector_search_endpoint/script +++ b/acceptance/bundle/deployment/bind/vector_search_endpoint/script @@ -17,7 +17,7 @@ trace $CLI vector-search-endpoints get-endpoint "${ENDPOINT_NAME}" | jq '{id, na trace $CLI bundle deployment unbind endpoint1 -trace $CLI bundle destroy --auto-approve +destroy-bundle # Read the pre-defined endpoint again (expecting it still exists and is not deleted): trace $CLI vector-search-endpoints get-endpoint "${ENDPOINT_NAME}" | jq '{id, name, endpoint_type}' diff --git a/acceptance/bundle/deployment/bind/vector_search_index/script b/acceptance/bundle/deployment/bind/vector_search_index/script index 16f36a496fd..d6268eaf91c 100644 --- a/acceptance/bundle/deployment/bind/vector_search_index/script +++ b/acceptance/bundle/deployment/bind/vector_search_index/script @@ -21,7 +21,7 @@ trace $CLI vector-search-indexes get-index "${INDEX_NAME}" | jq '{name, endpoint trace $CLI bundle deployment unbind index1 -trace $CLI bundle destroy --auto-approve +destroy-bundle # Read the pre-defined index again (expecting it still exists and is not deleted): trace $CLI vector-search-indexes get-index "${INDEX_NAME}" | jq '{name, endpoint_name, index_type, primary_key}' diff --git a/acceptance/bundle/deployment/bind/volume/script b/acceptance/bundle/deployment/bind/volume/script index dee5352a837..5395c9f2808 100644 --- a/acceptance/bundle/deployment/bind/volume/script +++ b/acceptance/bundle/deployment/bind/volume/script @@ -25,6 +25,6 @@ trace $CLI volumes read "${VOLUME_FULL_NAME}" | jq '{catalog_name, full_name, sc trace $CLI bundle deployment unbind volume1 -trace $CLI bundle destroy --auto-approve +destroy-bundle trace $CLI volumes read "${VOLUME_FULL_NAME}" | jq '{catalog_name, full_name, schema_name, volume_type}' diff --git a/acceptance/bundle/destroy/all-resources/script b/acceptance/bundle/destroy/all-resources/script index ceb8acee91a..f66625fb7f6 100644 --- a/acceptance/bundle/destroy/all-resources/script +++ b/acceptance/bundle/destroy/all-resources/script @@ -1,2 +1,2 @@ trace $CLI bundle deploy -trace $CLI bundle destroy --auto-approve +destroy-bundle diff --git a/acceptance/bundle/generate/auto-bind/script b/acceptance/bundle/generate/auto-bind/script index f6517a8adb6..3858b76a87a 100755 --- a/acceptance/bundle/generate/auto-bind/script +++ b/acceptance/bundle/generate/auto-bind/script @@ -45,7 +45,7 @@ title "Deploy the bound job:" trace $CLI bundle deploy title "Destroy the bundle:" -trace $CLI bundle destroy --auto-approve +destroy-bundle title "Check that job is bound and does not exist after bundle is destroyed:" trace errcode $CLI jobs get "${JOB_ID}" --output json diff --git a/acceptance/bundle/generate/pipeline_and_deploy/script b/acceptance/bundle/generate/pipeline_and_deploy/script index 32d4cbcbc4a..2e531ffb070 100644 --- a/acceptance/bundle/generate/pipeline_and_deploy/script +++ b/acceptance/bundle/generate/pipeline_and_deploy/script @@ -50,4 +50,4 @@ title "Deploy the generated bundle" trace $CLI bundle deploy title "Destroy the deployed bundle" -trace $CLI bundle destroy --auto-approve +destroy-bundle diff --git a/acceptance/bundle/generate/python_job_and_deploy/script b/acceptance/bundle/generate/python_job_and_deploy/script index f9629bf8e7f..e7dc2d8d33a 100644 --- a/acceptance/bundle/generate/python_job_and_deploy/script +++ b/acceptance/bundle/generate/python_job_and_deploy/script @@ -47,4 +47,4 @@ title "Deploy the generated bundle" trace $CLI bundle deploy title "Destroy the deployed bundle" -trace $CLI bundle destroy --auto-approve +destroy-bundle diff --git a/acceptance/bundle/resource_deps/create_error/script b/acceptance/bundle/resource_deps/create_error/script index d475fdaea78..f0f4a3428c7 100644 --- a/acceptance/bundle/resource_deps/create_error/script +++ b/acceptance/bundle/resource_deps/create_error/script @@ -18,5 +18,5 @@ diff.py out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt out.deploy2.$DATABRICKS_BUNDLE_ rm out.deploy2.$DATABRICKS_BUNDLE_ENGINE.txt trace print_requests.py //jobs -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/job_id/script b/acceptance/bundle/resource_deps/job_id/script index 3b033fe390a..a06d1849c51 100644 --- a/acceptance/bundle/resource_deps/job_id/script +++ b/acceptance/bundle/resource_deps/job_id/script @@ -12,5 +12,5 @@ trace $CLI bundle plan -o json > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI bundle deploy trace print_requests.py //jobs -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script index 9136c748eee..99978e3e2b7 100644 --- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script +++ b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script @@ -15,5 +15,5 @@ cp empty.yml databricks.yml trace $CLI bundle plan > out.plan_delete.txt trace $CLI bundle deploy -trace $CLI bundle destroy --auto-approve +destroy-bundle rm -f out.requests.txt diff --git a/acceptance/bundle/resource_deps/job_id_delete_bar/script b/acceptance/bundle/resource_deps/job_id_delete_bar/script index 62bdc1e3fe9..06a3241782e 100644 --- a/acceptance/bundle/resource_deps/job_id_delete_bar/script +++ b/acceptance/bundle/resource_deps/job_id_delete_bar/script @@ -14,5 +14,5 @@ trace $CLI bundle deploy # (foo's dependency on bar was removed in only_foo.yml), so execution order is non-deterministic. trace print_requests.py --sort //jobs > out.deploy2.requests.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/job_id_delete_foo/script b/acceptance/bundle/resource_deps/job_id_delete_foo/script index 89e1d97bd38..fece716c76b 100644 --- a/acceptance/bundle/resource_deps/job_id_delete_foo/script +++ b/acceptance/bundle/resource_deps/job_id_delete_foo/script @@ -12,5 +12,5 @@ trace $CLI bundle plan -o json > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI bundle deploy trace print_requests.py //jobs -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/jobs_update/script b/acceptance/bundle/resource_deps/jobs_update/script index 3cb808b187f..9d60b4dc515 100644 --- a/acceptance/bundle/resource_deps/jobs_update/script +++ b/acceptance/bundle/resource_deps/jobs_update/script @@ -25,7 +25,7 @@ trace $CLI jobs get $foo_id > out.get_foo.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI jobs get $bar_id rm out.requests.txt -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs trace musterr $CLI jobs get $foo_id diff --git a/acceptance/bundle/resource_deps/jobs_update_remote/script b/acceptance/bundle/resource_deps/jobs_update_remote/script index 09572ae04be..7d4ce2812f0 100644 --- a/acceptance/bundle/resource_deps/jobs_update_remote/script +++ b/acceptance/bundle/resource_deps/jobs_update_remote/script @@ -15,5 +15,5 @@ trace envsubst < job_update.json > tmp.json && mv tmp.json job_update.json trace $CLI jobs reset --json @job_update.json $CLI bundle plan -o json > out.plan_update.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/pipelines_recreate/script b/acceptance/bundle/resource_deps/pipelines_recreate/script index 1a06b13bc24..0d06b039e13 100644 --- a/acceptance/bundle/resource_deps/pipelines_recreate/script +++ b/acceptance/bundle/resource_deps/pipelines_recreate/script @@ -33,7 +33,7 @@ $CLI bundle plan -o json > out.plan_noop.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI bundle deploy trace print_requests.py //jobs //pipelines -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs //pipelines trace musterr $CLI pipelines get $foo_id diff --git a/acceptance/bundle/resource_deps/remote_app_url/script b/acceptance/bundle/resource_deps/remote_app_url/script index d38692366b3..ba4fcbf3868 100644 --- a/acceptance/bundle/resource_deps/remote_app_url/script +++ b/acceptance/bundle/resource_deps/remote_app_url/script @@ -5,5 +5,5 @@ trace print_requests.py '^//import-file/' trace $CLI bundle deploy trace print_requests.py '^//import-file/' -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py --sort '^//import-file/' diff --git a/acceptance/bundle/resources/alerts/basic/script b/acceptance/bundle/resources/alerts/basic/script index e47c734d1bd..196a80126d9 100644 --- a/acceptance/bundle/resources/alerts/basic/script +++ b/acceptance/bundle/resources/alerts/basic/script @@ -14,7 +14,7 @@ trace $CLI permissions get alertsv2 $alert_id | jq ".access_control_list.[]" -c title "assert that no permanent drift happens" trace $CLI bundle plan -trace $CLI bundle destroy --auto-approve +destroy-bundle errcode trace $CLI alerts-v2 get-alert $alert_id diff --git a/acceptance/bundle/resources/apps/update/script b/acceptance/bundle/resources/apps/update/script index 0d988c0d4a2..e5bdd742740 100644 --- a/acceptance/bundle/resources/apps/update/script +++ b/acceptance/bundle/resources/apps/update/script @@ -24,5 +24,5 @@ trace print_requests >> out.requests.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI bundle plan trace $CLI bundle summary -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests >> out.requests.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/dashboards/destroy/script b/acceptance/bundle/resources/dashboards/destroy/script index e0419b0507e..1cf5e902d9e 100755 --- a/acceptance/bundle/resources/dashboards/destroy/script +++ b/acceptance/bundle/resources/dashboards/destroy/script @@ -16,6 +16,6 @@ add_repl "$DASHBOARD_ID" DASHBOARD_ID # Verify dashboard was deployed trace retry $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path}' -trace $CLI bundle destroy --auto-approve +destroy-bundle trace $CLI lakeview get $DASHBOARD_ID | jq '{lifecycle_state, parent_path}' diff --git a/acceptance/bundle/resources/grants/catalogs/script b/acceptance/bundle/resources/grants/catalogs/script index 067710b705e..57d7e0e45cd 100755 --- a/acceptance/bundle/resources/grants/catalogs/script +++ b/acceptance/bundle/resources/grants/catalogs/script @@ -20,5 +20,5 @@ trace print_requests.py //permissions > out.deploy2.requests.$DATABRICKS_BUNDLE_ trace $CLI grants get catalog catalog_grants_$UNIQUE_NAME | jq --sort-keys -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //permissions > out.destroy.requests.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/grants/registered_models/script b/acceptance/bundle/resources/grants/registered_models/script index 98d73773afc..18dab27b7d9 100644 --- a/acceptance/bundle/resources/grants/registered_models/script +++ b/acceptance/bundle/resources/grants/registered_models/script @@ -8,5 +8,5 @@ trace print_requests.py //permissions > out.deploy1.requests.$DATABRICKS_BUNDLE_ # Since we're sending different requests between terraform and direct, assert that the end result is the same: trace $CLI grants get function main.myschema_$UNIQUE_NAME.mymodel | jq --sort-keys -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //permissions > out.destroy.requests.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/grants/schemas/change_privilege/script b/acceptance/bundle/resources/grants/schemas/change_privilege/script index 737f7491d3a..1065d57274d 100644 --- a/acceptance/bundle/resources/grants/schemas/change_privilege/script +++ b/acceptance/bundle/resources/grants/schemas/change_privilege/script @@ -20,5 +20,5 @@ trace print_requests.py //permissions > out.deploy2.requests.$DATABRICKS_BUNDLE_ trace $CLI grants get schema main.schema_grants_$UNIQUE_NAME | jq --sort-keys -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //permissions > out.destroy.requests.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/grants/volumes/script b/acceptance/bundle/resources/grants/volumes/script index 725049cda8e..49cbcc25231 100644 --- a/acceptance/bundle/resources/grants/volumes/script +++ b/acceptance/bundle/resources/grants/volumes/script @@ -16,5 +16,5 @@ trace print_requests.py //permissions > out.deploy2.requests.$DATABRICKS_BUNDLE_ trace $CLI grants get volume main.schema_grants_$UNIQUE_NAME.volume_name | jq --sort-keys -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //permissions > out.destroy.requests.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/jobs/big_id/script b/acceptance/bundle/resources/jobs/big_id/script index 0b803cb1b8d..444c1c04897 100644 --- a/acceptance/bundle/resources/jobs/big_id/script +++ b/acceptance/bundle/resources/jobs/big_id/script @@ -4,5 +4,5 @@ $CLI bundle deploy $(readplanarg out.plan.direct.json) trace print_requests.py //jobs print_state.py > out.state.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI bundle plan | contains.py '0 to add, 0 to change, 0 to delete' -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs diff --git a/acceptance/bundle/resources/jobs/update/script b/acceptance/bundle/resources/jobs/update/script index 270efcaea6d..93717a42b6e 100644 --- a/acceptance/bundle/resources/jobs/update/script +++ b/acceptance/bundle/resources/jobs/update/script @@ -29,7 +29,7 @@ trace $CLI jobs get $ppid | jq 'del(.settings.run_as)' rm out.requests.txt title "Destroy the job and verify that it's removed from the state and from remote" -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs trace musterr $CLI jobs get $ppid diff --git a/acceptance/bundle/resources/jobs/update_single_node/script b/acceptance/bundle/resources/jobs/update_single_node/script index 9e84f677e73..b3d7b983062 100644 --- a/acceptance/bundle/resources/jobs/update_single_node/script +++ b/acceptance/bundle/resources/jobs/update_single_node/script @@ -23,7 +23,7 @@ trace $CLI jobs get $ppid | jq 'del(.settings.run_as)' rm out.requests.txt title "Destroy the job and verify that it's removed from the state and from remote" -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs trace musterr $CLI jobs get $ppid diff --git a/acceptance/bundle/resources/permissions/dashboards/create/script b/acceptance/bundle/resources/permissions/dashboards/create/script index 41f26f63604..44cf0c20f48 100644 --- a/acceptance/bundle/resources/permissions/dashboards/create/script +++ b/acceptance/bundle/resources/permissions/dashboards/create/script @@ -17,5 +17,5 @@ replace_ids.py print_requests.py //permissions > out.requests.deploy.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle destroy --auto-approve +destroy-bundle print_requests.py //permissions > out.requests.destroy.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script index ae805caebbc..ddcdc99dcd6 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script +++ b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script @@ -9,5 +9,5 @@ trace $CLI bundle deploy replace_ids.py print_requests.py //permissions > out.requests.deploy.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle destroy --auto-approve +destroy-bundle print_requests.py //permissions > out.requests.destroy.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/permissions/jobs/update/script b/acceptance/bundle/resources/permissions/jobs/update/script index 38ac1a5b62e..54ae5403c98 100644 --- a/acceptance/bundle/resources/permissions/jobs/update/script +++ b/acceptance/bundle/resources/permissions/jobs/update/script @@ -48,6 +48,6 @@ trace $CLI bundle plan -o json > out.plan_set_empty.$DATABRICKS_BUNDLE_ENGINE.js trace $CLI bundle deploy trace print_requests.py //jobs/ > out.requests_set_empty.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //jobs/ > out.requests_destroy.$DATABRICKS_BUNDLE_ENGINE.json #rm -fr .databricks diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/script b/acceptance/bundle/resources/permissions/models/current_can_manage/script index 0ade9d8934b..3929fa0107d 100644 --- a/acceptance/bundle/resources/permissions/models/current_can_manage/script +++ b/acceptance/bundle/resources/permissions/models/current_can_manage/script @@ -13,5 +13,5 @@ add_repl "$MODEL_ID" "FOO_MODEL_ID" print_requests.py //permissions > out.requests.deploy.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle destroy --auto-approve +destroy-bundle print_requests.py //permissions > out.requests.destroy.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/permissions/pipelines/update/script b/acceptance/bundle/resources/permissions/pipelines/update/script index 3fc2edd239c..19d638e762f 100644 --- a/acceptance/bundle/resources/permissions/pipelines/update/script +++ b/acceptance/bundle/resources/permissions/pipelines/update/script @@ -38,5 +38,5 @@ trace $CLI bundle deploy trace print_requests.py //pipeline > out.requests_restore_original.json trace $CLI bundle plan -trace $CLI bundle destroy --auto-approve +destroy-bundle print_requests.py //pipeline > out.requests_destroy.json diff --git a/acceptance/bundle/resources/permissions/target_permissions/script b/acceptance/bundle/resources/permissions/target_permissions/script index 1a07dad637e..1c7a8261a40 100644 --- a/acceptance/bundle/resources/permissions/target_permissions/script +++ b/acceptance/bundle/resources/permissions/target_permissions/script @@ -3,5 +3,5 @@ $CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json trace $CLI bundle deploy print_requests.py //jobs/ > out.requests_create.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle destroy --auto-approve +destroy-bundle print_requests.py //jobs/ > out.requests_delete.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/bundle/resources/pipelines/update/script b/acceptance/bundle/resources/pipelines/update/script index 255dea2e00d..bd3c2e9cf16 100644 --- a/acceptance/bundle/resources/pipelines/update/script +++ b/acceptance/bundle/resources/pipelines/update/script @@ -25,7 +25,7 @@ trace $CLI pipelines get $ppid rm out.requests.txt title "Destroy the pipeline and verify that it's removed from the state and from remote" -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests trace musterr $CLI pipelines get $ppid diff --git a/acceptance/bundle/resources/volumes/change-comment/script b/acceptance/bundle/resources/volumes/change-comment/script index 03254877b79..eab53f86519 100644 --- a/acceptance/bundle/resources/volumes/change-comment/script +++ b/acceptance/bundle/resources/volumes/change-comment/script @@ -27,7 +27,7 @@ trace print_requests.py //unity title "Verify updated deployment: should show new comment" trace $CLI volumes read main.myschema.myvolume | jq .comment -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py //unity trace musterr $CLI volumes read main.myschema.myvolume diff --git a/acceptance/bundle/summary/modified_status/script b/acceptance/bundle/summary/modified_status/script index 4da723c08eb..fb3291bba64 100644 --- a/acceptance/bundle/summary/modified_status/script +++ b/acceptance/bundle/summary/modified_status/script @@ -10,5 +10,5 @@ mv $VARIANT databricks.yml title "Expecting all resources to have modified_status=deleted" trace $CLI bundle summary -o json | jq .resources -trace $CLI bundle destroy --auto-approve +destroy-bundle trace $CLI bundle summary -o json | jq .resources diff --git a/acceptance/bundle/user_agent/simple/script b/acceptance/bundle/user_agent/simple/script index b1458b4a4c5..68cbfb0819b 100644 --- a/acceptance/bundle/user_agent/simple/script +++ b/acceptance/bundle/user_agent/simple/script @@ -16,5 +16,5 @@ trace print_requests.py --sort --get > out.requests.plan2.$DATABRICKS_BUNDLE_ENG musterr trace $CLI bundle run foo trace print_requests.py --sort --get > out.requests.run.$DATABRICKS_BUNDLE_ENGINE.json -trace $CLI bundle destroy --auto-approve +destroy-bundle trace print_requests.py --sort --get > out.requests.destroy.$DATABRICKS_BUNDLE_ENGINE.json diff --git a/acceptance/script.prepare b/acceptance/script.prepare index d71d37aae9b..5ed45744c49 100644 --- a/acceptance/script.prepare +++ b/acceptance/script.prepare @@ -166,6 +166,35 @@ as-test-sp() { "$@" } +# destroy-bundle destroys the bundle and then removes the ~/.bundle/ directory it +# was deployed under, so a destroy that only partially succeeded does not leave the tree +# behind. Test bundle names are unique per run, so nothing ever reuses a leftover +# directory and they pile up against the shared CI workspace's child-node limit. +# +# The `bundle destroy` invocation is traced exactly as a direct call would be, so +# switching a test to this helper does not change its output. The extra cleanup runs only +# against a real workspace and is best effort: it must never turn a passing test red. +destroy-bundle() { + local bundle_dir="" + if [[ -n "$CLOUD_ENV" ]]; then + local root_path + root_path=$($CLI bundle validate -o json 2>>LOG.destroy-bundle | jq -r '.workspace.root_path // empty') + if [[ -n "$root_path" ]]; then + bundle_dir=$(dirname "$root_path") + fi + fi + + local exit_code=0 + trace $CLI bundle destroy --auto-approve "$@" || exit_code=$? + + # root_path is configurable, so only the ~/.bundle// layout is ours. + if [[ -n "$bundle_dir" && "$(basename "$(dirname "$bundle_dir")")" == ".bundle" ]]; then + $CLI workspace delete "$bundle_dir" --recursive >>LOG.destroy-bundle 2>&1 || true + fi + + return $exit_code +} + readplanarg() { # Expands into "--plan " based on READPLAN env var # Use it with "bundle deploy" to configure two runs: once with saved plan and one without. From 365dc5415fb628b1361015e78c450940d06a6be0 Mon Sep 17 00:00:00 2001 From: Shreyas Goenka Date: Wed, 19 Aug 2026 10:44:31 +0000 Subject: [PATCH 2/4] Simplify the cleanup guard comment Co-authored-by: Isaac --- acceptance/script.prepare | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/script.prepare b/acceptance/script.prepare index 5ed45744c49..26257212717 100644 --- a/acceptance/script.prepare +++ b/acceptance/script.prepare @@ -187,7 +187,7 @@ destroy-bundle() { local exit_code=0 trace $CLI bundle destroy --auto-approve "$@" || exit_code=$? - # root_path is configurable, so only the ~/.bundle// layout is ours. + # Only ever clean up directories under .bundle. if [[ -n "$bundle_dir" && "$(basename "$(dirname "$bundle_dir")")" == ".bundle" ]]; then $CLI workspace delete "$bundle_dir" --recursive >>LOG.destroy-bundle 2>&1 || true fi From 65a70c426926fbd678191a04271a225a0ecd415e Mon Sep 17 00:00:00 2001 From: Shreyas Goenka Date: Wed, 19 Aug 2026 10:59:02 +0000 Subject: [PATCH 3/4] acceptance: use destroy-bundle in trapped cleanup hooks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The first pass only matched destroy invocations at the start of a line, which skipped every one indented inside a `cleanup() { ... }` body registered with `trap cleanup EXIT` — the most common shape in the suite. Convert those too, along with the one-line `cleanup()` definitions and the `trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT` form, all of which produce identical trace output through the helper. Only the last destroy in a script is converted: an earlier one would remove the parent directory recursively while a later destroy still needs it. The invocation also has to be terminal, meaning it sits in a trap, in a function a trap references, or at top level with no deploy after it. Left alone are the shapes whose recorded output would move: `musterr`, a traced `errcode` wrapper, untraced or redirected invocations, and flags placed before `--auto-approve`. Co-authored-by: Isaac --- acceptance/bundle/apps/compute_size/script | 2 +- acceptance/bundle/apps/git_source/script | 2 +- acceptance/bundle/config-remote-sync/cli_defaults/script | 2 +- acceptance/bundle/config-remote-sync/config_edits/script | 2 +- acceptance/bundle/config-remote-sync/dashboard_etag/script | 2 +- acceptance/bundle/config-remote-sync/flushed_cache/script | 2 +- .../bundle/config-remote-sync/formatting_preserved/script | 2 +- acceptance/bundle/config-remote-sync/job_fields/script | 2 +- acceptance/bundle/config-remote-sync/job_multiple_tasks/script | 2 +- .../bundle/config-remote-sync/job_params_variables/script | 2 +- acceptance/bundle/config-remote-sync/job_pipeline_task/script | 2 +- acceptance/bundle/config-remote-sync/multiple_files/script | 2 +- acceptance/bundle/config-remote-sync/multiple_resources/script | 2 +- acceptance/bundle/config-remote-sync/output_json/script | 2 +- acceptance/bundle/config-remote-sync/output_no_changes/script | 2 +- acceptance/bundle/config-remote-sync/pipeline_fields/script | 2 +- .../config-remote-sync/policy_injected_cluster_fields/script | 2 +- acceptance/bundle/config-remote-sync/resolve_variables/script | 2 +- acceptance/bundle/config-remote-sync/select_basic/script | 2 +- acceptance/bundle/config-remote-sync/select_multiple/script | 2 +- acceptance/bundle/config-remote-sync/skip_permissions/script | 2 +- acceptance/bundle/config-remote-sync/split/isolation/script | 2 +- acceptance/bundle/config-remote-sync/split/keyed_edit/script | 2 +- acceptance/bundle/config-remote-sync/split/keyed_remove/script | 2 +- acceptance/bundle/config-remote-sync/split/keyed_rename/script | 2 +- .../bundle/config-remote-sync/split/keyed_twoblock/script | 2 +- acceptance/bundle/config-remote-sync/split/multifile/script | 2 +- .../bundle/config-remote-sync/split/nested_sequence/script | 2 +- acceptance/bundle/config-remote-sync/split/positional/script | 2 +- .../bundle/config-remote-sync/split/target_variable/script | 2 +- acceptance/bundle/config-remote-sync/target_override/script | 2 +- acceptance/bundle/config-remote-sync/task_rename_revert/script | 2 +- acceptance/bundle/config-remote-sync/validation_errors/script | 2 +- acceptance/bundle/deploy/empty-bundle/script | 2 +- acceptance/bundle/deploy/files/no-snapshot-sync/script | 2 +- acceptance/bundle/deploy/immutable-permissions-change/script | 2 +- acceptance/bundle/deploy/immutable/script | 2 +- acceptance/bundle/deploy/partial-summary-on-push-fail/script | 2 +- acceptance/bundle/deploy/pipeline-config-dots/script | 2 +- acceptance/bundle/deploy/spark-jar-task/script | 2 +- acceptance/bundle/deployment/unbind/grants/script | 2 +- acceptance/bundle/deployment/unbind/permissions/script | 2 +- acceptance/bundle/destroy/jobs-and-pipeline/script | 2 +- acceptance/bundle/integration_whl/base/script | 2 +- acceptance/bundle/integration_whl/custom_params/script | 2 +- acceptance/bundle/integration_whl/interactive_cluster/script | 2 +- .../integration_whl/interactive_cluster_dynamic_version/script | 2 +- .../bundle/integration_whl/interactive_single_user/script | 2 +- acceptance/bundle/integration_whl/serverless/script | 2 +- .../bundle/integration_whl/serverless_custom_params/script | 2 +- .../bundle/integration_whl/serverless_dynamic_version/script | 2 +- acceptance/bundle/integration_whl/serverless_extras/script | 2 +- .../integration_whl/serverless_extras_dynamic_version/script | 2 +- acceptance/bundle/integration_whl/wrapper/script | 2 +- acceptance/bundle/integration_whl/wrapper_custom_params/script | 2 +- acceptance/bundle/quiet-levels/script | 2 +- acceptance/bundle/resource_deps/job_id_big_graph/destroy/script | 2 +- acceptance/bundle/resources/alerts/with_file/script | 2 +- acceptance/bundle/resources/apps/config-drift-stopped/script | 2 +- acceptance/bundle/resources/apps/config-drift/script | 2 +- acceptance/bundle/resources/apps/inline_config/script | 2 +- .../bundle/resources/apps/lifecycle-started-omitted/script | 2 +- .../bundle/resources/apps/lifecycle-started-toggle/script | 2 +- acceptance/bundle/resources/apps/lifecycle-started/script | 2 +- acceptance/bundle/resources/catalogs/auto-approve/script | 2 +- acceptance/bundle/resources/catalogs/basic/script | 2 +- acceptance/bundle/resources/catalogs/with-schemas/script | 2 +- .../bundle/resources/clusters/deploy/data_security_mode/script | 2 +- .../bundle/resources/clusters/deploy/local_ssd_count/script | 2 +- acceptance/bundle/resources/clusters/deploy/simple/script | 2 +- .../bundle/resources/clusters/deploy/update-after-create/script | 2 +- .../clusters/deploy/update-and-resize-autoscale/script | 2 +- .../bundle/resources/clusters/deploy/update-and-resize/script | 2 +- .../bundle/resources/clusters/lifecycle-started-toggle/script | 2 +- acceptance/bundle/resources/clusters/lifecycle-started/script | 2 +- .../bundle/resources/clusters/resize-terminated-fallback/script | 2 +- .../bundle/resources/clusters/run/spark_python_task/script | 2 +- .../bundle/resources/dashboards/change-embed-credentials/script | 2 +- acceptance/bundle/resources/dashboards/change-name/script | 2 +- .../bundle/resources/dashboards/change-parent-path/script | 2 +- .../resources/dashboards/change-serialized-dashboard/script | 2 +- .../bundle/resources/dashboards/dataset-catalog-schema/script | 2 +- .../resources/dashboards/delete-trashed-out-of-band/script | 2 +- acceptance/bundle/resources/dashboards/detect-change/script | 2 +- acceptance/bundle/resources/dashboards/generate_inplace/script | 2 +- acceptance/bundle/resources/dashboards/nested-folders/script | 2 +- .../resources/dashboards/publish-failure-stale-content/script | 2 +- .../resources/dashboards/republish-after-draft-update/script | 2 +- acceptance/bundle/resources/dashboards/simple/script | 2 +- .../resources/dashboards/simple_outside_bundle_root/script | 2 +- acceptance/bundle/resources/dashboards/simple_syncroot/script | 2 +- acceptance/bundle/resources/database_catalogs/basic/script | 2 +- acceptance/bundle/resources/database_catalogs/recreate/script | 2 +- acceptance/bundle/resources/database_instances/recreate/script | 2 +- .../bundle/resources/database_instances/single-instance/script | 2 +- acceptance/bundle/resources/experiments/basic/script | 2 +- acceptance/bundle/resources/external_locations/script | 2 +- acceptance/bundle/resources/genie_spaces/delete_warning/script | 2 +- acceptance/bundle/resources/genie_spaces/inline/script | 2 +- .../bundle/resources/genie_spaces/parent_path_update/script | 2 +- .../bundle/resources/genie_spaces/recreate_when_gone/script | 2 +- .../bundle/resources/genie_spaces/serialized_space/script | 2 +- acceptance/bundle/resources/genie_spaces/simple/script | 2 +- .../bundle/resources/genie_spaces/version_migration/script | 2 +- .../bundle/resources/grants/schemas/all_privileges/script | 2 +- .../bundle/resources/grants/schemas/duplicate_principals/script | 2 +- .../bundle/resources/grants/schemas/duplicate_privileges/script | 2 +- acceptance/bundle/resources/instance_pools/script | 2 +- acceptance/bundle/resources/job_runs/basic/script | 2 +- acceptance/bundle/resources/job_runs/failed_run/script | 2 +- acceptance/bundle/resources/job_runs/interrupted_run/script | 2 +- acceptance/bundle/resources/job_runs/job_parameters/script | 2 +- acceptance/bundle/resources/job_runs/on_bundle_deploy/script | 2 +- acceptance/bundle/resources/job_runs/redeploy/script | 2 +- acceptance/bundle/resources/job_runs/retried_run_now/script | 2 +- acceptance/bundle/resources/job_runs/wait/script | 2 +- acceptance/bundle/resources/jobs/alert-task/script | 2 +- acceptance/bundle/resources/jobs/check-metadata/script | 2 +- acceptance/bundle/resources/jobs/double-underscore-keys/script | 2 +- acceptance/bundle/resources/jobs/fail-on-active-runs/script | 2 +- acceptance/bundle/resources/jobs/shared-root-path/script | 2 +- .../bundle/resources/model_serving_endpoints/basic/script | 2 +- .../model_serving_endpoints/drift/recreated_same_name/script | 2 +- .../model_serving_endpoints/recreate/catalog-name/script | 2 +- .../model_serving_endpoints/recreate/name-change/script | 2 +- .../model_serving_endpoints/recreate/route-optimized/script | 2 +- .../model_serving_endpoints/recreate/schema-name/script | 2 +- .../model_serving_endpoints/recreate/table-prefix/script | 2 +- .../resources/model_serving_endpoints/running-endpoint/script | 2 +- .../resources/model_serving_endpoints/update/ai-gateway/script | 2 +- .../model_serving_endpoints/update/both_gateway_and_tags/script | 2 +- .../resources/model_serving_endpoints/update/config/script | 2 +- .../model_serving_endpoints/update/email-notifications/script | 2 +- .../bundle/resources/model_serving_endpoints/update/tags/script | 2 +- acceptance/bundle/resources/models/basic/script | 2 +- acceptance/bundle/resources/models/readplan-permissions/script | 2 +- acceptance/bundle/resources/permissions/factcheck/script | 2 +- .../permissions/genie_spaces/out_of_band_deletion/script | 2 +- .../bundle/resources/pipelines/allow-duplicate-names/script | 2 +- acceptance/bundle/resources/pipelines/auto-approve/script | 2 +- acceptance/bundle/resources/pipelines/lakeflow-pipeline/script | 2 +- acceptance/bundle/resources/pipelines/recreate/script | 2 +- acceptance/bundle/resources/postgres_branches/basic/script | 2 +- acceptance/bundle/resources/postgres_branches/recreate/script | 2 +- .../bundle/resources/postgres_branches/update_protected/script | 2 +- acceptance/bundle/resources/postgres_catalogs/basic/script | 2 +- acceptance/bundle/resources/postgres_catalogs/recreate/script | 2 +- acceptance/bundle/resources/postgres_databases/basic/script | 2 +- .../postgres_databases/live_errors/bad_database_id/script | 2 +- .../postgres_databases/live_errors/bad_role_ref/script | 2 +- acceptance/bundle/resources/postgres_databases/recreate/script | 2 +- .../bundle/resources/postgres_databases/replace_existing/script | 2 +- acceptance/bundle/resources/postgres_databases/update/script | 2 +- acceptance/bundle/resources/postgres_endpoints/basic/script | 2 +- acceptance/bundle/resources/postgres_endpoints/recreate/script | 2 +- .../resources/postgres_endpoints/update_autoscaling/script | 2 +- acceptance/bundle/resources/postgres_projects/basic/script | 2 +- acceptance/bundle/resources/postgres_projects/recreate/script | 2 +- .../resources/postgres_projects/update_display_name/script | 2 +- acceptance/bundle/resources/postgres_roles/basic/script | 2 +- .../bundle/resources/postgres_roles/inherited-role-bind/script | 2 +- .../resources/postgres_roles/inherited-role-conflict/script | 2 +- .../resources/postgres_roles/recreate-postgres-role/script | 2 +- acceptance/bundle/resources/postgres_roles/recreate/script | 2 +- .../bundle/resources/postgres_roles/replace_existing/script | 2 +- acceptance/bundle/resources/postgres_roles/update/script | 2 +- acceptance/bundle/resources/postgres_synced_tables/basic/script | 2 +- .../bundle/resources/postgres_synced_tables/recreate/script | 2 +- .../bundle/resources/quality_monitors/change_assets_dir/script | 2 +- .../resources/quality_monitors/change_output_schema_name/script | 2 +- .../bundle/resources/quality_monitors/change_table_name/script | 2 +- acceptance/bundle/resources/quality_monitors/create/script | 2 +- .../bundle/resources/registered_models/aliases_converge/script | 2 +- acceptance/bundle/resources/registered_models/basic/script | 2 +- acceptance/bundle/resources/schemas/auto-approve/script | 2 +- acceptance/bundle/resources/secret_scopes/basic/script | 2 +- acceptance/bundle/resources/secret_scopes/delete_scope/script | 2 +- .../bundle/resources/secret_scopes/permissions-collapse/script | 2 +- acceptance/bundle/resources/secret_scopes/permissions/script | 2 +- .../resources/sql_warehouses/lifecycle-started-edit/script | 2 +- .../resources/sql_warehouses/lifecycle-started-toggle/script | 2 +- .../bundle/resources/sql_warehouses/lifecycle-started/script | 2 +- acceptance/bundle/resources/sql_warehouses/script | 2 +- acceptance/bundle/resources/synced_database_tables/basic/script | 2 +- .../bundle/resources/synced_database_tables/recreate/script | 2 +- .../bundle/resources/vector_search_endpoints/basic/script | 2 +- .../vector_search_endpoints/drift/budget_policy/script | 2 +- .../vector_search_endpoints/drift/recreated_same_name/script | 2 +- .../resources/vector_search_endpoints/drift/target_qps/script | 2 +- .../vector_search_endpoints/recreate/endpoint_type/script | 2 +- .../vector_search_endpoints/update/budget_policy/script | 2 +- .../resources/vector_search_endpoints/update/target_qps/script | 2 +- acceptance/bundle/resources/vector_search_indexes/basic/script | 2 +- .../vector_search_indexes/drift/deleted_remotely/script | 2 +- .../vector_search_indexes/drift/orphaned_endpoint/script | 2 +- .../bundle/resources/vector_search_indexes/grants/select/script | 2 +- .../vector_search_indexes/recreate/embedding_dimension/script | 2 +- .../vector_search_indexes/recreate/pending_deletion/script | 2 +- .../vector_search_indexes/recreate/with_endpoint/script | 2 +- .../resources/vector_search_indexes/schema_normalization/script | 2 +- acceptance/bundle/resources/volumes/recreate/script | 2 +- acceptance/bundle/resources/volumes/set-storage-location/script | 2 +- acceptance/bundle/run/app-with-job/script | 2 +- acceptance/bundle/run_as/job_default/script | 2 +- acceptance/bundle/select/basic/script | 2 +- acceptance/bundle/select/grants_permissions/script | 2 +- acceptance/bundle/select/plan_file_survives_not_selected/script | 2 +- 207 files changed, 207 insertions(+), 207 deletions(-) diff --git a/acceptance/bundle/apps/compute_size/script b/acceptance/bundle/apps/compute_size/script index 5f4714ae8df..a7939b6050d 100644 --- a/acceptance/bundle/apps/compute_size/script +++ b/acceptance/bundle/apps/compute_size/script @@ -5,7 +5,7 @@ envsubst < databricks.yml.tmpl > databricks.yml # Set up cleanup trap to ensure resources are destroyed even on failure cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/apps/git_source/script b/acceptance/bundle/apps/git_source/script index f9d90c84a53..32d0782d17b 100644 --- a/acceptance/bundle/apps/git_source/script +++ b/acceptance/bundle/apps/git_source/script @@ -5,7 +5,7 @@ envsubst < databricks.yml.tmpl > databricks.yml # Set up cleanup trap to ensure resources are destroyed even on failure cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/cli_defaults/script b/acceptance/bundle/config-remote-sync/cli_defaults/script index cf626b9dc9c..b86714a8301 100755 --- a/acceptance/bundle/config-remote-sync/cli_defaults/script +++ b/acceptance/bundle/config-remote-sync/cli_defaults/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/config_edits/script b/acceptance/bundle/config-remote-sync/config_edits/script index e7defc9b658..e50ba9caed6 100755 --- a/acceptance/bundle/config-remote-sync/config_edits/script +++ b/acceptance/bundle/config-remote-sync/config_edits/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/dashboard_etag/script b/acceptance/bundle/config-remote-sync/dashboard_etag/script index 990988c5906..b6b81ed5526 100644 --- a/acceptance/bundle/config-remote-sync/dashboard_etag/script +++ b/acceptance/bundle/config-remote-sync/dashboard_etag/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/flushed_cache/script b/acceptance/bundle/config-remote-sync/flushed_cache/script index 7571c62bbbc..71b9b2e6da2 100755 --- a/acceptance/bundle/config-remote-sync/flushed_cache/script +++ b/acceptance/bundle/config-remote-sync/flushed_cache/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/formatting_preserved/script b/acceptance/bundle/config-remote-sync/formatting_preserved/script index 526ba1f439a..bd8e69b8fd0 100755 --- a/acceptance/bundle/config-remote-sync/formatting_preserved/script +++ b/acceptance/bundle/config-remote-sync/formatting_preserved/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/job_fields/script b/acceptance/bundle/config-remote-sync/job_fields/script index c667e273b21..acdb210a5a1 100755 --- a/acceptance/bundle/config-remote-sync/job_fields/script +++ b/acceptance/bundle/config-remote-sync/job_fields/script @@ -5,7 +5,7 @@ add_repl "$DEFAULT_SPARK_VERSION" DEFAULT_SPARK_VERSION add_repl "$NODE_TYPE_ID" NODE_TYPE_ID cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle # destroy records requests too; drop the recorded file so it is not compared. rm -f out.requests.txt } diff --git a/acceptance/bundle/config-remote-sync/job_multiple_tasks/script b/acceptance/bundle/config-remote-sync/job_multiple_tasks/script index ff2b7e464ac..c39a75a512f 100755 --- a/acceptance/bundle/config-remote-sync/job_multiple_tasks/script +++ b/acceptance/bundle/config-remote-sync/job_multiple_tasks/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/job_params_variables/script b/acceptance/bundle/config-remote-sync/job_params_variables/script index 8a8acc6d972..70a40ae8a7f 100644 --- a/acceptance/bundle/config-remote-sync/job_params_variables/script +++ b/acceptance/bundle/config-remote-sync/job_params_variables/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/job_pipeline_task/script b/acceptance/bundle/config-remote-sync/job_pipeline_task/script index d5587a201e1..da3cd4e4489 100755 --- a/acceptance/bundle/config-remote-sync/job_pipeline_task/script +++ b/acceptance/bundle/config-remote-sync/job_pipeline_task/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/multiple_files/script b/acceptance/bundle/config-remote-sync/multiple_files/script index 4316a3f1cc4..f6cc6188f86 100755 --- a/acceptance/bundle/config-remote-sync/multiple_files/script +++ b/acceptance/bundle/config-remote-sync/multiple_files/script @@ -5,7 +5,7 @@ envsubst < resources/job1.yml.tmpl > resources/job1.yml envsubst < resources/job2.yml.tmpl > resources/job2.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/script b/acceptance/bundle/config-remote-sync/multiple_resources/script index 7a89c168d69..b420c53c93b 100755 --- a/acceptance/bundle/config-remote-sync/multiple_resources/script +++ b/acceptance/bundle/config-remote-sync/multiple_resources/script @@ -6,7 +6,7 @@ cleanup() { # Restore original config before destroy to avoid Terraform errors # from server-side-only fields (e.g. creator_name) written by config-remote-sync. envsubst < databricks.yml.tmpl > databricks.yml - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/output_json/script b/acceptance/bundle/config-remote-sync/output_json/script index b3b9f6ab6c6..58e83e44943 100755 --- a/acceptance/bundle/config-remote-sync/output_json/script +++ b/acceptance/bundle/config-remote-sync/output_json/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/output_no_changes/script b/acceptance/bundle/config-remote-sync/output_no_changes/script index 1bef0ab9c02..1ba82e296fd 100755 --- a/acceptance/bundle/config-remote-sync/output_no_changes/script +++ b/acceptance/bundle/config-remote-sync/output_no_changes/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/script b/acceptance/bundle/config-remote-sync/pipeline_fields/script index 1fe0261689b..beef4407d90 100755 --- a/acceptance/bundle/config-remote-sync/pipeline_fields/script +++ b/acceptance/bundle/config-remote-sync/pipeline_fields/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/script b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/script index bcc9844b03f..a068c9e49a5 100644 --- a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/script +++ b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/resolve_variables/script b/acceptance/bundle/config-remote-sync/resolve_variables/script index 9a18bfe2d50..2fb57e77fef 100755 --- a/acceptance/bundle/config-remote-sync/resolve_variables/script +++ b/acceptance/bundle/config-remote-sync/resolve_variables/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle # destroy records requests too; drop the recorded file so it is not compared. rm -f out.requests.txt } diff --git a/acceptance/bundle/config-remote-sync/select_basic/script b/acceptance/bundle/config-remote-sync/select_basic/script index a85bb0b46a6..27f2c8e8d23 100644 --- a/acceptance/bundle/config-remote-sync/select_basic/script +++ b/acceptance/bundle/config-remote-sync/select_basic/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/select_multiple/script b/acceptance/bundle/config-remote-sync/select_multiple/script index 8eab7443aff..4db2dcf57ad 100644 --- a/acceptance/bundle/config-remote-sync/select_multiple/script +++ b/acceptance/bundle/config-remote-sync/select_multiple/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/skip_permissions/script b/acceptance/bundle/config-remote-sync/skip_permissions/script index 585db4a5535..401a8dc23ea 100644 --- a/acceptance/bundle/config-remote-sync/skip_permissions/script +++ b/acceptance/bundle/config-remote-sync/skip_permissions/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/isolation/script b/acceptance/bundle/config-remote-sync/split/isolation/script index b1320eed712..074008220bc 100644 --- a/acceptance/bundle/config-remote-sync/split/isolation/script +++ b/acceptance/bundle/config-remote-sync/split/isolation/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/keyed_edit/script b/acceptance/bundle/config-remote-sync/split/keyed_edit/script index dcfc1028455..15bb2497995 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_edit/script +++ b/acceptance/bundle/config-remote-sync/split/keyed_edit/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/keyed_remove/script b/acceptance/bundle/config-remote-sync/split/keyed_remove/script index 73998fa670b..2c4b84afae6 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_remove/script +++ b/acceptance/bundle/config-remote-sync/split/keyed_remove/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/keyed_rename/script b/acceptance/bundle/config-remote-sync/split/keyed_rename/script index 88b8106ed55..5cb33525543 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_rename/script +++ b/acceptance/bundle/config-remote-sync/split/keyed_rename/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/script b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/script index 2b7d8cf82ce..f2aa15a7dac 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/script +++ b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/multifile/script b/acceptance/bundle/config-remote-sync/split/multifile/script index 4f82441d08e..81c3f66c4ae 100644 --- a/acceptance/bundle/config-remote-sync/split/multifile/script +++ b/acceptance/bundle/config-remote-sync/split/multifile/script @@ -5,7 +5,7 @@ envsubst < overrides/10-first.yml.tmpl > overrides/10-first.yml envsubst < overrides/20-second.yml.tmpl > overrides/20-second.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/nested_sequence/script b/acceptance/bundle/config-remote-sync/split/nested_sequence/script index 26d26468995..f608274d313 100644 --- a/acceptance/bundle/config-remote-sync/split/nested_sequence/script +++ b/acceptance/bundle/config-remote-sync/split/nested_sequence/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/positional/script b/acceptance/bundle/config-remote-sync/split/positional/script index fa7b1d54db1..22f53f5d62d 100644 --- a/acceptance/bundle/config-remote-sync/split/positional/script +++ b/acceptance/bundle/config-remote-sync/split/positional/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/split/target_variable/script b/acceptance/bundle/config-remote-sync/split/target_variable/script index da7ff428244..8e29227ec91 100644 --- a/acceptance/bundle/config-remote-sync/split/target_variable/script +++ b/acceptance/bundle/config-remote-sync/split/target_variable/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/target_override/script b/acceptance/bundle/config-remote-sync/target_override/script index 671eb75ed23..7a71035ff5f 100755 --- a/acceptance/bundle/config-remote-sync/target_override/script +++ b/acceptance/bundle/config-remote-sync/target_override/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve -t dev + destroy-bundle -t dev } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/task_rename_revert/script b/acceptance/bundle/config-remote-sync/task_rename_revert/script index a01c1196de6..067c9c44c3d 100644 --- a/acceptance/bundle/config-remote-sync/task_rename_revert/script +++ b/acceptance/bundle/config-remote-sync/task_rename_revert/script @@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/config-remote-sync/validation_errors/script b/acceptance/bundle/config-remote-sync/validation_errors/script index 828ec206445..3d62be17a88 100644 --- a/acceptance/bundle/config-remote-sync/validation_errors/script +++ b/acceptance/bundle/config-remote-sync/validation_errors/script @@ -8,7 +8,7 @@ cleanup() { # Restore valid paths for destroy to work (includes pipeline_root_v2 from sync) mkdir -p pipeline_root pipeline_root_v2 src echo '# Databricks notebook source' > src/notebook.py - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/deploy/empty-bundle/script b/acceptance/bundle/deploy/empty-bundle/script index 775ccd0defc..39c314b60a1 100644 --- a/acceptance/bundle/deploy/empty-bundle/script +++ b/acceptance/bundle/deploy/empty-bundle/script @@ -1,6 +1,6 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/script b/acceptance/bundle/deploy/files/no-snapshot-sync/script index bc8544715eb..8c1089dff56 100644 --- a/acceptance/bundle/deploy/files/no-snapshot-sync/script +++ b/acceptance/bundle/deploy/files/no-snapshot-sync/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/deploy/immutable-permissions-change/script b/acceptance/bundle/deploy/immutable-permissions-change/script index 458bfdd2c85..5cf4ed05ca3 100644 --- a/acceptance/bundle/deploy/immutable-permissions-change/script +++ b/acceptance/bundle/deploy/immutable-permissions-change/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/deploy/immutable/script b/acceptance/bundle/deploy/immutable/script index 85e9a908d1d..d075d1adfa7 100644 --- a/acceptance/bundle/deploy/immutable/script +++ b/acceptance/bundle/deploy/immutable/script @@ -1,6 +1,6 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/script b/acceptance/bundle/deploy/partial-summary-on-push-fail/script index 9e11abbe1b6..c353073f421 100644 --- a/acceptance/bundle/deploy/partial-summary-on-push-fail/script +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/script @@ -2,7 +2,7 @@ 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 + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/deploy/pipeline-config-dots/script b/acceptance/bundle/deploy/pipeline-config-dots/script index 82f07ae34dc..9ea5fba218c 100644 --- a/acceptance/bundle/deploy/pipeline-config-dots/script +++ b/acceptance/bundle/deploy/pipeline-config-dots/script @@ -1,7 +1,7 @@ trace $CLI bundle validate cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/deploy/spark-jar-task/script b/acceptance/bundle/deploy/spark-jar-task/script index d736ca6bfae..22999323312 100644 --- a/acceptance/bundle/deploy/spark-jar-task/script +++ b/acceptance/bundle/deploy/spark-jar-task/script @@ -1,4 +1,4 @@ envsubst < databricks.yml.tmpl > databricks.yml -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy trace $CLI bundle run jar_job diff --git a/acceptance/bundle/deployment/unbind/grants/script b/acceptance/bundle/deployment/unbind/grants/script index f6da92a7e6d..fddc209cb4e 100644 --- a/acceptance/bundle/deployment/unbind/grants/script +++ b/acceptance/bundle/deployment/unbind/grants/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle if [[ -n "$schema_id" ]]; then trace $CLI schemas delete $schema_id fi diff --git a/acceptance/bundle/deployment/unbind/permissions/script b/acceptance/bundle/deployment/unbind/permissions/script index 078e3c3af6b..e6565dda666 100644 --- a/acceptance/bundle/deployment/unbind/permissions/script +++ b/acceptance/bundle/deployment/unbind/permissions/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle trace $CLI jobs delete $job_id echo $? } diff --git a/acceptance/bundle/destroy/jobs-and-pipeline/script b/acceptance/bundle/destroy/jobs-and-pipeline/script index 57ee878f12f..fdd23a2465d 100644 --- a/acceptance/bundle/destroy/jobs-and-pipeline/script +++ b/acceptance/bundle/destroy/jobs-and-pipeline/script @@ -8,7 +8,7 @@ DEPLOYMENT_PATH="//Workspace/Users/${CURRENT_USER_NAME}/.bundle/${UNIQUE_NAME}" cleanup() { title "Destroy bundle" - trace $CLI bundle destroy --auto-approve + destroy-bundle title "Assert pipeline is deleted" trace errcode $CLI pipelines get "${PIPELINE_ID}" diff --git a/acceptance/bundle/integration_whl/base/script b/acceptance/bundle/integration_whl/base/script index 0be0b1aa9be..0be8063ce72 100644 --- a/acceptance/bundle/integration_whl/base/script +++ b/acceptance/bundle/integration_whl/base/script @@ -1,7 +1,7 @@ export EXTRA_CONFIG=empty.yml envsubst < databricks.yml.tmpl > databricks.yml trace cat databricks.yml -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity diff --git a/acceptance/bundle/integration_whl/custom_params/script b/acceptance/bundle/integration_whl/custom_params/script index ff98482dc87..6024bb665c8 100644 --- a/acceptance/bundle/integration_whl/custom_params/script +++ b/acceptance/bundle/integration_whl/custom_params/script @@ -2,7 +2,7 @@ export EXTRA_CONFIG=empty.yml envsubst < $TESTDIR/../base/databricks.yml.tmpl > databricks.yml cp -r $TESTDIR/../base/{$EXTRA_CONFIG,setup.py,my_test_code} . trace cat databricks.yml -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity diff --git a/acceptance/bundle/integration_whl/interactive_cluster/script b/acceptance/bundle/integration_whl/interactive_cluster/script index 49ad28155b3..748b50bb289 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster/script +++ b/acceptance/bundle/integration_whl/interactive_cluster/script @@ -1,7 +1,7 @@ export DATA_SECURITY_MODE=USER_ISOLATION envsubst < databricks.yml.tmpl > databricks.yml trace cat databricks.yml -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity diff --git a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/script b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/script index b30a73ee0d2..6aa341f28df 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/script +++ b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/script @@ -1,6 +1,6 @@ envsubst < databricks.yml.tmpl > databricks.yml cp -r $TESTDIR/../interactive_cluster/{setup.py,my_test_code} . -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity diff --git a/acceptance/bundle/integration_whl/interactive_single_user/script b/acceptance/bundle/integration_whl/interactive_single_user/script index 25227da81ce..21f20b46726 100644 --- a/acceptance/bundle/integration_whl/interactive_single_user/script +++ b/acceptance/bundle/integration_whl/interactive_single_user/script @@ -2,7 +2,7 @@ export DATA_SECURITY_MODE=SINGLE_USER envsubst < $TESTDIR/../interactive_cluster/databricks.yml.tmpl > databricks.yml trace cat databricks.yml cp -r $TESTDIR/../interactive_cluster/{setup.py,my_test_code} . -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity diff --git a/acceptance/bundle/integration_whl/serverless/script b/acceptance/bundle/integration_whl/serverless/script index fc4be42b3c8..6b04ab80ea9 100644 --- a/acceptance/bundle/integration_whl/serverless/script +++ b/acceptance/bundle/integration_whl/serverless/script @@ -1,6 +1,6 @@ envsubst < databricks.yml.tmpl > databricks.yml trace cp -r $TESTDIR/../base/{setup.py,my_test_code} . -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity diff --git a/acceptance/bundle/integration_whl/serverless_custom_params/script b/acceptance/bundle/integration_whl/serverless_custom_params/script index 9f57bd052e6..b8fc4016b32 100644 --- a/acceptance/bundle/integration_whl/serverless_custom_params/script +++ b/acceptance/bundle/integration_whl/serverless_custom_params/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/integration_whl/serverless_dynamic_version/script b/acceptance/bundle/integration_whl/serverless_dynamic_version/script index fc4be42b3c8..6b04ab80ea9 100644 --- a/acceptance/bundle/integration_whl/serverless_dynamic_version/script +++ b/acceptance/bundle/integration_whl/serverless_dynamic_version/script @@ -1,6 +1,6 @@ envsubst < databricks.yml.tmpl > databricks.yml trace cp -r $TESTDIR/../base/{setup.py,my_test_code} . -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity diff --git a/acceptance/bundle/integration_whl/serverless_extras/script b/acceptance/bundle/integration_whl/serverless_extras/script index 2de85e21b4b..9570f427f6d 100644 --- a/acceptance/bundle/integration_whl/serverless_extras/script +++ b/acceptance/bundle/integration_whl/serverless_extras/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/script b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/script index 2de85e21b4b..9570f427f6d 100644 --- a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/script +++ b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/integration_whl/wrapper/script b/acceptance/bundle/integration_whl/wrapper/script index d0f98cb2898..481e175fcb2 100644 --- a/acceptance/bundle/integration_whl/wrapper/script +++ b/acceptance/bundle/integration_whl/wrapper/script @@ -7,7 +7,7 @@ export EXTRA_CONFIG=python_wheel_wrapper.yml envsubst < $TESTDIR/../base/databricks.yml.tmpl > databricks.yml cp -r $TESTDIR/../base/{$EXTRA_CONFIG,setup.py,my_test_code} . trace cat databricks.yml -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity diff --git a/acceptance/bundle/integration_whl/wrapper_custom_params/script b/acceptance/bundle/integration_whl/wrapper_custom_params/script index ab9c4503276..7319af7fbc8 100644 --- a/acceptance/bundle/integration_whl/wrapper_custom_params/script +++ b/acceptance/bundle/integration_whl/wrapper_custom_params/script @@ -3,6 +3,6 @@ export EXTRA_CONFIG=python_wheel_wrapper.yml envsubst < $TESTDIR/../base/databricks.yml.tmpl > databricks.yml cp -r $TESTDIR/../base/{$EXTRA_CONFIG,setup.py,my_test_code} . trace cat databricks.yml -trap "errcode trace '$CLI' bundle destroy --auto-approve" EXIT +trap "errcode destroy-bundle" EXIT trace $CLI bundle deploy trace $CLI bundle run some_other_job --python-params param1,param2 diff --git a/acceptance/bundle/quiet-levels/script b/acceptance/bundle/quiet-levels/script index cfe42aaab5e..defe6ba27b7 100644 --- a/acceptance/bundle/quiet-levels/script +++ b/acceptance/bundle/quiet-levels/script @@ -42,4 +42,4 @@ trace $CLI bundle destroy --auto-approve -q # a TTY, so TestApprovalForDestroyQuietWhilePrompting covers it. title "destroy --auto-approve -qq: nothing" trace $CLI bundle deploy -qq -trace $CLI bundle destroy --auto-approve -qq +destroy-bundle -qq diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script index 7e7ec71b1a4..0f6c43fc6ee 100644 --- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script +++ b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script @@ -10,5 +10,5 @@ replace_ids.py trace $CLI bundle plan > out.plan_sanity.txt title "Destroy all via bundle destroy" -trace $CLI bundle destroy --auto-approve +destroy-bundle rm -f out.requests.txt diff --git a/acceptance/bundle/resources/alerts/with_file/script b/acceptance/bundle/resources/alerts/with_file/script index 02a51e6d2cb..ecb8d16983e 100755 --- a/acceptance/bundle/resources/alerts/with_file/script +++ b/acceptance/bundle/resources/alerts/with_file/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/apps/config-drift-stopped/script b/acceptance/bundle/resources/apps/config-drift-stopped/script index c449a3099a3..16d36aed986 100644 --- a/acceptance/bundle/resources/apps/config-drift-stopped/script +++ b/acceptance/bundle/resources/apps/config-drift-stopped/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/apps/config-drift/script b/acceptance/bundle/resources/apps/config-drift/script index 4728255dc8f..ef09702ed7e 100644 --- a/acceptance/bundle/resources/apps/config-drift/script +++ b/acceptance/bundle/resources/apps/config-drift/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/apps/inline_config/script b/acceptance/bundle/resources/apps/inline_config/script index 764ab0bc99b..d0be6283c6a 100755 --- a/acceptance/bundle/resources/apps/inline_config/script +++ b/acceptance/bundle/resources/apps/inline_config/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/apps/lifecycle-started-omitted/script b/acceptance/bundle/resources/apps/lifecycle-started-omitted/script index c836adff587..4addda1b9af 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-omitted/script +++ b/acceptance/bundle/resources/apps/lifecycle-started-omitted/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/script b/acceptance/bundle/resources/apps/lifecycle-started-toggle/script index 7b5a2c8c32f..48d4b790d4e 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/script +++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/apps/lifecycle-started/script b/acceptance/bundle/resources/apps/lifecycle-started/script index 710dec5a10a..63035a4718f 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started/script +++ b/acceptance/bundle/resources/apps/lifecycle-started/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/catalogs/auto-approve/script b/acceptance/bundle/resources/catalogs/auto-approve/script index 62d2cafa982..421997b0d44 100755 --- a/acceptance/bundle/resources/catalogs/auto-approve/script +++ b/acceptance/bundle/resources/catalogs/auto-approve/script @@ -7,7 +7,7 @@ VOLUME_NAME="test-volume-${UNIQUE_NAME}" cleanup() { title "Test cleanup" - trace $CLI bundle destroy --auto-approve + destroy-bundle title "Assert the catalog is deleted" trace errcode $CLI catalogs get "${CATALOG_NAME}" 2>/dev/null diff --git a/acceptance/bundle/resources/catalogs/basic/script b/acceptance/bundle/resources/catalogs/basic/script index f5d2fd82486..9f8a5e71431 100644 --- a/acceptance/bundle/resources/catalogs/basic/script +++ b/acceptance/bundle/resources/catalogs/basic/script @@ -4,7 +4,7 @@ CATALOG_NAME="test_catalog_${UNIQUE_NAME}" cleanup() { title "Test cleanup" - trace $CLI bundle destroy --auto-approve + destroy-bundle title "Assert the catalog is deleted" trace errcode $CLI catalogs get "${CATALOG_NAME}" 2>/dev/null diff --git a/acceptance/bundle/resources/catalogs/with-schemas/script b/acceptance/bundle/resources/catalogs/with-schemas/script index 039a20fd670..b5a943df04b 100644 --- a/acceptance/bundle/resources/catalogs/with-schemas/script +++ b/acceptance/bundle/resources/catalogs/with-schemas/script @@ -5,7 +5,7 @@ SCHEMA_FULL_NAME="${CATALOG_NAME}.schema1" cleanup() { title "Test cleanup" - trace $CLI bundle destroy --auto-approve + destroy-bundle title "Assert schema is deleted" trace errcode $CLI schemas get "${SCHEMA_FULL_NAME}" 2>/dev/null diff --git a/acceptance/bundle/resources/clusters/deploy/data_security_mode/script b/acceptance/bundle/resources/clusters/deploy/data_security_mode/script index 43b1af4911c..834c46c82ce 100644 --- a/acceptance/bundle/resources/clusters/deploy/data_security_mode/script +++ b/acceptance/bundle/resources/clusters/deploy/data_security_mode/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/script b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/script index aa76b105bf0..1bd368a3ee4 100644 --- a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/script +++ b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/clusters/deploy/simple/script b/acceptance/bundle/resources/clusters/deploy/simple/script index 12977cedb09..8f47fc05154 100644 --- a/acceptance/bundle/resources/clusters/deploy/simple/script +++ b/acceptance/bundle/resources/clusters/deploy/simple/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/clusters/deploy/update-after-create/script b/acceptance/bundle/resources/clusters/deploy/update-after-create/script index 83f25cd2404..d04d5fc8001 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-after-create/script +++ b/acceptance/bundle/resources/clusters/deploy/update-after-create/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT 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 02dcebeb3f3..4c056694bb2 100755 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script index 7d007495c3d..4827bdb4d9b 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/script b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/script index 27a8e73a3ba..d4e46055880 100644 --- a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/script +++ b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/clusters/lifecycle-started/script b/acceptance/bundle/resources/clusters/lifecycle-started/script index 871f70407f8..c1bcb3fa995 100644 --- a/acceptance/bundle/resources/clusters/lifecycle-started/script +++ b/acceptance/bundle/resources/clusters/lifecycle-started/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/clusters/resize-terminated-fallback/script b/acceptance/bundle/resources/clusters/resize-terminated-fallback/script index eff7c541b94..cc21a8d99a6 100644 --- a/acceptance/bundle/resources/clusters/resize-terminated-fallback/script +++ b/acceptance/bundle/resources/clusters/resize-terminated-fallback/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/clusters/run/spark_python_task/script b/acceptance/bundle/resources/clusters/run/spark_python_task/script index 708bfaa8213..dc3c6c49779 100644 --- a/acceptance/bundle/resources/clusters/run/spark_python_task/script +++ b/acceptance/bundle/resources/clusters/run/spark_python_task/script @@ -3,7 +3,7 @@ trace cp $TESTDIR/../../deploy/simple/databricks.yml.tmpl . envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/change-embed-credentials/script b/acceptance/bundle/resources/dashboards/change-embed-credentials/script index 75046150329..09021493e28 100755 --- a/acceptance/bundle/resources/dashboards/change-embed-credentials/script +++ b/acceptance/bundle/resources/dashboards/change-embed-credentials/script @@ -1,7 +1,7 @@ export EMBED_CREDENTIALS="false" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/change-name/script b/acceptance/bundle/resources/dashboards/change-name/script index f361ed4417f..a06ef66c30b 100644 --- a/acceptance/bundle/resources/dashboards/change-name/script +++ b/acceptance/bundle/resources/dashboards/change-name/script @@ -1,7 +1,7 @@ export NAME="dashboard1" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/script b/acceptance/bundle/resources/dashboards/change-parent-path/script index 4440d5f1321..2aac16c494c 100755 --- a/acceptance/bundle/resources/dashboards/change-parent-path/script +++ b/acceptance/bundle/resources/dashboards/change-parent-path/script @@ -4,7 +4,7 @@ export USERNAME=$($CLI current-user me --output json | jq -r '.userName') export PARENT_PATH=" /Users/$USERNAME/.bundle/change-parent-path-$UNIQUE_NAME/default/resources" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script index 43327a7ff19..5dd65f4adee 100755 --- a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script +++ b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script index aa3aa4026b7..7873a241282 100755 --- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script +++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script @@ -9,7 +9,7 @@ export DASHBOARD_DISPLAY_NAME envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT 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 2c1396ac618..5f6f1679182 100755 --- a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script +++ b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/script @@ -30,4 +30,4 @@ trace $CLI bundle plan -o json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json # 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 +destroy-bundle -qq diff --git a/acceptance/bundle/resources/dashboards/detect-change/script b/acceptance/bundle/resources/dashboards/detect-change/script index 2b4966fd87d..5ac44937401 100644 --- a/acceptance/bundle/resources/dashboards/detect-change/script +++ b/acceptance/bundle/resources/dashboards/detect-change/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/generate_inplace/script b/acceptance/bundle/resources/dashboards/generate_inplace/script index a8112a752a0..f495f3dd1b9 100644 --- a/acceptance/bundle/resources/dashboards/generate_inplace/script +++ b/acceptance/bundle/resources/dashboards/generate_inplace/script @@ -5,7 +5,7 @@ mv databricks.yml.subst databricks.yml trace $CLI bundle deploy cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/nested-folders/script b/acceptance/bundle/resources/dashboards/nested-folders/script index c5004f3d6a2..4cff79c52cf 100644 --- a/acceptance/bundle/resources/dashboards/nested-folders/script +++ b/acceptance/bundle/resources/dashboards/nested-folders/script @@ -8,7 +8,7 @@ envsubst < databricks.yml.tmpl > databricks.yml envsubst < resources/dashboards.yml.tmpl > resources/dashboards.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script index 41022465670..469f2c6b1bb 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script +++ b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/republish-after-draft-update/script b/acceptance/bundle/resources/dashboards/republish-after-draft-update/script index 9cd9a12869f..9f5de43209e 100644 --- a/acceptance/bundle/resources/dashboards/republish-after-draft-update/script +++ b/acceptance/bundle/resources/dashboards/republish-after-draft-update/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/simple/script b/acceptance/bundle/resources/dashboards/simple/script index 4c8b9b55ace..cf1e8a89507 100644 --- a/acceptance/bundle/resources/dashboards/simple/script +++ b/acceptance/bundle/resources/dashboards/simple/script @@ -8,7 +8,7 @@ export DASHBOARD_DISPLAY_NAME envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/script b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/script index 7d4f814f70c..0be51c9813c 100644 --- a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/script +++ b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/script @@ -8,7 +8,7 @@ export DASHBOARD_DISPLAY_NAME envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/dashboards/simple_syncroot/script b/acceptance/bundle/resources/dashboards/simple_syncroot/script index 63cfaa008ab..31b8cebabb4 100644 --- a/acceptance/bundle/resources/dashboards/simple_syncroot/script +++ b/acceptance/bundle/resources/dashboards/simple_syncroot/script @@ -8,7 +8,7 @@ export DASHBOARD_DISPLAY_NAME envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm sample-dashboard.lvdash.json } trap cleanup EXIT diff --git a/acceptance/bundle/resources/database_catalogs/basic/script b/acceptance/bundle/resources/database_catalogs/basic/script index 705c7b349a2..da4e49038f3 100644 --- a/acceptance/bundle/resources/database_catalogs/basic/script +++ b/acceptance/bundle/resources/database_catalogs/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/database_catalogs/recreate/script b/acceptance/bundle/resources/database_catalogs/recreate/script index 78243de7042..7e974f0f56f 100644 --- a/acceptance/bundle/resources/database_catalogs/recreate/script +++ b/acceptance/bundle/resources/database_catalogs/recreate/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/database_instances/recreate/script b/acceptance/bundle/resources/database_instances/recreate/script index e331f9ee6ac..63d247c6ca6 100644 --- a/acceptance/bundle/resources/database_instances/recreate/script +++ b/acceptance/bundle/resources/database_instances/recreate/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/database_instances/single-instance/script b/acceptance/bundle/resources/database_instances/single-instance/script index 1f3cb82511f..99bbedb7274 100644 --- a/acceptance/bundle/resources/database_instances/single-instance/script +++ b/acceptance/bundle/resources/database_instances/single-instance/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/experiments/basic/script b/acceptance/bundle/resources/experiments/basic/script index 3513bf00cbd..c59a7acfc6e 100755 --- a/acceptance/bundle/resources/experiments/basic/script +++ b/acceptance/bundle/resources/experiments/basic/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/external_locations/script b/acceptance/bundle/resources/external_locations/script index 1ff7d02ec4d..1fef0ced8fd 100755 --- a/acceptance/bundle/resources/external_locations/script +++ b/acceptance/bundle/resources/external_locations/script @@ -7,7 +7,7 @@ EXT_LOCATION_NAME="test_ext_location_${UNIQUE_NAME}" cleanup() { title "Test cleanup" - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/genie_spaces/delete_warning/script b/acceptance/bundle/resources/genie_spaces/delete_warning/script index 1be25587904..f391494a92f 100644 --- a/acceptance/bundle/resources/genie_spaces/delete_warning/script +++ b/acceptance/bundle/resources/genie_spaces/delete_warning/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/genie_spaces/inline/script b/acceptance/bundle/resources/genie_spaces/inline/script index 812cfb9abd4..e9a0eff7567 100644 --- a/acceptance/bundle/resources/genie_spaces/inline/script +++ b/acceptance/bundle/resources/genie_spaces/inline/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/genie_spaces/parent_path_update/script b/acceptance/bundle/resources/genie_spaces/parent_path_update/script index cc7359b67d9..802dabc83bf 100644 --- a/acceptance/bundle/resources/genie_spaces/parent_path_update/script +++ b/acceptance/bundle/resources/genie_spaces/parent_path_update/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/script b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/script index 0ccb456f1cf..1c96205366b 100644 --- a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/script +++ b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/genie_spaces/serialized_space/script b/acceptance/bundle/resources/genie_spaces/serialized_space/script index bf5aea4c21d..045f4a5b735 100644 --- a/acceptance/bundle/resources/genie_spaces/serialized_space/script +++ b/acceptance/bundle/resources/genie_spaces/serialized_space/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/genie_spaces/simple/script b/acceptance/bundle/resources/genie_spaces/simple/script index 6ad76a8ab24..91df3e80bee 100644 --- a/acceptance/bundle/resources/genie_spaces/simple/script +++ b/acceptance/bundle/resources/genie_spaces/simple/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/genie_spaces/version_migration/script b/acceptance/bundle/resources/genie_spaces/version_migration/script index 141efd5bef6..db669cc8feb 100644 --- a/acceptance/bundle/resources/genie_spaces/version_migration/script +++ b/acceptance/bundle/resources/genie_spaces/version_migration/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges/script b/acceptance/bundle/resources/grants/schemas/all_privileges/script index e8f6e243dd9..fd7d783799a 100644 --- a/acceptance/bundle/resources/grants/schemas/all_privileges/script +++ b/acceptance/bundle/resources/grants/schemas/all_privileges/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_principals/script b/acceptance/bundle/resources/grants/schemas/duplicate_principals/script index 12a255773b1..a7c7168cabc 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/script +++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script index b1244a4c78c..983f8301f31 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script +++ b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/instance_pools/script b/acceptance/bundle/resources/instance_pools/script index 208a61abc1b..5cc0b366a4f 100644 --- a/acceptance/bundle/resources/instance_pools/script +++ b/acceptance/bundle/resources/instance_pools/script @@ -25,7 +25,7 @@ trace jq 'select(.method == "POST" and (.path | contains("/instance-pools/edit") trace $CLI bundle summary title "Destroy the instance pool" -trace $CLI bundle destroy --auto-approve +destroy-bundle title "Verify the destroy request" trace jq 'select(.method == "POST" and (.path | contains("/instance-pools/delete")))' out.requests.txt diff --git a/acceptance/bundle/resources/job_runs/basic/script b/acceptance/bundle/resources/job_runs/basic/script index 1c69eb547b4..fb263549571 100644 --- a/acceptance/bundle/resources/job_runs/basic/script +++ b/acceptance/bundle/resources/job_runs/basic/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle # destroy deletes the triggered run via jobs/runs/delete (also unlinks out.requests.txt) trace print_requests.py //jobs/runs/delete } diff --git a/acceptance/bundle/resources/job_runs/failed_run/script b/acceptance/bundle/resources/job_runs/failed_run/script index 0fe24556182..03732bc25a5 100644 --- a/acceptance/bundle/resources/job_runs/failed_run/script +++ b/acceptance/bundle/resources/job_runs/failed_run/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/job_runs/interrupted_run/script b/acceptance/bundle/resources/job_runs/interrupted_run/script index 11ef0aa1846..e9df5926619 100644 --- a/acceptance/bundle/resources/job_runs/interrupted_run/script +++ b/acceptance/bundle/resources/job_runs/interrupted_run/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/job_runs/job_parameters/script b/acceptance/bundle/resources/job_runs/job_parameters/script index 16eedf5d7dc..6ba551d07f1 100644 --- a/acceptance/bundle/resources/job_runs/job_parameters/script +++ b/acceptance/bundle/resources/job_runs/job_parameters/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/job_runs/on_bundle_deploy/script b/acceptance/bundle/resources/job_runs/on_bundle_deploy/script index e24cf944cd2..fc5bed539fe 100644 --- a/acceptance/bundle/resources/job_runs/on_bundle_deploy/script +++ b/acceptance/bundle/resources/job_runs/on_bundle_deploy/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/job_runs/redeploy/script b/acceptance/bundle/resources/job_runs/redeploy/script index 8ceb3a88052..94828458009 100644 --- a/acceptance/bundle/resources/job_runs/redeploy/script +++ b/acceptance/bundle/resources/job_runs/redeploy/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/job_runs/retried_run_now/script b/acceptance/bundle/resources/job_runs/retried_run_now/script index 0d69e76df6a..7efd3144ca3 100644 --- a/acceptance/bundle/resources/job_runs/retried_run_now/script +++ b/acceptance/bundle/resources/job_runs/retried_run_now/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/job_runs/wait/script b/acceptance/bundle/resources/job_runs/wait/script index 70cee1c9082..19ea4aaaf6d 100644 --- a/acceptance/bundle/resources/job_runs/wait/script +++ b/acceptance/bundle/resources/job_runs/wait/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/jobs/alert-task/script b/acceptance/bundle/resources/jobs/alert-task/script index 1dcc1d37a0b..73e10b8a44e 100644 --- a/acceptance/bundle/resources/jobs/alert-task/script +++ b/acceptance/bundle/resources/jobs/alert-task/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/jobs/check-metadata/script b/acceptance/bundle/resources/jobs/check-metadata/script index a486009c74c..05442578b6c 100644 --- a/acceptance/bundle/resources/jobs/check-metadata/script +++ b/acceptance/bundle/resources/jobs/check-metadata/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml envsubst < a/b/resources.yml.tmpl > a/b/resources.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/jobs/double-underscore-keys/script b/acceptance/bundle/resources/jobs/double-underscore-keys/script index e3d101db859..64b2d2391bc 100644 --- a/acceptance/bundle/resources/jobs/double-underscore-keys/script +++ b/acceptance/bundle/resources/jobs/double-underscore-keys/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/jobs/fail-on-active-runs/script b/acceptance/bundle/resources/jobs/fail-on-active-runs/script index 688f81d80bf..42aa8cad84b 100644 --- a/acceptance/bundle/resources/jobs/fail-on-active-runs/script +++ b/acceptance/bundle/resources/jobs/fail-on-active-runs/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/jobs/shared-root-path/script b/acceptance/bundle/resources/jobs/shared-root-path/script index 4e3e46c9300..cb42e7425b3 100644 --- a/acceptance/bundle/resources/jobs/shared-root-path/script +++ b/acceptance/bundle/resources/jobs/shared-root-path/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/script b/acceptance/bundle/resources/model_serving_endpoints/basic/script index 972439f6813..4ca7ab63bac 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/basic/script +++ b/acceptance/bundle/resources/model_serving_endpoints/basic/script @@ -3,7 +3,7 @@ export ENDPOINT_NAME="test-endpoint-$UNIQUE_NAME-1" envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script index 3f26d4a0738..341ccf4c9c4 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script +++ b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script index 919470c4ca4..474b4abd610 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script index d48a60c0ace..bd8e458a218 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script index 0b68be7c353..fec7f91a7be 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script index 0e31f7a4848..b974e69dd0d 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script index 7f915920ba1..809f753e78d 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/script b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/script index 8b420559c3d..91ac6bf555c 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/script +++ b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/script @@ -3,7 +3,7 @@ export VERSION=$($CLI model-versions list system.ai.llama_v3_2_1b_instruct | jq envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script index 6e556d2b1ab..3f0b2ee6724 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script index 763379ad9a6..1ab098a08c5 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/script b/acceptance/bundle/resources/model_serving_endpoints/update/config/script index 3a28d1dcda2..b11f32466d7 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/config/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script index 391d369d686..cc6d2199d17 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/script b/acceptance/bundle/resources/model_serving_endpoints/update/tags/script index 6f69dc2f063..693e7eae4ae 100755 --- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/script +++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/models/basic/script b/acceptance/bundle/resources/models/basic/script index f14cc0a2261..3d17c479019 100644 --- a/acceptance/bundle/resources/models/basic/script +++ b/acceptance/bundle/resources/models/basic/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/models/readplan-permissions/script b/acceptance/bundle/resources/models/readplan-permissions/script index f8be26409e3..5c9d22d790d 100644 --- a/acceptance/bundle/resources/models/readplan-permissions/script +++ b/acceptance/bundle/resources/models/readplan-permissions/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/permissions/factcheck/script b/acceptance/bundle/resources/permissions/factcheck/script index cbddce58087..41b47da668e 100644 --- a/acceptance/bundle/resources/permissions/factcheck/script +++ b/acceptance/bundle/resources/permissions/factcheck/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/script b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/script index 30130e75885..c2c56400f9d 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/script +++ b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/script b/acceptance/bundle/resources/pipelines/allow-duplicate-names/script index d121e073a3d..585343a5540 100644 --- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/script +++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/script @@ -3,7 +3,7 @@ envsubst < pipeline.json.tmpl > pipeline.json touch foo.py cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle trace $CLI pipelines delete ${PIPELINE_ID} rm out.requests.txt } diff --git a/acceptance/bundle/resources/pipelines/auto-approve/script b/acceptance/bundle/resources/pipelines/auto-approve/script index 7c68356ea7c..59a0464fb62 100644 --- a/acceptance/bundle/resources/pipelines/auto-approve/script +++ b/acceptance/bundle/resources/pipelines/auto-approve/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml envsubst < resources.yml.tmpl > resources.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script index d380b57c974..269eadd601d 100644 --- a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script +++ b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml trace $CLI bundle validate cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/pipelines/recreate/script b/acceptance/bundle/resources/pipelines/recreate/script index 08423e1d323..6e6b8c51bc6 100644 --- a/acceptance/bundle/resources/pipelines/recreate/script +++ b/acceptance/bundle/resources/pipelines/recreate/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_branches/basic/script b/acceptance/bundle/resources/postgres_branches/basic/script index 56af9987f86..ab148f5f2ae 100644 --- a/acceptance/bundle/resources/postgres_branches/basic/script +++ b/acceptance/bundle/resources/postgres_branches/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_branches/recreate/script b/acceptance/bundle/resources/postgres_branches/recreate/script index 6219513017b..0bf4810590a 100755 --- a/acceptance/bundle/resources/postgres_branches/recreate/script +++ b/acceptance/bundle/resources/postgres_branches/recreate/script @@ -41,7 +41,7 @@ branch_id_2=`read_id.py main` $CLI postgres get-branch $branch_id_2 | branch_fields > out.get_branch.txt title "Destroy and verify cleanup" -trace $CLI bundle destroy --auto-approve +destroy-bundle print_requests.py --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/' > out.requests.destroy.txt diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/script b/acceptance/bundle/resources/postgres_branches/update_protected/script index 28d21b69ecf..412c36e13bc 100755 --- a/acceptance/bundle/resources/postgres_branches/update_protected/script +++ b/acceptance/bundle/resources/postgres_branches/update_protected/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_catalogs/basic/script b/acceptance/bundle/resources/postgres_catalogs/basic/script index 48f54855709..df87fbfba90 100644 --- a/acceptance/bundle/resources/postgres_catalogs/basic/script +++ b/acceptance/bundle/resources/postgres_catalogs/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_catalogs/recreate/script b/acceptance/bundle/resources/postgres_catalogs/recreate/script index 4d9de784299..5f198d1f564 100644 --- a/acceptance/bundle/resources/postgres_catalogs/recreate/script +++ b/acceptance/bundle/resources/postgres_catalogs/recreate/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_databases/basic/script b/acceptance/bundle/resources/postgres_databases/basic/script index 0fed53dfcf9..5abb2d95071 100644 --- a/acceptance/bundle/resources/postgres_databases/basic/script +++ b/acceptance/bundle/resources/postgres_databases/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/script b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/script index 7315f6f5d37..3b6f9e61fc8 100644 --- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/script +++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/script b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/script index 0d040869c10..5909dbbecf6 100644 --- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/script +++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_databases/recreate/script b/acceptance/bundle/resources/postgres_databases/recreate/script index 578e6df92b1..c07e939ae62 100644 --- a/acceptance/bundle/resources/postgres_databases/recreate/script +++ b/acceptance/bundle/resources/postgres_databases/recreate/script @@ -44,6 +44,6 @@ database_id_2=`read_id.py my_database` trace $CLI postgres get-database $database_id_2 | database_fields title "Destroy and verify cleanup" -trace $CLI bundle destroy --auto-approve +destroy-bundle trace 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/script b/acceptance/bundle/resources/postgres_databases/replace_existing/script index 65db8cd6ae7..a53a59b7b06 100644 --- a/acceptance/bundle/resources/postgres_databases/replace_existing/script +++ b/acceptance/bundle/resources/postgres_databases/replace_existing/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_databases/update/script b/acceptance/bundle/resources/postgres_databases/update/script index e23fea3bbaa..664ee5de148 100644 --- a/acceptance/bundle/resources/postgres_databases/update/script +++ b/acceptance/bundle/resources/postgres_databases/update/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/script b/acceptance/bundle/resources/postgres_endpoints/basic/script index 7a2be07d9f5..702676c477a 100755 --- a/acceptance/bundle/resources/postgres_endpoints/basic/script +++ b/acceptance/bundle/resources/postgres_endpoints/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_endpoints/recreate/script b/acceptance/bundle/resources/postgres_endpoints/recreate/script index 6d4e7d62e1a..071ab8c03b5 100755 --- a/acceptance/bundle/resources/postgres_endpoints/recreate/script +++ b/acceptance/bundle/resources/postgres_endpoints/recreate/script @@ -40,6 +40,6 @@ endpoint_id_2=`read_id.py my_endpoint` trace $CLI postgres get-endpoint $endpoint_id_2 | jq 'del(.create_time, .update_time)' | jq '.status.endpoint_type' title "Destroy and verify cleanup" -trace $CLI bundle destroy --auto-approve +destroy-bundle trace 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/update_autoscaling/script b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script index 1df081df0a6..243e46522b3 100755 --- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script +++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_projects/basic/script b/acceptance/bundle/resources/postgres_projects/basic/script index f2ac6abbcfe..12a9df30810 100755 --- a/acceptance/bundle/resources/postgres_projects/basic/script +++ b/acceptance/bundle/resources/postgres_projects/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_projects/recreate/script b/acceptance/bundle/resources/postgres_projects/recreate/script index 7ed7fdd0f2d..8855fc8c049 100644 --- a/acceptance/bundle/resources/postgres_projects/recreate/script +++ b/acceptance/bundle/resources/postgres_projects/recreate/script @@ -41,7 +41,7 @@ project_id_2=`read_id.py my_project` $CLI postgres get-project $project_id_2 | project_fields > out.get_project.txt title "Destroy and verify cleanup" -trace $CLI bundle destroy --auto-approve +destroy-bundle print_requests.py --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/' > out.requests.destroy.txt diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/script b/acceptance/bundle/resources/postgres_projects/update_display_name/script index 5c6ac02445e..e77fcadd05d 100755 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/script +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_roles/basic/script b/acceptance/bundle/resources/postgres_roles/basic/script index d5e3f421cd7..e5a78c32fad 100644 --- a/acceptance/bundle/resources/postgres_roles/basic/script +++ b/acceptance/bundle/resources/postgres_roles/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/script b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/script index d98aed3e270..8f19b9f5191 100644 --- a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/script +++ b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/script b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/script index 0999984022d..e31f6be8485 100644 --- a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/script +++ b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script index 18041234f7a..558aeb9d6c1 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script +++ b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script @@ -35,6 +35,6 @@ role_name=`read_id.py my_role` trace $CLI postgres get-role $role_name | role_fields title "Destroy and verify cleanup" -trace $CLI bundle destroy --auto-approve +destroy-bundle trace 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/script b/acceptance/bundle/resources/postgres_roles/recreate/script index 922b5abaa16..2a49c142442 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate/script +++ b/acceptance/bundle/resources/postgres_roles/recreate/script @@ -37,6 +37,6 @@ role_id_2=`read_id.py my_role` trace $CLI postgres get-role $role_id_2 | role_fields title "Destroy and verify cleanup" -trace $CLI bundle destroy --auto-approve +destroy-bundle trace 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/script b/acceptance/bundle/resources/postgres_roles/replace_existing/script index b7a64f0cc49..11a5239c0a9 100644 --- a/acceptance/bundle/resources/postgres_roles/replace_existing/script +++ b/acceptance/bundle/resources/postgres_roles/replace_existing/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_roles/update/script b/acceptance/bundle/resources/postgres_roles/update/script index 6c727a34536..4425cbf1287 100644 --- a/acceptance/bundle/resources/postgres_roles/update/script +++ b/acceptance/bundle/resources/postgres_roles/update/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_synced_tables/basic/script b/acceptance/bundle/resources/postgres_synced_tables/basic/script index 68b04d83301..b0af09931bb 100644 --- a/acceptance/bundle/resources/postgres_synced_tables/basic/script +++ b/acceptance/bundle/resources/postgres_synced_tables/basic/script @@ -12,7 +12,7 @@ MSYS_NO_PATHCONV=1 $CLI api post "/api/2.0/sql/statements/" --json "{ }" > /dev/null cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle echo "Cleaning up temporary source table" $CLI tables delete main.source_$UNIQUE_NAME.trips_source || true $CLI schemas delete main.source_$UNIQUE_NAME || true diff --git a/acceptance/bundle/resources/postgres_synced_tables/recreate/script b/acceptance/bundle/resources/postgres_synced_tables/recreate/script index de437c0c151..b34dd87fc6c 100644 --- a/acceptance/bundle/resources/postgres_synced_tables/recreate/script +++ b/acceptance/bundle/resources/postgres_synced_tables/recreate/script @@ -8,7 +8,7 @@ MSYS_NO_PATHCONV=1 $CLI api post "/api/2.0/sql/statements/" --json "{ }" > /dev/null cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle echo "Cleaning up temporary source table" $CLI tables delete main.source_$UNIQUE_NAME.trips_source || true $CLI schemas delete main.source_$UNIQUE_NAME || true diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/script b/acceptance/bundle/resources/quality_monitors/change_assets_dir/script index 6caf49a7f4e..f6f5ba71cff 100644 --- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/script +++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/script @@ -6,7 +6,7 @@ trace $CLI schemas create "qm_test_${UNIQUE_NAME}_2" main -o json | jq '{full_na trace create_table.py "$TABLE_NAME" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle $CLI schemas delete "$SCHEMA_NAME" --force 2>/dev/null || true $CLI schemas delete "qm_test_${UNIQUE_NAME}_2" --force 2>/dev/null || true rm -f out.requests.txt diff --git a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/script b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/script index 72c57e08401..a6297382652 100644 --- a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/script +++ b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/script @@ -6,7 +6,7 @@ trace $CLI schemas create "qm_test_${UNIQUE_NAME}_2" main -o json | jq '{full_na trace create_table.py "$TABLE_NAME" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle $CLI schemas delete "$SCHEMA_NAME" --force 2>/dev/null || true $CLI schemas delete "qm_test_${UNIQUE_NAME}_2" --force 2>/dev/null || true rm -f out.requests.txt diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/script b/acceptance/bundle/resources/quality_monitors/change_table_name/script index 891aece1c11..54d0e2af3dd 100644 --- a/acceptance/bundle/resources/quality_monitors/change_table_name/script +++ b/acceptance/bundle/resources/quality_monitors/change_table_name/script @@ -6,7 +6,7 @@ trace create_table.py "$TABLE_NAME" trace create_table.py "${TABLE_NAME}_2" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle $CLI schemas delete "$SCHEMA_NAME" --force 2>/dev/null || true $CLI schemas delete "qm_test_${UNIQUE_NAME}_2" --force 2>/dev/null || true rm -f out.requests.txt diff --git a/acceptance/bundle/resources/quality_monitors/create/script b/acceptance/bundle/resources/quality_monitors/create/script index 97f6ce6a843..49036601f7d 100644 --- a/acceptance/bundle/resources/quality_monitors/create/script +++ b/acceptance/bundle/resources/quality_monitors/create/script @@ -7,7 +7,7 @@ trace $CLI schemas create "qm_test_${UNIQUE_NAME}_2" main -o json | jq '{full_na trace create_table.py "$TABLE_NAME" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle # Clean up schemas and table (suppress errors since they may already be gone) $CLI schemas delete "$SCHEMA_NAME" --force 2>/dev/null || true $CLI schemas delete "qm_test_${UNIQUE_NAME}_2" --force 2>/dev/null || true diff --git a/acceptance/bundle/resources/registered_models/aliases_converge/script b/acceptance/bundle/resources/registered_models/aliases_converge/script index ca9dc8f700a..a75802a0213 100644 --- a/acceptance/bundle/resources/registered_models/aliases_converge/script +++ b/acceptance/bundle/resources/registered_models/aliases_converge/script @@ -4,7 +4,7 @@ trace export COMMENT="original comment" envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/registered_models/basic/script b/acceptance/bundle/resources/registered_models/basic/script index 42313057e0b..80fd04dc939 100644 --- a/acceptance/bundle/resources/registered_models/basic/script +++ b/acceptance/bundle/resources/registered_models/basic/script @@ -11,7 +11,7 @@ trace $CLI catalogs create ${catalog_name} | jq '{full_name}' trace $CLI schemas create ${schema_name} ${catalog_name} | jq '{full_name}' cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle trace $CLI schemas delete ${catalog_name}.${schema_name} --force trace $CLI catalogs delete ${catalog_name} --force } diff --git a/acceptance/bundle/resources/schemas/auto-approve/script b/acceptance/bundle/resources/schemas/auto-approve/script index 9ea9f4fc410..006f02e8135 100644 --- a/acceptance/bundle/resources/schemas/auto-approve/script +++ b/acceptance/bundle/resources/schemas/auto-approve/script @@ -7,7 +7,7 @@ VOLUME_NAME="test-volume-${UNIQUE_NAME}" cleanup() { title "Test cleanup" - trace $CLI bundle destroy --auto-approve + destroy-bundle title "Assert the schema is deleted" trace errcode $CLI schemas get "${CATALOG_NAME}.${SCHEMA_NAME}" 2>/dev/null diff --git a/acceptance/bundle/resources/secret_scopes/basic/script b/acceptance/bundle/resources/secret_scopes/basic/script index e8aebc1853f..d0a76d1b2e5 100755 --- a/acceptance/bundle/resources/secret_scopes/basic/script +++ b/acceptance/bundle/resources/secret_scopes/basic/script @@ -3,7 +3,7 @@ export SECRET_SCOPE_NAME="test-scope-$UNIQUE_NAME-1" envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/secret_scopes/delete_scope/script b/acceptance/bundle/resources/secret_scopes/delete_scope/script index 5e42e2af4be..73b4e01e0b0 100755 --- a/acceptance/bundle/resources/secret_scopes/delete_scope/script +++ b/acceptance/bundle/resources/secret_scopes/delete_scope/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/secret_scopes/permissions-collapse/script b/acceptance/bundle/resources/secret_scopes/permissions-collapse/script index 6c2b4366c35..f85c603275d 100755 --- a/acceptance/bundle/resources/secret_scopes/permissions-collapse/script +++ b/acceptance/bundle/resources/secret_scopes/permissions-collapse/script @@ -3,7 +3,7 @@ export SECRET_SCOPE_NAME="test-scope-collapse-$UNIQUE_NAME" envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/secret_scopes/permissions/script b/acceptance/bundle/resources/secret_scopes/permissions/script index ad5d2a518f1..95812b3115c 100755 --- a/acceptance/bundle/resources/secret_scopes/permissions/script +++ b/acceptance/bundle/resources/secret_scopes/permissions/script @@ -31,7 +31,7 @@ EOF envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script index 5d444c6e4e9..e4bee7bf0fc 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script index c9e7b940f13..53952019513 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script index 369839f4769..7936c329c95 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/sql_warehouses/script b/acceptance/bundle/resources/sql_warehouses/script index b1d488f36da..d32022c6343 100644 --- a/acceptance/bundle/resources/sql_warehouses/script +++ b/acceptance/bundle/resources/sql_warehouses/script @@ -25,7 +25,7 @@ trace jq 'select(.method == "POST" and (.path | contains("/sql/warehouses")) and trace $CLI bundle summary title "Destroy the warehouse" -trace $CLI bundle destroy --auto-approve +destroy-bundle title "Verify the destroy request" trace jq 'select(.method == "DELETE" and (.path | contains("/sql/warehouses")))' out.requests.txt diff --git a/acceptance/bundle/resources/synced_database_tables/basic/script b/acceptance/bundle/resources/synced_database_tables/basic/script index 4aa11ab8491..485c3c513da 100644 --- a/acceptance/bundle/resources/synced_database_tables/basic/script +++ b/acceptance/bundle/resources/synced_database_tables/basic/script @@ -13,7 +13,7 @@ MSYS_NO_PATHCONV=1 $CLI api post "/api/2.0/sql/statements/" --json "{ }" > /dev/null cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle # Clean up the temporary source table echo "Cleaning up temporary source table" $CLI tables delete main.test_synced_$UNIQUE_NAME.trips_source || true diff --git a/acceptance/bundle/resources/synced_database_tables/recreate/script b/acceptance/bundle/resources/synced_database_tables/recreate/script index f77695bcd53..9b24838bf83 100644 --- a/acceptance/bundle/resources/synced_database_tables/recreate/script +++ b/acceptance/bundle/resources/synced_database_tables/recreate/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_endpoints/basic/script b/acceptance/bundle/resources/vector_search_endpoints/basic/script index e68232aab32..4e95344a5a2 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/basic/script +++ b/acceptance/bundle/resources/vector_search_endpoints/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/script b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/script index 40328247a30..285d348fc8c 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/script +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script index 9c834c66e55..bcbbe7f118a 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/script b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/script index 58ce3a2f5ad..a7e42517051 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/script +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/script b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/script index b3920cacbbd..33b15a8032b 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/script +++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/script b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/script index 8d19b9f60c8..3b67969454d 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/script +++ b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/script b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/script index c17c8adfedc..2c4c8b2f84f 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/script +++ b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_indexes/basic/script b/acceptance/bundle/resources/vector_search_indexes/basic/script index 2e513d8ea6f..73b64b5ed43 100644 --- a/acceptance/bundle/resources/vector_search_indexes/basic/script +++ b/acceptance/bundle/resources/vector_search_indexes/basic/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/script b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/script index f92a79a1eff..8bab175af1d 100644 --- a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/script +++ b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml index_name="main.default.vs_index_${UNIQUE_NAME}" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/script b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/script index d3470f38414..162efdb98a2 100644 --- a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/script +++ b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/script @@ -3,7 +3,7 @@ endpoint_name="vs-endpoint-${UNIQUE_NAME}" index_name="main.default.vs_index_${UNIQUE_NAME}" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_indexes/grants/select/script b/acceptance/bundle/resources/vector_search_indexes/grants/select/script index 5e3062f7e4f..4c9dc3907a9 100644 --- a/acceptance/bundle/resources/vector_search_indexes/grants/select/script +++ b/acceptance/bundle/resources/vector_search_indexes/grants/select/script @@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml index_name="main.default.vs_index_${UNIQUE_NAME}" cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/script b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/script index c56fb89841f..085dd6068cf 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/script +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/script b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/script index a17ef34ae50..7e37f1e7bb8 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/script +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/script b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/script index b6170f5b613..ffb24ebecf3 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/script +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/script b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/script index 02a84e6a3ee..7a9297eea31 100644 --- a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/script +++ b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/volumes/recreate/script b/acceptance/bundle/resources/volumes/recreate/script index 5e1b2e779ee..c2b8f670dcf 100644 --- a/acceptance/bundle/resources/volumes/recreate/script +++ b/acceptance/bundle/resources/volumes/recreate/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT diff --git a/acceptance/bundle/resources/volumes/set-storage-location/script b/acceptance/bundle/resources/volumes/set-storage-location/script index 9c53155fff7..ca4c2211c3d 100644 --- a/acceptance/bundle/resources/volumes/set-storage-location/script +++ b/acceptance/bundle/resources/volumes/set-storage-location/script @@ -1,5 +1,5 @@ cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle trace print_requests.py //unity } diff --git a/acceptance/bundle/run/app-with-job/script b/acceptance/bundle/run/app-with-job/script index c340f796c43..e30791c79cd 100644 --- a/acceptance/bundle/run/app-with-job/script +++ b/acceptance/bundle/run/app-with-job/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm out.app-run } trap cleanup EXIT diff --git a/acceptance/bundle/run_as/job_default/script b/acceptance/bundle/run_as/job_default/script index 3e80f98838e..a4e29f84bfc 100644 --- a/acceptance/bundle/run_as/job_default/script +++ b/acceptance/bundle/run_as/job_default/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/select/basic/script b/acceptance/bundle/select/basic/script index 88c61a537b7..ef980a50b53 100644 --- a/acceptance/bundle/select/basic/script +++ b/acceptance/bundle/select/basic/script @@ -2,7 +2,7 @@ envsubst '$UNIQUE_NAME' < databricks.yml.tmpl > databricks.yml cleanup() { title "Destroy" - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/select/grants_permissions/script b/acceptance/bundle/select/grants_permissions/script index 1aab6a33fa4..73d0304d3c7 100644 --- a/acceptance/bundle/select/grants_permissions/script +++ b/acceptance/bundle/select/grants_permissions/script @@ -2,7 +2,7 @@ envsubst '$UNIQUE_NAME' < databricks.yml.tmpl > databricks.yml cleanup() { title "Destroy" - trace $CLI bundle destroy --auto-approve + destroy-bundle rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/script b/acceptance/bundle/select/plan_file_survives_not_selected/script index 908aeb6ad1d..d14c32ec9ca 100644 --- a/acceptance/bundle/select/plan_file_survives_not_selected/script +++ b/acceptance/bundle/select/plan_file_survives_not_selected/script @@ -1,7 +1,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + destroy-bundle } trap cleanup EXIT From 0c1f59bdd6a9bc448afece3b1a4529c1de0d4cc6 Mon Sep 17 00:00:00 2001 From: Shreyas Goenka Date: Wed, 19 Aug 2026 11:08:24 +0000 Subject: [PATCH 4/4] acceptance: keep the plain destroy in the destroy/all-resources test That test asserts the CLI itself removes the .bundle/ directory. Routing it through destroy-bundle would satisfy the assertion from the helper's own cleanup instead, hiding the behaviour under test. Co-authored-by: Isaac --- acceptance/bundle/destroy/all-resources/script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/bundle/destroy/all-resources/script b/acceptance/bundle/destroy/all-resources/script index f66625fb7f6..ceb8acee91a 100644 --- a/acceptance/bundle/destroy/all-resources/script +++ b/acceptance/bundle/destroy/all-resources/script @@ -1,2 +1,2 @@ trace $CLI bundle deploy -destroy-bundle +trace $CLI bundle destroy --auto-approve