From 2e5b8b33d6b2e6a03fd974dc3ff0ca218bea813b Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 24 Aug 2026 14:17:23 +0200 Subject: [PATCH 1/7] direct: report resources as they are deployed The direct engine printed all per-resource lines after the whole deployment finished, so a deploy that failed part way through reported nothing about the resources it had already applied. Resources are applied in parallel, so the lines are no longer in a deterministic order. Add a SortLines/SortLinesOn acceptance config option that sorts runs of matching output lines before comparison, and enable it for these lines. Co-authored-by: Isaac --- .../deploy-progressive-resource-output.md | 1 + acceptance/acceptance_test.go | 32 +++++++++++-- .../partial-summary-on-push-fail/output.txt | 1 + .../bundle/deploy/wal/chain-3-jobs/output.txt | 2 + .../deploy/wal/crash-after-create/output.txt | 1 + .../bundle/resource_deps/create_error/script | 8 +++- .../out.deploy.direct.txt | 1 + .../missing_map_key/out.deploy.direct.txt | 1 + .../resources/job_runs/basic/output.txt | 2 +- .../resources/job_runs/failed_run/output.txt | 1 + .../job_runs/job_parameters/output.txt | 2 +- .../resources/job_runs/redeploy/output.txt | 2 +- .../job_runs/retried_run_now/output.txt | 2 +- .../bundle/resources/job_runs/wait/output.txt | 2 +- .../pipelines/504/create/output.txt | 2 +- .../without_branch_id/out.deploy.direct.txt | 1 + .../live_errors/bad_database_id/output.txt | 3 ++ .../live_errors/bad_role_ref/output.txt | 2 + .../without_endpoint_id/out.deploy.direct.txt | 2 + .../out.deploy.direct.txt | 1 + acceptance/internal/config.go | 11 +++++ acceptance/selftest/sortlines/out.test.toml | 2 + acceptance/selftest/sortlines/output.txt | 7 +++ .../selftest/sortlines/override/out.test.toml | 2 + .../selftest/sortlines/override/output.txt | 4 ++ acceptance/selftest/sortlines/override/script | 4 ++ .../selftest/sortlines/override/test.toml | 3 ++ acceptance/selftest/sortlines/script | 11 +++++ acceptance/selftest/sortlines/test.toml | 9 ++++ acceptance/test.toml | 6 +++ bundle/deployplan/action.go | 10 ++++ bundle/direct/bundle_apply.go | 19 +++++++- bundle/phases/deploy.go | 25 +++++----- bundle/phases/destroy.go | 3 +- libs/testdiff/sortlines.go | 33 +++++++++++++ libs/testdiff/sortlines_test.go | 48 +++++++++++++++++++ 36 files changed, 242 insertions(+), 24 deletions(-) create mode 100644 .nextchanges/bundles/deploy-progressive-resource-output.md create mode 100644 acceptance/selftest/sortlines/out.test.toml create mode 100644 acceptance/selftest/sortlines/output.txt create mode 100644 acceptance/selftest/sortlines/override/out.test.toml create mode 100644 acceptance/selftest/sortlines/override/output.txt create mode 100644 acceptance/selftest/sortlines/override/script create mode 100644 acceptance/selftest/sortlines/override/test.toml create mode 100644 acceptance/selftest/sortlines/script create mode 100644 acceptance/selftest/sortlines/test.toml create mode 100644 libs/testdiff/sortlines.go create mode 100644 libs/testdiff/sortlines_test.go diff --git a/.nextchanges/bundles/deploy-progressive-resource-output.md b/.nextchanges/bundles/deploy-progressive-resource-output.md new file mode 100644 index 00000000000..60687d5787c --- /dev/null +++ b/.nextchanges/bundles/deploy-progressive-resource-output.md @@ -0,0 +1 @@ +`bundle deploy` on the direct engine now reports each resource as soon as it is deployed, instead of listing them all after the deployment finishes. A deploy that fails part way through now reports the resources it did apply. diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 9bb65e7ed41..f084925e4c6 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -994,6 +994,7 @@ func runTest(t *testing.T, printedRepls := false pathFilter := preparePathFilter(config, customEnv) + sortLines := compileSortLines(t, config) // Compare expected outputs for relPath := range outputs { @@ -1001,7 +1002,7 @@ func runTest(t *testing.T, continue } - doComparison(t, repls, dir, tmpDir, relPath, &printedRepls) + doComparison(t, repls, sortLines, dir, tmpDir, relPath, &printedRepls) } // Make sure there are not unaccounted for new files @@ -1032,7 +1033,7 @@ func runTest(t *testing.T, if strings.HasPrefix(relPath, "out") { // We have a new file starting with "out" // Show the contents & support overwrite mode for it: - doComparison(t, repls, dir, tmpDir, relPath, &printedRepls) + doComparison(t, repls, sortLines, dir, tmpDir, relPath, &printedRepls) } } @@ -1105,7 +1106,24 @@ func addEnvVar(t *testing.T, env []string, repls *testdiff.ReplacementsContext, return append(env, key+"="+newValue) } -func doComparison(t *testing.T, repls testdiff.ReplacementsContext, dirRef, dirNew, relPath string, printedRepls *bool) { +// compileSortLines compiles the enabled SortLines patterns from the test config. +// Patterns are returned in name order so the result does not depend on map iteration. +func compileSortLines(t *testing.T, config internal.TestConfig) []*regexp.Regexp { + result := make([]*regexp.Regexp, 0, len(config.SortLines)) + for _, name := range slices.Sorted(maps.Keys(config.SortLines)) { + if on, ok := config.SortLinesOn[name]; ok && !on { + continue + } + re, err := regexp.Compile(config.SortLines[name]) + if err != nil { + t.Fatalf("Invalid SortLines pattern %s = %#v: %s", name, config.SortLines[name], err) + } + result = append(result, re) + } + return result +} + +func doComparison(t *testing.T, repls testdiff.ReplacementsContext, sortLines []*regexp.Regexp, dirRef, dirNew, relPath string, printedRepls *bool) { pathRef := filepath.Join(dirRef, relPath) pathNew := filepath.Join(dirNew, relPath) bufRef, okRef := tryReading(t, pathRef) @@ -1124,6 +1142,14 @@ func doComparison(t *testing.T, repls testdiff.ReplacementsContext, dirRef, dirN valueNew = repls.Replace(valueNew) } + // Canonicalize line runs whose order the command does not guarantee. Applied to + // the reference too so a hand-edited golden compares the same way; sorting is + // idempotent, so a stored reference is unaffected. + for _, re := range sortLines { + valueRef = testdiff.SortLineRuns(valueRef, re) + valueNew = testdiff.SortLineRuns(valueNew, re) + } + // In update mode, regenerating the reference files is the goal: each branch below // writes or removes the reference and returns without failing the test. Genuine // problems still fail — read errors (via tryReading above), write errors (via diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt index 36d57ffdbfa..fd83af4f0c5 100644 --- a/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt @@ -1,6 +1,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Created jobs.my_job Error: access denied: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json (403 INJECTED) Endpoint: POST [DATABRICKS_URL]/api/2.0/workspace-files/import-file/Workspace%2FUsers%2F[USERNAME]%2F.bundle%2Ftest-bundle%2Fdefault%2Fstate%2Fresources.json?overwrite=true diff --git a/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt b/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt index ddba262ca36..d9ae467f59b 100644 --- a/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt +++ b/acceptance/bundle/deploy/wal/chain-3-jobs/output.txt @@ -2,6 +2,8 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-chain-test/default/files... +Created jobs.job_01 +Created jobs.job_02 [PROCESS_KILLED] Exit code: [KILLED] diff --git a/acceptance/bundle/deploy/wal/crash-after-create/output.txt b/acceptance/bundle/deploy/wal/crash-after-create/output.txt index 09f5d04a69e..e0e0bf1a627 100644 --- a/acceptance/bundle/deploy/wal/crash-after-create/output.txt +++ b/acceptance/bundle/deploy/wal/crash-after-create/output.txt @@ -2,6 +2,7 @@ >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-crash-test/default/files... +Created jobs.job_a [PROCESS_KILLED] Exit code: [KILLED] diff --git a/acceptance/bundle/resource_deps/create_error/script b/acceptance/bundle/resource_deps/create_error/script index d475fdaea78..4c9ea312b55 100644 --- a/acceptance/bundle/resource_deps/create_error/script +++ b/acceptance/bundle/resource_deps/create_error/script @@ -1,6 +1,10 @@ echo "*" > .gitignore trace $CLI bundle plan 2>&1 -musterr $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt +# -q: jobs.independent has no dependency on the failing job, so where its "Created" line +# lands relative to the errors below is not stable. This test is about which errors a +# failing deploy reports, so it opts out of the per-resource lines; partial-progress +# reporting is covered by the wal/* and postgres live_errors tests. +musterr $CLI bundle deploy -q &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt trace print_requests.py --sort //jobs trace $CLI bundle summary @@ -12,7 +16,7 @@ title "Plan should still contain foo and bar" trace $CLI bundle plan rm out.requests.txt -musterr $CLI bundle deploy &> out.deploy2.$DATABRICKS_BUNDLE_ENGINE.txt +musterr $CLI bundle deploy -q &> out.deploy2.$DATABRICKS_BUNDLE_ENGINE.txt title "Expecting no difference in the output between first and second deploy" diff.py out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt out.deploy2.$DATABRICKS_BUNDLE_ENGINE.txt rm out.deploy2.$DATABRICKS_BUNDLE_ENGINE.txt diff --git a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt index b99c41ca46b..558fced9e22 100644 --- a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt @@ -1,4 +1,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Created pipelines.foo Error: cannot create resources.pipelines.bar: cannot resolve "${resources.pipelines.foo.ingestion_definition.connection_name}": ingestion_definition: cannot access nil value Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt index fe12fac4f34..b7e43c67f70 100644 --- a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt +++ b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt @@ -1,4 +1,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files... +Created jobs.test Error: cannot create resources.jobs.bar: cannot resolve "${resources.jobs.test.tasks[0].new_cluster.custom_tags.missing_tag}": tasks[0].new_cluster.custom_tags.missing_tag: key "missing_tag" not found in map Files: 7 uploaded, 0 deleted diff --git a/acceptance/bundle/resources/job_runs/basic/output.txt b/acceptance/bundle/resources/job_runs/basic/output.txt index 64625c59277..4e98b174beb 100644 --- a/acceptance/bundle/resources/job_runs/basic/output.txt +++ b/acceptance/bundle/resources/job_runs/basic/output.txt @@ -33,10 +33,10 @@ Resources: >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-basic/default/files... +Created jobs.my_job Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS Created job_runs.my_run -Created jobs.my_job Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/job_runs/failed_run/output.txt b/acceptance/bundle/resources/job_runs/failed_run/output.txt index f8b8dbf4398..5c010b28bc2 100644 --- a/acceptance/bundle/resources/job_runs/failed_run/output.txt +++ b/acceptance/bundle/resources/job_runs/failed_run/output.txt @@ -2,6 +2,7 @@ === a run that finishes FAILED fails the deploy >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... +Created jobs.my_job Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [RUN_URL] Error: cannot create resources.job_runs.my_run: waiting after creating id=[MY_RUN_ID]: run did not succeed: FAILED: Task main failed with message: Workload failed, see run output for details. task "main": RuntimeError: intentional failure diff --git a/acceptance/bundle/resources/job_runs/job_parameters/output.txt b/acceptance/bundle/resources/job_runs/job_parameters/output.txt index e35d03c12c6..f5b8951cb5f 100644 --- a/acceptance/bundle/resources/job_runs/job_parameters/output.txt +++ b/acceptance/bundle/resources/job_runs/job_parameters/output.txt @@ -2,10 +2,10 @@ === deploy triggers the run with only the overridden parameter >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-job-parameters/default/files... +Created jobs.my_job Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS Created job_runs.my_run -Created jobs.my_job Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/job_runs/redeploy/output.txt b/acceptance/bundle/resources/job_runs/redeploy/output.txt index 06129f79373..a06600f5eca 100644 --- a/acceptance/bundle/resources/job_runs/redeploy/output.txt +++ b/acceptance/bundle/resources/job_runs/redeploy/output.txt @@ -2,10 +2,10 @@ === initial deploy triggers the first run >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-redeploy/default/files... +Created jobs.my_job Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS Created job_runs.my_run -Created jobs.my_job Files: 4 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt index 1997c56d031..fca04b36f78 100644 --- a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt +++ b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt @@ -2,10 +2,10 @@ === the deploy succeeds, though its run-now was answered with a 503 >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-retried-run-now/default/files... +Created jobs.my_job Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS Created job_runs.my_run -Created jobs.my_job Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/job_runs/wait/output.txt b/acceptance/bundle/resources/job_runs/wait/output.txt index 80f36fe3ce8..034ecf1835c 100644 --- a/acceptance/bundle/resources/job_runs/wait/output.txt +++ b/acceptance/bundle/resources/job_runs/wait/output.txt @@ -2,11 +2,11 @@ === the deploy waits for the run to finish >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files... +Created jobs.my_job Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [RUN_URL] Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS Created job_runs.my_run Created jobs.downstream_job -Created jobs.my_job Files: 6 uploaded, 0 deleted Resources: 3 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt index a38fa993af1..15c605d3a7f 100644 --- a/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt @@ -1,6 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... -Warn: deploying resources.pipelines.foo.permissions: retrying after 504 Gateway Timeout from PUT /api/2.0/permissions/pipelines/[UUID] Created pipelines.foo +Warn: deploying resources.pipelines.foo.permissions: retrying after 504 Gateway Timeout from PUT /api/2.0/permissions/pipelines/[UUID] Created pipelines.foo.permissions Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged diff --git a/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.direct.txt b/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.direct.txt index 9d65ab09313..3118fd0daea 100644 --- a/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.direct.txt +++ b/acceptance/bundle/resources/postgres_branches/without_branch_id/out.deploy.direct.txt @@ -3,6 +3,7 @@ Warning: required field "branch_id" is not set in databricks.yml:21:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-no-id-[UNIQUE_NAME]/default/files... +Created postgres_projects.my_project Error: cannot create resources.postgres_branches.main: Field 'branch_id' is required, expected non-default value (not "")! (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt index c0c02c1c82a..7034fd62db6 100644 --- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt +++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt @@ -1,4 +1,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bad-database-id-[UNIQUE_NAME]/default/files... +Created postgres_branches.main +Created postgres_projects.my_project +Created postgres_roles.owner Error: cannot create resources.postgres_databases.my_database: Field database_id must match pattern ^[a-z]([a-z0-9-]{0,61}[a-z0-9])?$, got 'Invalid_DB_ID'. (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases?database_id=Invalid_DB_ID diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt index 1f95583baca..207518f3b3f 100644 --- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt +++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt @@ -1,4 +1,6 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bad-role-ref-[UNIQUE_NAME]/default/files... +Created postgres_branches.main +Created postgres_projects.my_project Error: cannot create resources.postgres_databases.my_database: role not found; role_id:"does-not-exist" [TraceId: [TRACE_ID]] (404 NOT_FOUND) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/databases?database_id=my-database diff --git a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.direct.txt b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.direct.txt index e2137454122..6aebf11934d 100644 --- a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.direct.txt +++ b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/out.deploy.direct.txt @@ -3,6 +3,8 @@ Warning: required field "endpoint_id" is not set in databricks.yml:27:7 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-no-id-[UNIQUE_NAME]/default/files... +Created postgres_branches.main +Created postgres_projects.my_project Error: cannot create resources.postgres_endpoints.primary: Field 'endpoint_id' is required, expected non-default value (not "")! (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.0/postgres/projects/test-pg-proj-[UNIQUE_NAME]/branches/main/endpoints diff --git a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt index c5237fefbd5..9d7f571c16c 100644 --- a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt +++ b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt @@ -1,6 +1,7 @@ >>> musterr [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default/files... +Created schemas.myschema Error: cannot create resources.volumes.volume1: CreateVolume storage_location can not be provided. (400 INVALID_PARAMETER_VALUE) Endpoint: POST [DATABRICKS_URL]/api/2.1/unity-catalog/volumes diff --git a/acceptance/internal/config.go b/acceptance/internal/config.go index 66908c03e18..dcecbc76ff4 100644 --- a/acceptance/internal/config.go +++ b/acceptance/internal/config.go @@ -85,6 +85,17 @@ type TestConfig struct { // List of request headers to include when recording requests. IncludeRequestHeaders []string + // Map of name -> regexp. Each run of consecutive output lines matching one of the + // regexps is sorted before comparison. Use for output whose line order is not + // deterministic, e.g. "bundle deploy" reporting resources as they are applied in + // parallel. Entries are keyed by name so an inner test.toml can replace an + // inherited pattern by reusing its name, or switch it off via SortLinesOn. + SortLines map[string]string + + // Map of SortLines name -> whether to apply it. If a name is not listed, defaults + // to true; set it to false to drop an inherited pattern for this test. + SortLinesOn map[string]bool + // List of gitignore patterns to ignore when checking output files Ignore []string diff --git a/acceptance/selftest/sortlines/out.test.toml b/acceptance/selftest/sortlines/out.test.toml new file mode 100644 index 00000000000..8fdd3560ef2 --- /dev/null +++ b/acceptance/selftest/sortlines/out.test.toml @@ -0,0 +1,2 @@ +Cloud = false +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = [] diff --git a/acceptance/selftest/sortlines/output.txt b/acceptance/selftest/sortlines/output.txt new file mode 100644 index 00000000000..52d827397d4 --- /dev/null +++ b/acceptance/selftest/sortlines/output.txt @@ -0,0 +1,7 @@ +Fruit: apple +Fruit: pear +Not a fruit: rock +Fruit: banana +Fruit: cherry +Created jobs.z +Created jobs.a diff --git a/acceptance/selftest/sortlines/override/out.test.toml b/acceptance/selftest/sortlines/override/out.test.toml new file mode 100644 index 00000000000..8fdd3560ef2 --- /dev/null +++ b/acceptance/selftest/sortlines/override/out.test.toml @@ -0,0 +1,2 @@ +Cloud = false +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = [] diff --git a/acceptance/selftest/sortlines/override/output.txt b/acceptance/selftest/sortlines/override/output.txt new file mode 100644 index 00000000000..339e6b00366 --- /dev/null +++ b/acceptance/selftest/sortlines/override/output.txt @@ -0,0 +1,4 @@ +Fruit: pear +Fruit: apple +Veg: carrot +Veg: turnip diff --git a/acceptance/selftest/sortlines/override/script b/acceptance/selftest/sortlines/override/script new file mode 100644 index 00000000000..4a51a9f1add --- /dev/null +++ b/acceptance/selftest/sortlines/override/script @@ -0,0 +1,4 @@ +echo "Fruit: pear" +echo "Fruit: apple" +echo "Veg: turnip" +echo "Veg: carrot" diff --git a/acceptance/selftest/sortlines/override/test.toml b/acceptance/selftest/sortlines/override/test.toml new file mode 100644 index 00000000000..36c7a8748da --- /dev/null +++ b/acceptance/selftest/sortlines/override/test.toml @@ -0,0 +1,3 @@ +# Reusing the inherited name replaces the parent's pattern rather than adding to it: +# "Fruit:" lines are left alone from here on, and "Veg:" lines are sorted instead. +SortLines.fruit = '^Veg: ' diff --git a/acceptance/selftest/sortlines/script b/acceptance/selftest/sortlines/script new file mode 100644 index 00000000000..ded24981940 --- /dev/null +++ b/acceptance/selftest/sortlines/script @@ -0,0 +1,11 @@ +# Each run of "Fruit:" lines is sorted before the output is compared, so this test passes +# no matter which order the lines are printed in. Everything else stays put. +echo "Fruit: pear" +echo "Fruit: apple" +echo "Not a fruit: rock" +echo "Fruit: cherry" +echo "Fruit: banana" + +# deploy_actions is disabled here, so these keep the order they were printed in. +echo "Created jobs.z" +echo "Created jobs.a" diff --git a/acceptance/selftest/sortlines/test.toml b/acceptance/selftest/sortlines/test.toml new file mode 100644 index 00000000000..5375590369b --- /dev/null +++ b/acceptance/selftest/sortlines/test.toml @@ -0,0 +1,9 @@ +# Runs once: the sorting is independent of the deployment engine. +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = [] + +# Only "Fruit:" lines are sorted; every other line delimits the runs. +SortLines.fruit = '^Fruit: ' + +# The inherited deploy_actions pattern is irrelevant here, and switching it off +# exercises SortLinesOn. +SortLinesOn.deploy_actions = false diff --git a/acceptance/test.toml b/acceptance/test.toml index 5fca2e77234..0e3258c8aa1 100644 --- a/acceptance/test.toml +++ b/acceptance/test.toml @@ -19,6 +19,12 @@ Env.PYTHONDONTWRITEBYTECODE = "1" Env.PYTHONUNBUFFERED = "1" Env.PYTHONUTF8 = "1" +# The direct engine reports resources as soon as each one is applied, and resources are +# applied in parallel, so the order of these lines is not deterministic. Sort each run of +# them before comparing, so tests pin which resources were applied, not the order. +# A test that needs the raw order sets SortLinesOn.deploy_actions = false. +SortLines.deploy_actions = '^(Created|Updated|Deleted|Recreated|Resized) \S+$' + EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["terraform", "direct"] EnvMatrixExclude.noplantf = ["DATABRICKS_BUNDLE_ENGINE=terraform", "READPLAN=1"] EnvRepl.DATABRICKS_BUNDLE_ENGINE = false diff --git a/bundle/deployplan/action.go b/bundle/deployplan/action.go index e855dbb2197..05669a029b3 100644 --- a/bundle/deployplan/action.go +++ b/bundle/deployplan/action.go @@ -67,6 +67,16 @@ func (a ActionType) StringShort() string { return items[0] } +// AppliedLine renders the user-facing line reporting that action has been applied +// to resourceKey, e.g. "Created jobs.foo". The past-tense verb is the short action +// name plus "d" (create->Created, delete->Deleted, ...), capitalized to match the +// sentence case of other output. "bundle plan" keeps the lower-case present tense, +// so the two are still distinguishable at a glance. +func AppliedLine(resourceKey string, action ActionType) string { + verb := action.StringShort() + "d" + return strings.ToUpper(verb[:1]) + verb[1:] + " " + strings.TrimPrefix(resourceKey, "resources.") +} + // GetHigherAction returns the action with higher severity between a and b. // Actions are ordered by severity in actionOrder map. func GetHigherAction(a, b ActionType) ActionType { diff --git a/bundle/direct/bundle_apply.go b/bundle/direct/bundle_apply.go index 424ae2bdec9..a351220fa1e 100644 --- a/bundle/direct/bundle_apply.go +++ b/bundle/direct/bundle_apply.go @@ -9,6 +9,7 @@ import ( "github.com/databricks/cli/bundle/config" "github.com/databricks/cli/bundle/deployplan" "github.com/databricks/cli/bundle/terraform_dabs_map" + "github.com/databricks/cli/libs/cmdio" "github.com/databricks/cli/libs/log" "github.com/databricks/cli/libs/logdiag" "github.com/databricks/cli/libs/structs/structaccess" @@ -16,7 +17,10 @@ import ( "github.com/databricks/databricks-sdk-go" ) -func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.WorkspaceClient, plan *deployplan.Plan) { +// Apply deploys every node in plan, respecting dependency order. When reportApplied +// is set, each resource is reported as soon as it is applied, so a long deploy shows +// what it has done and a failing one still reports the resources it did apply. +func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.WorkspaceClient, plan *deployplan.Plan, reportApplied bool) { if plan == nil { panic("Planning is not done") } @@ -111,6 +115,7 @@ func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.Workspa logdiag.LogError(ctx, fmt.Errorf("%s: %w", errorPrefix, err)) return false } + logApplied(ctx, reportApplied, resourceKey, action) return true } @@ -139,6 +144,10 @@ func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.Workspa logdiag.LogError(ctx, fmt.Errorf("%s: %w", errorPrefix, err)) return false } + + // Reported before the remote-state refresh below: the resource is already + // deployed at this point, so the line is accurate even if the refresh fails. + logApplied(ctx, reportApplied, resourceKey, action) } // TODO: Note, we only really need remote state if there are remote references. @@ -164,6 +173,14 @@ func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.Workspa }) } +// logApplied reports a resource that has just been applied. Resources are applied in +// parallel, so lines appear in completion order, which varies between runs. +func logApplied(ctx context.Context, reportApplied bool, resourceKey string, action deployplan.ActionType) { + if reportApplied { + cmdio.LogString(ctx, deployplan.AppliedLine(resourceKey, action)) + } +} + func (b *DeploymentBundle) LookupReferencePostDeploy(ctx context.Context, path *structpath.PathNode) (any, error) { targetResourceKey, fieldPath := splitResourcePath(path) targetGroup := config.GetResourceTypeFromKey(targetResourceKey) diff --git a/bundle/phases/deploy.go b/bundle/phases/deploy.go index f16088e4518..ebbe10cdd5f 100644 --- a/bundle/phases/deploy.go +++ b/bundle/phases/deploy.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "slices" - "strings" "github.com/databricks/cli/bundle" "github.com/databricks/cli/bundle/artifacts" @@ -90,7 +89,7 @@ func deployCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, st // should report the engine that ran. b.Metrics.StateEngine = stateEngine.ThisOrDefault() if stateEngine.IsDirect() { - b.DeploymentBundle.Apply(ctx, b.WorkspaceClient(ctx), plan) + b.DeploymentBundle.Apply(ctx, b.WorkspaceClient(ctx), plan, reportPerResource(b)) state, err = b.DeploymentBundle.StateDB.Finalize(ctx) // Capture the finalized state for deploy telemetry. It carries each // resource's state-size in bytes (from the WAL replay Finalize just @@ -118,6 +117,12 @@ func deployCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, st ) } +// reportPerResource reports whether the deploy should list resources individually +// (-q and -qq drop those lines). +func reportPerResource(b *bundle.Bundle) bool { + return b.Quiet < bundle.QuietSummary +} + // logFileSummary reports what the file sync did. Separate from the resource summary // because a deploy that only changes business logic (a .py or .sql file) leaves every // resource unchanged, so without this line its summary is all zeros and looks like a @@ -132,22 +137,20 @@ func logFileSummary(ctx context.Context, b *bundle.Bundle) { // logDeploySummary prints the per-resource actions that were applied followed by the // resource summary line. -q drops the per-resource lines, -qq drops the summary too. -// The past-tense verb is the short action name plus "d" (create→Created, -// delete→Deleted, ...), capitalized to match the sentence case of other output. -// "bundle plan" keeps the lower-case present tense, so the two are still -// distinguishable at a glance. -func logDeploySummary(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan) { +// The direct engine prints its own lines as it goes, so only the terraform engine +// reports them from the plan here. +func logDeploySummary(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, stateEngine engine.EngineType) { if b.Quiet >= bundle.QuietAll { return } - if b.Quiet < bundle.QuietSummary { + // The direct engine already printed these lines as each resource was applied. + if reportPerResource(b) && !stateEngine.IsDirect() { for _, action := range plan.GetActions() { if action.ActionType == deployplan.Skip || action.ActionType == deployplan.Undefined { continue } - verb := action.ActionType.StringShort() + "d" - cmdio.LogString(ctx, strings.ToUpper(verb[:1])+verb[1:]+" "+strings.TrimPrefix(action.ResourceKey, "resources.")) + cmdio.LogString(ctx, deployplan.AppliedLine(action.ResourceKey, action.ActionType)) } } @@ -319,7 +322,7 @@ func Deploy(ctx context.Context, b *bundle.Bundle, outputHandler sync.OutputHand // still propagates. Earlier failures report the files only, since the plan // counts would then describe what was intended rather than what was applied. filesReported = true - logDeploySummary(ctx, b, plan) + logDeploySummary(ctx, b, plan, stateEngine) bundle.ApplyContext(ctx, b, scripts.Execute(config.ScriptPostDeploy)) diff --git a/bundle/phases/destroy.go b/bundle/phases/destroy.go index e19dd11fb56..bd0a89b3fb4 100644 --- a/bundle/phases/destroy.go +++ b/bundle/phases/destroy.go @@ -136,7 +136,8 @@ func approvalForDestroy(ctx context.Context, b *bundle.Bundle, plan *deployplan. func destroyCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, engine engine.EngineType) { if engine.IsDirect() { - b.DeploymentBundle.Apply(ctx, b.WorkspaceClient(ctx), plan) + // destroy prints its own summary and never lists resources individually. + b.DeploymentBundle.Apply(ctx, b.WorkspaceClient(ctx), plan, false) } else { // Core destructive mutators for destroy. These require informed user consent. bundle.ApplyContext(ctx, b, terraform.Apply()) diff --git a/libs/testdiff/sortlines.go b/libs/testdiff/sortlines.go new file mode 100644 index 00000000000..332a11f1c27 --- /dev/null +++ b/libs/testdiff/sortlines.go @@ -0,0 +1,33 @@ +package testdiff + +import ( + "regexp" + "slices" + "strings" +) + +// SortLineRuns sorts each run of consecutive lines matching pattern, leaving every +// other line where it is. Use it for output whose line order is genuinely +// nondeterministic — for example "bundle deploy" reporting resources as they are +// applied, which happens in parallel — so that a test pins the set of lines without +// pinning an order the command does not guarantee. +func SortLineRuns(input string, pattern *regexp.Regexp) string { + lines := strings.Split(input, "\n") + start := -1 + for i := range lines { + if pattern.MatchString(lines[i]) { + if start < 0 { + start = i + } + continue + } + if start >= 0 { + slices.Sort(lines[start:i]) + start = -1 + } + } + if start >= 0 { + slices.Sort(lines[start:]) + } + return strings.Join(lines, "\n") +} diff --git a/libs/testdiff/sortlines_test.go b/libs/testdiff/sortlines_test.go new file mode 100644 index 00000000000..f0651cf6f44 --- /dev/null +++ b/libs/testdiff/sortlines_test.go @@ -0,0 +1,48 @@ +package testdiff + +import ( + "regexp" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestSortLineRuns(t *testing.T) { + pattern := regexp.MustCompile(`^(Created|Updated|Deleted) `) + + for _, tc := range []struct { + name string + input string + want string + }{ + { + name: "sorts a run and leaves surrounding lines alone", + input: "Uploading files...\nCreated volumes.v\nCreated jobs.a\nUpdated jobs.b\nFiles: 1 uploaded\n", + want: "Uploading files...\nCreated jobs.a\nCreated volumes.v\nUpdated jobs.b\nFiles: 1 uploaded\n", + }, + { + // Runs are sorted independently: a non-matching line between them is a + // boundary, so lines never move across it. + name: "does not merge runs separated by other output", + input: "Created jobs.z\nError: boom\nCreated jobs.a\n", + want: "Created jobs.z\nError: boom\nCreated jobs.a\n", + }, + { + name: "sorts a run that ends the input", + input: ">>> deploy\nDeleted jobs.b\nDeleted jobs.a", + want: ">>> deploy\nDeleted jobs.a\nDeleted jobs.b", + }, + { + name: "leaves input without matches untouched", + input: "Plan: 1 to add\n\nResources: 1 created\n", + want: "Plan: 1 to add\n\nResources: 1 created\n", + }, + } { + t.Run(tc.name, func(t *testing.T) { + got := SortLineRuns(tc.input, pattern) + assert.Equal(t, tc.want, got) + // Sorting is idempotent, so goldens stay stable when re-recorded. + assert.Equal(t, tc.want, SortLineRuns(got, pattern)) + }) + } +} From c596191f793d50c7a745182104cb68a8d8c45d6e Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 24 Aug 2026 14:25:52 +0200 Subject: [PATCH 2/7] acc: make independent-block sorting visible in the SortLines selftest The blocks in the selftest sorted the same way whether or not the boundary was respected. Pick values so a merged sort would move lines across it, and add the matching unit test case. Co-authored-by: Isaac --- acceptance/selftest/sortlines/output.txt | 8 +++++--- acceptance/selftest/sortlines/script | 14 +++++++++----- libs/testdiff/sortlines_test.go | 7 +++++++ 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/acceptance/selftest/sortlines/output.txt b/acceptance/selftest/sortlines/output.txt index 52d827397d4..013e56e8224 100644 --- a/acceptance/selftest/sortlines/output.txt +++ b/acceptance/selftest/sortlines/output.txt @@ -1,7 +1,9 @@ -Fruit: apple -Fruit: pear +Fruit: quince +Fruit: zucchini Not a fruit: rock +Fruit: apple Fruit: banana -Fruit: cherry +Not a fruit: spoon +Fruit: melon Created jobs.z Created jobs.a diff --git a/acceptance/selftest/sortlines/script b/acceptance/selftest/sortlines/script index ded24981940..afe77ccac2c 100644 --- a/acceptance/selftest/sortlines/script +++ b/acceptance/selftest/sortlines/script @@ -1,10 +1,14 @@ -# Each run of "Fruit:" lines is sorted before the output is compared, so this test passes -# no matter which order the lines are printed in. Everything else stays put. -echo "Fruit: pear" -echo "Fruit: apple" +# Each run of consecutive "Fruit:" lines is sorted on its own, and a non-matching line ends +# the run. The values are picked so that this is visible in the output: the first block +# sorts late in the alphabet and the second sorts early, so if the two blocks were sorted +# together, "apple" and "banana" would move up past "Not a fruit: rock". +echo "Fruit: zucchini" +echo "Fruit: quince" echo "Not a fruit: rock" -echo "Fruit: cherry" echo "Fruit: banana" +echo "Fruit: apple" +echo "Not a fruit: spoon" +echo "Fruit: melon" # deploy_actions is disabled here, so these keep the order they were printed in. echo "Created jobs.z" diff --git a/libs/testdiff/sortlines_test.go b/libs/testdiff/sortlines_test.go index f0651cf6f44..951d8b3f617 100644 --- a/libs/testdiff/sortlines_test.go +++ b/libs/testdiff/sortlines_test.go @@ -27,6 +27,13 @@ func TestSortLineRuns(t *testing.T) { input: "Created jobs.z\nError: boom\nCreated jobs.a\n", want: "Created jobs.z\nError: boom\nCreated jobs.a\n", }, + { + // Same, with runs long enough to sort: each is ordered on its own, and the + // second run stays below the boundary even though it sorts first overall. + name: "sorts each run independently", + input: "Updated jobs.z\nUpdated jobs.y\nError: boom\nCreated jobs.b\nCreated jobs.a\n", + want: "Updated jobs.y\nUpdated jobs.z\nError: boom\nCreated jobs.a\nCreated jobs.b\n", + }, { name: "sorts a run that ends the input", input: ">>> deploy\nDeleted jobs.b\nDeleted jobs.a", From e1eca5c75df3bbc34796dee6dfc0c35b970cbf16 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 24 Aug 2026 15:38:27 +0200 Subject: [PATCH 3/7] direct: inline logApplied, shorten the create_error comment Co-authored-by: Isaac --- .../bundle/resource_deps/create_error/script | 6 +----- bundle/direct/bundle_apply.go | 19 ++++++++----------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/acceptance/bundle/resource_deps/create_error/script b/acceptance/bundle/resource_deps/create_error/script index 4c9ea312b55..55b0d2ace42 100644 --- a/acceptance/bundle/resource_deps/create_error/script +++ b/acceptance/bundle/resource_deps/create_error/script @@ -1,10 +1,6 @@ echo "*" > .gitignore trace $CLI bundle plan 2>&1 -# -q: jobs.independent has no dependency on the failing job, so where its "Created" line -# lands relative to the errors below is not stable. This test is about which errors a -# failing deploy reports, so it opts out of the per-resource lines; partial-progress -# reporting is covered by the wal/* and postgres live_errors tests. -musterr $CLI bundle deploy -q &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt +musterr $CLI bundle deploy -q &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt # -q: independent job races the failure trace print_requests.py --sort //jobs trace $CLI bundle summary diff --git a/bundle/direct/bundle_apply.go b/bundle/direct/bundle_apply.go index a351220fa1e..43edcba485f 100644 --- a/bundle/direct/bundle_apply.go +++ b/bundle/direct/bundle_apply.go @@ -19,7 +19,8 @@ import ( // Apply deploys every node in plan, respecting dependency order. When reportApplied // is set, each resource is reported as soon as it is applied, so a long deploy shows -// what it has done and a failing one still reports the resources it did apply. +// what it has done and a failing one still reports the resources it did apply. Nodes +// run in parallel, so the lines come out in completion order, which varies per run. func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.WorkspaceClient, plan *deployplan.Plan, reportApplied bool) { if plan == nil { panic("Planning is not done") @@ -115,7 +116,9 @@ func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.Workspa logdiag.LogError(ctx, fmt.Errorf("%s: %w", errorPrefix, err)) return false } - logApplied(ctx, reportApplied, resourceKey, action) + if reportApplied { + cmdio.LogString(ctx, deployplan.AppliedLine(resourceKey, action)) + } return true } @@ -147,7 +150,9 @@ func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.Workspa // Reported before the remote-state refresh below: the resource is already // deployed at this point, so the line is accurate even if the refresh fails. - logApplied(ctx, reportApplied, resourceKey, action) + if reportApplied { + cmdio.LogString(ctx, deployplan.AppliedLine(resourceKey, action)) + } } // TODO: Note, we only really need remote state if there are remote references. @@ -173,14 +178,6 @@ func (b *DeploymentBundle) Apply(ctx context.Context, client *databricks.Workspa }) } -// logApplied reports a resource that has just been applied. Resources are applied in -// parallel, so lines appear in completion order, which varies between runs. -func logApplied(ctx context.Context, reportApplied bool, resourceKey string, action deployplan.ActionType) { - if reportApplied { - cmdio.LogString(ctx, deployplan.AppliedLine(resourceKey, action)) - } -} - func (b *DeploymentBundle) LookupReferencePostDeploy(ctx context.Context, path *structpath.PathNode) (any, error) { targetResourceKey, fieldPath := splitResourcePath(path) targetGroup := config.GetResourceTypeFromKey(targetResourceKey) From 5b03437cb28841237105545bb9ebe968093a95b8 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 24 Aug 2026 16:11:49 +0200 Subject: [PATCH 4/7] Run the migration to direct after the postdeploy script The migration ran inside deployCore, before the postdeploy script. Order is now deploy, then the postdeploy script, then the migration. The migration is still gated on the deploy succeeding and still not on the script: the resources are deployed either way, so the state describes the same deployment. Co-authored-by: Isaac --- .../databricks.yml | 7 ++++++ .../myscript.py | 5 ++++ .../out.test.toml | 2 ++ .../auto-migrate-postdeploy-script/output.txt | 24 +++++++++++++++++++ .../auto-migrate-postdeploy-script/script | 22 +++++++++++++++++ .../auto-migrate-postdeploy-script/test.toml | 1 + 6 files changed, 61 insertions(+) create mode 100644 acceptance/bundle/migrate/auto-migrate-postdeploy-script/databricks.yml create mode 100644 acceptance/bundle/migrate/auto-migrate-postdeploy-script/myscript.py create mode 100644 acceptance/bundle/migrate/auto-migrate-postdeploy-script/out.test.toml create mode 100644 acceptance/bundle/migrate/auto-migrate-postdeploy-script/output.txt create mode 100644 acceptance/bundle/migrate/auto-migrate-postdeploy-script/script create mode 100644 acceptance/bundle/migrate/auto-migrate-postdeploy-script/test.toml diff --git a/acceptance/bundle/migrate/auto-migrate-postdeploy-script/databricks.yml b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/databricks.yml new file mode 100644 index 00000000000..747555aaab9 --- /dev/null +++ b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/databricks.yml @@ -0,0 +1,7 @@ +bundle: + name: test-bundle + engine: direct + +experimental: + scripts: + postdeploy: "python3 ./myscript.py $POSTDEPLOY_EXITCODE postdeploy" diff --git a/acceptance/bundle/migrate/auto-migrate-postdeploy-script/myscript.py b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/myscript.py new file mode 100644 index 00000000000..c039766d65f --- /dev/null +++ b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/myscript.py @@ -0,0 +1,5 @@ +import sys + +exitcode, name = sys.argv[1], sys.argv[2] +print(f"from {name}: hello") +sys.exit(int(exitcode)) diff --git a/acceptance/bundle/migrate/auto-migrate-postdeploy-script/out.test.toml b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/out.test.toml new file mode 100644 index 00000000000..0938e678987 --- /dev/null +++ b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/out.test.toml @@ -0,0 +1,2 @@ +Cloud = false +EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"] diff --git a/acceptance/bundle/migrate/auto-migrate-postdeploy-script/output.txt b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/output.txt new file mode 100644 index 00000000000..f53d494a763 --- /dev/null +++ b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/output.txt @@ -0,0 +1,24 @@ + +=== postdeploy script output comes before the migration notice +>>> [CLI] bundle deploy +Warn: Direct engine requested in bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11 but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Executing 'postdeploy' script +from postdeploy: hello +Removing empty terraform state; direct engine will be used on the next deploy (opted in via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)... +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged + +=== Same when the postdeploy script fails: the migration still runs +>>> errcode [CLI] bundle deploy +Warn: Direct engine requested in bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11 but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. +Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Executing 'postdeploy' script +from postdeploy: hello +Error: failed to execute script: exit status 1 + +Removing empty terraform state; direct engine will be used on the next deploy (opted in via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)... +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged + +Exit code: 1 diff --git a/acceptance/bundle/migrate/auto-migrate-postdeploy-script/script b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/script new file mode 100644 index 00000000000..c2b6e831bcf --- /dev/null +++ b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/script @@ -0,0 +1,22 @@ +# The deploy runs first, then the postdeploy script, then the migration. The migration is +# not gated on the script: the resources are deployed either way, so the state describes +# the same deployment whether or not the script succeeded. + +seed_empty_tfstate() { + mkdir -p .databricks/bundle/default/terraform + cat > .databricks/bundle/default/terraform/terraform.tfstate <<'JSON' +{"version": 4, "serial": 1, "lineage": "test-lineage", "resources": []} +JSON +} + +seed_empty_tfstate +title "postdeploy script output comes before the migration notice" +trace $CLI bundle deploy + +title "Same when the postdeploy script fails: the migration still runs" +rm -rf .databricks +seed_empty_tfstate +export POSTDEPLOY_EXITCODE=1 +trace errcode $CLI bundle deploy + +rm -f out.requests.txt diff --git a/acceptance/bundle/migrate/auto-migrate-postdeploy-script/test.toml b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/test.toml new file mode 100644 index 00000000000..322b96cacba --- /dev/null +++ b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/test.toml @@ -0,0 +1 @@ +Env.POSTDEPLOY_EXITCODE = "0" From 1552eda60c24cf0bcfa564161d39bfa19805f90a Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Tue, 25 Aug 2026 09:29:35 +0200 Subject: [PATCH 5/7] acc: regenerate goldens after rebase on main #6368 moved the deploy summary ahead of the postdeploy script and the migration, and #6357 changed the job_runs tests. Co-authored-by: Isaac --- .../migrate/auto-migrate-postdeploy-script/output.txt | 8 ++++---- .../bundle/resources/job_runs/interrupted_run/output.txt | 1 + .../bundle/resources/job_runs/on_bundle_deploy/output.txt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/acceptance/bundle/migrate/auto-migrate-postdeploy-script/output.txt b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/output.txt index f53d494a763..64a7fce0500 100644 --- a/acceptance/bundle/migrate/auto-migrate-postdeploy-script/output.txt +++ b/acceptance/bundle/migrate/auto-migrate-postdeploy-script/output.txt @@ -3,22 +3,22 @@ >>> [CLI] bundle deploy Warn: Direct engine requested in bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11 but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged Executing 'postdeploy' script from postdeploy: hello Removing empty terraform state; direct engine will be used on the next deploy (opted in via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)... -Files: 6 uploaded, 0 deleted -Resources: 0 created, 0 changed, 0 deleted, 0 unchanged === Same when the postdeploy script fails: the migration still runs >>> errcode [CLI] bundle deploy Warn: Direct engine requested in bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11 but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy. Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files... +Files: 6 uploaded, 0 deleted +Resources: 0 created, 0 changed, 0 deleted, 0 unchanged Executing 'postdeploy' script from postdeploy: hello Error: failed to execute script: exit status 1 Removing empty terraform state; direct engine will be used on the next deploy (opted in via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)... -Files: 6 uploaded, 0 deleted -Resources: 0 created, 0 changed, 0 deleted, 0 unchanged Exit code: 1 diff --git a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt index 2e1d9cacd7a..0d27e0ba334 100644 --- a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt +++ b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt @@ -2,6 +2,7 @@ === the deploy stops waiting before the run finishes >>> errcode [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-interrupted-run/default/files... +Created jobs.my_job Error: cannot create resources.job_runs.my_run: waiting after creating id=[MY_RUN_ID]: Fault injected by test. (403 INJECTED) Endpoint: GET [DATABRICKS_URL]/api/2.2/jobs/runs/get?run_id=[MY_RUN_ID] diff --git a/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt b/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt index 39123f3370f..f342619d618 100644 --- a/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt +++ b/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt @@ -2,10 +2,10 @@ === first deploy triggers a run >>> [CLI] bundle deploy Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-bundle-deploy/default/files... +Created jobs.my_job Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID]?o=[NUMID] Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS Created job_runs.my_run -Created jobs.my_job Files: 5 uploaded, 0 deleted Resources: 2 created, 0 changed, 0 deleted, 0 unchanged From ac23d2b633ffd3deaf2754179afb9c0ed630a7e6 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Tue, 25 Aug 2026 11:20:22 +0200 Subject: [PATCH 6/7] Fix an inaccurate comment on the destroy reporting flag destroy does list resources individually, up front for consent; what it lacks is per-resource completion output. State the reason for the flag instead. Co-authored-by: Isaac --- bundle/phases/destroy.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundle/phases/destroy.go b/bundle/phases/destroy.go index bd0a89b3fb4..6ad118677ab 100644 --- a/bundle/phases/destroy.go +++ b/bundle/phases/destroy.go @@ -136,7 +136,8 @@ func approvalForDestroy(ctx context.Context, b *bundle.Bundle, plan *deployplan. func destroyCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, engine engine.EngineType) { if engine.IsDirect() { - // destroy prints its own summary and never lists resources individually. + // Not reported per resource: destroy names them up front for consent and then + // reports only a count, so there is no per-resource output to report into. b.DeploymentBundle.Apply(ctx, b.WorkspaceClient(ctx), plan, false) } else { // Core destructive mutators for destroy. These require informed user consent. From 91e8e1f036a29e54f0efcdf55bd24c68f61b9827 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Tue, 25 Aug 2026 11:40:12 +0200 Subject: [PATCH 7/7] Report resources as they are deleted in bundle destroy destroy behaves like deploy now: each resource is reported as it is deleted, so a destroy that fails part way through says what it removed. The terraform engine has no per-resource results, so it reports them from the plan before the count, keeping the two engines' output identical. -q where the lines are not the subject: the templates tests keep only the last two lines of destroy output, and the secret_scopes cleanup destroy diverges because the scope's permissions are a node of their own on direct but not on terraform. Co-authored-by: Isaac --- .../deploy/bundle-no-args-with-flags/output.txt | 1 + acceptance/apps/deploy/bundle-no-args/output.txt | 1 + .../ai_runtime_task/local_code_source/output.txt | 1 + acceptance/bundle/apps/app_yaml/output.txt | 1 + acceptance/bundle/apps/compute_size/output.txt | 1 + acceptance/bundle/apps/git_source/output.txt | 1 + .../bundle/apps/job_permissions/output.txt | 4 ++++ acceptance/bundle/bundle_tag/id/output.txt | 1 + acceptance/bundle/bundle_tag/url/output.txt | 1 + .../bundle_tag/url_ref/out.destroy.terraform.txt | 2 ++ .../config-remote-sync/cli_defaults/output.txt | 3 +++ .../config-remote-sync/config_edits/output.txt | 1 + .../config-remote-sync/dashboard_etag/output.txt | 1 + .../config-remote-sync/flushed_cache/output.txt | 1 + .../formatting_preserved/output.txt | 1 + .../config-remote-sync/job_fields/output.txt | 1 + .../job_multiple_tasks/output.txt | 3 +++ .../job_params_variables/output.txt | 1 + .../job_pipeline_task/output.txt | 2 ++ .../config-remote-sync/multiple_files/output.txt | 2 ++ .../multiple_resources/output.txt | 7 +++++++ .../config-remote-sync/output_json/output.txt | 1 + .../output_no_changes/output.txt | 1 + .../pipeline_fields/output.txt | 1 + .../policy_injected_cluster_fields/output.txt | 1 + .../resolve_variables/output.txt | 2 ++ .../config-remote-sync/select_basic/output.txt | 2 ++ .../select_multiple/output.txt | 3 +++ .../skip_permissions/output.txt | 2 ++ .../split/cli_default_split_element/output.txt | 1 + .../split/dotted_target/output.txt | 1 + .../split/isolation/output.txt | 2 ++ .../split/keyed_edit/output.txt | 1 + .../split/keyed_remove/output.txt | 2 ++ .../split/keyed_rename/output.txt | 2 ++ .../split/keyed_twoblock/output.txt | 1 + .../split/multifile/output.txt | 1 + .../split/nested_add_split_parent/output.txt | 1 + .../split/nested_sequence/output.txt | 1 + .../split/positional/output.txt | 1 + .../split/remove_field_both_blocks/output.txt | 1 + .../split/remove_with_unrelated_add/output.txt | 1 + .../split/rename_ambiguous_pairing/output.txt | 1 + .../rename_ambiguous_single_block/output.txt | 1 + .../split/rename_two_removes_one_add/output.txt | 1 + .../split/target_variable/output.txt | 1 + .../split/variable_file_order/output.txt | 1 + .../target_override/output.txt | 1 + .../task_rename_revert/output.txt | 1 + .../validation_errors/output.txt | 2 ++ .../variable_reference_parent/output.txt | 1 + .../deploy/files/no-snapshot-sync/output.txt | 1 + .../deploy/immutable-no-artifacts/output.txt | 1 + .../immutable-permissions-change/output.txt | 4 +++- acceptance/bundle/deploy/immutable/output.txt | 1 + acceptance/bundle/deploy/mlops-stacks/output.txt | 8 ++++++++ .../partial-summary-on-push-fail/output.txt | 1 + .../deploy/pipeline-config-dots/output.txt | 2 ++ .../bundle/deploy/readplan/basic/output.txt | 1 + .../readplan/cli-version-mismatch/output.txt | 1 + .../readplan/grants-remove-principal/output.txt | 2 ++ .../deploy/readplan/postgres_role/output.txt | 3 +++ .../deploy/readplan/serial-mismatch/output.txt | 1 + .../deploy/resource-max-wait-zero/output.txt | 2 ++ .../bundle/deploy/resource-max-wait/output.txt | 1 + .../bundle/deploy/snapshot-comparison/output.txt | 4 ++++ .../bundle/deploy/spark-jar-task/output.txt | 1 + .../bind/job/generate-and-bind/output.txt | 1 + .../bundle/deployment/unbind/grants/output.txt | 2 ++ .../deployment/unbind/permissions/output.txt | 2 ++ .../bundle/destroy/all-resources/output.txt | 2 ++ .../destroy/force-lock-node-limit/output.txt | 1 + .../bundle/destroy/jobs-and-pipeline/output.txt | 2 ++ .../lineage-mismatch-after-redeploy/output.txt | 1 + acceptance/bundle/generate/auto-bind/output.txt | 1 + .../bundle/integration_whl/base/output.txt | 1 + .../integration_whl/custom_params/output.txt | 1 + .../interactive_cluster/output.txt | 2 ++ .../output.txt | 2 ++ .../interactive_single_user/output.txt | 2 ++ .../bundle/integration_whl/serverless/output.txt | 1 + .../serverless_custom_params/output.txt | 1 + .../serverless_dynamic_version/output.txt | 1 + .../integration_whl/serverless_extras/output.txt | 1 + .../serverless_extras_dynamic_version/output.txt | 1 + .../bundle/integration_whl/wrapper/output.txt | 1 + .../wrapper_custom_params/output.txt | 1 + .../bundle/local_state_staleness/output.txt | 1 + acceptance/bundle/migrate/runas/output.txt | 2 ++ acceptance/bundle/migrate/var_arg/output.txt | 2 ++ acceptance/bundle/quiet-levels/output.txt | 1 + .../bundle/resource_deps/create_error/output.txt | 1 + .../job_id_big_graph/destroy/output.txt | 12 ++++++++++++ .../resource_deps/job_id_delete_bar/output.txt | 1 + .../resource_deps/job_id_delete_foo/output.txt | 1 + .../bundle/resource_deps/jobs_update/output.txt | 2 ++ .../resource_deps/jobs_update_remote/output.txt | 2 ++ .../resource_deps/pipelines_recreate/output.txt | 4 +++- .../resource_deps/remote_app_url/output.txt | 2 ++ .../out.destroy.direct.txt | 3 +++ .../out.destroy.terraform.txt | 2 ++ .../volume_path_contains_id/out.destroy.txt | 3 +++ .../bundle/resources/alerts/basic/output.txt | 2 ++ .../bundle/resources/alerts/with_file/output.txt | 1 + .../apps/config-drift-stopped/output.txt | 1 + .../resources/apps/config-drift/output.txt | 1 + .../resources/apps/inline_config/output.txt | 1 + .../apps/lifecycle-started-omitted/output.txt | 1 + .../apps/lifecycle-started-toggle/output.txt | 1 + .../resources/apps/lifecycle-started/output.txt | 1 + .../resources/apps/readplan-lifecycle/output.txt | 1 + .../resources/apps/uc-securable-drift/output.txt | 1 + .../bundle/resources/apps/update/output.txt | 1 + .../resources/catalogs/auto-approve/output.txt | 2 ++ .../bundle/resources/catalogs/basic/output.txt | 1 + .../resources/catalogs/with-schemas/output.txt | 2 ++ .../backend_normalization/output.txt | 3 +++ .../resources/cluster_policies/basic/output.txt | 1 + .../definition_multiline/output.txt | 1 + .../cluster_policies/definition_yaml/output.txt | 1 + .../cluster_policies/job_ref/output.txt | 2 ++ .../out_of_band_change/output.txt | 1 + .../permissions/levels/output.txt | 2 ++ .../permissions/out_of_band_deletion/output.txt | 2 ++ .../permissions/out_of_band_grant/output.txt | 2 ++ .../policy_family_definition/output.txt | 1 + .../policy_family_overrides/output.txt | 3 +++ .../deploy/data_security_mode/output.txt | 1 + .../clusters/deploy/local_ssd_count/output.txt | 1 + .../resources/clusters/deploy/simple/output.txt | 2 ++ .../deploy/update-after-create/output.txt | 1 + .../update-and-resize-autoscale/output.txt | 1 + .../clusters/deploy/update-and-resize/output.txt | 1 + .../clusters/lifecycle-started-toggle/output.txt | 1 + .../clusters/lifecycle-started/output.txt | 1 + .../clusters/readplan-lifecycle/output.txt | 1 + .../resize-terminated-fallback/output.txt | 1 + .../clusters/run/spark_python_task/output.txt | 2 ++ .../change-embed-credentials/output.txt | 1 + .../resources/dashboards/change-name/output.txt | 1 + .../dashboards/change-parent-path/output.txt | 1 + .../change-serialized-dashboard/output.txt | 1 + .../dashboards/dataset-catalog-schema/output.txt | 1 + .../resources/dashboards/destroy/output.txt | 1 + .../dashboards/detect-change/output.txt | 1 + .../dashboards/generate_inplace/output.txt | 1 + .../dashboards/nested-folders/output.txt | 1 + .../publish-failure-stale-content/output.txt | 1 + .../republish-after-draft-update/output.txt | 1 + .../resources/dashboards/simple/output.txt | 1 + .../simple_outside_bundle_root/output.txt | 1 + .../dashboards/simple_syncroot/output.txt | 1 + .../resources/database_catalogs/basic/output.txt | 2 ++ .../database_catalogs/recreate/output.txt | 2 ++ .../database_instances/recreate/output.txt | 1 + .../single-instance/output.txt | 1 + .../resources/experiments/basic/output.txt | 1 + .../resources/external_locations/output.txt | 4 ++++ .../resources/genie_spaces/inline/output.txt | 1 + .../genie_spaces/parent_path_update/output.txt | 1 + .../genie_spaces/recreate_when_gone/output.txt | 1 + .../genie_spaces/serialized_space/output.txt | 2 ++ .../resources/genie_spaces/simple/output.txt | 1 + .../genie_spaces/version_migration/output.txt | 1 + .../bundle/resources/grants/catalogs/output.txt | 2 ++ .../grants/registered_models/output.txt | 3 +++ .../grants/schemas/all_privileges/output.txt | 2 ++ .../schemas/all_privileges_coexist/output.txt | 2 ++ .../grants/schemas/change_privilege/output.txt | 2 ++ .../schemas/duplicate_principals/output.txt | 2 ++ .../schemas/duplicate_privileges/output.txt | 2 ++ .../schemas/out_of_band_principal/output.txt | 2 ++ .../grants/schemas/remove_all/output.txt | 1 + .../grants/schemas/remove_principal/output.txt | 2 ++ .../bundle/resources/grants/volumes/output.txt | 3 +++ .../bundle/resources/instance_pools/output.txt | 1 + .../bundle/resources/job_runs/basic/output.txt | 2 ++ .../resources/job_runs/failed_run/output.txt | 2 ++ .../job_runs/interrupted_run/output.txt | 2 ++ .../resources/job_runs/job_parameters/output.txt | 2 ++ .../job_runs/on_bundle_deploy/output.txt | 2 ++ .../resources/job_runs/redeploy/output.txt | 2 ++ .../job_runs/retried_run_now/output.txt | 2 ++ .../bundle/resources/job_runs/wait/output.txt | 3 +++ .../bundle/resources/jobs/alert-task/output.txt | 1 + .../bundle/resources/jobs/big_id/output.txt | 1 + .../resources/jobs/check-metadata/output.txt | 2 ++ .../jobs/double-underscore-keys/output.txt | 2 ++ .../jobs/fail-on-active-runs/output.txt | 1 + .../no-git-provider/out.destroy.terraform.txt | 1 + .../remote_delete/destroy/out.destroy.direct.txt | 1 + .../resources/jobs/shared-root-path/output.txt | 1 + .../bundle/resources/jobs/update/output.txt | 1 + .../resources/jobs/update_single_node/output.txt | 1 + .../model_serving_endpoints/basic/output.txt | 2 ++ .../drift/recreated_same_name/output.txt | 2 ++ .../recreate/catalog-name/output.txt | 1 + .../recreate/name-change/output.txt | 1 + .../recreate/route-optimized/output.txt | 1 + .../recreate/schema-name/output.txt | 1 + .../recreate/table-prefix/output.txt | 1 + .../running-endpoint/output.txt | 1 + .../update/ai-gateway/output.txt | 1 + .../update/both_gateway_and_tags/output.txt | 1 + .../update/config/output.txt | 1 + .../update/email-notifications/output.txt | 1 + .../update/tags/output.txt | 1 + .../bundle/resources/models/basic/output.txt | 1 + .../models/readplan-permissions/output.txt | 2 ++ .../apps/current_can_manage/output.txt | 2 ++ .../permissions/apps/other_can_manage/output.txt | 2 ++ .../clusters/current_can_manage/output.txt | 2 ++ .../permissions/dashboards/create/output.txt | 2 ++ .../current_can_manage/output.txt | 2 ++ .../experiments/current_can_manage/output.txt | 2 ++ .../resources/permissions/factcheck/output.txt | 2 ++ .../genie_spaces/current_can_manage/output.txt | 2 ++ .../genie_spaces/out_of_band_deletion/output.txt | 2 ++ .../jobs/current_can_manage/output.txt | 2 ++ .../jobs/current_can_manage_run/output.txt | 2 ++ .../permissions/jobs/current_is_owner/output.txt | 2 ++ .../permissions/jobs/delete_one/output.txt | 2 ++ .../with_permissions/out.destroy.direct.txt | 2 ++ .../without_permissions/out.destroy.direct.txt | 1 + .../permissions/jobs/empty_list/output.txt | 1 + .../permissions/jobs/other_can_manage/output.txt | 2 ++ .../jobs/other_can_manage_run/output.txt | 2 ++ .../permissions/jobs/other_is_owner/output.txt | 2 ++ .../resources/permissions/jobs/update/output.txt | 1 + .../permissions/jobs/viewers/output.txt | 2 ++ .../models/current_can_manage/output.txt | 2 ++ .../pipelines/current_can_manage/output.txt | 2 ++ .../pipelines/current_is_owner/output.txt | 2 ++ .../permissions/pipelines/empty_list/output.txt | 1 + .../pipelines/other_can_manage/output.txt | 2 ++ .../pipelines/other_is_owner/output.txt | 2 ++ .../permissions/pipelines/update/output.txt | 2 ++ .../current_can_manage/output.txt | 2 ++ .../sql_warehouses/current_can_manage/output.txt | 2 ++ .../permissions/target_permissions/output.txt | 2 ++ .../current_can_manage/output.txt | 2 ++ .../pipelines/allow-duplicate-names/output.txt | 1 + .../resources/pipelines/auto-approve/output.txt | 2 ++ .../pipelines/lakeflow-pipeline/output.txt | 1 + .../change-ingestion-definition/output.txt | 1 + .../recreate-keys/change-storage/output.txt | 1 + .../resources/pipelines/recreate/output.txt | 2 ++ .../bundle/resources/pipelines/update/output.txt | 1 + .../resources/postgres_branches/basic/output.txt | 2 ++ .../purge_on_delete/out.destroy.txt | 3 +++ .../purge_on_delete_transitions/out.destroy.txt | 2 ++ .../postgres_branches/recreate/output.txt | 2 ++ .../replace_existing/out.destroy.txt | 2 ++ .../update_protected/output.txt | 2 ++ .../resources/postgres_catalogs/basic/output.txt | 2 ++ .../postgres_catalogs/recreate/output.txt | 2 ++ .../postgres_databases/basic/output.txt | 4 ++++ .../live_errors/bad_database_id/output.txt | 3 +++ .../live_errors/bad_role_ref/output.txt | 2 ++ .../postgres_databases/recreate/output.txt | 4 ++++ .../replace_existing/output.txt | 4 ++++ .../postgres_databases/update/output.txt | 4 ++++ .../postgres_endpoints/basic/output.txt | 3 +++ .../postgres_endpoints/recreate/output.txt | 3 +++ .../replace_existing/out.destroy.txt | 3 +++ .../update_autoscaling/output.txt | 3 +++ .../resources/postgres_projects/basic/output.txt | 1 + .../purge_on_delete/out.destroy.txt | 2 ++ .../purge_on_delete_transitions/out.destroy.txt | 1 + .../postgres_projects/recreate/output.txt | 1 + .../update_display_name/output.txt | 1 + .../resources/postgres_roles/basic/output.txt | 3 +++ .../inherited-role-bind/output.txt | 3 +++ .../inherited-role-conflict/output.txt | 2 ++ .../recreate-postgres-role/output.txt | 3 +++ .../resources/postgres_roles/recreate/output.txt | 3 +++ .../postgres_roles/replace_existing/output.txt | 3 +++ .../resources/postgres_roles/update/output.txt | 3 +++ .../postgres_synced_tables/basic/output.txt | 4 ++++ .../postgres_synced_tables/recreate/output.txt | 4 ++++ .../change_assets_dir/output.txt | 1 + .../change_output_schema_name/output.txt | 1 + .../change_table_name/output.txt | 1 + .../resources/quality_monitors/create/output.txt | 1 + .../aliases_converge/output.txt | 1 + .../resources/registered_models/basic/output.txt | 1 + .../resources/schemas/auto-approve/output.txt | 2 ++ .../resources/secret_scopes/basic/output.txt | 2 ++ .../secret_scopes/delete_scope/output.txt | 2 +- .../resources/secret_scopes/delete_scope/script | 4 +++- .../permissions-collapse/output.txt | 2 ++ .../secret_scopes/permissions/output.txt | 2 ++ .../bundle/resources/secrets/basic/output.txt | 1 + .../lifecycle-started-edit/output.txt | 1 + .../lifecycle-started-toggle/output.txt | 1 + .../sql_warehouses/lifecycle-started/output.txt | 1 + .../bundle/resources/sql_warehouses/output.txt | 1 + .../synced_database_tables/basic/output.txt | 3 +++ .../synced_database_tables/recreate/output.txt | 3 +++ .../vector_search_endpoints/basic/output.txt | 1 + .../drift/budget_policy/output.txt | 1 + .../drift/recreated_same_name/output.txt | 2 ++ .../drift/target_qps/output.txt | 1 + .../recreate/create-fails/output.txt | 1 + .../recreate/endpoint_type/output.txt | 1 + .../update/budget_policy/output.txt | 1 + .../update/target_qps/output.txt | 2 ++ .../vector_search_indexes/basic/output.txt | 2 ++ .../drift/deleted_remotely/output.txt | 2 ++ .../drift/orphaned_endpoint/output.txt | 2 ++ .../grants/select/output.txt | 3 +++ .../recreate/embedding_dimension/output.txt | 2 ++ .../recreate/pending_deletion/output.txt | 2 ++ .../recreate/with_endpoint/output.txt | 2 ++ .../schema_normalization/output.txt | 2 ++ .../resources/volumes/change-comment/output.txt | 1 + .../bundle/resources/volumes/recreate/output.txt | 4 ++++ .../volumes/set-storage-location/output.txt | 1 + acceptance/bundle/run/app-with-job/output.txt | 2 ++ acceptance/bundle/run_as/job_default/output.txt | 1 + acceptance/bundle/select/basic/output.txt | 3 +++ .../bundle/select/grants_permissions/output.txt | 4 ++++ .../plan_file_survives_not_selected/output.txt | 1 + acceptance/bundle/state/state_present/output.txt | 1 + .../bundle/summary/modified_status/output.txt | 4 ++++ .../default-python/combinations/classic/script | 4 ++-- .../combinations/serverless/script | 4 ++-- .../integration_classic/output.txt | 6 ++++++ acceptance/bundle/user_agent/simple/output.txt | 1 + .../pipelines/destroy/auto-approve/output.txt | 1 + .../output.txt | 1 + .../destroy/destroy-pipeline-cascade/output.txt | 1 + .../destroy/destroy-pipeline/output.txt | 1 + .../pipelines/destroy/force-lock/output.txt | 1 + acceptance/pipelines/e2e/output.txt | 3 +++ bundle/phases/destroy.go | 16 +++++++++++++--- 336 files changed, 589 insertions(+), 11 deletions(-) diff --git a/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt b/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt index 41b3407e518..e43f7f32408 100644 --- a/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt +++ b/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt @@ -21,4 +21,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted apps.myapp Destroy: 1 deleted diff --git a/acceptance/apps/deploy/bundle-no-args/output.txt b/acceptance/apps/deploy/bundle-no-args/output.txt index 5a9942a8d6b..43f586ea070 100644 --- a/acceptance/apps/deploy/bundle-no-args/output.txt +++ b/acceptance/apps/deploy/bundle-no-args/output.txt @@ -21,4 +21,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted apps.myapp Destroy: 1 deleted diff --git a/acceptance/bundle/ai_runtime_task/local_code_source/output.txt b/acceptance/bundle/ai_runtime_task/local_code_source/output.txt index 768955bc2b2..7b6c8863f75 100644 --- a/acceptance/bundle/ai_runtime_task/local_code_source/output.txt +++ b/acceptance/bundle/ai_runtime_task/local_code_source/output.txt @@ -131,4 +131,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/ai-runtime-test/default +Deleted jobs.train Destroy: 1 deleted diff --git a/acceptance/bundle/apps/app_yaml/output.txt b/acceptance/bundle/apps/app_yaml/output.txt index 53429bbbb4c..71f4e439aa8 100644 --- a/acceptance/bundle/apps/app_yaml/output.txt +++ b/acceptance/bundle/apps/app_yaml/output.txt @@ -27,6 +27,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted apps.myapp Destroy: 1 deleted >>> print_requests.py //apps diff --git a/acceptance/bundle/apps/compute_size/output.txt b/acceptance/bundle/apps/compute_size/output.txt index ea71df156b3..fa4a875f3c8 100644 --- a/acceptance/bundle/apps/compute_size/output.txt +++ b/acceptance/bundle/apps/compute_size/output.txt @@ -13,4 +13,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/app-compute-size-[UNIQUE_NAME] +Deleted apps.my_app Destroy: 1 deleted diff --git a/acceptance/bundle/apps/git_source/output.txt b/acceptance/bundle/apps/git_source/output.txt index c7bce16a663..486f36e27a3 100644 --- a/acceptance/bundle/apps/git_source/output.txt +++ b/acceptance/bundle/apps/git_source/output.txt @@ -77,4 +77,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/app-git-source-[UNIQUE_NAME] +Deleted apps.my_app Destroy: 1 deleted diff --git a/acceptance/bundle/apps/job_permissions/output.txt b/acceptance/bundle/apps/job_permissions/output.txt index ec50e4828c6..b63080c7360 100644 --- a/acceptance/bundle/apps/job_permissions/output.txt +++ b/acceptance/bundle/apps/job_permissions/output.txt @@ -51,4 +51,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted apps.my_app +Deleted apps.my_app.permissions +Deleted jobs.my_job +Deleted jobs.my_job.permissions Destroy: 2 deleted diff --git a/acceptance/bundle/bundle_tag/id/output.txt b/acceptance/bundle/bundle_tag/id/output.txt index 6feadfe6ad9..a52496d5ab6 100644 --- a/acceptance/bundle/bundle_tag/id/output.txt +++ b/acceptance/bundle/bundle_tag/id/output.txt @@ -76,6 +76,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/bundle_tag/url/output.txt b/acceptance/bundle/bundle_tag/url/output.txt index a86aec5254d..2548aac5d09 100644 --- a/acceptance/bundle/bundle_tag/url/output.txt +++ b/acceptance/bundle/bundle_tag/url/output.txt @@ -76,6 +76,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/bundle_tag/url_ref/out.destroy.terraform.txt b/acceptance/bundle/bundle_tag/url_ref/out.destroy.terraform.txt index 34801cda18f..a84e4d080c1 100644 --- a/acceptance/bundle/bundle_tag/url_ref/out.destroy.terraform.txt +++ b/acceptance/bundle/bundle_tag/url_ref/out.destroy.terraform.txt @@ -7,4 +7,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.bar +Deleted jobs.foo Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/cli_defaults/output.txt b/acceptance/bundle/config-remote-sync/cli_defaults/output.txt index 21f517c910c..b743feb89d6 100644 --- a/acceptance/bundle/config-remote-sync/cli_defaults/output.txt +++ b/acceptance/bundle/config-remote-sync/cli_defaults/output.txt @@ -64,4 +64,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.job1 +Deleted jobs.job2 +Deleted pipelines.pipeline1 Destroy: 3 deleted diff --git a/acceptance/bundle/config-remote-sync/config_edits/output.txt b/acceptance/bundle/config-remote-sync/config_edits/output.txt index 981bf7d1032..6b8d376d347 100644 --- a/acceptance/bundle/config-remote-sync/config_edits/output.txt +++ b/acceptance/bundle/config-remote-sync/config_edits/output.txt @@ -59,4 +59,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt b/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt index 121bce1d9ff..a5a361016a8 100644 --- a/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt +++ b/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt @@ -28,4 +28,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted dashboards.my_dashboard Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/flushed_cache/output.txt b/acceptance/bundle/config-remote-sync/flushed_cache/output.txt index 1c545626279..1a22cb26c1b 100644 --- a/acceptance/bundle/config-remote-sync/flushed_cache/output.txt +++ b/acceptance/bundle/config-remote-sync/flushed_cache/output.txt @@ -27,4 +27,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.test_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt b/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt index d79a5be5527..daea611ad9b 100644 --- a/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt +++ b/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt @@ -55,4 +55,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/job_fields/output.txt b/acceptance/bundle/config-remote-sync/job_fields/output.txt index afd0d45778e..ec83fe5507a 100644 --- a/acceptance/bundle/config-remote-sync/job_fields/output.txt +++ b/acceptance/bundle/config-remote-sync/job_fields/output.txt @@ -119,4 +119,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt b/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt index f9e195fd11f..8a64d96ca38 100644 --- a/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt +++ b/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt @@ -145,4 +145,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job +Deleted jobs.no_tasks_job +Deleted jobs.rename_task_job Destroy: 3 deleted diff --git a/acceptance/bundle/config-remote-sync/job_params_variables/output.txt b/acceptance/bundle/config-remote-sync/job_params_variables/output.txt index 08d5483a2aa..a4658eee615 100644 --- a/acceptance/bundle/config-remote-sync/job_params_variables/output.txt +++ b/acceptance/bundle/config-remote-sync/job_params_variables/output.txt @@ -31,4 +31,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt b/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt index 8775f22de5b..507e84b43b6 100644 --- a/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt +++ b/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt @@ -47,4 +47,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job +Deleted pipelines.my_pipeline Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/multiple_files/output.txt b/acceptance/bundle/config-remote-sync/multiple_files/output.txt index cae1d0d39b7..624e6322ade 100644 --- a/acceptance/bundle/config-remote-sync/multiple_files/output.txt +++ b/acceptance/bundle/config-remote-sync/multiple_files/output.txt @@ -87,4 +87,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.job_one +Deleted jobs.job_two Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/output.txt b/acceptance/bundle/config-remote-sync/multiple_resources/output.txt index b09808f177e..00fd516f90f 100644 --- a/acceptance/bundle/config-remote-sync/multiple_resources/output.txt +++ b/acceptance/bundle/config-remote-sync/multiple_resources/output.txt @@ -71,4 +71,11 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted clusters.test_cluster +Deleted experiments.test_experiment +Deleted jobs.job_one +Deleted jobs.job_two +Deleted registered_models.test_model +Deleted sql_warehouses.test_warehouse +Deleted volumes.test_volume Destroy: 7 deleted diff --git a/acceptance/bundle/config-remote-sync/output_json/output.txt b/acceptance/bundle/config-remote-sync/output_json/output.txt index 32aa28536e7..98f7eb4da63 100644 --- a/acceptance/bundle/config-remote-sync/output_json/output.txt +++ b/acceptance/bundle/config-remote-sync/output_json/output.txt @@ -31,4 +31,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.test_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/output_no_changes/output.txt b/acceptance/bundle/config-remote-sync/output_no_changes/output.txt index 684b3f1bc4a..3d0f241c341 100644 --- a/acceptance/bundle/config-remote-sync/output_no_changes/output.txt +++ b/acceptance/bundle/config-remote-sync/output_no_changes/output.txt @@ -23,4 +23,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.test_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt index 0df7958ad6f..911c4631d55 100644 --- a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt +++ b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt @@ -65,4 +65,5 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted pipelines.my_pipeline Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt index 28193bab84b..79904475460 100644 --- a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt +++ b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt @@ -34,4 +34,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.job1 Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/resolve_variables/output.txt b/acceptance/bundle/config-remote-sync/resolve_variables/output.txt index c042ad534b2..161c0a12786 100644 --- a/acceptance/bundle/config-remote-sync/resolve_variables/output.txt +++ b/acceptance/bundle/config-remote-sync/resolve_variables/output.txt @@ -161,4 +161,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job +Deleted pipelines.my_pipeline Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/select_basic/output.txt b/acceptance/bundle/config-remote-sync/select_basic/output.txt index 1fda3f33833..6d3de2fc345 100644 --- a/acceptance/bundle/config-remote-sync/select_basic/output.txt +++ b/acceptance/bundle/config-remote-sync/select_basic/output.txt @@ -84,4 +84,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.job_one +Deleted jobs.job_two Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/select_multiple/output.txt b/acceptance/bundle/config-remote-sync/select_multiple/output.txt index 4dcc78c98ab..c85cd3c8db0 100644 --- a/acceptance/bundle/config-remote-sync/select_multiple/output.txt +++ b/acceptance/bundle/config-remote-sync/select_multiple/output.txt @@ -72,4 +72,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.job_a +Deleted jobs.job_b +Deleted jobs.job_c Destroy: 3 deleted diff --git a/acceptance/bundle/config-remote-sync/skip_permissions/output.txt b/acceptance/bundle/config-remote-sync/skip_permissions/output.txt index 79eafa5f508..71c84a6e62a 100644 --- a/acceptance/bundle/config-remote-sync/skip_permissions/output.txt +++ b/acceptance/bundle/config-remote-sync/skip_permissions/output.txt @@ -35,4 +35,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job +Deleted jobs.my_job.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt b/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt index e8eea611e76..7412d544f8d 100644 --- a/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt +++ b/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt @@ -37,4 +37,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.cli_default_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt b/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt index a8d7609ffe3..0a86dfcd4b6 100644 --- a/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt +++ b/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt @@ -29,4 +29,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev.eu +Deleted jobs.dotted_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/isolation/output.txt b/acceptance/bundle/config-remote-sync/split/isolation/output.txt index b1f86eb01ec..f96c9adb8e2 100644 --- a/acceptance/bundle/config-remote-sync/split/isolation/output.txt +++ b/acceptance/bundle/config-remote-sync/split/isolation/output.txt @@ -56,4 +56,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.job_a +Deleted jobs.job_b Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt b/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt index ea1904b917d..52a9ff54b25 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt +++ b/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt @@ -49,4 +49,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.split_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt b/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt index 4d3d4743f4c..2c3f68025be 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt +++ b/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt @@ -84,4 +84,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.remove_job +Deleted jobs.twoblock_remove_job Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt b/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt index 6051692bf88..fd6af3640ed 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt +++ b/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt @@ -112,4 +112,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.rename_job +Deleted jobs.shift_job Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt index f9192065795..fdf4df22065 100644 --- a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt +++ b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt @@ -60,4 +60,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.twoblock_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/multifile/output.txt b/acceptance/bundle/config-remote-sync/split/multifile/output.txt index e16279ac0c0..7b2d0a62bc9 100644 --- a/acceptance/bundle/config-remote-sync/split/multifile/output.txt +++ b/acceptance/bundle/config-remote-sync/split/multifile/output.txt @@ -94,4 +94,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.multifile_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt b/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt index 38b35116b2b..3b02f3cc52f 100644 --- a/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt +++ b/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt @@ -39,4 +39,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.nested_add_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt b/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt index 0f70692c7c8..89e716c4bf5 100644 --- a/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt +++ b/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt @@ -34,4 +34,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.nested_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/positional/output.txt b/acceptance/bundle/config-remote-sync/split/positional/output.txt index 23e49c0ed79..8258d907f88 100644 --- a/acceptance/bundle/config-remote-sync/split/positional/output.txt +++ b/acceptance/bundle/config-remote-sync/split/positional/output.txt @@ -70,4 +70,5 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted pipelines.split_pipeline Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt b/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt index 2559a933cbf..40cb5d58324 100644 --- a/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt +++ b/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt @@ -37,4 +37,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.shared_field_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt b/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt index 6617285a1fe..039c89c0aa0 100644 --- a/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt +++ b/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt @@ -49,4 +49,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.unrelated_add_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt index e92258ccb2f..02675d1b5ff 100644 --- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt +++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt @@ -31,4 +31,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.ambiguous_rename_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt index 5aab462c96f..b8daa0d2a30 100644 --- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt +++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt @@ -81,4 +81,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.ambiguous_single_block_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt index 22d19607451..d7b15607ba6 100644 --- a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt +++ b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt @@ -37,4 +37,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.two_removes_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/target_variable/output.txt b/acceptance/bundle/config-remote-sync/split/target_variable/output.txt index f8e56c51fdb..6fdebb6ed2a 100644 --- a/acceptance/bundle/config-remote-sync/split/target_variable/output.txt +++ b/acceptance/bundle/config-remote-sync/split/target_variable/output.txt @@ -35,4 +35,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.var_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt b/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt index 054ec3fc099..2753fe816c8 100644 --- a/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt +++ b/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt @@ -32,4 +32,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.file_order_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/target_override/output.txt b/acceptance/bundle/config-remote-sync/target_override/output.txt index 3fc95ddbd76..11247b4256e 100644 --- a/acceptance/bundle/config-remote-sync/target_override/output.txt +++ b/acceptance/bundle/config-remote-sync/target_override/output.txt @@ -35,4 +35,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt b/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt index a12c957f86a..e8bf8f9ab52 100644 --- a/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt +++ b/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt @@ -53,4 +53,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.sample_job Destroy: 1 deleted diff --git a/acceptance/bundle/config-remote-sync/validation_errors/output.txt b/acceptance/bundle/config-remote-sync/validation_errors/output.txt index ebbb667b85a..e843267b5ff 100644 --- a/acceptance/bundle/config-remote-sync/validation_errors/output.txt +++ b/acceptance/bundle/config-remote-sync/validation_errors/output.txt @@ -57,4 +57,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job +Deleted pipelines.my_pipeline Destroy: 2 deleted diff --git a/acceptance/bundle/config-remote-sync/variable_reference_parent/output.txt b/acceptance/bundle/config-remote-sync/variable_reference_parent/output.txt index d8ec99aacbc..f8abd356f3d 100644 --- a/acceptance/bundle/config-remote-sync/variable_reference_parent/output.txt +++ b/acceptance/bundle/config-remote-sync/variable_reference_parent/output.txt @@ -65,4 +65,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt b/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt index b17cf0f620a..dae7eebf9b3 100644 --- a/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt +++ b/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt @@ -68,4 +68,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/immutable-no-artifacts/output.txt b/acceptance/bundle/deploy/immutable-no-artifacts/output.txt index 317d6c9dd5e..1c7a5abd9df 100644 --- a/acceptance/bundle/deploy/immutable-no-artifacts/output.txt +++ b/acceptance/bundle/deploy/immutable-no-artifacts/output.txt @@ -29,4 +29,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-immutable-no-artifacts-[UNIQUE_NAME]/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/immutable-permissions-change/output.txt b/acceptance/bundle/deploy/immutable-permissions-change/output.txt index bfc43defff9..246fc33c9ab 100644 --- a/acceptance/bundle/deploy/immutable-permissions-change/output.txt +++ b/acceptance/bundle/deploy/immutable-permissions-change/output.txt @@ -22,8 +22,8 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more in databricks.yml:22:3 Uploading immutable bundle snapshot... -Updated jobs.my_job Created jobs.my_job.permissions +Updated jobs.my_job Files: 0 uploaded, 0 deleted Resources: 1 created, 1 changed, 0 deleted, 0 unchanged Second snapshot path: /Workspace/Users/[UUID]/.snapshots/[UUID]/[SNAPSHOT_HASH]/files/src/main.py @@ -49,4 +49,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-immutable-perms-[UNIQUE_NAME]/default +Deleted jobs.my_job +Deleted jobs.my_job.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/immutable/output.txt b/acceptance/bundle/deploy/immutable/output.txt index d02d2cd1d31..48fa02d82d8 100644 --- a/acceptance/bundle/deploy/immutable/output.txt +++ b/acceptance/bundle/deploy/immutable/output.txt @@ -58,4 +58,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-immutable-[UNIQUE_NAME]/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/mlops-stacks/output.txt b/acceptance/bundle/deploy/mlops-stacks/output.txt index 62b2dbcd8f4..e69a9bc3d16 100644 --- a/acceptance/bundle/deploy/mlops-stacks/output.txt +++ b/acceptance/bundle/deploy/mlops-stacks/output.txt @@ -147,6 +147,14 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/dev +Deleted experiments.experiment +Deleted experiments.experiment.permissions +Deleted jobs.batch_inference_job +Deleted jobs.batch_inference_job.permissions +Deleted jobs.model_training_job +Deleted jobs.model_training_job.permissions +Deleted registered_models.model +Deleted registered_models.model.grants Destroy: 4 deleted >>> [CLI] schemas delete main.project_name_[UNIQUE_NAME] diff --git a/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt index fd83af4f0c5..6ba2a330aed 100644 --- a/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt +++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt @@ -24,4 +24,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/pipeline-config-dots/output.txt b/acceptance/bundle/deploy/pipeline-config-dots/output.txt index 4692d68e2d9..a1c0f8032c3 100644 --- a/acceptance/bundle/deploy/pipeline-config-dots/output.txt +++ b/acceptance/bundle/deploy/pipeline-config-dots/output.txt @@ -29,4 +29,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted pipelines.my_pipeline +Deleted schemas.my_schema Destroy: 2 deleted diff --git a/acceptance/bundle/deploy/readplan/basic/output.txt b/acceptance/bundle/deploy/readplan/basic/output.txt index 5211ba04b57..d4009938793 100644 --- a/acceptance/bundle/deploy/readplan/basic/output.txt +++ b/acceptance/bundle/deploy/readplan/basic/output.txt @@ -52,4 +52,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.job Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt b/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt index 7d6f07a44cd..b5bf378d88f 100644 --- a/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt +++ b/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt @@ -31,4 +31,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.job Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt b/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt index 68a8439c550..7bed2788c31 100644 --- a/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt +++ b/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt @@ -78,4 +78,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted schemas.myschema +Deleted schemas.myschema.grants Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/readplan/postgres_role/output.txt b/acceptance/bundle/deploy/readplan/postgres_role/output.txt index 5a422d8e993..13c703ad7ee 100644 --- a/acceptance/bundle/deploy/readplan/postgres_role/output.txt +++ b/acceptance/bundle/deploy/readplan/postgres_role/output.txt @@ -44,4 +44,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted postgres_branches.branch +Deleted postgres_projects.project +Deleted postgres_roles.role Destroy: 3 deleted diff --git a/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt b/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt index 02c4439f2eb..69f6cc09943 100644 --- a/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt +++ b/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt @@ -15,4 +15,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.job Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/resource-max-wait-zero/output.txt b/acceptance/bundle/deploy/resource-max-wait-zero/output.txt index 1f379a5692e..4c9b533eeff 100644 --- a/acceptance/bundle/deploy/resource-max-wait-zero/output.txt +++ b/acceptance/bundle/deploy/resource-max-wait-zero/output.txt @@ -16,6 +16,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted clusters.my_cluster Destroy: 1 deleted === No cap: the deployment polls until the cluster is RUNNING @@ -35,4 +36,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted clusters.my_cluster Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/resource-max-wait/output.txt b/acceptance/bundle/deploy/resource-max-wait/output.txt index 9da7b2c014a..2ec86a48b26 100644 --- a/acceptance/bundle/deploy/resource-max-wait/output.txt +++ b/acceptance/bundle/deploy/resource-max-wait/output.txt @@ -25,4 +25,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/deploy/snapshot-comparison/output.txt b/acceptance/bundle/deploy/snapshot-comparison/output.txt index 35c1b7ad43d..ac6274081a9 100644 --- a/acceptance/bundle/deploy/snapshot-comparison/output.txt +++ b/acceptance/bundle/deploy/snapshot-comparison/output.txt @@ -50,6 +50,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/snapshot-test-1-[UNIQUE_NAME]/default +Deleted jobs.test_job +Deleted pipelines.test_pipeline Destroy: 2 deleted === Cleanup bundle 2 @@ -64,4 +66,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/snapshot-test-2-[UNIQUE_NAME]/default +Deleted jobs.test_job +Deleted pipelines.test_pipeline Destroy: 2 deleted diff --git a/acceptance/bundle/deploy/spark-jar-task/output.txt b/acceptance/bundle/deploy/spark-jar-task/output.txt index 34360cc0b49..1e47466fe1b 100644 --- a/acceptance/bundle/deploy/spark-jar-task/output.txt +++ b/acceptance/bundle/deploy/spark-jar-task/output.txt @@ -20,4 +20,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/spark-jar-task-[UNIQUE_NAME]/default +Deleted jobs.jar_job Destroy: 1 deleted diff --git a/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt b/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt index 84ce98e76ae..2e7c3d11340 100644 --- a/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt +++ b/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt @@ -32,6 +32,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-generate-bind-[UNIQUE_NAME] +Deleted jobs.test_job_key Destroy: 1 deleted === Check that job is bound and does not exist after bundle is destroyed: diff --git a/acceptance/bundle/deployment/unbind/grants/output.txt b/acceptance/bundle/deployment/unbind/grants/output.txt index 191681970c1..e1f53b8b91c 100644 --- a/acceptance/bundle/deployment/unbind/grants/output.txt +++ b/acceptance/bundle/deployment/unbind/grants/output.txt @@ -43,6 +43,8 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted schemas.schema_1 +Deleted schemas.schema_1.grants Destroy: 1 deleted >>> [CLI] schemas delete main.test-schema-[UNIQUE_NAME] diff --git a/acceptance/bundle/deployment/unbind/permissions/output.txt b/acceptance/bundle/deployment/unbind/permissions/output.txt index ee5587fdeca..74bef573c0f 100644 --- a/acceptance/bundle/deployment/unbind/permissions/output.txt +++ b/acceptance/bundle/deployment/unbind/permissions/output.txt @@ -46,6 +46,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.job_1 +Deleted jobs.job_1.permissions Destroy: 1 deleted >>> [CLI] jobs delete [NUMID] diff --git a/acceptance/bundle/destroy/all-resources/output.txt b/acceptance/bundle/destroy/all-resources/output.txt index eed7625730b..bf9b68a4a6a 100644 --- a/acceptance/bundle/destroy/all-resources/output.txt +++ b/acceptance/bundle/destroy/all-resources/output.txt @@ -20,6 +20,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted pipelines.my_pipeline +Deleted schemas.my_schema Destroy: 2 deleted === Assert the bundle directory is deleted diff --git a/acceptance/bundle/destroy/force-lock-node-limit/output.txt b/acceptance/bundle/destroy/force-lock-node-limit/output.txt index 97a2a8bda56..ead512901a9 100644 --- a/acceptance/bundle/destroy/force-lock-node-limit/output.txt +++ b/acceptance/bundle/destroy/force-lock-node-limit/output.txt @@ -27,4 +27,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/destroy/jobs-and-pipeline/output.txt b/acceptance/bundle/destroy/jobs-and-pipeline/output.txt index ceb94eee711..d857052efa1 100644 --- a/acceptance/bundle/destroy/jobs-and-pipeline/output.txt +++ b/acceptance/bundle/destroy/jobs-and-pipeline/output.txt @@ -59,6 +59,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.foo +Deleted pipelines.bar Destroy: 2 deleted === Assert pipeline is deleted diff --git a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt index cd5a4ff7df6..d1ec386bdbd 100644 --- a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt +++ b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt @@ -13,6 +13,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lineage-mismatch-after-redeploy/default +Deleted jobs.test_job Destroy: 1 deleted === Machine B: fresh deploy of the same bundle (mints a new lineage L2 remotely) diff --git a/acceptance/bundle/generate/auto-bind/output.txt b/acceptance/bundle/generate/auto-bind/output.txt index 6126b186d14..3be184c893b 100644 --- a/acceptance/bundle/generate/auto-bind/output.txt +++ b/acceptance/bundle/generate/auto-bind/output.txt @@ -32,6 +32,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME] +Deleted jobs.test_job Destroy: 1 deleted === Check that job is bound and does not exist after bundle is destroyed: diff --git a/acceptance/bundle/integration_whl/base/output.txt b/acceptance/bundle/integration_whl/base/output.txt index 719ca009f95..c3ef8a0d2d6 100644 --- a/acceptance/bundle/integration_whl/base/output.txt +++ b/acceptance/bundle/integration_whl/base/output.txt @@ -70,4 +70,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/custom_params/output.txt b/acceptance/bundle/integration_whl/custom_params/output.txt index 279e3f4c6d9..2cd22209888 100644 --- a/acceptance/bundle/integration_whl/custom_params/output.txt +++ b/acceptance/bundle/integration_whl/custom_params/output.txt @@ -53,4 +53,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/interactive_cluster/output.txt b/acceptance/bundle/integration_whl/interactive_cluster/output.txt index 8273d81d88a..4932d230ad3 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster/output.txt +++ b/acceptance/bundle/integration_whl/interactive_cluster/output.txt @@ -72,4 +72,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster +Deleted jobs.some_other_job Destroy: 2 deleted diff --git a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt index 3eaade58cd5..75d01ed0228 100644 --- a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt +++ b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt @@ -36,4 +36,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster +Deleted jobs.some_other_job Destroy: 2 deleted diff --git a/acceptance/bundle/integration_whl/interactive_single_user/output.txt b/acceptance/bundle/integration_whl/interactive_single_user/output.txt index b2d63a874dd..bcdaa78f616 100644 --- a/acceptance/bundle/integration_whl/interactive_single_user/output.txt +++ b/acceptance/bundle/integration_whl/interactive_single_user/output.txt @@ -61,4 +61,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster +Deleted jobs.some_other_job Destroy: 2 deleted diff --git a/acceptance/bundle/integration_whl/serverless/output.txt b/acceptance/bundle/integration_whl/serverless/output.txt index 50d2b6fc479..6f8e3542732 100644 --- a/acceptance/bundle/integration_whl/serverless/output.txt +++ b/acceptance/bundle/integration_whl/serverless/output.txt @@ -41,4 +41,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/serverless_custom_params/output.txt b/acceptance/bundle/integration_whl/serverless_custom_params/output.txt index 8b11a9ff6e1..d1611003d35 100644 --- a/acceptance/bundle/integration_whl/serverless_custom_params/output.txt +++ b/acceptance/bundle/integration_whl/serverless_custom_params/output.txt @@ -31,4 +31,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt b/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt index 14e9b5dc2c8..1a638c5d3f0 100644 --- a/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt +++ b/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt @@ -42,4 +42,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/serverless_extras/output.txt b/acceptance/bundle/integration_whl/serverless_extras/output.txt index 600f76985bb..1f4d348efe2 100644 --- a/acceptance/bundle/integration_whl/serverless_extras/output.txt +++ b/acceptance/bundle/integration_whl/serverless_extras/output.txt @@ -28,4 +28,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt index e072c6ce83d..18188ce7c25 100644 --- a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt +++ b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt @@ -28,4 +28,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/wrapper/output.txt b/acceptance/bundle/integration_whl/wrapper/output.txt index 18a3af3b426..7f29573e9cd 100644 --- a/acceptance/bundle/integration_whl/wrapper/output.txt +++ b/acceptance/bundle/integration_whl/wrapper/output.txt @@ -53,4 +53,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt b/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt index 1e44f101659..700a82a52e7 100644 --- a/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt +++ b/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt @@ -53,4 +53,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.some_other_job Destroy: 1 deleted diff --git a/acceptance/bundle/local_state_staleness/output.txt b/acceptance/bundle/local_state_staleness/output.txt index abcc31c9164..576504082da 100644 --- a/acceptance/bundle/local_state_staleness/output.txt +++ b/acceptance/bundle/local_state_staleness/output.txt @@ -32,6 +32,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/local-state-staleness-test-[UNIQUE_NAME] +Deleted jobs.test_job Destroy: 1 deleted >>> rm -rf [TEST_TMP_DIR]/bundle_a diff --git a/acceptance/bundle/migrate/runas/output.txt b/acceptance/bundle/migrate/runas/output.txt index fd710079fba..a10f57d236b 100644 --- a/acceptance/bundle/migrate/runas/output.txt +++ b/acceptance/bundle/migrate/runas/output.txt @@ -144,4 +144,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/dabs_revenue-[UNIQUE_NAME]/production +Deleted pipelines.foo +Deleted pipelines.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/migrate/var_arg/output.txt b/acceptance/bundle/migrate/var_arg/output.txt index f3647efb91a..c2d38a015e2 100644 --- a/acceptance/bundle/migrate/var_arg/output.txt +++ b/acceptance/bundle/migrate/var_arg/output.txt @@ -27,6 +27,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev +Deleted jobs.test_job Destroy: 1 deleted >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy --var job_name=Custom Job Name @@ -57,4 +58,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev +Deleted jobs.test_job Destroy: 1 deleted diff --git a/acceptance/bundle/quiet-levels/output.txt b/acceptance/bundle/quiet-levels/output.txt index bd445ed09d0..3eceb12dc5c 100644 --- a/acceptance/bundle/quiet-levels/output.txt +++ b/acceptance/bundle/quiet-levels/output.txt @@ -39,6 +39,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted experiments.my_experiment Destroy: 1 deleted === destroy -q: same as default, there are no per-resource lines to drop diff --git a/acceptance/bundle/resource_deps/create_error/output.txt b/acceptance/bundle/resource_deps/create_error/output.txt index 6a0e7df520a..5a11a3a1fd6 100644 --- a/acceptance/bundle/resource_deps/create_error/output.txt +++ b/acceptance/bundle/resource_deps/create_error/output.txt @@ -101,6 +101,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.independent Destroy: 1 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt index da391a4bb83..26822209617 100644 --- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt +++ b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/output.txt @@ -302,4 +302,16 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.chain_bottom +Deleted jobs.chain_mid +Deleted jobs.chain_top +Deleted jobs.diamond_bottom +Deleted jobs.diamond_left +Deleted jobs.diamond_right +Deleted jobs.diamond_top +Deleted jobs.independent1 +Deleted jobs.independent2 +Deleted jobs.multi_child +Deleted jobs.multi_parent1 +Deleted jobs.multi_parent2 Destroy: 12 deleted diff --git a/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt b/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt index c27aec4f27c..fd4a59e78c9 100644 --- a/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt +++ b/acceptance/bundle/resource_deps/job_id_delete_bar/output.txt @@ -68,6 +68,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt b/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt index 0c74679588d..1fedffaa53d 100644 --- a/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt +++ b/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt @@ -74,6 +74,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.bar Destroy: 1 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/jobs_update/output.txt b/acceptance/bundle/resource_deps/jobs_update/output.txt index 195da809b6a..3499866c459 100644 --- a/acceptance/bundle/resource_deps/jobs_update/output.txt +++ b/acceptance/bundle/resource_deps/jobs_update/output.txt @@ -71,6 +71,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.bar +Deleted jobs.foo Destroy: 2 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/jobs_update_remote/output.txt b/acceptance/bundle/resource_deps/jobs_update_remote/output.txt index e38eebee2cc..103c43eb0c9 100644 --- a/acceptance/bundle/resource_deps/jobs_update_remote/output.txt +++ b/acceptance/bundle/resource_deps/jobs_update_remote/output.txt @@ -74,6 +74,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.bar +Deleted jobs.foo Destroy: 2 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resource_deps/pipelines_recreate/output.txt b/acceptance/bundle/resource_deps/pipelines_recreate/output.txt index cf1d62686ff..9eac7ddd283 100644 --- a/acceptance/bundle/resource_deps/pipelines_recreate/output.txt +++ b/acceptance/bundle/resource_deps/pipelines_recreate/output.txt @@ -34,8 +34,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Recreating restore the defined STs and MVs through full refresh. Note that recreation is necessary when pipeline properties such as the 'catalog' or 'storage' are changed: recreate resources.pipelines.foo -Updated jobs.bar Recreated pipelines.foo +Updated jobs.bar Files: 0 uploaded, 0 deleted Resources: 1 created, 1 changed, 1 deleted, 0 unchanged @@ -114,6 +114,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.bar +Deleted pipelines.foo Destroy: 2 deleted >>> print_requests.py //jobs //pipelines diff --git a/acceptance/bundle/resource_deps/remote_app_url/output.txt b/acceptance/bundle/resource_deps/remote_app_url/output.txt index 9301329af12..f2e8bcf3362 100644 --- a/acceptance/bundle/resource_deps/remote_app_url/output.txt +++ b/acceptance/bundle/resource_deps/remote_app_url/output.txt @@ -96,6 +96,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted apps.myapp +Deleted pipelines.mypipeline Destroy: 2 deleted >>> print_requests.py --sort ^//import-file/ diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.direct.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.direct.txt index e850f627d51..2d0020e6e07 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.direct.txt +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.direct.txt @@ -15,4 +15,7 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default +Deleted schemas.my +Deleted volumes.bar +Deleted volumes.foo Destroy: 3 deleted diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.terraform.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.terraform.txt index d3bc5027d4e..c0bec95e49a 100644 --- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.terraform.txt +++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.destroy.terraform.txt @@ -13,4 +13,6 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default +Deleted schemas.my +Deleted volumes.bar Destroy: 2 deleted diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.txt index 7e9a4dd2263..a1c2f4de9b7 100644 --- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.txt +++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.destroy.txt @@ -13,4 +13,7 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted volumes.bar +Deleted volumes.baz +Deleted volumes.foo Destroy: 3 deleted diff --git a/acceptance/bundle/resources/alerts/basic/output.txt b/acceptance/bundle/resources/alerts/basic/output.txt index 94c81a531c8..2a07fb8eb71 100644 --- a/acceptance/bundle/resources/alerts/basic/output.txt +++ b/acceptance/bundle/resources/alerts/basic/output.txt @@ -59,6 +59,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/alerts-basic-[UNIQUE_NAME]/default +Deleted alerts.myalert +Deleted alerts.myalert.permissions Destroy: 1 deleted >>> [CLI] alerts-v2 get-alert [ALERT_ID] diff --git a/acceptance/bundle/resources/alerts/with_file/output.txt b/acceptance/bundle/resources/alerts/with_file/output.txt index b01e7b7b145..e267c579916 100644 --- a/acceptance/bundle/resources/alerts/with_file/output.txt +++ b/acceptance/bundle/resources/alerts/with_file/output.txt @@ -96,4 +96,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/alerts-with-file-[UNIQUE_NAME]/default +Deleted alerts.myalert Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/config-drift-stopped/output.txt b/acceptance/bundle/resources/apps/config-drift-stopped/output.txt index 1a33d51a6f6..922edf9f302 100644 --- a/acceptance/bundle/resources/apps/config-drift-stopped/output.txt +++ b/acceptance/bundle/resources/apps/config-drift-stopped/output.txt @@ -69,4 +69,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/config-drift-stopped-[UNIQUE_NAME]/default +Deleted apps.myapp Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/config-drift/output.txt b/acceptance/bundle/resources/apps/config-drift/output.txt index 16e41652081..4e27204ebba 100644 --- a/acceptance/bundle/resources/apps/config-drift/output.txt +++ b/acceptance/bundle/resources/apps/config-drift/output.txt @@ -33,4 +33,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/config-drift-[UNIQUE_NAME]/default +Deleted apps.myapp Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/inline_config/output.txt b/acceptance/bundle/resources/apps/inline_config/output.txt index 8a82bbec897..480b76c4b20 100644 --- a/acceptance/bundle/resources/apps/inline_config/output.txt +++ b/acceptance/bundle/resources/apps/inline_config/output.txt @@ -29,4 +29,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/app-inline-config-[UNIQUE_NAME]/default +Deleted apps.myapp Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt index abe37f235f8..cfad9adc73f 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt @@ -74,4 +74,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default +Deleted apps.mykey Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt index ef03a4541d9..0606b3d75f9 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt @@ -74,4 +74,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default +Deleted apps.mykey Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/lifecycle-started/output.txt b/acceptance/bundle/resources/apps/lifecycle-started/output.txt index 6e0d5e5d7f5..f2180f87f50 100644 --- a/acceptance/bundle/resources/apps/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/apps/lifecycle-started/output.txt @@ -143,4 +143,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default +Deleted apps.myapp Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt b/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt index 1677b668672..a9429cb48ab 100644 --- a/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt +++ b/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt @@ -21,4 +21,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted apps.myapp Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/uc-securable-drift/output.txt b/acceptance/bundle/resources/apps/uc-securable-drift/output.txt index aa4af5ba44a..0b00acca6b7 100644 --- a/acceptance/bundle/resources/apps/uc-securable-drift/output.txt +++ b/acceptance/bundle/resources/apps/uc-securable-drift/output.txt @@ -26,4 +26,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/apps-uc-securable-drift/default +Deleted apps.myapp Destroy: 1 deleted diff --git a/acceptance/bundle/resources/apps/update/output.txt b/acceptance/bundle/resources/apps/update/output.txt index 406295a6b07..a63b3025511 100644 --- a/acceptance/bundle/resources/apps/update/output.txt +++ b/acceptance/bundle/resources/apps/update/output.txt @@ -101,6 +101,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted apps.mykey Destroy: 1 deleted >>> print_requests diff --git a/acceptance/bundle/resources/catalogs/auto-approve/output.txt b/acceptance/bundle/resources/catalogs/auto-approve/output.txt index bf16801b4a4..e58f564f07e 100644 --- a/acceptance/bundle/resources/catalogs/auto-approve/output.txt +++ b/acceptance/bundle/resources/catalogs/auto-approve/output.txt @@ -55,6 +55,8 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted catalogs.bar +Deleted schemas.foo Destroy: 2 deleted === Assert the catalog is deleted diff --git a/acceptance/bundle/resources/catalogs/basic/output.txt b/acceptance/bundle/resources/catalogs/basic/output.txt index c4d144b3666..adc1ab19398 100644 --- a/acceptance/bundle/resources/catalogs/basic/output.txt +++ b/acceptance/bundle/resources/catalogs/basic/output.txt @@ -38,6 +38,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted catalogs.test_catalog Destroy: 1 deleted === Assert the catalog is deleted \ No newline at end of file diff --git a/acceptance/bundle/resources/catalogs/with-schemas/output.txt b/acceptance/bundle/resources/catalogs/with-schemas/output.txt index 22037eb01b8..f44639f4cad 100644 --- a/acceptance/bundle/resources/catalogs/with-schemas/output.txt +++ b/acceptance/bundle/resources/catalogs/with-schemas/output.txt @@ -58,6 +58,8 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted catalogs.test_catalog +Deleted schemas.test_schema Destroy: 2 deleted === Assert schema is deleted diff --git a/acceptance/bundle/resources/cluster_policies/backend_normalization/output.txt b/acceptance/bundle/resources/cluster_policies/backend_normalization/output.txt index 994a3c0fc9f..ccf41692e91 100644 --- a/acceptance/bundle/resources/cluster_policies/backend_normalization/output.txt +++ b/acceptance/bundle/resources/cluster_policies/backend_normalization/output.txt @@ -36,4 +36,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted cluster_policies.json_string +Deleted cluster_policies.multiline +Deleted cluster_policies.yaml Destroy: 3 deleted diff --git a/acceptance/bundle/resources/cluster_policies/basic/output.txt b/acceptance/bundle/resources/cluster_policies/basic/output.txt index 9141e7bf3cc..097d25967e3 100644 --- a/acceptance/bundle/resources/cluster_policies/basic/output.txt +++ b/acceptance/bundle/resources/cluster_policies/basic/output.txt @@ -97,6 +97,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted cluster_policies.test_cluster_policy Destroy: 1 deleted === Verify the destroy request diff --git a/acceptance/bundle/resources/cluster_policies/definition_multiline/output.txt b/acceptance/bundle/resources/cluster_policies/definition_multiline/output.txt index 1436fd014e5..51b706432d5 100644 --- a/acceptance/bundle/resources/cluster_policies/definition_multiline/output.txt +++ b/acceptance/bundle/resources/cluster_policies/definition_multiline/output.txt @@ -30,4 +30,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted cluster_policies.pol Destroy: 1 deleted diff --git a/acceptance/bundle/resources/cluster_policies/definition_yaml/output.txt b/acceptance/bundle/resources/cluster_policies/definition_yaml/output.txt index c5edec39e9a..5f1c91bbba1 100644 --- a/acceptance/bundle/resources/cluster_policies/definition_yaml/output.txt +++ b/acceptance/bundle/resources/cluster_policies/definition_yaml/output.txt @@ -30,4 +30,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted cluster_policies.pol Destroy: 1 deleted diff --git a/acceptance/bundle/resources/cluster_policies/job_ref/output.txt b/acceptance/bundle/resources/cluster_policies/job_ref/output.txt index 1a5b87c1627..ffed9f48e9b 100644 --- a/acceptance/bundle/resources/cluster_policies/job_ref/output.txt +++ b/acceptance/bundle/resources/cluster_policies/job_ref/output.txt @@ -105,6 +105,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/cluster_policy_job_ref/default +Deleted cluster_policies.pol +Deleted jobs.j Destroy: 2 deleted >>> print_requests.py //policies/clusters //jobs diff --git a/acceptance/bundle/resources/cluster_policies/out_of_band_change/output.txt b/acceptance/bundle/resources/cluster_policies/out_of_band_change/output.txt index 8f8afc280e4..4ebb572fb79 100644 --- a/acceptance/bundle/resources/cluster_policies/out_of_band_change/output.txt +++ b/acceptance/bundle/resources/cluster_policies/out_of_band_change/output.txt @@ -47,4 +47,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted cluster_policies.test_cluster_policy Destroy: 1 deleted diff --git a/acceptance/bundle/resources/cluster_policies/permissions/levels/output.txt b/acceptance/bundle/resources/cluster_policies/permissions/levels/output.txt index 40fccf6448b..4e9f366e37d 100644 --- a/acceptance/bundle/resources/cluster_policies/permissions/levels/output.txt +++ b/acceptance/bundle/resources/cluster_policies/permissions/levels/output.txt @@ -31,4 +31,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/cluster-policy-permission-levels-[UNIQUE_NAME]/default +Deleted cluster_policies.test_cluster_policy +Deleted cluster_policies.test_cluster_policy.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/output.txt b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/output.txt index d1b2cc33b65..6af4a3079eb 100644 --- a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/output.txt +++ b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/output.txt @@ -55,4 +55,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test_cluster_policy_permissions_recreate/default +Deleted cluster_policies.test_cluster_policy +Deleted cluster_policies.test_cluster_policy.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/output.txt b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/output.txt index 3fd663498dc..d60162b826d 100644 --- a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/output.txt +++ b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/output.txt @@ -75,4 +75,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test_cluster_policy_permissions_drift/default +Deleted cluster_policies.test_cluster_policy +Deleted cluster_policies.test_cluster_policy.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/cluster_policies/policy_family_definition/output.txt b/acceptance/bundle/resources/cluster_policies/policy_family_definition/output.txt index 7bad908a6af..e62482edf0e 100644 --- a/acceptance/bundle/resources/cluster_policies/policy_family_definition/output.txt +++ b/acceptance/bundle/resources/cluster_policies/policy_family_definition/output.txt @@ -23,4 +23,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted cluster_policies.family_policy Destroy: 1 deleted diff --git a/acceptance/bundle/resources/cluster_policies/policy_family_overrides/output.txt b/acceptance/bundle/resources/cluster_policies/policy_family_overrides/output.txt index 3a0032161a8..495a330dbf9 100644 --- a/acceptance/bundle/resources/cluster_policies/policy_family_overrides/output.txt +++ b/acceptance/bundle/resources/cluster_policies/policy_family_overrides/output.txt @@ -64,4 +64,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted cluster_policies.json_string +Deleted cluster_policies.multiline +Deleted cluster_policies.yaml Destroy: 3 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt b/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt index 2703994609c..9b54cfbbe99 100644 --- a/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt @@ -19,4 +19,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt index 1042e292508..81ce92c403c 100644 --- a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt @@ -13,4 +13,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-ssd-count-0-[UNIQUE_NAME]/default +Deleted clusters.test_cluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/simple/output.txt b/acceptance/bundle/resources/clusters/deploy/simple/output.txt index 3c51a254649..e7c3388e1bc 100644 --- a/acceptance/bundle/resources/clusters/deploy/simple/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/simple/output.txt @@ -19,4 +19,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster +Deleted jobs.foo Destroy: 2 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt b/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt index 13f32c2df7f..6e017a20820 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt @@ -30,4 +30,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt index ced0bc3994a..f4f9a74dc7c 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt @@ -164,4 +164,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt b/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt index 104baa1797b..386c4a29f27 100644 --- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt +++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt @@ -106,4 +106,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt index 4ece922a78e..fe9e257c560 100644 --- a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt @@ -77,4 +77,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.mycluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/lifecycle-started/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started/output.txt index d902c63731d..f4605f16bef 100644 --- a/acceptance/bundle/resources/clusters/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/clusters/lifecycle-started/output.txt @@ -107,4 +107,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.mycluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt b/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt index cee977be92d..5dd8c1f41d9 100644 --- a/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt +++ b/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt @@ -21,4 +21,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted clusters.mycluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt b/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt index 5bcd056b2c9..50e6620fc21 100644 --- a/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt +++ b/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt @@ -62,4 +62,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster Destroy: 1 deleted diff --git a/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt b/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt index 111c7ca711b..f4a76044aaf 100644 --- a/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt +++ b/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt @@ -24,4 +24,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted clusters.test_cluster +Deleted jobs.foo Destroy: 2 deleted diff --git a/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt b/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt index f0c44299a8c..15326976eaf 100644 --- a/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt +++ b/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt @@ -55,4 +55,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/change-embed-credentials-[UNIQUE_NAME]/default +Deleted dashboards.my_dashboard Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/change-name/output.txt b/acceptance/bundle/resources/dashboards/change-name/output.txt index 4d83d9bc3b7..b11bfa3b9c0 100644 --- a/acceptance/bundle/resources/dashboards/change-name/output.txt +++ b/acceptance/bundle/resources/dashboards/change-name/output.txt @@ -43,4 +43,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/change-name-[UNIQUE_NAME]/default +Deleted dashboards.my_dashboard Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/output.txt b/acceptance/bundle/resources/dashboards/change-parent-path/output.txt index e1627105be5..64291bfa215 100644 --- a/acceptance/bundle/resources/dashboards/change-parent-path/output.txt +++ b/acceptance/bundle/resources/dashboards/change-parent-path/output.txt @@ -51,4 +51,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/change-parent-path-[UNIQUE_NAME]/default +Deleted dashboards.my_dashboard Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt index 525a432aabb..4a4a203986b 100644 --- a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt +++ b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt @@ -47,4 +47,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/change-serialized-dashboard-[UNIQUE_NAME]/default +Deleted dashboards.my_dashboard Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt index 5260bb9b490..2c247b89270 100644 --- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt +++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt @@ -22,4 +22,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-dataset-test-[UNIQUE_NAME]/default +Deleted dashboards.dashboard1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/destroy/output.txt b/acceptance/bundle/resources/dashboards/destroy/output.txt index 525941139c3..d022571216f 100644 --- a/acceptance/bundle/resources/dashboards/destroy/output.txt +++ b/acceptance/bundle/resources/dashboards/destroy/output.txt @@ -17,6 +17,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/destroy-dashboard-[UNIQUE_NAME]/default +Deleted dashboards.dashboard1 Destroy: 1 deleted >>> [CLI] lakeview get [DASHBOARD_ID] diff --git a/acceptance/bundle/resources/dashboards/detect-change/output.txt b/acceptance/bundle/resources/dashboards/detect-change/output.txt index 1641d352758..bae981a7a76 100644 --- a/acceptance/bundle/resources/dashboards/detect-change/output.txt +++ b/acceptance/bundle/resources/dashboards/detect-change/output.txt @@ -112,4 +112,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted dashboards.file_reference Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/generate_inplace/output.txt b/acceptance/bundle/resources/dashboards/generate_inplace/output.txt index a1e52a4b293..f17edb56f5a 100644 --- a/acceptance/bundle/resources/dashboards/generate_inplace/output.txt +++ b/acceptance/bundle/resources/dashboards/generate_inplace/output.txt @@ -44,4 +44,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/dashboard-replace-[UNIQUE_NAME]/default +Deleted dashboards.already_exists Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/nested-folders/output.txt b/acceptance/bundle/resources/dashboards/nested-folders/output.txt index 26c1181a0cf..5773813fb12 100644 --- a/acceptance/bundle/resources/dashboards/nested-folders/output.txt +++ b/acceptance/bundle/resources/dashboards/nested-folders/output.txt @@ -25,4 +25,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-nested-folders-[UNIQUE_NAME]/default +Deleted dashboards.dashboard1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt index d8daf7b8a0c..0c662edaa6a 100644 --- a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt +++ b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt @@ -169,4 +169,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default +Deleted dashboards.dashboard1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt b/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt index 1fe4e418ebc..6a07163cef5 100644 --- a/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt +++ b/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt @@ -37,4 +37,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted dashboards.dashboard1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/simple/output.txt b/acceptance/bundle/resources/dashboards/simple/output.txt index 12a9c3f2042..b92530dbb3a 100644 --- a/acceptance/bundle/resources/dashboards/simple/output.txt +++ b/acceptance/bundle/resources/dashboards/simple/output.txt @@ -19,4 +19,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-test-[UNIQUE_NAME]/default +Deleted dashboards.dashboard1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/output.txt b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/output.txt index 622d8111fea..108d99756f9 100644 --- a/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/output.txt +++ b/acceptance/bundle/resources/dashboards/simple_outside_bundle_root/output.txt @@ -15,4 +15,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-outside-bundle-root-[UNIQUE_NAME]/default +Deleted dashboards.dashboard1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/dashboards/simple_syncroot/output.txt b/acceptance/bundle/resources/dashboards/simple_syncroot/output.txt index a725a96753d..98e666627cb 100644 --- a/acceptance/bundle/resources/dashboards/simple_syncroot/output.txt +++ b/acceptance/bundle/resources/dashboards/simple_syncroot/output.txt @@ -15,4 +15,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-test-[UNIQUE_NAME]/default +Deleted dashboards.dashboard1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/database_catalogs/basic/output.txt b/acceptance/bundle/resources/database_catalogs/basic/output.txt index 73164574d89..739e45866e5 100644 --- a/acceptance/bundle/resources/database_catalogs/basic/output.txt +++ b/acceptance/bundle/resources/database_catalogs/basic/output.txt @@ -54,4 +54,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-[UNIQUE_NAME]/default +Deleted database_catalogs.my_catalog +Deleted database_instances.my_instance Destroy: 2 deleted diff --git a/acceptance/bundle/resources/database_catalogs/recreate/output.txt b/acceptance/bundle/resources/database_catalogs/recreate/output.txt index 3af23a6caad..2e283629e6b 100644 --- a/acceptance/bundle/resources/database_catalogs/recreate/output.txt +++ b/acceptance/bundle/resources/database_catalogs/recreate/output.txt @@ -29,4 +29,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-recreate-[UNIQUE_NAME]/default +Deleted database_catalogs.my_catalog +Deleted database_instances.my_instance Destroy: 2 deleted diff --git a/acceptance/bundle/resources/database_instances/recreate/output.txt b/acceptance/bundle/resources/database_instances/recreate/output.txt index dc6c194d76f..cd3e944e03b 100644 --- a/acceptance/bundle/resources/database_instances/recreate/output.txt +++ b/acceptance/bundle/resources/database_instances/recreate/output.txt @@ -31,4 +31,5 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-recreate-[UNIQUE_NAME]/default +Deleted database_instances.my_database Destroy: 1 deleted diff --git a/acceptance/bundle/resources/database_instances/single-instance/output.txt b/acceptance/bundle/resources/database_instances/single-instance/output.txt index 95b9e492938..0601974bb0c 100644 --- a/acceptance/bundle/resources/database_instances/single-instance/output.txt +++ b/acceptance/bundle/resources/database_instances/single-instance/output.txt @@ -65,4 +65,5 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-single-instance-[UNIQUE_NAME]/default +Deleted database_instances.my_database Destroy: 1 deleted diff --git a/acceptance/bundle/resources/experiments/basic/output.txt b/acceptance/bundle/resources/experiments/basic/output.txt index 9c1cf620c81..4911acdd49e 100644 --- a/acceptance/bundle/resources/experiments/basic/output.txt +++ b/acceptance/bundle/resources/experiments/basic/output.txt @@ -178,4 +178,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/experiment-basic-[UNIQUE_NAME]/default +Deleted experiments.my_experiment Destroy: 1 deleted diff --git a/acceptance/bundle/resources/external_locations/output.txt b/acceptance/bundle/resources/external_locations/output.txt index 6a6b8253eab..2bfcc248cb9 100644 --- a/acceptance/bundle/resources/external_locations/output.txt +++ b/acceptance/bundle/resources/external_locations/output.txt @@ -110,4 +110,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted catalogs.test_catalog +Deleted catalogs.test_catalog.grants +Deleted external_locations.test_location +Deleted external_locations.test_location.grants Destroy: 2 deleted diff --git a/acceptance/bundle/resources/genie_spaces/inline/output.txt b/acceptance/bundle/resources/genie_spaces/inline/output.txt index d7539b973b9..3a642bccc9e 100644 --- a/acceptance/bundle/resources/genie_spaces/inline/output.txt +++ b/acceptance/bundle/resources/genie_spaces/inline/output.txt @@ -17,4 +17,5 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-inline-[UNIQUE_NAME]/default +Deleted genie_spaces.sales_analytics Destroy: 1 deleted diff --git a/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt b/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt index bc2024c6bdd..2448ce63dc0 100644 --- a/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt +++ b/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt @@ -21,4 +21,5 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-genie-space-[UNIQUE_NAME]/default +Deleted genie_spaces.update_target Destroy: 1 deleted diff --git a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt index e5621c9677d..6917cc056d6 100644 --- a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt +++ b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt @@ -16,4 +16,5 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged >>> [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-gone-genie-space-[UNIQUE_NAME]/default +Deleted genie_spaces.sales_analytics Destroy: 1 deleted diff --git a/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt b/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt index 702c283f5a0..343571c83af 100644 --- a/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt +++ b/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt @@ -18,4 +18,6 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/genie-serialized-space-[UNIQUE_NAME]/default +Deleted genie_spaces.from_file +Deleted genie_spaces.from_inline Destroy: 2 deleted diff --git a/acceptance/bundle/resources/genie_spaces/simple/output.txt b/acceptance/bundle/resources/genie_spaces/simple/output.txt index 129ab135efd..bf2844d06f9 100644 --- a/acceptance/bundle/resources/genie_spaces/simple/output.txt +++ b/acceptance/bundle/resources/genie_spaces/simple/output.txt @@ -25,4 +25,5 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-test-[UNIQUE_NAME]/default +Deleted genie_spaces.sales_analytics Destroy: 1 deleted diff --git a/acceptance/bundle/resources/genie_spaces/version_migration/output.txt b/acceptance/bundle/resources/genie_spaces/version_migration/output.txt index 1842d77156f..274d12b58d6 100644 --- a/acceptance/bundle/resources/genie_spaces/version_migration/output.txt +++ b/acceptance/bundle/resources/genie_spaces/version_migration/output.txt @@ -26,4 +26,5 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/genie-version-migration-[UNIQUE_NAME]/default +Deleted genie_spaces.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/catalogs/output.txt b/acceptance/bundle/resources/grants/catalogs/output.txt index ede2dfee69a..08b0d3d732d 100644 --- a/acceptance/bundle/resources/grants/catalogs/output.txt +++ b/acceptance/bundle/resources/grants/catalogs/output.txt @@ -77,6 +77,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/catalog-grants-[UNIQUE_NAME]/default +Deleted catalogs.grants_catalog +Deleted catalogs.grants_catalog.grants Destroy: 1 deleted >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/registered_models/output.txt b/acceptance/bundle/resources/grants/registered_models/output.txt index ae9684ad527..b048aadca35 100644 --- a/acceptance/bundle/resources/grants/registered_models/output.txt +++ b/acceptance/bundle/resources/grants/registered_models/output.txt @@ -35,6 +35,9 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default +Deleted registered_models.my_registered_model +Deleted registered_models.my_registered_model.grants +Deleted schemas.my_schema Destroy: 2 deleted >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt b/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt index 125974790a5..81c397c257c 100644 --- a/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt +++ b/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt @@ -13,4 +13,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default +Deleted schemas.apps_schema +Deleted schemas.apps_schema.grants Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt index a81692e99ec..7004ef74f88 100644 --- a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt +++ b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt @@ -22,4 +22,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-all-privileges-coexist-[UNIQUE_NAME]/default +Deleted schemas.grants_schema +Deleted schemas.grants_schema.grants Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt b/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt index 371eeb7eaa3..01286518a2f 100644 --- a/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt +++ b/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt @@ -80,6 +80,8 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default +Deleted schemas.grants_schema +Deleted schemas.grants_schema.grants Destroy: 1 deleted >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt b/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt index afba2d08be5..676b613d469 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt +++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt @@ -17,4 +17,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default +Deleted schemas.apps_schema +Deleted schemas.apps_schema.grants Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt index d503d211362..25db61a0db5 100644 --- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt +++ b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt @@ -15,4 +15,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default +Deleted schemas.apps_schema +Deleted schemas.apps_schema.grants Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt index 0d253209caa..74d3847d9cc 100644 --- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt +++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/output.txt @@ -27,4 +27,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-out-of-band-principal-[UNIQUE_NAME]/default +Deleted schemas.grants_schema +Deleted schemas.grants_schema.grants Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/output.txt b/acceptance/bundle/resources/grants/schemas/remove_all/output.txt index 2236e37e274..70a5fc8b1f4 100644 --- a/acceptance/bundle/resources/grants/schemas/remove_all/output.txt +++ b/acceptance/bundle/resources/grants/schemas/remove_all/output.txt @@ -24,4 +24,5 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-all-[UNIQUE_NAME]/default +Deleted schemas.grants_schema Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt b/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt index 0f2c26acf6c..746b11e5669 100644 --- a/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt +++ b/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt @@ -40,4 +40,6 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default +Deleted schemas.grants_schema +Deleted schemas.grants_schema.grants Destroy: 1 deleted diff --git a/acceptance/bundle/resources/grants/volumes/output.txt b/acceptance/bundle/resources/grants/volumes/output.txt index ef31432f8b0..706fd202151 100644 --- a/acceptance/bundle/resources/grants/volumes/output.txt +++ b/acceptance/bundle/resources/grants/volumes/output.txt @@ -63,6 +63,9 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default +Deleted schemas.grants_schema +Deleted volumes.grants_volume +Deleted volumes.grants_volume.grants Destroy: 2 deleted >>> print_requests.py //permissions diff --git a/acceptance/bundle/resources/instance_pools/output.txt b/acceptance/bundle/resources/instance_pools/output.txt index ac7a7d4ce92..5bbdb54e947 100644 --- a/acceptance/bundle/resources/instance_pools/output.txt +++ b/acceptance/bundle/resources/instance_pools/output.txt @@ -106,6 +106,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test_instance_pool/default +Deleted instance_pools.test_instance_pool Destroy: 1 deleted === Verify the destroy request diff --git a/acceptance/bundle/resources/job_runs/basic/output.txt b/acceptance/bundle/resources/job_runs/basic/output.txt index 4e98b174beb..7291716aa30 100644 --- a/acceptance/bundle/resources/job_runs/basic/output.txt +++ b/acceptance/bundle/resources/job_runs/basic/output.txt @@ -86,6 +86,8 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-basic/default +Deleted job_runs.my_run +Deleted jobs.my_job Destroy: 2 deleted >>> print_requests.py //jobs/runs/delete diff --git a/acceptance/bundle/resources/job_runs/failed_run/output.txt b/acceptance/bundle/resources/job_runs/failed_run/output.txt index 5c010b28bc2..4c83543a5b7 100644 --- a/acceptance/bundle/resources/job_runs/failed_run/output.txt +++ b/acceptance/bundle/resources/job_runs/failed_run/output.txt @@ -101,4 +101,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted job_runs.my_run +Deleted jobs.my_job Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt index 0d27e0ba334..9adb0de688c 100644 --- a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt +++ b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt @@ -79,4 +79,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-interrupted-run/default +Deleted job_runs.my_run +Deleted jobs.my_job Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/job_parameters/output.txt b/acceptance/bundle/resources/job_runs/job_parameters/output.txt index f5b8951cb5f..86c59260833 100644 --- a/acceptance/bundle/resources/job_runs/job_parameters/output.txt +++ b/acceptance/bundle/resources/job_runs/job_parameters/output.txt @@ -49,4 +49,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-job-parameters/default +Deleted job_runs.my_run +Deleted jobs.my_job Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt b/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt index f342619d618..9d9ab65b694 100644 --- a/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt +++ b/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt @@ -139,4 +139,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-on-bundle-deploy/default +Deleted job_runs.my_run +Deleted jobs.my_job Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/redeploy/output.txt b/acceptance/bundle/resources/job_runs/redeploy/output.txt index a06600f5eca..9d10cde19d3 100644 --- a/acceptance/bundle/resources/job_runs/redeploy/output.txt +++ b/acceptance/bundle/resources/job_runs/redeploy/output.txt @@ -148,4 +148,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-redeploy/default +Deleted job_runs.my_run +Deleted jobs.my_job Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt index fca04b36f78..2bd3ce96b06 100644 --- a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt +++ b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt @@ -45,4 +45,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/job-runs-retried-run-now/default +Deleted job_runs.my_run +Deleted jobs.my_job Destroy: 2 deleted diff --git a/acceptance/bundle/resources/job_runs/wait/output.txt b/acceptance/bundle/resources/job_runs/wait/output.txt index 034ecf1835c..0a10046c9d3 100644 --- a/acceptance/bundle/resources/job_runs/wait/output.txt +++ b/acceptance/bundle/resources/job_runs/wait/output.txt @@ -36,4 +36,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted job_runs.my_run +Deleted jobs.downstream_job +Deleted jobs.my_job Destroy: 3 deleted diff --git a/acceptance/bundle/resources/jobs/alert-task/output.txt b/acceptance/bundle/resources/jobs/alert-task/output.txt index 3b01790e4cc..6772fa5748e 100644 --- a/acceptance/bundle/resources/jobs/alert-task/output.txt +++ b/acceptance/bundle/resources/jobs/alert-task/output.txt @@ -17,4 +17,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/alert-task-[UNIQUE_NAME]/default +Deleted jobs.my_job Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/big_id/output.txt b/acceptance/bundle/resources/jobs/big_id/output.txt index 25b292ca868..012206f3e72 100644 --- a/acceptance/bundle/resources/jobs/big_id/output.txt +++ b/acceptance/bundle/resources/jobs/big_id/output.txt @@ -67,6 +67,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resources/jobs/check-metadata/output.txt b/acceptance/bundle/resources/jobs/check-metadata/output.txt index cda7d2c87de..77fb66499ca 100644 --- a/acceptance/bundle/resources/jobs/check-metadata/output.txt +++ b/acceptance/bundle/resources/jobs/check-metadata/output.txt @@ -92,4 +92,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.bar +Deleted jobs.foo Destroy: 2 deleted diff --git a/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt b/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt index a92373777fb..e19b319cdec 100644 --- a/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt +++ b/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt @@ -22,4 +22,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-test-[UNIQUE_NAME]/default +Deleted jobs.foo +Deleted jobs.foo__bar Destroy: 2 deleted diff --git a/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt b/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt index 0dc4f29667b..e94a56beddf 100644 --- a/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt +++ b/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt @@ -28,4 +28,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-active-runs-test-[UNIQUE_NAME]/default +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.terraform.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.terraform.txt index a3e25190f3e..ce2e56278e7 100644 --- a/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.terraform.txt +++ b/acceptance/bundle/resources/jobs/no-git-provider/out.destroy.terraform.txt @@ -9,4 +9,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt index cbbde0249f1..a053c298bb6 100644 --- a/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt +++ b/acceptance/bundle/resources/jobs/remote_delete/destroy/out.destroy.direct.txt @@ -2,4 +2,5 @@ >>> errcode [CLI] bundle destroy --auto-approve All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/shared-root-path/output.txt b/acceptance/bundle/resources/jobs/shared-root-path/output.txt index 28dee8868cd..ac01d09f090 100644 --- a/acceptance/bundle/resources/jobs/shared-root-path/output.txt +++ b/acceptance/bundle/resources/jobs/shared-root-path/output.txt @@ -34,4 +34,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/jobs/update/output.txt b/acceptance/bundle/resources/jobs/update/output.txt index 0fecb880fc3..9dad6f354b2 100644 --- a/acceptance/bundle/resources/jobs/update/output.txt +++ b/acceptance/bundle/resources/jobs/update/output.txt @@ -85,6 +85,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resources/jobs/update_single_node/output.txt b/acceptance/bundle/resources/jobs/update_single_node/output.txt index 2f3e61786f9..bc16689de60 100644 --- a/acceptance/bundle/resources/jobs/update_single_node/output.txt +++ b/acceptance/bundle/resources/jobs/update_single_node/output.txt @@ -86,6 +86,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted >>> print_requests.py //jobs diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/output.txt b/acceptance/bundle/resources/model_serving_endpoints/basic/output.txt index d4e80df1f81..69a63da1599 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/basic/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/basic/output.txt @@ -25,4 +25,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default +Deleted model_serving_endpoints.my_endpoint +Deleted model_serving_endpoints.my_endpoint.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/output.txt b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/output.txt index fdeba3e5dc4..4a975b9f38a 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/output.txt @@ -60,4 +60,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-mse-recreated-same-name-[UNIQUE_NAME]/default +Deleted model_serving_endpoints.my_endpoint +Deleted model_serving_endpoints.my_endpoint.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt index cb9328d9655..76dd938066d 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/output.txt @@ -91,4 +91,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt index c855f542373..daa666003cd 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/output.txt @@ -81,4 +81,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt index 752eb18837b..879f569f7f2 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/output.txt @@ -86,4 +86,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt index 091953cdf41..6d66bc7804e 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/output.txt @@ -91,4 +91,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt index 276441b47fb..a30619a6a3c 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/output.txt @@ -91,4 +91,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt index 5eecef109d8..50bf7c413a2 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt @@ -43,4 +43,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default +Deleted model_serving_endpoints.my_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt index bc1d02d6c92..7aa3352bf25 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/output.txt @@ -73,4 +73,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt index 5fb46febcba..66d750734f5 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/output.txt @@ -131,4 +131,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt index 28797ce10c4..a19ccf1bc9c 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt @@ -130,4 +130,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt index 077c27ab917..61691218c9e 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/output.txt @@ -33,4 +33,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt b/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt index 410fd39eabf..5134155596a 100644 --- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt +++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt @@ -79,4 +79,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted model_serving_endpoints.test_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/models/basic/output.txt b/acceptance/bundle/resources/models/basic/output.txt index 6727e0d9d9e..17bdc9707ef 100644 --- a/acceptance/bundle/resources/models/basic/output.txt +++ b/acceptance/bundle/resources/models/basic/output.txt @@ -90,4 +90,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-models-basic-[UNIQUE_NAME]/default +Deleted models.my_model Destroy: 1 deleted diff --git a/acceptance/bundle/resources/models/readplan-permissions/output.txt b/acceptance/bundle/resources/models/readplan-permissions/output.txt index e65f9b2a560..61ef3df78cd 100644 --- a/acceptance/bundle/resources/models/readplan-permissions/output.txt +++ b/acceptance/bundle/resources/models/readplan-permissions/output.txt @@ -59,4 +59,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted models.mymodel +Deleted models.mymodel.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt index 7ecf5f62063..e757e184968 100644 --- a/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted apps.foo +Deleted apps.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt index 7ecf5f62063..e757e184968 100644 --- a/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted apps.foo +Deleted apps.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt index a8c9eca4124..8408bc240b0 100644 --- a/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted clusters.foo +Deleted clusters.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/dashboards/create/output.txt b/acceptance/bundle/resources/permissions/dashboards/create/output.txt index d2faac5a681..9bf8a11ed58 100644 --- a/acceptance/bundle/resources/permissions/dashboards/create/output.txt +++ b/acceptance/bundle/resources/permissions/dashboards/create/output.txt @@ -24,4 +24,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/dashboard-perm-[UNIQUE_NAME]/default +Deleted dashboards.foo +Deleted dashboards.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt index bb4ee4bc75c..dca6d3be1dd 100644 --- a/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/database_instances/current_can_manage/output.txt @@ -68,4 +68,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted database_instances.foo +Deleted database_instances.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt index aa0d4a3b608..b81372d35af 100644 --- a/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted experiments.foo +Deleted experiments.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/factcheck/output.txt b/acceptance/bundle/resources/permissions/factcheck/output.txt index ae6df5bd275..570f8996a4f 100644 --- a/acceptance/bundle/resources/permissions/factcheck/output.txt +++ b/acceptance/bundle/resources/permissions/factcheck/output.txt @@ -30,4 +30,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test_bundle_[UNIQUE_NAME]/default +Deleted jobs.job +Deleted sql_warehouses.warehouse Destroy: 2 deleted diff --git a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt index 0ad7954092b..131c2efa49c 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/output.txt @@ -36,4 +36,6 @@ The conversation history attached to them is permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted genie_spaces.foo +Deleted genie_spaces.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt index ec85eecf2b4..b4bc2bfeac7 100644 --- a/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt +++ b/acceptance/bundle/resources/permissions/genie_spaces/out_of_band_deletion/output.txt @@ -75,4 +75,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted genie_spaces.foo +Deleted genie_spaces.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt index ff2a662c903..ba34a25db78 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo +Deleted jobs.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt index 769795fe908..7c423a170f6 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage_run/output.txt @@ -39,4 +39,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green +Deleted jobs.interim_gold_layer_job +Deleted jobs.interim_gold_layer_job.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt b/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt index e4db99624a0..7b08d6e147b 100644 --- a/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt @@ -20,4 +20,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo +Deleted jobs.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt b/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt index 0a09e858c7e..d23bd2c7458 100644 --- a/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt @@ -25,4 +25,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.job_with_permissions +Deleted jobs.job_with_permissions.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.destroy.direct.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.destroy.direct.txt index 4e47b717bce..f155396141a 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.destroy.direct.txt +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/out.destroy.direct.txt @@ -7,5 +7,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted jobs.foo.permissions Warn: destroying resources.jobs.foo: Ignoring permission error when deleting resources.jobs.foo id=[NUMID]: User [TEST_SP_APPLICATION_ID] does not have Admin or Owner permissions on job [NUMID] +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.destroy.direct.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.destroy.direct.txt index 45b95472392..f211a944e93 100644 --- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.destroy.direct.txt +++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/out.destroy.direct.txt @@ -7,4 +7,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default Warn: destroying resources.jobs.foo: Ignoring permission error when deleting resources.jobs.foo id=[NUMID]: User [TEST_SP_APPLICATION_ID] does not have Admin or Owner permissions on job [NUMID] +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt b/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt index 4a1625e9921..3092a6790de 100644 --- a/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt @@ -14,4 +14,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt index ff2a662c903..ba34a25db78 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo +Deleted jobs.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt index 3c44c1366e1..c8884b753e5 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage_run/output.txt @@ -41,4 +41,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green +Deleted jobs.interim_gold_layer_job +Deleted jobs.interim_gold_layer_job.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt b/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt index 00f7d225cc9..41a3c4d4bda 100644 --- a/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt @@ -24,4 +24,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo +Deleted jobs.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/jobs/update/output.txt b/acceptance/bundle/resources/permissions/jobs/update/output.txt index 23ddca160af..36fdaf4942e 100644 --- a/acceptance/bundle/resources/permissions/jobs/update/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/update/output.txt @@ -161,6 +161,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default +Deleted jobs.job_with_permissions Destroy: 1 deleted >>> print_requests.py //jobs/ diff --git a/acceptance/bundle/resources/permissions/jobs/viewers/output.txt b/acceptance/bundle/resources/permissions/jobs/viewers/output.txt index 69ab0ef32a4..bb3a60c9b22 100644 --- a/acceptance/bundle/resources/permissions/jobs/viewers/output.txt +++ b/acceptance/bundle/resources/permissions/jobs/viewers/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted jobs.foo +Deleted jobs.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/models/current_can_manage/output.txt index f65983f32d9..958b11351b3 100644 --- a/acceptance/bundle/resources/permissions/models/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/models/current_can_manage/output.txt @@ -25,4 +25,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted models.foo +Deleted models.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt index a836e2e62db..6ee1fbe9a71 100644 --- a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt @@ -36,4 +36,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted pipelines.foo +Deleted pipelines.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt index ddf2d97edce..64f2a2a2844 100644 --- a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt @@ -24,4 +24,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted pipelines.foo +Deleted pipelines.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt b/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt index 7ebaf7080a7..613e51d13c8 100644 --- a/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt @@ -18,4 +18,5 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted pipelines.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt index a836e2e62db..6ee1fbe9a71 100644 --- a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt @@ -36,4 +36,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted pipelines.foo +Deleted pipelines.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt index d32158fc54b..a4bcd5a2bb5 100644 --- a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt @@ -28,4 +28,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted pipelines.foo +Deleted pipelines.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/pipelines/update/output.txt b/acceptance/bundle/resources/permissions/pipelines/update/output.txt index dbccf317c7f..76947065bac 100644 --- a/acceptance/bundle/resources/permissions/pipelines/update/output.txt +++ b/acceptance/bundle/resources/permissions/pipelines/update/output.txt @@ -129,4 +129,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/permissions-test/default +Deleted pipelines.foo +Deleted pipelines.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt index 297ee552f4e..ca9c05a019b 100644 --- a/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/postgres_projects/current_can_manage/output.txt @@ -36,4 +36,6 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted postgres_projects.foo +Deleted postgres_projects.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt index 4c31dc64d27..490b576a3bb 100644 --- a/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/sql_warehouses/current_can_manage/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted sql_warehouses.foo +Deleted sql_warehouses.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/target_permissions/output.txt b/acceptance/bundle/resources/permissions/target_permissions/output.txt index b5e9c911998..ec9f7bfdfaf 100644 --- a/acceptance/bundle/resources/permissions/target_permissions/output.txt +++ b/acceptance/bundle/resources/permissions/target_permissions/output.txt @@ -18,4 +18,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/test-bundle +Deleted jobs.foo +Deleted jobs.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt b/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt index bfd8ce6a288..a40e485eab0 100644 --- a/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt +++ b/acceptance/bundle/resources/permissions/vector_search_endpoints/current_can_manage/output.txt @@ -32,4 +32,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted vector_search_endpoints.foo +Deleted vector_search_endpoints.foo.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt index e10e04e6b44..cae623a57d4 100644 --- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt +++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt @@ -52,6 +52,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-bundle-deploy-pipeline-duplicate-names-[UNIQUE_NAME]/default +Deleted pipelines.pipeline_one Destroy: 1 deleted >>> [CLI] pipelines delete [UUID] diff --git a/acceptance/bundle/resources/pipelines/auto-approve/output.txt b/acceptance/bundle/resources/pipelines/auto-approve/output.txt index 0b6b9441db5..f27c9c540fe 100644 --- a/acceptance/bundle/resources/pipelines/auto-approve/output.txt +++ b/acceptance/bundle/resources/pipelines/auto-approve/output.txt @@ -70,4 +70,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted jobs.foo +Deleted pipelines.bar Destroy: 2 deleted diff --git a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt index 8c25edb6b9e..75a81408fed 100644 --- a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt +++ b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt @@ -48,4 +48,5 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-lakeflow-pipeline-[UNIQUE_NAME]/default +Deleted pipelines.foo Destroy: 1 deleted diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt b/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt index 4f4aa021dfa..825714fd056 100644 --- a/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-ingestion-definition/output.txt @@ -155,6 +155,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default +Deleted pipelines.my Destroy: 1 deleted >>> print_requests diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt index 2c470d41f1a..149d5855da0 100644 --- a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt @@ -139,6 +139,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default +Deleted pipelines.my Destroy: 1 deleted >>> print_requests diff --git a/acceptance/bundle/resources/pipelines/recreate/output.txt b/acceptance/bundle/resources/pipelines/recreate/output.txt index 993909f9db3..dc3294f9352 100644 --- a/acceptance/bundle/resources/pipelines/recreate/output.txt +++ b/acceptance/bundle/resources/pipelines/recreate/output.txt @@ -72,4 +72,6 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted pipelines.foo +Deleted schemas.bar Destroy: 2 deleted diff --git a/acceptance/bundle/resources/pipelines/update/output.txt b/acceptance/bundle/resources/pipelines/update/output.txt index 7fdaa732497..1344ca02c7f 100644 --- a/acceptance/bundle/resources/pipelines/update/output.txt +++ b/acceptance/bundle/resources/pipelines/update/output.txt @@ -77,6 +77,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default +Deleted pipelines.my Destroy: 1 deleted >>> print_requests diff --git a/acceptance/bundle/resources/postgres_branches/basic/output.txt b/acceptance/bundle/resources/postgres_branches/basic/output.txt index e06e2d8413b..b1c5a26d585 100644 --- a/acceptance/bundle/resources/postgres_branches/basic/output.txt +++ b/acceptance/bundle/resources/postgres_branches/basic/output.txt @@ -82,4 +82,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.destroy.txt b/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.destroy.txt index 1f456f888a5..56a91a9570b 100644 --- a/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete/out.destroy.txt @@ -14,4 +14,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-purge-[UNIQUE_NAME]/default +Deleted postgres_branches.hard_delete +Deleted postgres_branches.soft_delete +Deleted postgres_projects.my_project Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.destroy.txt b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.destroy.txt index 0d7119fe189..b5c86c0aeeb 100644 --- a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/out.destroy.txt @@ -12,4 +12,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/pg-branch-purge-transitions-[UNIQUE_NAME]/default +Deleted postgres_branches.branch +Deleted postgres_projects.proj Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_branches/recreate/output.txt b/acceptance/bundle/resources/postgres_branches/recreate/output.txt index 78cf8d611dc..fda71853bf2 100644 --- a/acceptance/bundle/resources/postgres_branches/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_branches/recreate/output.txt @@ -90,6 +90,8 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-branch-recreate-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project Destroy: 2 deleted >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.txt b/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.txt index 100e0a9a4b6..2f2b4aac478 100644 --- a/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_branches/replace_existing/out.destroy.txt @@ -12,4 +12,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-branch-[UNIQUE_NAME]/default +Deleted postgres_branches.production +Deleted postgres_projects.my_project Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/output.txt b/acceptance/bundle/resources/postgres_branches/update_protected/output.txt index 1a2eadd2c68..5454cd9716e 100644 --- a/acceptance/bundle/resources/postgres_branches/update_protected/output.txt +++ b/acceptance/bundle/resources/postgres_branches/update_protected/output.txt @@ -170,4 +170,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-branch-[UNIQUE_NAME]/default +Deleted postgres_branches.dev_branch +Deleted postgres_projects.my_project Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_catalogs/basic/output.txt b/acceptance/bundle/resources/postgres_catalogs/basic/output.txt index 3d0adb7dd20..27a047fcd92 100644 --- a/acceptance/bundle/resources/postgres_catalogs/basic/output.txt +++ b/acceptance/bundle/resources/postgres_catalogs/basic/output.txt @@ -71,4 +71,6 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-catalog-[UNIQUE_NAME]/default +Deleted postgres_catalogs.my_catalog +Deleted postgres_projects.my_project Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_catalogs/recreate/output.txt b/acceptance/bundle/resources/postgres_catalogs/recreate/output.txt index 97ce24003be..39ad8410c74 100644 --- a/acceptance/bundle/resources/postgres_catalogs/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_catalogs/recreate/output.txt @@ -28,4 +28,6 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-postgres-catalog-[UNIQUE_NAME]/default +Deleted postgres_catalogs.my_catalog +Deleted postgres_projects.my_project Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_databases/basic/output.txt b/acceptance/bundle/resources/postgres_databases/basic/output.txt index defd7cfdd1e..af8948dd742 100644 --- a/acceptance/bundle/resources/postgres_databases/basic/output.txt +++ b/acceptance/bundle/resources/postgres_databases/basic/output.txt @@ -100,4 +100,8 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-database-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_databases.my_database +Deleted postgres_projects.my_project +Deleted postgres_roles.owner Destroy: 4 deleted diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt index 7034fd62db6..bff70465322 100644 --- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt +++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_database_id/output.txt @@ -27,4 +27,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bad-database-id-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project +Deleted postgres_roles.owner Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt index 207518f3b3f..1fb0d111ae4 100644 --- a/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt +++ b/acceptance/bundle/resources/postgres_databases/live_errors/bad_role_ref/output.txt @@ -25,4 +25,6 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/bad-role-ref-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_databases/recreate/output.txt b/acceptance/bundle/resources/postgres_databases/recreate/output.txt index 2619af86a8b..a819994aaf2 100644 --- a/acceptance/bundle/resources/postgres_databases/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_databases/recreate/output.txt @@ -219,6 +219,10 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-database-recreate-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_databases.my_database +Deleted postgres_projects.my_project +Deleted postgres_roles.owner Destroy: 4 deleted >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ diff --git a/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt b/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt index 944668621bf..325e866ed1c 100644 --- a/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_databases/replace_existing/output.txt @@ -61,4 +61,8 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/replace-existing-database-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_databases.my_database +Deleted postgres_projects.my_project +Deleted postgres_roles.owner Destroy: 4 deleted diff --git a/acceptance/bundle/resources/postgres_databases/update/output.txt b/acceptance/bundle/resources/postgres_databases/update/output.txt index b94e0180d7e..1426c7ad58a 100644 --- a/acceptance/bundle/resources/postgres_databases/update/output.txt +++ b/acceptance/bundle/resources/postgres_databases/update/output.txt @@ -170,4 +170,8 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-database-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_databases.my_database +Deleted postgres_projects.my_project +Deleted postgres_roles.owner Destroy: 4 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/output.txt b/acceptance/bundle/resources/postgres_endpoints/basic/output.txt index cef82784922..ee28ecf9d5b 100644 --- a/acceptance/bundle/resources/postgres_endpoints/basic/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/basic/output.txt @@ -89,4 +89,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_endpoints.custom +Deleted postgres_projects.my_project Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt b/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt index 7ff6430ff42..e469dbfaa00 100644 --- a/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/recreate/output.txt @@ -179,6 +179,9 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-endpoint-recreate-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_endpoints.my_endpoint +Deleted postgres_projects.my_project Destroy: 3 deleted >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.txt b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.txt index 58f199c143a..eed49704326 100644 --- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/out.destroy.txt @@ -13,4 +13,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-replace-endpoint-[UNIQUE_NAME]/default +Deleted postgres_branches.develop +Deleted postgres_endpoints.primary +Deleted postgres_projects.my_project Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt index 1a613bbb5b8..b3cc55a2120 100644 --- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt +++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/output.txt @@ -168,4 +168,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-endpoint-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_endpoints.my_endpoint +Deleted postgres_projects.my_project Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_projects/basic/output.txt b/acceptance/bundle/resources/postgres_projects/basic/output.txt index 8290600440e..78201b10ddd 100644 --- a/acceptance/bundle/resources/postgres_projects/basic/output.txt +++ b/acceptance/bundle/resources/postgres_projects/basic/output.txt @@ -73,4 +73,5 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-single-project-[UNIQUE_NAME]/default +Deleted postgres_projects.my_project Destroy: 1 deleted diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.destroy.txt b/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.destroy.txt index 4945b3240dd..6b5c8ba52a2 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/out.destroy.txt @@ -9,4 +9,6 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-purge-[UNIQUE_NAME]/default +Deleted postgres_projects.hard_delete +Deleted postgres_projects.soft_delete Destroy: 2 deleted diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.destroy.txt b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.destroy.txt index 8af80c7c83b..0618a014116 100644 --- a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.destroy.txt +++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/out.destroy.txt @@ -7,4 +7,5 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/pg-purge-transitions-[UNIQUE_NAME]/default +Deleted postgres_projects.proj Destroy: 1 deleted diff --git a/acceptance/bundle/resources/postgres_projects/recreate/output.txt b/acceptance/bundle/resources/postgres_projects/recreate/output.txt index c731c8a3f2f..dc505132989 100644 --- a/acceptance/bundle/resources/postgres_projects/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_projects/recreate/output.txt @@ -71,6 +71,7 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-recreate-[UNIQUE_NAME]/default +Deleted postgres_projects.my_project Destroy: 1 deleted >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt b/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt index edb088c3a45..977012423db 100644 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/output.txt @@ -171,4 +171,5 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-project-[UNIQUE_NAME]/default +Deleted postgres_projects.my_project Destroy: 1 deleted diff --git a/acceptance/bundle/resources/postgres_roles/basic/output.txt b/acceptance/bundle/resources/postgres_roles/basic/output.txt index 7b292070dfb..c549fd403bc 100644 --- a/acceptance/bundle/resources/postgres_roles/basic/output.txt +++ b/acceptance/bundle/resources/postgres_roles/basic/output.txt @@ -92,4 +92,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project +Deleted postgres_roles.my_role Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/output.txt b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/output.txt index f3f4318a653..595843f7a26 100644 --- a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/output.txt +++ b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/output.txt @@ -38,4 +38,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/inherited-role-bind-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project +Deleted postgres_roles.my_role Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/output.txt b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/output.txt index f6f94cb232d..61059fced7e 100644 --- a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/output.txt +++ b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/output.txt @@ -44,6 +44,8 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/inherited-role-conflict-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project Destroy: 2 deleted Exit code: 1 diff --git a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt index 8743a283141..68b72fd881c 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt +++ b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/output.txt @@ -173,6 +173,9 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-recreate-postgres-role-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project +Deleted postgres_roles.my_role Destroy: 3 deleted >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ diff --git a/acceptance/bundle/resources/postgres_roles/recreate/output.txt b/acceptance/bundle/resources/postgres_roles/recreate/output.txt index dc0c7e73f6d..d1db5aa8ab7 100644 --- a/acceptance/bundle/resources/postgres_roles/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_roles/recreate/output.txt @@ -173,6 +173,9 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-role-recreate-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project +Deleted postgres_roles.my_role Destroy: 3 deleted >>> print_requests.py --unique --del-body parent,project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id //postgres ^//workspace-files/ ^//workspace/ ^//telemetry-ext ^//operations/ diff --git a/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt b/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt index 4073ac96ab0..1cbdf58d479 100644 --- a/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt +++ b/acceptance/bundle/resources/postgres_roles/replace_existing/output.txt @@ -61,4 +61,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/replace-existing-role-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project +Deleted postgres_roles.my_role Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_roles/update/output.txt b/acceptance/bundle/resources/postgres_roles/update/output.txt index f95c6c0118e..8377e4ff600 100644 --- a/acceptance/bundle/resources/postgres_roles/update/output.txt +++ b/acceptance/bundle/resources/postgres_roles/update/output.txt @@ -176,4 +176,7 @@ All data stored in them will be permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-postgres-role-[UNIQUE_NAME]/default +Deleted postgres_branches.main +Deleted postgres_projects.my_project +Deleted postgres_roles.my_role Destroy: 3 deleted diff --git a/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt b/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt index e752198edcf..0434968135b 100644 --- a/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt +++ b/acceptance/bundle/resources/postgres_synced_tables/basic/output.txt @@ -93,5 +93,9 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-postgres-synced-table-[UNIQUE_NAME]/default +Deleted postgres_catalogs.my_catalog +Deleted postgres_projects.my_project +Deleted postgres_synced_tables.my_table +Deleted schemas.pipeline_storage Destroy: 4 deleted Cleaning up temporary source table diff --git a/acceptance/bundle/resources/postgres_synced_tables/recreate/output.txt b/acceptance/bundle/resources/postgres_synced_tables/recreate/output.txt index 9f76f730db0..5963e9e0e95 100644 --- a/acceptance/bundle/resources/postgres_synced_tables/recreate/output.txt +++ b/acceptance/bundle/resources/postgres_synced_tables/recreate/output.txt @@ -39,5 +39,9 @@ all their branches, databases, and endpoints. All data stored in them will be pe All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-postgres-synced-table-[UNIQUE_NAME]/default +Deleted postgres_catalogs.my_catalog +Deleted postgres_projects.my_project +Deleted postgres_synced_tables.my_table +Deleted schemas.pipeline_storage Destroy: 4 deleted Cleaning up temporary source table diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt b/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt index 1731a30ca11..74671c37d0b 100644 --- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt @@ -31,4 +31,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default +Deleted quality_monitors.monitor1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt index 16289c061a8..62c293cb0d4 100644 --- a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/output.txt @@ -47,4 +47,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default +Deleted quality_monitors.monitor1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt b/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt index a6d3f78f881..5671144a768 100644 --- a/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt +++ b/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt @@ -31,4 +31,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default +Deleted quality_monitors.monitor1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/quality_monitors/create/output.txt b/acceptance/bundle/resources/quality_monitors/create/output.txt index d1a8e3b14ff..1381646bd9c 100644 --- a/acceptance/bundle/resources/quality_monitors/create/output.txt +++ b/acceptance/bundle/resources/quality_monitors/create/output.txt @@ -26,4 +26,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default +Deleted quality_monitors.monitor1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/registered_models/aliases_converge/output.txt b/acceptance/bundle/resources/registered_models/aliases_converge/output.txt index 3f201aa8149..3bbe04ce60a 100644 --- a/acceptance/bundle/resources/registered_models/aliases_converge/output.txt +++ b/acceptance/bundle/resources/registered_models/aliases_converge/output.txt @@ -53,4 +53,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-aliases-[UNIQUE_NAME]/default +Deleted registered_models.my_registered_model Destroy: 1 deleted diff --git a/acceptance/bundle/resources/registered_models/basic/output.txt b/acceptance/bundle/resources/registered_models/basic/output.txt index b6173728333..889c7de5f7e 100644 --- a/acceptance/bundle/resources/registered_models/basic/output.txt +++ b/acceptance/bundle/resources/registered_models/basic/output.txt @@ -124,6 +124,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default +Deleted registered_models.my_registered_model Destroy: 1 deleted >>> [CLI] schemas delete mycatalog-[UNIQUE_NAME].myschema-[UNIQUE_NAME] --force diff --git a/acceptance/bundle/resources/schemas/auto-approve/output.txt b/acceptance/bundle/resources/schemas/auto-approve/output.txt index 0cf3d6fe0de..9a8e55dfc83 100644 --- a/acceptance/bundle/resources/schemas/auto-approve/output.txt +++ b/acceptance/bundle/resources/schemas/auto-approve/output.txt @@ -79,6 +79,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted pipelines.foo +Deleted schemas.bar Destroy: 2 deleted === Assert the schema is deleted diff --git a/acceptance/bundle/resources/secret_scopes/basic/output.txt b/acceptance/bundle/resources/secret_scopes/basic/output.txt index c432f2996de..bda56de72c6 100644 --- a/acceptance/bundle/resources/secret_scopes/basic/output.txt +++ b/acceptance/bundle/resources/secret_scopes/basic/output.txt @@ -97,4 +97,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/secret-scope-basic-[UNIQUE_NAME]/default +Deleted secret_scopes.my_scope +Deleted secret_scopes.my_scope.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/secret_scopes/delete_scope/output.txt b/acceptance/bundle/resources/secret_scopes/delete_scope/output.txt index 8540e39661a..db5778de10c 100644 --- a/acceptance/bundle/resources/secret_scopes/delete_scope/output.txt +++ b/acceptance/bundle/resources/secret_scopes/delete_scope/output.txt @@ -4,7 +4,7 @@ >>> [CLI] bundle deploy -qq ->>> [CLI] bundle destroy --auto-approve +>>> [CLI] bundle destroy --auto-approve -q The following resources will be deleted: delete resources.secret_scopes.first diff --git a/acceptance/bundle/resources/secret_scopes/delete_scope/script b/acceptance/bundle/resources/secret_scopes/delete_scope/script index 5e42e2af4be..20ff0872193 100755 --- a/acceptance/bundle/resources/secret_scopes/delete_scope/script +++ b/acceptance/bundle/resources/secret_scopes/delete_scope/script @@ -1,7 +1,9 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { - trace $CLI bundle destroy --auto-approve + # -q: cleanup, not the subject of the test, and the engines disagree on whether the + # scope's permissions are a node of their own. + trace $CLI bundle destroy --auto-approve -q rm out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt b/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt index 2bb8eb57dcc..f2cc9ccf570 100644 --- a/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt +++ b/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt @@ -27,4 +27,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/secret-scope-collapse-[UNIQUE_NAME]/default +Deleted secret_scopes.my_scope +Deleted secret_scopes.my_scope.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/secret_scopes/permissions/output.txt b/acceptance/bundle/resources/secret_scopes/permissions/output.txt index 998becfd22f..7199461b2e9 100644 --- a/acceptance/bundle/resources/secret_scopes/permissions/output.txt +++ b/acceptance/bundle/resources/secret_scopes/permissions/output.txt @@ -51,4 +51,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/secret-scope-permissions-[UNIQUE_NAME]/default +Deleted secret_scopes.my_scope +Deleted secret_scopes.my_scope.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/secrets/basic/output.txt b/acceptance/bundle/resources/secrets/basic/output.txt index 95fd4f5b1b0..fe0b7b0a047 100644 --- a/acceptance/bundle/resources/secrets/basic/output.txt +++ b/acceptance/bundle/resources/secrets/basic/output.txt @@ -110,4 +110,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default +Deleted secrets.secret1 Destroy: 1 deleted diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt index d8ee64ccb42..2abc5e8f7fa 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt @@ -65,4 +65,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted sql_warehouses.mywarehouse Destroy: 1 deleted diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt index cf5703f183d..bbf0a352de7 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt @@ -72,4 +72,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted sql_warehouses.mywarehouse Destroy: 1 deleted diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt index 7ccad8a5480..e0903aa87dc 100644 --- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt @@ -100,4 +100,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME] +Deleted sql_warehouses.mywarehouse Destroy: 1 deleted diff --git a/acceptance/bundle/resources/sql_warehouses/output.txt b/acceptance/bundle/resources/sql_warehouses/output.txt index 4b8141d0946..ad881437881 100644 --- a/acceptance/bundle/resources/sql_warehouses/output.txt +++ b/acceptance/bundle/resources/sql_warehouses/output.txt @@ -114,6 +114,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test_sql_warehouse/default +Deleted sql_warehouses.test_sql_warehouse Destroy: 1 deleted === Verify the destroy request diff --git a/acceptance/bundle/resources/synced_database_tables/basic/output.txt b/acceptance/bundle/resources/synced_database_tables/basic/output.txt index 13104690bbe..ad9fa96664c 100644 --- a/acceptance/bundle/resources/synced_database_tables/basic/output.txt +++ b/acceptance/bundle/resources/synced_database_tables/basic/output.txt @@ -62,5 +62,8 @@ The synced data in the destination database will be lost (the source table is pr All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-table-[UNIQUE_NAME]/default +Deleted database_catalogs.my_catalog +Deleted database_instances.my_instance +Deleted synced_database_tables.my_synced_table Destroy: 3 deleted Cleaning up temporary source table diff --git a/acceptance/bundle/resources/synced_database_tables/recreate/output.txt b/acceptance/bundle/resources/synced_database_tables/recreate/output.txt index 6b6a43e57c5..231e103e955 100644 --- a/acceptance/bundle/resources/synced_database_tables/recreate/output.txt +++ b/acceptance/bundle/resources/synced_database_tables/recreate/output.txt @@ -39,4 +39,7 @@ The synced data in the destination database will be lost (the source table is pr All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-synced-recreate-[UNIQUE_NAME]/default +Deleted database_catalogs.my_catalog +Deleted database_instances.my_instance +Deleted synced_database_tables.my_synced_table Destroy: 3 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/basic/output.txt b/acceptance/bundle/resources/vector_search_endpoints/basic/output.txt index 937623f7b77..1cf91656e74 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/basic/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/basic/output.txt @@ -52,4 +52,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-endpoint-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/output.txt b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/output.txt index 4c2d7b3ddeb..90928e94a6f 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/output.txt @@ -22,4 +22,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-budget-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/output.txt b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/output.txt index 844b2b19aeb..21b34f2c896 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/output.txt @@ -62,4 +62,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-recreated-same-name-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_endpoints.my_endpoint.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/output.txt b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/output.txt index 8e7a03dce0d..d8d5e2ee417 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/output.txt @@ -58,4 +58,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-endpoint-target-qps-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/output.txt b/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/output.txt index c2ae0b7a92a..d928ee2c7a1 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/output.txt @@ -38,4 +38,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-create-fails-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.blocker_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/output.txt b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/output.txt index 22ca8a55cf6..8f03123ccd3 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/output.txt @@ -36,4 +36,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/recreate-vs-endpoint-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/output.txt b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/output.txt index 017c9052b9b..ffb7ae6d6e9 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/output.txt @@ -31,4 +31,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-vs-endpoint-budget-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/output.txt b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/output.txt index 44bbd77a910..d116c501ddf 100644 --- a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/output.txt +++ b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/output.txt @@ -45,4 +45,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/update-vs-endpoint-target-qps-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_endpoints.my_endpoint.permissions Destroy: 1 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/basic/output.txt b/acceptance/bundle/resources/vector_search_indexes/basic/output.txt index 71713fedfae..4b69413d2b8 100644 --- a/acceptance/bundle/resources/vector_search_indexes/basic/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/basic/output.txt @@ -69,4 +69,6 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_indexes.my_index Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/output.txt b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/output.txt index b5aed53ad30..067198f64ce 100644 --- a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/output.txt @@ -43,4 +43,6 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-index-deleted-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_indexes.my_index Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/output.txt b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/output.txt index 2f0118a9743..dfd71ba88b5 100644 --- a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/output.txt @@ -50,4 +50,6 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/drift-vs-index-orphaned-endpoint-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.vs_endpoint +Deleted vector_search_indexes.my_index Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/grants/select/output.txt b/acceptance/bundle/resources/vector_search_indexes/grants/select/output.txt index 14fa8a3d48b..74b6a2fa89f 100644 --- a/acceptance/bundle/resources/vector_search_indexes/grants/select/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/grants/select/output.txt @@ -43,4 +43,7 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/vs-index-grants-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_indexes.my_index +Deleted vector_search_indexes.my_index.grants Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/output.txt b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/output.txt index cdb909152fd..30779aba70f 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/output.txt @@ -50,4 +50,6 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_indexes.my_index Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/output.txt b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/output.txt index a175c2dcae3..da859116a10 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/output.txt @@ -89,4 +89,6 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_indexes.my_index Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt index 9f3980b3e80..2a919fbde96 100644 --- a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/output.txt @@ -156,4 +156,6 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/deploy-vs-index-with-endpoint-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_indexes.my_index Destroy: 2 deleted diff --git a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/output.txt b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/output.txt index 596c188baa7..b526b8dc590 100644 --- a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/output.txt +++ b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/output.txt @@ -24,4 +24,6 @@ For Direct Access indexes, all upserted vectors are permanently lost: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/vs-index-schema-[UNIQUE_NAME]/default +Deleted vector_search_endpoints.my_endpoint +Deleted vector_search_indexes.my_index Destroy: 2 deleted diff --git a/acceptance/bundle/resources/volumes/change-comment/output.txt b/acceptance/bundle/resources/volumes/change-comment/output.txt index ac715b86983..b7ba2861b73 100644 --- a/acceptance/bundle/resources/volumes/change-comment/output.txt +++ b/acceptance/bundle/resources/volumes/change-comment/output.txt @@ -101,6 +101,7 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted volumes.volume1 Destroy: 1 deleted >>> print_requests.py //unity diff --git a/acceptance/bundle/resources/volumes/recreate/output.txt b/acceptance/bundle/resources/volumes/recreate/output.txt index fc94847412b..3b90aa2b43d 100644 --- a/acceptance/bundle/resources/volumes/recreate/output.txt +++ b/acceptance/bundle/resources/volumes/recreate/output.txt @@ -76,4 +76,8 @@ is removed from the catalog, but the underlying files are not deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-uc-volumes-[UNIQUE_NAME]/default +Deleted schemas.schema1 +Deleted schemas.schema2 +Deleted volumes.foo +Deleted volumes.foo.grants Destroy: 3 deleted diff --git a/acceptance/bundle/resources/volumes/set-storage-location/output.txt b/acceptance/bundle/resources/volumes/set-storage-location/output.txt index 620b16f3859..964fa20e9b5 100644 --- a/acceptance/bundle/resources/volumes/set-storage-location/output.txt +++ b/acceptance/bundle/resources/volumes/set-storage-location/output.txt @@ -38,6 +38,7 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE_NAME]/default +Deleted schemas.myschema Destroy: 1 deleted >>> print_requests.py //unity diff --git a/acceptance/bundle/run/app-with-job/output.txt b/acceptance/bundle/run/app-with-job/output.txt index 718a16a873a..2d27b870c49 100644 --- a/acceptance/bundle/run/app-with-job/output.txt +++ b/acceptance/bundle/run/app-with-job/output.txt @@ -95,4 +95,6 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/app-with-job-[UNIQUE_NAME] +Deleted apps.test_app +Deleted jobs.foo Destroy: 2 deleted diff --git a/acceptance/bundle/run_as/job_default/output.txt b/acceptance/bundle/run_as/job_default/output.txt index fe5721893bc..0a3b4b7ee08 100644 --- a/acceptance/bundle/run_as/job_default/output.txt +++ b/acceptance/bundle/run_as/job_default/output.txt @@ -104,4 +104,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/run_as_job_default_[UNIQUE_NAME]/default +Deleted jobs.job_with_run_as Destroy: 1 deleted diff --git a/acceptance/bundle/select/basic/output.txt b/acceptance/bundle/select/basic/output.txt index 0d84ac9c569..57bff9a519e 100644 --- a/acceptance/bundle/select/basic/output.txt +++ b/acceptance/bundle/select/basic/output.txt @@ -138,4 +138,7 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/select-[UNIQUE_NAME]/default +Deleted jobs.bar +Deleted jobs.baz +Deleted jobs.foo Destroy: 3 deleted diff --git a/acceptance/bundle/select/grants_permissions/output.txt b/acceptance/bundle/select/grants_permissions/output.txt index 0912c16da8b..3ca1ae3d9df 100644 --- a/acceptance/bundle/select/grants_permissions/output.txt +++ b/acceptance/bundle/select/grants_permissions/output.txt @@ -76,4 +76,8 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/select-subnodes-[UNIQUE_NAME]/default +Deleted jobs.my_job +Deleted jobs.my_job.permissions +Deleted schemas.my_schema +Deleted schemas.my_schema.grants Destroy: 2 deleted diff --git a/acceptance/bundle/select/plan_file_survives_not_selected/output.txt b/acceptance/bundle/select/plan_file_survives_not_selected/output.txt index 65005bdd6ec..32b3c4292bc 100644 --- a/acceptance/bundle/select/plan_file_survives_not_selected/output.txt +++ b/acceptance/bundle/select/plan_file_survives_not_selected/output.txt @@ -13,4 +13,5 @@ The following resources will be deleted: All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/select-plan-[UNIQUE_NAME]/default +Deleted jobs.foo Destroy: 1 deleted diff --git a/acceptance/bundle/state/state_present/output.txt b/acceptance/bundle/state/state_present/output.txt index 60d2f22541d..09a196e5f80 100644 --- a/acceptance/bundle/state/state_present/output.txt +++ b/acceptance/bundle/state/state_present/output.txt @@ -47,6 +47,7 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted schemas.foo Destroy: 1 deleted >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy diff --git a/acceptance/bundle/summary/modified_status/output.txt b/acceptance/bundle/summary/modified_status/output.txt index 9b767f45254..c95127191ff 100644 --- a/acceptance/bundle/summary/modified_status/output.txt +++ b/acceptance/bundle/summary/modified_status/output.txt @@ -197,6 +197,10 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted alerts.my_alert +Deleted pipelines.my_pipeline +Deleted schemas.my_schema +Deleted sql_warehouses.my_sql_warehouse Destroy: 4 deleted >>> [CLI] bundle summary -o json diff --git a/acceptance/bundle/templates/default-python/combinations/classic/script b/acceptance/bundle/templates/default-python/combinations/classic/script index 589290b77c2..2109106e032 100644 --- a/acceptance/bundle/templates/default-python/combinations/classic/script +++ b/acceptance/bundle/templates/default-python/combinations/classic/script @@ -10,13 +10,13 @@ trace $CLI bundle plan -t dev -o json > tmp.plan.json 2> LOG.plan1.error $TESTDIR/../check_output.py $CLI bundle deploy -t dev $(readplanarg tmp.plan.json) # check no unexpected drift after deploy; due to dynamic_version whl is different so job is updated $CLI bundle plan -t dev 2> LOG.plan2.error | contains.py '0 to add' '0 to delete' '!0 unchanged' > /dev/null -trace $CLI bundle destroy -t dev --auto-approve 2>&1 | tail -n 2 +trace $CLI bundle destroy -t dev --auto-approve -q 2>&1 | tail -n 2 # -q: only the summary is wanted here trace $CLI bundle plan -t prod -o json > tmp.plan.json 2> LOG.plan3.error $TESTDIR/../check_output.py $CLI bundle deploy -t prod $(readplanarg tmp.plan.json) # check no drift after deploy $CLI bundle plan -t prod 2> LOG.plan4.error | contains.py '0 to add, 0 to change, 0 to delete' '!0 unchanged' > /dev/null -trace $CLI bundle destroy -t prod --auto-approve 2>&1 | tail -n 2 +trace $CLI bundle destroy -t prod --auto-approve -q 2>&1 | tail -n 2 # -q: only the summary is wanted here rm tmp.plan.json diff --git a/acceptance/bundle/templates/default-python/combinations/serverless/script b/acceptance/bundle/templates/default-python/combinations/serverless/script index 389bdf3bbc7..7f07ac0197d 100644 --- a/acceptance/bundle/templates/default-python/combinations/serverless/script +++ b/acceptance/bundle/templates/default-python/combinations/serverless/script @@ -10,13 +10,13 @@ trace $CLI bundle plan -t dev -o json > tmp.plan.json 2> LOG.plan1.error $TESTDIR/../check_output.py $CLI bundle deploy -t dev $(readplanarg tmp.plan.json) # check no drift after deploy $CLI bundle plan -t dev 2> LOG.plan2.error | contains.py '0 to add, 0 to change, 0 to delete' '!0 unchanged' > /dev/null -trace $CLI bundle destroy -t dev --auto-approve 2>&1 | tail -n 2 +trace $CLI bundle destroy -t dev --auto-approve -q 2>&1 | tail -n 2 # -q: only the summary is wanted here trace $CLI bundle plan -t prod -o json > tmp.plan.json 2> LOG.plan3.error $TESTDIR/../check_output.py $CLI bundle deploy -t prod $(readplanarg tmp.plan.json) # check no drift after deploy $CLI bundle plan -t prod 2> LOG.plan4.error | contains.py '0 to add, 0 to change, 0 to delete' '!0 unchanged' > /dev/null -trace $CLI bundle destroy -t prod --auto-approve 2>&1 | tail -n 2 +trace $CLI bundle destroy -t prod --auto-approve -q 2>&1 | tail -n 2 # -q: only the summary is wanted here rm tmp.plan.json diff --git a/acceptance/bundle/templates/default-python/integration_classic/output.txt b/acceptance/bundle/templates/default-python/integration_classic/output.txt index 6511805177c..20401df9860 100644 --- a/acceptance/bundle/templates/default-python/integration_classic/output.txt +++ b/acceptance/bundle/templates/default-python/integration_classic/output.txt @@ -99,6 +99,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/dev +Deleted jobs.sample_job +Deleted pipelines.project_name_[UNIQUE_NAME]_etl Destroy: 2 deleted >>> [CLI] bundle validate -t prod @@ -499,4 +501,8 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/project_name_[UNIQUE_NAME]/prod +Deleted jobs.sample_job +Deleted jobs.sample_job.permissions +Deleted pipelines.project_name_[UNIQUE_NAME]_etl +Deleted pipelines.project_name_[UNIQUE_NAME]_etl.permissions Destroy: 2 deleted diff --git a/acceptance/bundle/user_agent/simple/output.txt b/acceptance/bundle/user_agent/simple/output.txt index cd0e2103dad..dfae69ff350 100644 --- a/acceptance/bundle/user_agent/simple/output.txt +++ b/acceptance/bundle/user_agent/simple/output.txt @@ -58,6 +58,7 @@ This action will result in the deletion of the following UC schemas. Any underly All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default +Deleted schemas.foo Destroy: 1 deleted >>> print_requests.py --sort --get diff --git a/acceptance/pipelines/destroy/auto-approve/output.txt b/acceptance/pipelines/destroy/auto-approve/output.txt index 518ba08b816..db483d25e66 100644 --- a/acceptance/pipelines/destroy/auto-approve/output.txt +++ b/acceptance/pipelines/destroy/auto-approve/output.txt @@ -24,4 +24,5 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default +Deleted pipelines.my_pipeline Destroy: 1 deleted diff --git a/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt b/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt index 8eab6bf9bf6..726de74838e 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt @@ -34,6 +34,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade-divergence/default +Deleted pipelines.my_pipeline Destroy: 1 deleted >>> print_requests.py //api/2.0/pipelines diff --git a/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt b/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt index 16020a0b91b..49bc342e594 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt @@ -63,6 +63,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default +Deleted pipelines.my_pipeline Destroy: 1 deleted >>> print_requests.py //api/2.0/pipelines diff --git a/acceptance/pipelines/destroy/destroy-pipeline/output.txt b/acceptance/pipelines/destroy/destroy-pipeline/output.txt index 25d35ff3d50..1f2ba896a7a 100644 --- a/acceptance/pipelines/destroy/destroy-pipeline/output.txt +++ b/acceptance/pipelines/destroy/destroy-pipeline/output.txt @@ -17,6 +17,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default +Deleted pipelines.my_pipeline Destroy: 1 deleted === Assert pipeline is deleted diff --git a/acceptance/pipelines/destroy/force-lock/output.txt b/acceptance/pipelines/destroy/force-lock/output.txt index 2b58acb0ff1..b661e7f5074 100644 --- a/acceptance/pipelines/destroy/force-lock/output.txt +++ b/acceptance/pipelines/destroy/force-lock/output.txt @@ -32,4 +32,5 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-pipeline-force-lock/default +Deleted pipelines.foo Destroy: 1 deleted diff --git a/acceptance/pipelines/e2e/output.txt b/acceptance/pipelines/e2e/output.txt index e72dbfeb1fb..6d87df38bf3 100644 --- a/acceptance/pipelines/e2e/output.txt +++ b/acceptance/pipelines/e2e/output.txt @@ -113,4 +113,7 @@ Streaming Tables (STs) and Materialized Views (MVs) managed by them. Set 'cascad All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/lakeflow_project/dev +Deleted jobs.sample_job +Deleted pipelines.lakeflow_project_etl +Deleted pipelines.lakeflow_project_etl_2 Destroy: 3 deleted diff --git a/bundle/phases/destroy.go b/bundle/phases/destroy.go index 6ad118677ab..148e038b930 100644 --- a/bundle/phases/destroy.go +++ b/bundle/phases/destroy.go @@ -136,9 +136,7 @@ func approvalForDestroy(ctx context.Context, b *bundle.Bundle, plan *deployplan. func destroyCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, engine engine.EngineType) { if engine.IsDirect() { - // Not reported per resource: destroy names them up front for consent and then - // reports only a count, so there is no per-resource output to report into. - b.DeploymentBundle.Apply(ctx, b.WorkspaceClient(ctx), plan, false) + b.DeploymentBundle.Apply(ctx, b.WorkspaceClient(ctx), plan, reportPerResource(b)) } else { // Core destructive mutators for destroy. These require informed user consent. bundle.ApplyContext(ctx, b, terraform.Apply()) @@ -163,6 +161,18 @@ func destroyCore(ctx context.Context, b *bundle.Bundle, plan *deployplan.Plan, e bundle.ApplyContext(ctx, b, files.Delete()) if !logdiag.HasError(ctx) && b.Quiet < bundle.QuietAll { + // The direct engine reported these as each resource was deleted, so a destroy + // that failed part way through has already said what it removed. Terraform + // gives no per-resource results, so report them from the plan instead, which + // only describes what was intended and is therefore limited to the success path. + if reportPerResource(b) && !engine.IsDirect() { + for _, a := range plan.GetActions() { + if a.ActionType == deployplan.Delete { + cmdio.LogString(ctx, deployplan.AppliedLine(a.ResourceKey, a.ActionType)) + } + } + } + // Count top-level resources only, matching the approval list above (which // skips children); this also keeps the count stable across engines. Gone // resources are included: they are excluded from the approval prompt because