From e68ee7aaf72d0e8bb5651b5948923e007989ed16 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Mon, 16 Mar 2026 17:52:53 +0100 Subject: [PATCH 1/7] acceptance: don't apply Ignore filter to out* files Inherited Ignore patterns (e.g. `databricks.yml` from bundle/test.toml) were silently swallowing output files in template tests, preventing them from being tracked and updated with -update. Co-Authored-By: Claude Sonnet 4.6 --- acceptance/acceptance_test.go | 2 +- acceptance/bundle/resources/postgres_branches/basic/script | 1 + .../bundle/resources/postgres_branches/recreate/script | 4 ++-- acceptance/bundle/resources/postgres_branches/test.toml | 1 - .../resources/postgres_branches/update_protected/script | 1 + .../resources/postgres_branches/without_branch_id/script | 1 + .../templates/default-python/fail-missing-uv/output.txt | 2 +- .../bundle/templates/default-python/fail-missing-uv/script | 6 ++++-- .../templates/default-python/fail-missing-uv/test.toml | 4 ---- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 0dff5c82f9..695027f0a2 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -682,7 +682,7 @@ func runTest(t *testing.T, if _, ok := Ignored[relPath]; ok { continue } - if config.CompiledIgnoreObject.MatchesPath(relPath) { + if config.CompiledIgnoreObject.MatchesPath(relPath) && !strings.HasPrefix(relPath, "out") { continue } if strings.HasPrefix(filepath.Base(relPath), "LOG") { diff --git a/acceptance/bundle/resources/postgres_branches/basic/script b/acceptance/bundle/resources/postgres_branches/basic/script index c753ecdf14..0086234c2e 100644 --- a/acceptance/bundle/resources/postgres_branches/basic/script +++ b/acceptance/bundle/resources/postgres_branches/basic/script @@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { trace $CLI bundle destroy --auto-approve + rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_branches/recreate/script b/acceptance/bundle/resources/postgres_branches/recreate/script index 31bc023b12..f81650b2e7 100755 --- a/acceptance/bundle/resources/postgres_branches/recreate/script +++ b/acceptance/bundle/resources/postgres_branches/recreate/script @@ -5,6 +5,8 @@ cleanup() { # Also try to delete the old branch directly in case it wasn't cleaned up $CLI postgres delete-branch "projects/test-pg-proj-${UNIQUE_NAME}/branches/old-branch-${UNIQUE_NAME}" 2>/dev/null || true + + rm -f out.requests.txt } trap cleanup EXIT @@ -51,5 +53,3 @@ print_requests destroy # Clean up any orphaned old branch (terraform doesn't delete it on recreation) $CLI postgres delete-branch $branch_id_1 2>/dev/null || true - -rm -f out.requests.txt diff --git a/acceptance/bundle/resources/postgres_branches/test.toml b/acceptance/bundle/resources/postgres_branches/test.toml index 5e22b1116a..9a4d447f99 100644 --- a/acceptance/bundle/resources/postgres_branches/test.toml +++ b/acceptance/bundle/resources/postgres_branches/test.toml @@ -11,7 +11,6 @@ EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"] Ignore = [ "databricks.yml", - "out.requests.txt", ".databricks", ] diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/script b/acceptance/bundle/resources/postgres_branches/update_protected/script index 85eba7fed9..cbdec19a6c 100755 --- a/acceptance/bundle/resources/postgres_branches/update_protected/script +++ b/acceptance/bundle/resources/postgres_branches/update_protected/script @@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { trace $CLI bundle destroy --auto-approve + rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_branches/without_branch_id/script b/acceptance/bundle/resources/postgres_branches/without_branch_id/script index 4e03eb0ba2..519a143b44 100755 --- a/acceptance/bundle/resources/postgres_branches/without_branch_id/script +++ b/acceptance/bundle/resources/postgres_branches/without_branch_id/script @@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { $CLI bundle destroy --auto-approve > /dev/null 2>&1 || true + rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/templates/default-python/fail-missing-uv/output.txt b/acceptance/bundle/templates/default-python/fail-missing-uv/output.txt index 8eec220aec..9b8f39f93e 100644 --- a/acceptance/bundle/templates/default-python/fail-missing-uv/output.txt +++ b/acceptance/bundle/templates/default-python/fail-missing-uv/output.txt @@ -1,5 +1,5 @@ ->>> [CLI] bundle init default-python --config-file ./input.json --output-dir output +>>> [CLI] bundle init default-python --config-file ./input.json --output-dir tmp Welcome to the default Python template for Declarative Automation Bundles! Answer the following questions to customize your project. diff --git a/acceptance/bundle/templates/default-python/fail-missing-uv/script b/acceptance/bundle/templates/default-python/fail-missing-uv/script index 2d2d451f8a..7e0cca4d67 100644 --- a/acceptance/bundle/templates/default-python/fail-missing-uv/script +++ b/acceptance/bundle/templates/default-python/fail-missing-uv/script @@ -1,6 +1,6 @@ -trace $CLI bundle init default-python --config-file ./input.json --output-dir output +trace $CLI bundle init default-python --config-file ./input.json --output-dir tmp -cd output/fail_missing_uv +cd tmp/fail_missing_uv trace $CLI bundle validate # Dynamically find ALL directories containing 'uv' and remove them from PATH @@ -11,3 +11,5 @@ done # Try to deploy, expect failure due to missing uv errcode trace $CLI bundle deploy + +cd ../.. && rm -fr tmp diff --git a/acceptance/bundle/templates/default-python/fail-missing-uv/test.toml b/acceptance/bundle/templates/default-python/fail-missing-uv/test.toml index 8e90e70cd5..2f7c45f0ab 100644 --- a/acceptance/bundle/templates/default-python/fail-missing-uv/test.toml +++ b/acceptance/bundle/templates/default-python/fail-missing-uv/test.toml @@ -3,10 +3,6 @@ Badness = "The error message is not ideal: it reports a generic build failure or Local = true Cloud = false -Ignore = [ - 'output/fail_missing_uv', -] - # Replace the uv not found error for portability [[Repls]] Old = '(/usr)?(/bin)?/bash(: line 1)?: uv: command not found' From 665a4beae0feef1e150b93a8ccb58ee008800d6a Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 18 Mar 2026 17:51:09 +0100 Subject: [PATCH 2/7] acceptance: reject Ignore patterns targeting out* files at config parse time Rename test artifacts from out.json/out.app-run to tmp.json/tmp.app-run to comply with the new validation. Co-Authored-By: Claude Opus 4.6 --- acceptance/bundle/apps/compute_size/test.toml | 2 +- acceptance/bundle/apps/git_source/script | 4 ++-- acceptance/bundle/apps/git_source/test.toml | 2 +- .../bundle/config-remote-sync/output_json/script | 4 ++-- .../bundle/config-remote-sync/output_json/test.toml | 2 +- .../bundle/config-remote-sync/output_no_changes/script | 4 ++-- .../config-remote-sync/output_no_changes/test.toml | 2 +- acceptance/internal/config.go | 10 ++++++++++ 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/acceptance/bundle/apps/compute_size/test.toml b/acceptance/bundle/apps/compute_size/test.toml index df8141452c..60f5da6887 100644 --- a/acceptance/bundle/apps/compute_size/test.toml +++ b/acceptance/bundle/apps/compute_size/test.toml @@ -2,7 +2,7 @@ Local = true Cloud = true RecordRequests = false -Ignore = [".databricks", "databricks.yml", "databricks.yml.bak", "out.app-run"] +Ignore = [".databricks", "databricks.yml", "databricks.yml.bak", "tmp.app-run"] # Apps can take longer to deploy TimeoutCloud = "5m" diff --git a/acceptance/bundle/apps/git_source/script b/acceptance/bundle/apps/git_source/script index 5e87210ee4..b1241ec40a 100644 --- a/acceptance/bundle/apps/git_source/script +++ b/acceptance/bundle/apps/git_source/script @@ -28,8 +28,8 @@ title "Verify no drift after deployment" trace $CLI bundle plan title "Run the app to verify it works" -$CLI bundle run my_app &> out.app-run || true -trace cat out.app-run | head -20 +$CLI bundle run my_app &> tmp.app-run || true +trace cat tmp.app-run | head -20 title "Update git_source branch and redeploy" # Change branch from main to a different value (still main, but via sed to test config change) diff --git a/acceptance/bundle/apps/git_source/test.toml b/acceptance/bundle/apps/git_source/test.toml index ee68c7a08d..819e361dcd 100644 --- a/acceptance/bundle/apps/git_source/test.toml +++ b/acceptance/bundle/apps/git_source/test.toml @@ -5,7 +5,7 @@ Cloud = false RecordRequests = false RequiresWarehouse = true -Ignore = [".databricks", "databricks.yml", "databricks.yml.bak", "out.app-run"] +Ignore = [".databricks", "databricks.yml", "databricks.yml.bak", "tmp.app-run"] # Apps can take longer to deploy TimeoutCloud = "5m" diff --git a/acceptance/bundle/config-remote-sync/output_json/script b/acceptance/bundle/config-remote-sync/output_json/script index 761a4e3de1..c452faa1dc 100755 --- a/acceptance/bundle/config-remote-sync/output_json/script +++ b/acceptance/bundle/config-remote-sync/output_json/script @@ -17,5 +17,5 @@ r["tags"] = {"env": "test"} EOF title "JSON output format" -$CLI bundle config-remote-sync -o json > out.json -cat out.json +$CLI bundle config-remote-sync -o json > tmp.json +cat tmp.json diff --git a/acceptance/bundle/config-remote-sync/output_json/test.toml b/acceptance/bundle/config-remote-sync/output_json/test.toml index 37fbb30d66..056ad8b30b 100644 --- a/acceptance/bundle/config-remote-sync/output_json/test.toml +++ b/acceptance/bundle/config-remote-sync/output_json/test.toml @@ -1,7 +1,7 @@ Cloud = true RecordRequests = false -Ignore = [".databricks", "dummy.whl", "out.json", "databricks.yml"] +Ignore = [".databricks", "dummy.whl", "tmp.json", "databricks.yml"] [Env] DATABRICKS_BUNDLE_ENABLE_EXPERIMENTAL_YAML_SYNC = "true" diff --git a/acceptance/bundle/config-remote-sync/output_no_changes/script b/acceptance/bundle/config-remote-sync/output_no_changes/script index ea238cc52a..1bef0ab9c0 100755 --- a/acceptance/bundle/config-remote-sync/output_no_changes/script +++ b/acceptance/bundle/config-remote-sync/output_no_changes/script @@ -20,5 +20,5 @@ $CLI bundle config-remote-sync | contains.py "No changes detected" title "JSON output" echo -$CLI bundle config-remote-sync -o json > out.json -cat out.json +$CLI bundle config-remote-sync -o json > tmp.json +cat tmp.json diff --git a/acceptance/bundle/config-remote-sync/output_no_changes/test.toml b/acceptance/bundle/config-remote-sync/output_no_changes/test.toml index 37fbb30d66..056ad8b30b 100644 --- a/acceptance/bundle/config-remote-sync/output_no_changes/test.toml +++ b/acceptance/bundle/config-remote-sync/output_no_changes/test.toml @@ -1,7 +1,7 @@ Cloud = true RecordRequests = false -Ignore = [".databricks", "dummy.whl", "out.json", "databricks.yml"] +Ignore = [".databricks", "dummy.whl", "tmp.json", "databricks.yml"] [Env] DATABRICKS_BUNDLE_ENABLE_EXPERIMENTAL_YAML_SYNC = "true" diff --git a/acceptance/internal/config.go b/acceptance/internal/config.go index 65fcadfbf3..376047c9ca 100644 --- a/acceptance/internal/config.go +++ b/acceptance/internal/config.go @@ -228,6 +228,16 @@ func validateConfig(t *testing.T, config TestConfig, configPath string) { t.Fatalf("Invalid config %s: RunsOnDbr and RecordRequests cannot both be true. "+ "Serverless does not allow access to localhost ports, which the test proxy server requires.", configPath) } + + // Reject Ignore patterns that target out* files, since those are generated + // output files and must never be ignored. + for _, pattern := range config.Ignore { + name := strings.TrimLeft(pattern, "!/") + if strings.HasPrefix(name, "out") { + t.Fatalf("Invalid config %s: Ignore pattern %q targets output files (out*). "+ + "Output files must not be ignored.", configPath, pattern) + } + } } func DoLoadConfig(t *testing.T, path string) TestConfig { From cd9435faecf610298af94fae926abe1d3f017e8d Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Thu, 19 Mar 2026 11:17:34 +0100 Subject: [PATCH 3/7] acceptance: fix remaining out* patterns caught by new validation - snapshot-comparison: rename out.bundle*.json to tmp.bundle*.json - postgres_endpoints/projects: set RecordRequests=false, remove out.requests.txt from Ignore - git_source: update output.txt to match renamed tmp.app-run Co-Authored-By: Claude Opus 4.6 --- acceptance/bundle/apps/git_source/output.txt | 2 +- .../bundle/deploy/snapshot-comparison/output.txt | 10 +++++----- acceptance/bundle/deploy/snapshot-comparison/script | 10 +++++----- acceptance/bundle/deploy/snapshot-comparison/test.toml | 2 +- .../bundle/resources/postgres_endpoints/test.toml | 3 ++- .../bundle/resources/postgres_projects/test.toml | 3 ++- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/acceptance/bundle/apps/git_source/output.txt b/acceptance/bundle/apps/git_source/output.txt index 0c9982661c..6779647f8a 100644 --- a/acceptance/bundle/apps/git_source/output.txt +++ b/acceptance/bundle/apps/git_source/output.txt @@ -41,7 +41,7 @@ Deployment complete! Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged === Run the app to verify it works ->>> cat out.app-run +>>> cat tmp.app-run ✓ Getting the status of the app [APP_NAME] ✓ App is in RUNNING state ✓ App compute is in ACTIVE state diff --git a/acceptance/bundle/deploy/snapshot-comparison/output.txt b/acceptance/bundle/deploy/snapshot-comparison/output.txt index c151985efe..1db9fa5024 100644 --- a/acceptance/bundle/deploy/snapshot-comparison/output.txt +++ b/acceptance/bundle/deploy/snapshot-comparison/output.txt @@ -27,16 +27,16 @@ Updating deployment state... Deployment complete! === Normalize bundle names for comparison ->>> cp bundle1/.databricks/bundle/default/resources.json out.bundle1.json +>>> cp bundle1/.databricks/bundle/default/resources.json tmp.bundle1.json ->>> cp bundle2/.databricks/bundle/default/resources-config-sync-snapshot.json out.bundle2.json +>>> cp bundle2/.databricks/bundle/default/resources-config-sync-snapshot.json tmp.bundle2.json ->>> update_file.py out.bundle1.json snapshot-test-1- snapshot-test-NORMALIZED- +>>> update_file.py tmp.bundle1.json snapshot-test-1- snapshot-test-NORMALIZED- ->>> update_file.py out.bundle2.json snapshot-test-2- snapshot-test-NORMALIZED- +>>> update_file.py tmp.bundle2.json snapshot-test-2- snapshot-test-NORMALIZED- === Compare normalized snapshots ->>> diff.py out.bundle1.json out.bundle2.json +>>> diff.py tmp.bundle1.json tmp.bundle2.json === Cleanup bundle 1 >>> [CLI] bundle destroy --auto-approve diff --git a/acceptance/bundle/deploy/snapshot-comparison/script b/acceptance/bundle/deploy/snapshot-comparison/script index 540e9346eb..9084c83ad8 100755 --- a/acceptance/bundle/deploy/snapshot-comparison/script +++ b/acceptance/bundle/deploy/snapshot-comparison/script @@ -30,11 +30,11 @@ title "Deploy bundle 2 with terraform and YamlSync" (cd bundle2 && trace DATABRICKS_BUNDLE_ENABLE_EXPERIMENTAL_YAML_SYNC=true DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy) title "Normalize bundle names for comparison" -trace cp bundle1/.databricks/bundle/default/resources.json out.bundle1.json -trace cp bundle2/.databricks/bundle/default/resources-config-sync-snapshot.json out.bundle2.json +trace cp bundle1/.databricks/bundle/default/resources.json tmp.bundle1.json +trace cp bundle2/.databricks/bundle/default/resources-config-sync-snapshot.json tmp.bundle2.json -trace update_file.py out.bundle1.json "snapshot-test-1-" "snapshot-test-NORMALIZED-" -trace update_file.py out.bundle2.json "snapshot-test-2-" "snapshot-test-NORMALIZED-" +trace update_file.py tmp.bundle1.json "snapshot-test-1-" "snapshot-test-NORMALIZED-" +trace update_file.py tmp.bundle2.json "snapshot-test-2-" "snapshot-test-NORMALIZED-" title "Compare normalized snapshots" -trace diff.py out.bundle1.json out.bundle2.json +trace diff.py tmp.bundle1.json tmp.bundle2.json diff --git a/acceptance/bundle/deploy/snapshot-comparison/test.toml b/acceptance/bundle/deploy/snapshot-comparison/test.toml index 9ef3d5aa0d..51bdb7525a 100644 --- a/acceptance/bundle/deploy/snapshot-comparison/test.toml +++ b/acceptance/bundle/deploy/snapshot-comparison/test.toml @@ -5,7 +5,7 @@ RecordRequests = true Ignore = [ ".databricks", "databricks.yml", - "out.*", + "tmp.*", "bundle1", "bundle2" ] diff --git a/acceptance/bundle/resources/postgres_endpoints/test.toml b/acceptance/bundle/resources/postgres_endpoints/test.toml index d2b8f81b1f..160c62cbd6 100644 --- a/acceptance/bundle/resources/postgres_endpoints/test.toml +++ b/acceptance/bundle/resources/postgres_endpoints/test.toml @@ -9,9 +9,10 @@ CloudEnvs.azure = false # Run on both direct and Terraform modes EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"] +RecordRequests = false + Ignore = [ "databricks.yml", - "out.requests.txt", ".databricks", ] diff --git a/acceptance/bundle/resources/postgres_projects/test.toml b/acceptance/bundle/resources/postgres_projects/test.toml index a677b26153..70cc71794a 100644 --- a/acceptance/bundle/resources/postgres_projects/test.toml +++ b/acceptance/bundle/resources/postgres_projects/test.toml @@ -9,9 +9,10 @@ CloudEnvs.azure = false # Run on both direct and Terraform modes EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"] +RecordRequests = false + Ignore = [ "databricks.yml", - "out.requests.txt", ".databricks", ] From 665e47dec6bdd2fc0b57b1e7507d3aef8506fdf2 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Thu, 19 Mar 2026 11:32:12 +0100 Subject: [PATCH 4/7] rm out.requests.txt --- acceptance/bundle/resources/postgres_endpoints/basic/script | 1 + .../bundle/resources/postgres_endpoints/recreate/script | 5 ++--- acceptance/bundle/resources/postgres_endpoints/test.toml | 2 -- .../resources/postgres_endpoints/update_autoscaling/script | 1 + .../resources/postgres_endpoints/without_endpoint_id/script | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/script b/acceptance/bundle/resources/postgres_endpoints/basic/script index cc307c585a..d1d39ec291 100755 --- a/acceptance/bundle/resources/postgres_endpoints/basic/script +++ b/acceptance/bundle/resources/postgres_endpoints/basic/script @@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { trace $CLI bundle destroy --auto-approve + rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_endpoints/recreate/script b/acceptance/bundle/resources/postgres_endpoints/recreate/script index 78a85074d2..4fb810c36d 100755 --- a/acceptance/bundle/resources/postgres_endpoints/recreate/script +++ b/acceptance/bundle/resources/postgres_endpoints/recreate/script @@ -6,6 +6,8 @@ cleanup() { # Also try to delete the endpoints directly in case they weren't cleaned up $CLI postgres delete-endpoint "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/endpoints/test-endpoint-${UNIQUE_NAME}" 2>/dev/null || true $CLI postgres delete-endpoint "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/endpoints/test-endpoint-${UNIQUE_NAME}-v2" 2>/dev/null || true + + rm -f out.requests.txt } trap cleanup EXIT @@ -15,7 +17,6 @@ envsubst < databricks.yml.tmpl | sed "s/ENDPOINT_ID_PLACEHOLDER/test-endpoint-${ trace cat databricks.yml trace $CLI bundle plan -rm -f out.requests.txt trace $CLI bundle deploy endpoint_id_1=`read_id.py my_endpoint` @@ -50,5 +51,3 @@ title "Destroy and verify cleanup" trace $CLI bundle destroy --auto-approve trace print_requests - -rm -f out.requests.txt diff --git a/acceptance/bundle/resources/postgres_endpoints/test.toml b/acceptance/bundle/resources/postgres_endpoints/test.toml index 160c62cbd6..66fd405c0c 100644 --- a/acceptance/bundle/resources/postgres_endpoints/test.toml +++ b/acceptance/bundle/resources/postgres_endpoints/test.toml @@ -9,8 +9,6 @@ CloudEnvs.azure = false # Run on both direct and Terraform modes EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"] -RecordRequests = false - Ignore = [ "databricks.yml", ".databricks", diff --git a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script index fff2d87f00..07f1b9141b 100755 --- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script +++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script @@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { trace $CLI bundle destroy --auto-approve + rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/script b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/script index 4e03eb0ba2..519a143b44 100755 --- a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/script +++ b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/script @@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { $CLI bundle destroy --auto-approve > /dev/null 2>&1 || true + rm -f out.requests.txt } trap cleanup EXIT From c21842b2a6876ba5b9eadbbd6472af88eb68cef8 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Thu, 19 Mar 2026 12:17:51 +0100 Subject: [PATCH 5/7] update --- acceptance/bundle/resources/postgres_projects/basic/script | 1 + acceptance/bundle/resources/postgres_projects/recreate/script | 4 ++-- acceptance/bundle/resources/postgres_projects/test.toml | 2 -- .../resources/postgres_projects/update_display_name/script | 1 + .../resources/postgres_projects/without_project_id/test.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/acceptance/bundle/resources/postgres_projects/basic/script b/acceptance/bundle/resources/postgres_projects/basic/script index f5d4843342..46b0c88462 100755 --- a/acceptance/bundle/resources/postgres_projects/basic/script +++ b/acceptance/bundle/resources/postgres_projects/basic/script @@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { trace $CLI bundle destroy --auto-approve + rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_projects/recreate/script b/acceptance/bundle/resources/postgres_projects/recreate/script index e62e842223..422b625700 100644 --- a/acceptance/bundle/resources/postgres_projects/recreate/script +++ b/acceptance/bundle/resources/postgres_projects/recreate/script @@ -5,6 +5,8 @@ cleanup() { # Also try to delete the old project directly in case it wasn't cleaned up $CLI postgres delete-project "projects/test-pg-old-${UNIQUE_NAME}" 2>/dev/null || true + + rm -f out.requests.txt } trap cleanup EXIT @@ -51,5 +53,3 @@ print_requests destroy # Clean up any orphaned old project (terraform doesn't delete it on recreation) $CLI postgres delete-project $project_id_1 2>/dev/null || true - -rm -f out.requests.txt diff --git a/acceptance/bundle/resources/postgres_projects/test.toml b/acceptance/bundle/resources/postgres_projects/test.toml index 70cc71794a..4e67bd684f 100644 --- a/acceptance/bundle/resources/postgres_projects/test.toml +++ b/acceptance/bundle/resources/postgres_projects/test.toml @@ -9,8 +9,6 @@ CloudEnvs.azure = false # Run on both direct and Terraform modes EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct", "terraform"] -RecordRequests = false - Ignore = [ "databricks.yml", ".databricks", diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/script b/acceptance/bundle/resources/postgres_projects/update_display_name/script index c375f6312f..88c26610f2 100755 --- a/acceptance/bundle/resources/postgres_projects/update_display_name/script +++ b/acceptance/bundle/resources/postgres_projects/update_display_name/script @@ -2,6 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml cleanup() { trace $CLI bundle destroy --auto-approve + rm -f out.requests.txt } trap cleanup EXIT diff --git a/acceptance/bundle/resources/postgres_projects/without_project_id/test.toml b/acceptance/bundle/resources/postgres_projects/without_project_id/test.toml index f8b3bbe49d..a030353d57 100644 --- a/acceptance/bundle/resources/postgres_projects/without_project_id/test.toml +++ b/acceptance/bundle/resources/postgres_projects/without_project_id/test.toml @@ -1 +1 @@ -# All configuration inherited from parent test.toml +RecordRequests = false From 8f728bdcf8e11a688a043afecb4e7b7cb015e43f Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Thu, 19 Mar 2026 12:19:06 +0100 Subject: [PATCH 6/7] updat --- acceptance/pipelines/e2e/script | 2 ++ acceptance/pipelines/e2e/test.toml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/acceptance/pipelines/e2e/script b/acceptance/pipelines/e2e/script index fd20cbf761..dd8a50ada1 100644 --- a/acceptance/pipelines/e2e/script +++ b/acceptance/pipelines/e2e/script @@ -34,3 +34,5 @@ trace $CLI pipelines destroy --auto-approve # Do not affect this repository's git behaviour mv .gitignore out.gitignore + +rm -fr .databricks diff --git a/acceptance/pipelines/e2e/test.toml b/acceptance/pipelines/e2e/test.toml index 07fffc834e..e69de29bb2 100644 --- a/acceptance/pipelines/e2e/test.toml +++ b/acceptance/pipelines/e2e/test.toml @@ -1,3 +0,0 @@ -Ignore = [ - '.databricks', -] From 5dc612c369d1241319548b98dbd39300fce6d76b Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Thu, 19 Mar 2026 13:42:17 +0100 Subject: [PATCH 7/7] cleanup --- acceptance/bundle/deploy/snapshot-comparison/script | 2 ++ 1 file changed, 2 insertions(+) diff --git a/acceptance/bundle/deploy/snapshot-comparison/script b/acceptance/bundle/deploy/snapshot-comparison/script index 9084c83ad8..d15616e642 100755 --- a/acceptance/bundle/deploy/snapshot-comparison/script +++ b/acceptance/bundle/deploy/snapshot-comparison/script @@ -17,6 +17,8 @@ cleanup() { (cd bundle1 && unset DATABRICKS_BUNDLE_ENGINE && trace $CLI bundle destroy --auto-approve) title "Cleanup bundle 2" (cd bundle2 && unset DATABRICKS_BUNDLE_ENGINE && trace $CLI bundle destroy --auto-approve) + + rm -f out.requests.txt } trap cleanup EXIT