diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go
index 4da55ccd983..91d1080d68b 100644
--- a/acceptance/acceptance_test.go
+++ b/acceptance/acceptance_test.go
@@ -836,6 +836,15 @@ func runTest(t *testing.T,
 		tmpDir = t.TempDir()
 	}
 
+	// Harness-written output files (output.txt, out.requests.txt) live outside the
+	// test dir so the bundle sync doesn't upload them as bundle sources. They are
+	// written here during the run and copied into tmpDir afterwards for comparison.
+	// Otherwise these continuously-rewritten files perturb the deploy "Files: N" count.
+	// Register this repl before [TEST_TMP_DIR] so it wins: outputDir is a sibling of
+	// tmpDir, so the [TEST_TMP_DIR]_PARENT repl would otherwise match it first.
+	outputDir := t.TempDir()
+	repls.SetPath(outputDir, "[OUTPUT_DIR]")
+
 	repls.SetPathWithParents(tmpDir, "[TEST_TMP_DIR]")
 
 	scriptContents := readMergedScriptContents(t, dir)
@@ -871,7 +880,7 @@ func runTest(t *testing.T,
 	args := []string{"bash", "-euo", "pipefail", EntryPointScript}
 	cmd := exec.CommandContext(ctx, args[0], args[1:]...)
 
-	cfg, user := internal.PrepareServerAndClient(t, config, LogRequests, tmpDir, testEnv)
+	cfg, user := internal.PrepareServerAndClient(t, config, LogRequests, outputDir, testEnv)
 	testdiff.PrepareReplacementsUser(t, &repls, user)
 	testdiff.PrepareReplacementsWorkspaceConfig(t, &repls, cfg)
 
@@ -888,6 +897,9 @@ func runTest(t *testing.T,
 	cmd.Env = append(cmd.Env, "DATABRICKS_RATE_LIMIT="+rateLimit)
 	cmd.Env = append(cmd.Env, "UNIQUE_NAME="+uniqueName)
 	cmd.Env = append(cmd.Env, "TEST_TMP_DIR="+tmpDir)
+	// Forward slashes: scripts pass $OUT_REQUESTS straight to bash tools, and a
+	// backslash Windows path would be mangled inside double quotes in Git Bash.
+	cmd.Env = append(cmd.Env, "OUT_REQUESTS="+filepath.ToSlash(filepath.Join(outputDir, "out.requests.txt")))
 
 	replsPath := filepath.Join(t.TempDir(), ReplsEnvVar)
 	cmd.Env = append(cmd.Env, ReplsEnvVar+"="+replsPath)
@@ -1001,7 +1013,7 @@ func runTest(t *testing.T,
 	}
 	cmd.Dir = tmpDir
 
-	outputPath := filepath.Join(tmpDir, "output.txt")
+	outputPath := filepath.Join(outputDir, "output.txt")
 	out, err := os.Create(outputPath)
 	require.NoError(t, err)
 	defer out.Close()
@@ -1022,8 +1034,19 @@ func runTest(t *testing.T,
 
 	pathFilter := preparePathFilter(config, customEnv)
 
+	// output.txt lives in outputDir, not tmpDir, so the bundle sync never uploads it;
+	// compare it from there. Every run produces it, so compare it explicitly rather
+	// than relying on it turning up in the tmpDir scan below. out.requests.txt also
+	// stays in outputDir and is never compared: tests assert on recorded requests
+	// through print_requests.py, not by committing the raw recording.
+	doComparison(t, repls, dir, outputDir, "output.txt", &printedRepls)
+
 	// Compare expected outputs
 	for relPath := range outputs {
+		if relPath == "output.txt" {
+			// Handled above: it is produced in outputDir, not tmpDir.
+			continue
+		}
 		if shouldSkip(pathFilter, relPath) {
 			continue
 		}
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..966b87e7f50 100644
--- a/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt
+++ b/acceptance/apps/deploy/bundle-no-args-with-flags/output.txt
@@ -3,7 +3,7 @@
 Deploying project...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created apps.myapp
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 ✓ Getting the status of the app myapp
 ✓ App is in UNAVAILABLE state
diff --git a/acceptance/apps/deploy/bundle-no-args/output.txt b/acceptance/apps/deploy/bundle-no-args/output.txt
index 5a9942a8d6b..84cd56680bc 100644
--- a/acceptance/apps/deploy/bundle-no-args/output.txt
+++ b/acceptance/apps/deploy/bundle-no-args/output.txt
@@ -3,7 +3,7 @@
 Deploying project...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created apps.myapp
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 ✓ Getting the status of the app myapp
 ✓ App is in UNAVAILABLE state
diff --git a/acceptance/apps/deploy/bundle-with-appname/out.requests.txt b/acceptance/apps/deploy/bundle-with-appname/out.requests.txt
deleted file mode 100644
index 4e01ce32704..00000000000
--- a/acceptance/apps/deploy/bundle-with-appname/out.requests.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/apps/test-app/deployments",
-  "body": {}
-}
diff --git a/acceptance/apps/deploy/bundle-with-appname/output.txt b/acceptance/apps/deploy/bundle-with-appname/output.txt
index 59e34f264c4..73b77d480cd 100644
--- a/acceptance/apps/deploy/bundle-with-appname/output.txt
+++ b/acceptance/apps/deploy/bundle-with-appname/output.txt
@@ -9,3 +9,10 @@
     "state": "PENDING"
   }
 }
+
+>>> print_requests.py //apps
+{
+  "method": "POST",
+  "path": "/api/2.0/apps/test-app/deployments",
+  "body": {}
+}
diff --git a/acceptance/apps/deploy/bundle-with-appname/script b/acceptance/apps/deploy/bundle-with-appname/script
index 8dac818a074..cf5f53c351c 100644
--- a/acceptance/apps/deploy/bundle-with-appname/script
+++ b/acceptance/apps/deploy/bundle-with-appname/script
@@ -1,3 +1,5 @@
 # Test: apps deploy with APP_NAME in a bundle directory
 # Expected: Falls back to API deploy (ignores bundle, no validation)
 trace $CLI apps deploy test-app --no-wait
+
+trace print_requests.py //apps
diff --git a/acceptance/apps/deploy/no-bundle-with-appname/out.requests.txt b/acceptance/apps/deploy/no-bundle-with-appname/out.requests.txt
deleted file mode 100644
index 4e01ce32704..00000000000
--- a/acceptance/apps/deploy/no-bundle-with-appname/out.requests.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/apps/test-app/deployments",
-  "body": {}
-}
diff --git a/acceptance/apps/deploy/no-bundle-with-appname/output.txt b/acceptance/apps/deploy/no-bundle-with-appname/output.txt
index 59e34f264c4..73b77d480cd 100644
--- a/acceptance/apps/deploy/no-bundle-with-appname/output.txt
+++ b/acceptance/apps/deploy/no-bundle-with-appname/output.txt
@@ -9,3 +9,10 @@
     "state": "PENDING"
   }
 }
+
+>>> print_requests.py //apps
+{
+  "method": "POST",
+  "path": "/api/2.0/apps/test-app/deployments",
+  "body": {}
+}
diff --git a/acceptance/apps/deploy/no-bundle-with-appname/script b/acceptance/apps/deploy/no-bundle-with-appname/script
index 628866514f7..e5135b16605 100644
--- a/acceptance/apps/deploy/no-bundle-with-appname/script
+++ b/acceptance/apps/deploy/no-bundle-with-appname/script
@@ -1,3 +1,5 @@
 # Test: apps deploy with APP_NAME but without databricks.yml
 # Expected: Normal API deploy using apps deploy API
 trace $CLI apps deploy test-app --no-wait
+
+trace print_requests.py //apps
diff --git a/acceptance/auth/credentials/basic/out.requests.txt b/acceptance/auth/credentials/basic/out.requests.txt
deleted file mode 100644
index 93825cd38dd..00000000000
--- a/acceptance/auth/credentials/basic/out.requests.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ],
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/current-user_me cmd-exec-id/[UUID] interactive/none auth/basic"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
diff --git a/acceptance/auth/credentials/basic/output.txt b/acceptance/auth/credentials/basic/output.txt
index 93c6060cffc..93d17337132 100644
--- a/acceptance/auth/credentials/basic/output.txt
+++ b/acceptance/auth/credentials/basic/output.txt
@@ -2,3 +2,26 @@
   "id": "[USERID]",
   "userName": "[USERNAME]"
 }
+
+>>> print_requests.py --get //
+{
+  "headers": {
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
+    ]
+  },
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ],
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/current-user_me cmd-exec-id/[UUID] interactive/none auth/basic"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
diff --git a/acceptance/auth/credentials/basic/script b/acceptance/auth/credentials/basic/script
index aae249083f5..8817191edf3 100644
--- a/acceptance/auth/credentials/basic/script
+++ b/acceptance/auth/credentials/basic/script
@@ -6,3 +6,5 @@ export DATABRICKS_USERNAME=username
 export DATABRICKS_PASSWORD=password
 
 $CLI current-user me
+
+trace print_requests.py --get //
diff --git a/acceptance/auth/credentials/oauth/out.requests.txt b/acceptance/auth/credentials/oauth/out.requests.txt
deleted file mode 100644
index 600f1ccf61f..00000000000
--- a/acceptance/auth/credentials/oauth/out.requests.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ],
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ],
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/current-user_me cmd-exec-id/[UUID] interactive/none auth/oauth-m2m"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
diff --git a/acceptance/auth/credentials/oauth/output.txt b/acceptance/auth/credentials/oauth/output.txt
index 93c6060cffc..dc95db17fd1 100644
--- a/acceptance/auth/credentials/oauth/output.txt
+++ b/acceptance/auth/credentials/oauth/output.txt
@@ -2,3 +2,48 @@
   "id": "[USERID]",
   "userName": "[USERNAME]"
 }
+
+>>> print_requests.py --get //
+{
+  "headers": {
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
+    ]
+  },
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "headers": {
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
+    ]
+  },
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ],
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ],
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/current-user_me cmd-exec-id/[UUID] interactive/none auth/oauth-m2m"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
diff --git a/acceptance/auth/credentials/oauth/script b/acceptance/auth/credentials/oauth/script
index e4519e41b18..7f38140c467 100644
--- a/acceptance/auth/credentials/oauth/script
+++ b/acceptance/auth/credentials/oauth/script
@@ -6,3 +6,5 @@ export DATABRICKS_CLIENT_ID=client_id
 export DATABRICKS_CLIENT_SECRET=client_secret
 
 $CLI current-user me
+
+trace print_requests.py --get //
diff --git a/acceptance/auth/credentials/pat/out.requests.txt b/acceptance/auth/credentials/pat/out.requests.txt
deleted file mode 100644
index 9018e380d56..00000000000
--- a/acceptance/auth/credentials/pat/out.requests.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer dapi1234"
-    ],
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/current-user_me cmd-exec-id/[UUID] interactive/none auth/pat"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
diff --git a/acceptance/auth/credentials/pat/output.txt b/acceptance/auth/credentials/pat/output.txt
index 93c6060cffc..4d1f837a9e7 100644
--- a/acceptance/auth/credentials/pat/output.txt
+++ b/acceptance/auth/credentials/pat/output.txt
@@ -2,3 +2,26 @@
   "id": "[USERID]",
   "userName": "[USERNAME]"
 }
+
+>>> print_requests.py --get //
+{
+  "headers": {
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
+    ]
+  },
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer dapi1234"
+    ],
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/current-user_me cmd-exec-id/[UUID] interactive/none auth/pat"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
diff --git a/acceptance/auth/credentials/pat/script b/acceptance/auth/credentials/pat/script
index ccf1098e7a8..dcc8361e698 100644
--- a/acceptance/auth/credentials/pat/script
+++ b/acceptance/auth/credentials/pat/script
@@ -1,3 +1,5 @@
 export DATABRICKS_TOKEN=dapi1234
 
 $CLI current-user me
+
+trace print_requests.py --get //
diff --git a/acceptance/bin/extract_command_exec_id.py b/acceptance/bin/extract_command_exec_id.py
index d9a7b36f307..46a76916f4d 100755
--- a/acceptance/bin/extract_command_exec_id.py
+++ b/acceptance/bin/extract_command_exec_id.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 import json
+import os
 import re
 from pathlib import Path
 
 
 def extract_cmd_exec_id():
-    requests_file = Path("out.requests.txt")
+    requests_file = Path(os.environ["OUT_REQUESTS"])
 
     # Read JSON objects one at a time and find the first one with a cmd-exec-id
     # in the User-Agent header. Some requests (e.g. .well-known/databricks-config)
@@ -31,7 +32,7 @@ def extract_cmd_exec_id():
             if match:
                 return match.group(1)
 
-    raise SystemExit("No command execution ID found in any request in out.requests.txt")
+    raise SystemExit(f"No command execution ID found in any request in {requests_file}")
 
 
 if __name__ == "__main__":
diff --git a/acceptance/bin/print_requests.py b/acceptance/bin/print_requests.py
index c151845fc40..728db3ec1a8 100755
--- a/acceptance/bin/print_requests.py
+++ b/acceptance/bin/print_requests.py
@@ -255,7 +255,7 @@ def main():
         "bodies, so a test asserts the same requests whether or not deployment history "
         "recording is on. Shorthand for the --del-body fields it implies.",
     )
-    parser.add_argument("--fname", default="out.requests.txt")
+    parser.add_argument("--fname", default=os.environ["OUT_REQUESTS"])
     args = parser.parse_args()
 
     del_body_fields = [field for group in args.del_body for field in group.split(",")]
@@ -263,11 +263,12 @@ def main():
         del_body_fields += STAMP_FIELDS
     del_fields = [field for group in args.del_field for field in group.split(",")]
 
+    fname = Path(args.fname)
     test_tmp_dir = os.environ.get("TEST_TMP_DIR")
-    if test_tmp_dir:
-        requests_file = Path(test_tmp_dir) / args.fname
+    if test_tmp_dir and not fname.is_absolute():
+        requests_file = Path(test_tmp_dir) / fname
     else:
-        requests_file = Path(args.fname)
+        requests_file = fname
 
     if not requests_file.exists():
         sys.exit(f"File {requests_file.as_posix()} not found")
diff --git a/acceptance/bundle/apps/app_yaml/output.txt b/acceptance/bundle/apps/app_yaml/output.txt
index 53429bbbb4c..1956e96ee4b 100644
--- a/acceptance/bundle/apps/app_yaml/output.txt
+++ b/acceptance/bundle/apps/app_yaml/output.txt
@@ -16,10 +16,10 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created apps.myapp
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq select(.path | test("app.yml")) out.requests.txt
+>>> jq select(.path | test("app.yml")) [OUTPUT_DIR]/out.requests.txt
 
 >>> [CLI] bundle destroy --auto-approve
 The following resources will be deleted:
diff --git a/acceptance/bundle/apps/app_yaml/script b/acceptance/bundle/apps/app_yaml/script
index d0dd8d5f800..3db6c9e8969 100644
--- a/acceptance/bundle/apps/app_yaml/script
+++ b/acceptance/bundle/apps/app_yaml/script
@@ -1,9 +1,9 @@
 trace $CLI bundle validate
 trace $CLI bundle plan
 trace $CLI bundle deploy
-trace jq 'select(.path | test("app.yml"))' out.requests.txt | sed 's/\\r//g'  > out.app.yml.txt
+trace jq 'select(.path | test("app.yml"))' "$OUT_REQUESTS" | sed 's/\\r//g'  > out.app.yml.txt
 #trace print_requests.py //apps  # currently fails due to TF inserting description=""
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 trace $CLI bundle destroy --auto-approve
 trace print_requests.py //apps
diff --git a/acceptance/bundle/apps/compute_size/out.update.direct.txt b/acceptance/bundle/apps/compute_size/out.update.direct.txt
index a1bb89ee44d..c65c036da27 100644
--- a/acceptance/bundle/apps/compute_size/out.update.direct.txt
+++ b/acceptance/bundle/apps/compute_size/out.update.direct.txt
@@ -2,7 +2,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-compute-size-[UNIQUE_NAME]/files...
 Updated apps.my_app
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] apps get app-[UNIQUE_NAME]
diff --git a/acceptance/bundle/apps/compute_size/out.update.terraform.txt b/acceptance/bundle/apps/compute_size/out.update.terraform.txt
index fd4e9aa67ec..d852c5bef2e 100644
--- a/acceptance/bundle/apps/compute_size/out.update.terraform.txt
+++ b/acceptance/bundle/apps/compute_size/out.update.terraform.txt
@@ -13,7 +13,7 @@ Compute size updates are not supported in this update API. Please use the new
 update API instead.
 
 
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 
 Exit code: 1
 
diff --git a/acceptance/bundle/apps/compute_size/output.txt b/acceptance/bundle/apps/compute_size/output.txt
index ea71df156b3..bdfdab86bcd 100644
--- a/acceptance/bundle/apps/compute_size/output.txt
+++ b/acceptance/bundle/apps/compute_size/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-compute-size-[UNIQUE_NAME]/files...
 Created apps.my_app
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Update compute size and redeploy
diff --git a/acceptance/bundle/apps/git_source/output.txt b/acceptance/bundle/apps/git_source/output.txt
index c7bce16a663..32b26e5ef3b 100644
--- a/acceptance/bundle/apps/git_source/output.txt
+++ b/acceptance/bundle/apps/git_source/output.txt
@@ -19,7 +19,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-git-source-[UNIQUE_NAME]/files...
 Created apps.my_app
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run my_app
@@ -61,7 +61,7 @@ You can access the app at [APP_NAME]-123.cloud.databricksapps.com
 === Update git_source branch and redeploy
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-git-source-[UNIQUE_NAME]/files...
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 === Verify config update was applied
diff --git a/acceptance/bundle/apps/source_code_path_update/output.txt b/acceptance/bundle/apps/source_code_path_update/output.txt
index 1a6050b6d1b..5f5269e08c8 100644
--- a/acceptance/bundle/apps/source_code_path_update/output.txt
+++ b/acceptance/bundle/apps/source_code_path_update/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-scp-update-[UNIQUE_NAME]/files...
 Created apps.my_app
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Run app to redeploy (reproduces the issue precondition of having an active deployment)
@@ -11,7 +11,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy --plan plan.json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-scp-update-[UNIQUE_NAME]/files...
 Updated apps.my_app
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt b/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt
index d384cc5190d..dbdde6f32db 100644
--- a/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt
+++ b/acceptance/bundle/artifacts/ai_runtime_code_source/output.txt
@@ -4,11 +4,11 @@ Building code_source...
 Uploading code.tgz...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Expecting code_source_path rewritten to the uploaded artifact remote path
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[].ai_runtime_task out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[].ai_runtime_task [OUTPUT_DIR]/out.requests.txt
 {
   "code_source_path": "/Workspace/foo/bar/artifacts/.internal/code.tgz",
   "deployments": [
diff --git a/acceptance/bundle/artifacts/ai_runtime_code_source/script b/acceptance/bundle/artifacts/ai_runtime_code_source/script
index 2b71cf524aa..6c4b98f9602 100644
--- a/acceptance/bundle/artifacts/ai_runtime_code_source/script
+++ b/acceptance/bundle/artifacts/ai_runtime_code_source/script
@@ -1,9 +1,9 @@
 trace $CLI bundle deploy
 
 title "Expecting code_source_path rewritten to the uploaded artifact remote path"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[].ai_runtime_task' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[].ai_runtime_task' "$OUT_REQUESTS"
 
 title "Expecting the code_source tarball to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep code.tgz | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep code.tgz | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt b/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt
index cf539c84438..6e03c5d7b69 100644
--- a/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt
+++ b/acceptance/bundle/artifacts/artifact_upload_for_volumes/output.txt
@@ -3,11 +3,11 @@
 Uploading whl/source.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Expecting 2 wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-132531-5opeqon1",
@@ -50,7 +50,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 ]
 
 === Expecting environment dependencies to be updated
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments [OUTPUT_DIR]/out.requests.txt
 [
   {
     "environment_key": "test_env",
@@ -65,7 +65,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 ]
 
 === Expecting wheel to be uploaded
->>> jq -s .[] | select(.path=="/api/2.0/fs/files/Volumes/foo/bar/artifacts/.internal/source.whl") out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/fs/files/Volumes/foo/bar/artifacts/.internal/source.whl") [OUTPUT_DIR]/out.requests.txt
 {
   "method": "PUT",
   "path": "/api/2.0/fs/files/Volumes/foo/bar/artifacts/.internal/source.whl",
diff --git a/acceptance/bundle/artifacts/artifact_upload_for_volumes/script b/acceptance/bundle/artifacts/artifact_upload_for_volumes/script
index 185482ca15e..22b92598b0a 100644
--- a/acceptance/bundle/artifacts/artifact_upload_for_volumes/script
+++ b/acceptance/bundle/artifacts/artifact_upload_for_volumes/script
@@ -5,12 +5,12 @@ echo "test wheel content" > whl/source.whl
 trace $CLI bundle deploy
 
 title "Expecting 2 wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting environment dependencies to be updated"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' "$OUT_REQUESTS"
 
 title "Expecting wheel to be uploaded"
-trace jq -s '.[] | select(.path=="/api/2.0/fs/files/Volumes/foo/bar/artifacts/.internal/source.whl")' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/fs/files/Volumes/foo/bar/artifacts/.internal/source.whl")' "$OUT_REQUESTS"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt b/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt
index 452a913bffa..73613ae0deb 100644
--- a/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt
+++ b/acceptance/bundle/artifacts/artifact_upload_for_workspace/output.txt
@@ -3,11 +3,11 @@
 Uploading whl/source.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Expecting 2 wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-132531-5opeqon1",
@@ -55,7 +55,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 "/api/2.0/workspace-files/import-file/Workspace/foo/bar/artifacts/.internal/source.whl"
 
 === Expecting environment dependencies to be updated
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments [OUTPUT_DIR]/out.requests.txt
 [
   {
     "environment_key": "test_env",
@@ -70,7 +70,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 ]
 
 === Expecting delete request to artifact_path/.internal folder
->>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace/delete",
@@ -81,7 +81,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 }
 
 === Expecting mkdirs request to artifact_path/.internal folder
->>> jq -s .[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
diff --git a/acceptance/bundle/artifacts/artifact_upload_for_workspace/script b/acceptance/bundle/artifacts/artifact_upload_for_workspace/script
index e6b1437627c..f32c52da0ea 100644
--- a/acceptance/bundle/artifacts/artifact_upload_for_workspace/script
+++ b/acceptance/bundle/artifacts/artifact_upload_for_workspace/script
@@ -5,18 +5,18 @@ echo "test wheel content" > whl/source.whl
 trace $CLI bundle deploy
 
 title "Expecting 2 wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting wheel to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
 title "Expecting environment dependencies to be updated"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' "$OUT_REQUESTS"
 
 title "Expecting delete request to artifact_path/.internal folder"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
 title "Expecting mkdirs request to artifact_path/.internal folder"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt
index 1072fffd3bd..ba55ef40efb 100644
--- a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt
+++ b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading whl/source.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 === Expecting wheel to be uploaded
@@ -11,7 +11,7 @@ Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 "/api/2.0/workspace-files/import-file/Workspace/foo/bar/artifacts/.internal/source.whl"
 
 === Expecting delete request to artifact_path/.internal folder
->>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace/delete",
@@ -22,7 +22,7 @@ Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 }
 
 === Expecting mkdirs request to artifact_path/.internal folder
->>> jq -s .[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
diff --git a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/script b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/script
index 883601185c9..18742b64832 100644
--- a/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/script
+++ b/acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/script
@@ -5,12 +5,12 @@ echo "test wheel content" > whl/source.whl
 trace $CLI bundle deploy
 
 title "Expecting wheel to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
 title "Expecting delete request to artifact_path/.internal folder"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
 title "Expecting mkdirs request to artifact_path/.internal folder"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/build_and_files_whl/output.txt b/acceptance/bundle/artifacts/build_and_files_whl/output.txt
index a37019f5ada..d9b6e19881c 100644
--- a/acceptance/bundle/artifacts/build_and_files_whl/output.txt
+++ b/acceptance/bundle/artifacts/build_and_files_whl/output.txt
@@ -12,5 +12,5 @@ Validation OK!
 Building artifact_with_custom_dist...
 Uploading mydist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 16 uploaded, 0 deleted
+Files: 15 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/artifacts/glob_exact_whl/output.txt b/acceptance/bundle/artifacts/glob_exact_whl/output.txt
index 30efca0e06a..9d238b0ceac 100644
--- a/acceptance/bundle/artifacts/glob_exact_whl/output.txt
+++ b/acceptance/bundle/artifacts/glob_exact_whl/output.txt
@@ -16,5 +16,5 @@
 Uploading prebuilt/other_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/artifacts/issue_3109/output.txt b/acceptance/bundle/artifacts/issue_3109/output.txt
index 6d84a5ec8b5..61493901a4d 100644
--- a/acceptance/bundle/artifacts/issue_3109/output.txt
+++ b/acceptance/bundle/artifacts/issue_3109/output.txt
@@ -6,5 +6,5 @@ Building wheels...
 Uploading dist/my_default_python-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files...
 Created jobs.job1
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/artifacts/shell/bash/output.txt b/acceptance/bundle/artifacts/shell/bash/output.txt
index 2ff671d28ac..7a9518fde67 100644
--- a/acceptance/bundle/artifacts/shell/bash/output.txt
+++ b/acceptance/bundle/artifacts/shell/bash/output.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Building my_artifact...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-bash/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/artifacts/shell/basic/output.txt b/acceptance/bundle/artifacts/shell/basic/output.txt
index 2fd0ac1d308..46f5254dd55 100644
--- a/acceptance/bundle/artifacts/shell/basic/output.txt
+++ b/acceptance/bundle/artifacts/shell/basic/output.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Building my_artifact...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-basic/default/files...
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/artifacts/shell/default/output.txt b/acceptance/bundle/artifacts/shell/default/output.txt
index 2ff671d28ac..7a9518fde67 100644
--- a/acceptance/bundle/artifacts/shell/default/output.txt
+++ b/acceptance/bundle/artifacts/shell/default/output.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Building my_artifact...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-bash/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/artifacts/shell/sh/output.txt b/acceptance/bundle/artifacts/shell/sh/output.txt
index 90b9a3081d0..35cc8050739 100644
--- a/acceptance/bundle/artifacts/shell/sh/output.txt
+++ b/acceptance/bundle/artifacts/shell/sh/output.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Building my_artifact...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/shell-sh/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/artifacts/unique_name_libraries/output.txt b/acceptance/bundle/artifacts/unique_name_libraries/output.txt
index cbcbd2bf29e..ae518e9fdd3 100644
--- a/acceptance/bundle/artifacts/unique_name_libraries/output.txt
+++ b/acceptance/bundle/artifacts/unique_name_libraries/output.txt
@@ -6,5 +6,5 @@ Uploading whl1/dist/my_package-0.0.1-py3-none-any.whl...
 Uploading whl2/dist/my_other_package-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test
-Files: 28 uploaded, 0 deleted
+Files: 27 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt b/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt
index 90c4730c1ab..52749d36c45 100644
--- a/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt
+++ b/acceptance/bundle/artifacts/upload_multiple_libraries/output.txt
@@ -6,11 +6,11 @@ Uploading whl/source3.whl...
 Uploading whl/source4.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Expecting 5 wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-132531-5opeqon1",
@@ -51,7 +51,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 "/api/2.0/workspace-files/import-file/Workspace/foo/bar/artifacts/.internal/source4.whl"
 
 === Expecting environment dependencies to be updated
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments [OUTPUT_DIR]/out.requests.txt
 [
   {
     "environment_key": "test_env",
diff --git a/acceptance/bundle/artifacts/upload_multiple_libraries/script b/acceptance/bundle/artifacts/upload_multiple_libraries/script
index f615147f8c4..74b9fa58807 100644
--- a/acceptance/bundle/artifacts/upload_multiple_libraries/script
+++ b/acceptance/bundle/artifacts/upload_multiple_libraries/script
@@ -8,12 +8,12 @@ echo "test wheel content 4" > whl/source4.whl
 trace $CLI bundle deploy
 
 title "Expecting 5 wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting 4 wheels to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
 title "Expecting environment dependencies to be updated"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' "$OUT_REQUESTS"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_change_version/output.txt b/acceptance/bundle/artifacts/whl_change_version/output.txt
index 5c76f9ae00e..833aec9600e 100644
--- a/acceptance/bundle/artifacts/whl_change_version/output.txt
+++ b/acceptance/bundle/artifacts/whl_change_version/output.txt
@@ -4,14 +4,14 @@ Building python_artifact...
 Uploading dist/my_test_code-0.1.0-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 10 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 1 whl
 dist/my_test_code-0.1.0-py3-none-any.whl
 
 === Expecting 1 wheel in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-aaaaa-bbbbbb",
@@ -29,15 +29,13 @@ dist/my_test_code-0.1.0-py3-none-any.whl
 ]
 
 === Expecting 1 wheel to be uploaded
->>> jq .path out.requests.txt
+>>> jq .path [OUTPUT_DIR]/out.requests.txt
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.1.0-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/.gitignore"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/databricks.yml"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/dist/my_test_code-0.1.0-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/__init__.py"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/__main__.py"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/out.requests.txt"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/output.txt"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/script"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/setup.py"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/test.toml"
@@ -54,7 +52,7 @@ Building python_artifact...
 Uploading dist/my_test_code-0.2.0-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 2 whl
@@ -62,16 +60,14 @@ dist/my_test_code-0.1.0-py3-none-any.whl
 dist/my_test_code-0.2.0-py3-none-any.whl
 
 === Expecting 1 wheel in libraries section in /jobs/reset
->>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks [OUTPUT_DIR]/out.requests.txt
 json[0].libraries[0].whl = "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.2.0-py3-none-any.whl";
 
 === Expecting 1 wheel to be uploaded
->>> jq .path out.requests.txt
+>>> jq .path [OUTPUT_DIR]/out.requests.txt
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.2.0-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/dist/my_test_code-0.2.0-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/__init__.py"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/out.requests.txt"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/output.txt"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deployment.json"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
@@ -86,7 +82,7 @@ Uploading dist/my_test_code-0.1.0-py3-none-any.whl...
 Uploading dist/my_test_code-0.2.0-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 2 whl
@@ -94,17 +90,15 @@ dist/my_test_code-0.1.0-py3-none-any.whl
 dist/my_test_code-0.2.0-py3-none-any.whl
 
 === Expecting 1 wheel in libraries section in /jobs/reset
->>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks [OUTPUT_DIR]/out.requests.txt
 json[0].libraries[0].whl = "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.1.0-py3-none-any.whl";
 
 === Expecting 1 wheel to be uploaded
->>> jq .path out.requests.txt
+>>> jq .path [OUTPUT_DIR]/out.requests.txt
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.1.0-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.2.0-py3-none-any.whl"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/databricks.yml"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/dist/my_test_code-0.2.0-py3-none-any.whl"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/out.requests.txt"
-"/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/output.txt"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deployment.json"
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
diff --git a/acceptance/bundle/artifacts/whl_change_version/script b/acceptance/bundle/artifacts/whl_change_version/script
index 9f6f480f0db..49d50f0b0b5 100644
--- a/acceptance/bundle/artifacts/whl_change_version/script
+++ b/acceptance/bundle/artifacts/whl_change_version/script
@@ -3,12 +3,12 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheel in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting 1 wheel to be uploaded"
-trace jq .path out.requests.txt | grep import | sort
+trace jq .path "$OUT_REQUESTS" | grep import | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 
 trace update_file.py my_test_code/__init__.py 0.1.0 0.2.0
@@ -17,12 +17,12 @@ trace $CLI bundle deploy
 trace find.py --expect 2 whl  # there are now 2 wheels on disk
 
 title "Expecting 1 wheel in libraries section in /jobs/reset"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks' out.requests.txt | gron.py | grep -w libraries
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks' "$OUT_REQUESTS" | gron.py | grep -w libraries
 
 title "Expecting 1 wheel to be uploaded"
-trace jq .path out.requests.txt | grep import | sort
+trace jq .path "$OUT_REQUESTS" | grep import | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 
 title 'Restore config to target old wheel'
@@ -31,9 +31,9 @@ trace $CLI bundle deploy
 trace find.py --expect 2 whl
 
 title "Expecting 1 wheel in libraries section in /jobs/reset"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks' out.requests.txt | gron.py | grep -w libraries
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks' "$OUT_REQUESTS" | gron.py | grep -w libraries
 
 title "Expecting 1 wheel to be uploaded"
-trace jq .path out.requests.txt | grep import | sort
+trace jq .path "$OUT_REQUESTS" | grep import | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_dbfs/output.txt b/acceptance/bundle/artifacts/whl_dbfs/output.txt
index 3ebe5c59872..f32692e61d2 100644
--- a/acceptance/bundle/artifacts/whl_dbfs/output.txt
+++ b/acceptance/bundle/artifacts/whl_dbfs/output.txt
@@ -2,14 +2,14 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Expecting to find no wheels
 >>> errcode find.py --expect 0 whl
 
 === Expecting 1 wheel in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-132531-5opeqon1",
@@ -27,6 +27,6 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 ]
 
 === Expecting no wheels to be uploaded
->>> errcode sh -c jq .path < out.requests.txt | grep import | grep whl
+>>> errcode sh -c jq .path < "$OUT_REQUESTS" | grep import | grep whl
 
 Exit code: 1
diff --git a/acceptance/bundle/artifacts/whl_dbfs/script b/acceptance/bundle/artifacts/whl_dbfs/script
index d7c93d8f38f..681a3453237 100644
--- a/acceptance/bundle/artifacts/whl_dbfs/script
+++ b/acceptance/bundle/artifacts/whl_dbfs/script
@@ -4,9 +4,9 @@ title "Expecting to find no wheels"
 trace errcode find.py --expect 0 whl
 
 title "Expecting 1 wheel in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting no wheels to be uploaded"
-trace errcode sh -c 'jq .path < out.requests.txt | grep import | grep whl'
+trace errcode sh -c 'jq .path < "$OUT_REQUESTS" | grep import | grep whl'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_dynamic/output.txt b/acceptance/bundle/artifacts/whl_dynamic/output.txt
index eae8cd91f5f..3f270c25153 100644
--- a/acceptance/bundle/artifacts/whl_dynamic/output.txt
+++ b/acceptance/bundle/artifacts/whl_dynamic/output.txt
@@ -31,7 +31,7 @@ Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_c
 Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 19 uploaded, 0 deleted
+Files: 17 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === There are 2 original wheels and 2 patched ones
@@ -52,7 +52,7 @@ my_test_code-0.0.1+[UNIX_TIME_NANOS][1].dist-info/top_level.txt
 my_test_code-0.0.1+[UNIX_TIME_NANOS][1].dist-info/RECORD
 
 === Expecting 2 patched wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 json[1].for_each_task.task.libraries[0].whl = "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl";
 json[1].libraries[0].whl = "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl";
 json[1].libraries[1].whl = "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl";
@@ -73,7 +73,7 @@ Uploading .databricks/bundle/default/patched_wheels/my_prebuilt_whl_other_test_c
 Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated jobs.test_job
-Files: 12 uploaded, 0 deleted
+Files: 10 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Verify contents, it should now have new_module.py
@@ -88,7 +88,7 @@ my_test_code-0.0.1+[UNIX_TIME_NANOS][2].dist-info/top_level.txt
 my_test_code-0.0.1+[UNIX_TIME_NANOS][2].dist-info/RECORD
 
 === Expecting 2 patched wheels in libraries section in /jobs/reset
->>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks [OUTPUT_DIR]/out.requests.txt
 json[1].for_each_task.task.libraries[0].whl = "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl";
 json[1].libraries[0].whl = "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1+[UNIX_TIME_NANOS][2]-py3-none-any.whl";
 json[1].libraries[1].whl = "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/other_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl";
diff --git a/acceptance/bundle/artifacts/whl_dynamic/script b/acceptance/bundle/artifacts/whl_dynamic/script
index ddb6fcd55ec..1744ce38e47 100644
--- a/acceptance/bundle/artifacts/whl_dynamic/script
+++ b/acceptance/bundle/artifacts/whl_dynamic/script
@@ -1,4 +1,4 @@
-trap "rm -fr out.requests.txt databricks.yml my_test_code prebuilt" EXIT
+trap "rm -fr "$OUT_REQUESTS" databricks.yml my_test_code prebuilt" EXIT
 
 cp -r $TESTDIR/../whl_explicit/my_test_code .
 mkdir prebuilt
@@ -16,12 +16,12 @@ title "Verify contents of the zip file"
 trace find.py --expect 1 '.databricks/.*my_test_code.*whl' | xargs ziplist.py
 
 title "Expecting 2 patched wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt | gron.py | grep -w libraries
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS" | gron.py | grep -w libraries
 
 title "Expecting 2 patched wheels to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Updating the local wheel and deploying again\n"
 touch my_test_code/src/new_module.py
@@ -32,7 +32,7 @@ title "Verify contents, it should now have new_module.py"
 trace find.py --expect 1 '.databricks/.*my_test_code.*whl' | xargs ziplist.py
 
 title "Expecting 2 patched wheels in libraries section in /jobs/reset"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks' out.requests.txt | gron.py | grep -w libraries
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | .body.new_settings.tasks' "$OUT_REQUESTS" | gron.py | grep -w libraries
 
 title "Expecting 2 pached wheels to be uploaded (Bad: it is currently uploaded twice)"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
diff --git a/acceptance/bundle/artifacts/whl_explicit/output.txt b/acceptance/bundle/artifacts/whl_explicit/output.txt
index 239ffa6f82b..62f57d4cb35 100644
--- a/acceptance/bundle/artifacts/whl_explicit/output.txt
+++ b/acceptance/bundle/artifacts/whl_explicit/output.txt
@@ -4,14 +4,14 @@ Building my_test_code...
 Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 1 whl
 my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheel in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-132531-5opeqon1",
@@ -34,7 +34,7 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl"
 
 === Expecting delete request to artifact_path/.internal folder
->>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace/delete",
@@ -45,7 +45,7 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 }
 
 === Expecting mkdirs request to artifact_path/.internal folder
->>> jq -s .[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
diff --git a/acceptance/bundle/artifacts/whl_explicit/script b/acceptance/bundle/artifacts/whl_explicit/script
index 4988edd8155..fb51363da33 100644
--- a/acceptance/bundle/artifacts/whl_explicit/script
+++ b/acceptance/bundle/artifacts/whl_explicit/script
@@ -3,16 +3,16 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheel in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting 1 wheel to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
 title "Expecting delete request to artifact_path/.internal folder"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
 title "Expecting mkdirs request to artifact_path/.internal folder"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_implicit/output.txt b/acceptance/bundle/artifacts/whl_implicit/output.txt
index b70acc109e6..6ce5d21a91b 100644
--- a/acceptance/bundle/artifacts/whl_implicit/output.txt
+++ b/acceptance/bundle/artifacts/whl_implicit/output.txt
@@ -4,14 +4,14 @@ Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 1 whl
 dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-aaaaa-bbbbbb",
diff --git a/acceptance/bundle/artifacts/whl_implicit/script b/acceptance/bundle/artifacts/whl_implicit/script
index da61fb91f83..330bdbcda16 100644
--- a/acceptance/bundle/artifacts/whl_implicit/script
+++ b/acceptance/bundle/artifacts/whl_implicit/script
@@ -3,9 +3,9 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting 1 wheels to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt b/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt
index 835ab7c3413..5b12c809af3 100644
--- a/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt
+++ b/acceptance/bundle/artifacts/whl_implicit_custom_path/output.txt
@@ -3,14 +3,14 @@
 Uploading package/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 1 whl
 package/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheel in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body [OUTPUT_DIR]/out.requests.txt
 {
   "deployment": {
     "kind": "BUNDLE",
diff --git a/acceptance/bundle/artifacts/whl_implicit_custom_path/script b/acceptance/bundle/artifacts/whl_implicit_custom_path/script
index 623849d3bb5..02d9ca0cc2c 100644
--- a/acceptance/bundle/artifacts/whl_implicit_custom_path/script
+++ b/acceptance/bundle/artifacts/whl_implicit_custom_path/script
@@ -3,9 +3,9 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheel in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt | nostamp
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' "$OUT_REQUESTS" | nostamp
 
 title "Expecting 1 wheel to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt b/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt
index bab8fe2a99d..df5af4c8718 100644
--- a/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt
+++ b/acceptance/bundle/artifacts/whl_implicit_notebook/output.txt
@@ -4,14 +4,14 @@ Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 10 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 1 whl
 dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheel in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[0].libraries out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[0].libraries [OUTPUT_DIR]/out.requests.txt
 [
   {
     "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.0.1-py3-none-any.whl"
diff --git a/acceptance/bundle/artifacts/whl_implicit_notebook/script b/acceptance/bundle/artifacts/whl_implicit_notebook/script
index 30196556f1e..93564887e0e 100644
--- a/acceptance/bundle/artifacts/whl_implicit_notebook/script
+++ b/acceptance/bundle/artifacts/whl_implicit_notebook/script
@@ -3,9 +3,9 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheel in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[0].libraries' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks[0].libraries' "$OUT_REQUESTS"
 
 title "Expecting 1 wheel to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_multiple/output.txt b/acceptance/bundle/artifacts/whl_multiple/output.txt
index a6eeab1b952..fc8096ca712 100644
--- a/acceptance/bundle/artifacts/whl_multiple/output.txt
+++ b/acceptance/bundle/artifacts/whl_multiple/output.txt
@@ -6,7 +6,7 @@ Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 11 uploaded, 0 deleted
+Files: 9 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 2 whl
@@ -14,7 +14,7 @@ my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 my_test_code/dist/my_test_code_2-0.0.1-py3-none-any.whl
 
 === Expecting 2 wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-132531-5opeqon1",
diff --git a/acceptance/bundle/artifacts/whl_multiple/script b/acceptance/bundle/artifacts/whl_multiple/script
index 380c6c60f8a..4db8c8a7ce6 100644
--- a/acceptance/bundle/artifacts/whl_multiple/script
+++ b/acceptance/bundle/artifacts/whl_multiple/script
@@ -3,9 +3,9 @@ trace $CLI bundle deploy 2>&1
 trace find.py --expect 2 whl
 
 title "Expecting 2 wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting 2 wheels to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm -fr out.requests.txt
+rm -fr "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_no_cleanup/output.txt b/acceptance/bundle/artifacts/whl_no_cleanup/output.txt
index e9573230b06..70b9bd1875a 100644
--- a/acceptance/bundle/artifacts/whl_no_cleanup/output.txt
+++ b/acceptance/bundle/artifacts/whl_no_cleanup/output.txt
@@ -4,7 +4,7 @@ Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 1 whl
@@ -19,14 +19,14 @@ dist/my_test_code-0.0.1-py3-none-any.whl
 Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 === No calls to delete internal folder expected
->>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 
 === Expected 2 calls to create artifacts folder (because 2 deploys were done)
->>> jq -s .[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace/mkdirs",
diff --git a/acceptance/bundle/artifacts/whl_no_cleanup/script b/acceptance/bundle/artifacts/whl_no_cleanup/script
index 4536f929468..363df36b002 100644
--- a/acceptance/bundle/artifacts/whl_no_cleanup/script
+++ b/acceptance/bundle/artifacts/whl_no_cleanup/script
@@ -3,13 +3,13 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheels to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
 trace $CLI bundle deploy
 title "No calls to delete internal folder expected"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
 title "Expected 2 calls to create artifacts folder (because 2 deploys were done)"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/mkdirs") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt b/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt
index 560a1b1ad43..5171e10e463 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt
+++ b/acceptance/bundle/artifacts/whl_prebuilt_multiple/output.txt
@@ -8,7 +8,7 @@ Uploading dist/lib/other_test_code-0.0.1-py3-none-any.whl...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Expecting to find 2 wheels, same as initially provided
@@ -17,7 +17,7 @@ dist/lib/other_test_code-0.0.1-py3-none-any.whl
 dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 2 wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-132531-5opeqon1",
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_multiple/script b/acceptance/bundle/artifacts/whl_prebuilt_multiple/script
index 9df7ea3d987..4757c1482a1 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_multiple/script
+++ b/acceptance/bundle/artifacts/whl_prebuilt_multiple/script
@@ -6,9 +6,9 @@ title "Expecting to find 2 wheels, same as initially provided"
 trace find.py --expect 2 whl
 
 title "Expecting 2 wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting 2 wheels to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside/output.txt b/acceptance/bundle/artifacts/whl_prebuilt_outside/output.txt
index b5cf6bf9ad3..9611c9541f2 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_outside/output.txt
+++ b/acceptance/bundle/artifacts/whl_prebuilt_outside/output.txt
@@ -11,7 +11,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> find.py --expect 0 whl
 
 === Expecting 2 wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "existing_cluster_id": "0717-132531-5opeqon1",
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside/script b/acceptance/bundle/artifacts/whl_prebuilt_outside/script
index 939847f6c12..ecfd7bea799 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_outside/script
+++ b/acceptance/bundle/artifacts/whl_prebuilt_outside/script
@@ -8,9 +8,9 @@ trace find.py --expect 0 whl
 cd ..
 
 title "Expecting 2 wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
 
 title "Expecting 2 wheels to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/output.txt b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/output.txt
index cdd2b4432d8..324b0a1b18a 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/output.txt
+++ b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/output.txt
@@ -13,7 +13,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 .databricks/bundle/default/patched_wheels/art2_other_test_code/other_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl
 
 === Expecting 2 wheels in libraries section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "environment_key": "test_env",
@@ -41,7 +41,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
   }
 ]
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments [OUTPUT_DIR]/out.requests.txt
 [
   {
     "environment_key": "test_env",
diff --git a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/script b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/script
index af4e84b8b3f..b53c1dc55b2 100644
--- a/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/script
+++ b/acceptance/bundle/artifacts/whl_prebuilt_outside_dynamic/script
@@ -10,10 +10,10 @@ trace find.py --expect 2 whl
 cd ..
 
 title "Expecting 2 wheels in libraries section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' "$OUT_REQUESTS"
 
 title "Expecting 2 wheels to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key/output.txt b/acceptance/bundle/artifacts/whl_via_environment_key/output.txt
index e0cb8bcb22b..543b3e28853 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key/output.txt
+++ b/acceptance/bundle/artifacts/whl_via_environment_key/output.txt
@@ -4,14 +4,14 @@ Building my_test_code...
 Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 1 whl
 my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting 1 wheel in environments section in /jobs/create
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body [OUTPUT_DIR]/out.requests.txt
 {
   "deployment": {
     "kind": "BUNDLE",
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key/script b/acceptance/bundle/artifacts/whl_via_environment_key/script
index f82c5d7eccf..6285925d682 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key/script
+++ b/acceptance/bundle/artifacts/whl_via_environment_key/script
@@ -3,9 +3,9 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting 1 wheel in environments section in /jobs/create"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt | nostamp
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' "$OUT_REQUESTS" | nostamp
 
 title "Expecting 1 wheel to be uploaded"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key_extras/output.txt b/acceptance/bundle/artifacts/whl_via_environment_key_extras/output.txt
index 2ecf86709e1..e9b4812a204 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key_extras/output.txt
+++ b/acceptance/bundle/artifacts/whl_via_environment_key_extras/output.txt
@@ -4,14 +4,14 @@ Building my_test_code...
 Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> find.py --expect 1 whl
 my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl
 
 === Expecting the environments dependency to keep its [train] extras suffix
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body [OUTPUT_DIR]/out.requests.txt
 {
   "deployment": {
     "kind": "BUNDLE",
diff --git a/acceptance/bundle/artifacts/whl_via_environment_key_extras/script b/acceptance/bundle/artifacts/whl_via_environment_key_extras/script
index ccc0d9ed7f8..74db0f1a655 100644
--- a/acceptance/bundle/artifacts/whl_via_environment_key_extras/script
+++ b/acceptance/bundle/artifacts/whl_via_environment_key_extras/script
@@ -3,9 +3,9 @@ trace $CLI bundle deploy
 trace find.py --expect 1 whl
 
 title "Expecting the environments dependency to keep its [train] extras suffix"
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' out.requests.txt | nostamp
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body' "$OUT_REQUESTS" | nostamp
 
 title "Expecting 1 wheel to be uploaded under its bare filename (no extras)"
-trace jq .path < out.requests.txt | grep import | grep whl | sort
+trace jq .path < "$OUT_REQUESTS" | grep import | grep whl | sort
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/bundle_tag/id/output.txt b/acceptance/bundle/bundle_tag/id/output.txt
index 85768641368..96207c29b26 100644
--- a/acceptance/bundle/bundle_tag/id/output.txt
+++ b/acceptance/bundle/bundle_tag/id/output.txt
@@ -36,7 +36,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/bundle_tag/url/output.txt b/acceptance/bundle/bundle_tag/url/output.txt
index adf8cd2452b..19cfb07b01b 100644
--- a/acceptance/bundle/bundle_tag/url/output.txt
+++ b/acceptance/bundle/bundle_tag/url/output.txt
@@ -36,7 +36,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt b/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt
index 4de72fd5e43..1cf3ea7c01a 100644
--- a/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt
+++ b/acceptance/bundle/bundle_tag/url_ref/out.deploy.terraform.txt
@@ -4,5 +4,5 @@ Warning: "resources.jobs.foo.url": Terraform-only field; this reference will not
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.bar
 Created jobs.foo
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/bundle_tag/url_ref/out.destroy-requests.direct.txt b/acceptance/bundle/bundle_tag/url_ref/out.destroy-requests.direct.txt
index 712e41d868b..9ae96b91891 100644
--- a/acceptance/bundle/bundle_tag/url_ref/out.destroy-requests.direct.txt
+++ b/acceptance/bundle/bundle_tag/url_ref/out.destroy-requests.direct.txt
@@ -1,3 +1,3 @@
-File [TEST_TMP_DIR]/out.requests.txt not found
+File [OUTPUT_DIR]/out.requests.txt not found
 
 Exit code: 1
diff --git a/acceptance/bundle/config-remote-sync/cli_defaults/output.txt b/acceptance/bundle/config-remote-sync/cli_defaults/output.txt
index 21f517c910c..cbbb19f4d99 100644
--- a/acceptance/bundle/config-remote-sync/cli_defaults/output.txt
+++ b/acceptance/bundle/config-remote-sync/cli_defaults/output.txt
@@ -2,7 +2,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQU
 Created jobs.job1
 Created jobs.job2
 Created pipelines.pipeline1
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify jobs
diff --git a/acceptance/bundle/config-remote-sync/config_edits/output.txt b/acceptance/bundle/config-remote-sync/config_edits/output.txt
index 981bf7d1032..919a672eec3 100644
--- a/acceptance/bundle/config-remote-sync/config_edits/output.txt
+++ b/acceptance/bundle/config-remote-sync/config_edits/output.txt
@@ -1,7 +1,7 @@
 Uploading dummy.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Case 1: Added locally, updated remotely with different value
diff --git a/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt b/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt
index 121bce1d9ff..2ee2fd1ebee 100644
--- a/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt
+++ b/acceptance/bundle/config-remote-sync/dashboard_etag/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created dashboards.my_dashboard
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify the dashboard out of band to bump its remote etag
diff --git a/acceptance/bundle/config-remote-sync/flushed_cache/output.txt b/acceptance/bundle/config-remote-sync/flushed_cache/output.txt
index 1c545626279..508f5b1889b 100644
--- a/acceptance/bundle/config-remote-sync/flushed_cache/output.txt
+++ b/acceptance/bundle/config-remote-sync/flushed_cache/output.txt
@@ -2,7 +2,7 @@
 === Deploy bundle
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.test_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Get job ID and modify remote resource
diff --git a/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt b/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt
index d79a5be5527..6a25d9ffe18 100644
--- a/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt
+++ b/acceptance/bundle/config-remote-sync/formatting_preserved/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify max_concurrent_runs, description, and add timeout
diff --git a/acceptance/bundle/config-remote-sync/job_fields/output.txt b/acceptance/bundle/config-remote-sync/job_fields/output.txt
index afd0d45778e..3f7d3f1b14c 100644
--- a/acceptance/bundle/config-remote-sync/job_fields/output.txt
+++ b/acceptance/bundle/config-remote-sync/job_fields/output.txt
@@ -1,7 +1,7 @@
 Uploading dummy.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify job fields remotely
@@ -84,7 +84,7 @@ Resource: resources.jobs.my_job
 
 === Telemetry
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "save": true,
   "changes_total": 12,
diff --git a/acceptance/bundle/config-remote-sync/job_fields/script b/acceptance/bundle/config-remote-sync/job_fields/script
index c667e273b21..20653434666 100755
--- a/acceptance/bundle/config-remote-sync/job_fields/script
+++ b/acceptance/bundle/config-remote-sync/job_fields/script
@@ -7,7 +7,7 @@ add_repl "$NODE_TYPE_ID" NODE_TYPE_ID
 cleanup() {
   trace $CLI bundle destroy --auto-approve
   # destroy records requests too; drop the recorded file so it is not compared.
-  rm -f out.requests.txt
+  rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -71,4 +71,4 @@ echo
 # The engine name is dropped because both EnvMatrix variants share this output;
 # every other counter is engine-agnostic. This run exercises add_count and
 # remove_count (the remote edits add and remove keyed fields).
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null) | del(.engine)'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null) | del(.engine)'
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..e009aa87c0d 100644
--- a/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt
+++ b/acceptance/bundle/config-remote-sync/job_multiple_tasks/output.txt
@@ -2,7 +2,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQU
 Created jobs.my_job
 Created jobs.no_tasks_job
 Created jobs.rename_task_job
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify c_task, remove d_task, add e_task
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..543d48d2371 100644
--- a/acceptance/bundle/config-remote-sync/job_params_variables/output.txt
+++ b/acceptance/bundle/config-remote-sync/job_params_variables/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Add new parameter remotely
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..539987111fc 100644
--- a/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt
+++ b/acceptance/bundle/config-remote-sync/job_pipeline_task/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
 Created pipelines.my_pipeline
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify pipeline_task full_refresh to True
diff --git a/acceptance/bundle/config-remote-sync/json_status_selectors/output.txt b/acceptance/bundle/config-remote-sync/json_status_selectors/output.txt
index a6c6cd28529..6d021966e50 100644
--- a/acceptance/bundle/config-remote-sync/json_status_selectors/output.txt
+++ b/acceptance/bundle/config-remote-sync/json_status_selectors/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.test_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === A selector that matches nothing is reported as skipped, exit 0
diff --git a/acceptance/bundle/config-remote-sync/multiple_files/output.txt b/acceptance/bundle/config-remote-sync/multiple_files/output.txt
index cae1d0d39b7..a2a46515664 100644
--- a/acceptance/bundle/config-remote-sync/multiple_files/output.txt
+++ b/acceptance/bundle/config-remote-sync/multiple_files/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.job_one
 Created jobs.job_two
-Files: 11 uploaded, 0 deleted
+Files: 10 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify job_one: max_concurrent_runs, rename c_task
diff --git a/acceptance/bundle/config-remote-sync/multiple_resources/output.txt b/acceptance/bundle/config-remote-sync/multiple_resources/output.txt
index b09808f177e..4543f461007 100644
--- a/acceptance/bundle/config-remote-sync/multiple_resources/output.txt
+++ b/acceptance/bundle/config-remote-sync/multiple_resources/output.txt
@@ -6,7 +6,7 @@ Created jobs.job_two
 Created registered_models.test_model
 Created sql_warehouses.test_warehouse
 Created volumes.test_volume
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 7 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify both jobs
diff --git a/acceptance/bundle/config-remote-sync/output_json/output.txt b/acceptance/bundle/config-remote-sync/output_json/output.txt
index 41522af37e3..87b504a9264 100644
--- a/acceptance/bundle/config-remote-sync/output_json/output.txt
+++ b/acceptance/bundle/config-remote-sync/output_json/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.test_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === JSON output format{
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 5b479cba596..fd086ef212d 100644
--- a/acceptance/bundle/config-remote-sync/output_no_changes/output.txt
+++ b/acceptance/bundle/config-remote-sync/output_no_changes/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.test_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Check for changes immediately after deployment
diff --git a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
index 0df7958ad6f..0d2a026593f 100644
--- a/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
+++ b/acceptance/bundle/config-remote-sync/pipeline_fields/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created pipelines.my_pipeline
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify pipeline fields remotely
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..8375c9ca658 100644
--- a/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt
+++ b/acceptance/bundle/config-remote-sync/policy_injected_cluster_fields/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.job1
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Simulate a cluster policy injecting custom_tags and cluster_log_conf
diff --git a/acceptance/bundle/config-remote-sync/resolve_variables/output.txt b/acceptance/bundle/config-remote-sync/resolve_variables/output.txt
index c042ad534b2..98c0ecb9869 100644
--- a/acceptance/bundle/config-remote-sync/resolve_variables/output.txt
+++ b/acceptance/bundle/config-remote-sync/resolve_variables/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
 Created pipelines.my_pipeline
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify pipeline environment dependencies
@@ -111,7 +111,7 @@ Resource: resources.pipelines.my_pipeline
 
 === Telemetry
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "save": true,
   "changes_total": 17,
diff --git a/acceptance/bundle/config-remote-sync/resolve_variables/script b/acceptance/bundle/config-remote-sync/resolve_variables/script
index 9a18bfe2d50..a3d0edf7468 100755
--- a/acceptance/bundle/config-remote-sync/resolve_variables/script
+++ b/acceptance/bundle/config-remote-sync/resolve_variables/script
@@ -5,7 +5,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 cleanup() {
   trace $CLI bundle destroy --auto-approve
   # destroy records requests too; drop the recorded file so it is not compared.
-  rm -f out.requests.txt
+  rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -136,4 +136,4 @@ echo
 # every other counter is engine-agnostic. This run exercises refs_retargeted
 # (the env param re-targeted to a different variable) and refs_from_siblings
 # (added params/tasks restored from sibling references).
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null) | del(.engine)'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null) | del(.engine)'
diff --git a/acceptance/bundle/config-remote-sync/select_basic/output.txt b/acceptance/bundle/config-remote-sync/select_basic/output.txt
index 1fda3f33833..a9acf3e386f 100644
--- a/acceptance/bundle/config-remote-sync/select_basic/output.txt
+++ b/acceptance/bundle/config-remote-sync/select_basic/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.job_one
 Created jobs.job_two
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify both jobs remotely
diff --git a/acceptance/bundle/config-remote-sync/select_multiple/output.txt b/acceptance/bundle/config-remote-sync/select_multiple/output.txt
index 4dcc78c98ab..7f106637e34 100644
--- a/acceptance/bundle/config-remote-sync/select_multiple/output.txt
+++ b/acceptance/bundle/config-remote-sync/select_multiple/output.txt
@@ -2,7 +2,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQU
 Created jobs.job_a
 Created jobs.job_b
 Created jobs.job_c
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify all three jobs remotely
diff --git a/acceptance/bundle/config-remote-sync/skip_deployment/output.txt b/acceptance/bundle/config-remote-sync/skip_deployment/output.txt
index b552e59e21c..b464570939f 100644
--- a/acceptance/bundle/config-remote-sync/skip_deployment/output.txt
+++ b/acceptance/bundle/config-remote-sync/skip_deployment/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
 Created pipelines.my_pipeline
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify the CLI-managed deployment metadata and one user field remotely
diff --git a/acceptance/bundle/config-remote-sync/skip_permissions/output.txt b/acceptance/bundle/config-remote-sync/skip_permissions/output.txt
index 79eafa5f508..e585b8b7983 100644
--- a/acceptance/bundle/config-remote-sync/skip_permissions/output.txt
+++ b/acceptance/bundle/config-remote-sync/skip_permissions/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
 Created jobs.my_job.permissions
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Add a permission remotely (a change on the permissions sub-resource)
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..ace5341ac66 100644
--- a/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/cli_default_split_element/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.cli_default_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === existing_cluster_id is injected by OverrideCompute; the YAML has none
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..ffdc480eb74 100644
--- a/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/dotted_target/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev.eu/files...
 Created jobs.dotted_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Edit a field in the override block of a target whose name contains a dot
diff --git a/acceptance/bundle/config-remote-sync/split/isolation/output.txt b/acceptance/bundle/config-remote-sync/split/isolation/output.txt
index b1f86eb01ec..0d2b8d4a27f 100644
--- a/acceptance/bundle/config-remote-sync/split/isolation/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/isolation/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.job_a
 Created jobs.job_b
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Rename the two-block task on job_a, and edit job_b in the same run
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..fb5a0512731 100644
--- a/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/keyed_edit/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.split_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Edit alpha, defined only in the target block
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..619a1dca0f3 100644
--- a/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/keyed_remove/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.remove_job
 Created jobs.twoblock_remove_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Remove gamma from the top-level block and alpha from the target block
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..39c95b0a242 100644
--- a/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/keyed_rename/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.rename_job
 Created jobs.shift_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Rename a task defined in both blocks and a target-only task
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..36fdca3235d 100644
--- a/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/keyed_twoblock/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.twoblock_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Edit omega, whose sibling is defined in two blocks
diff --git a/acceptance/bundle/config-remote-sync/split/multifile/output.txt b/acceptance/bundle/config-remote-sync/split/multifile/output.txt
index e16279ac0c0..a8a7da3874a 100644
--- a/acceptance/bundle/config-remote-sync/split/multifile/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/multifile/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.multifile_job
-Files: 8 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Edit a task defined in the second included file
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..368b97e457e 100644
--- a/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/nested_add_split_parent/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.nested_add_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Add a task, then depend on it from the split task zzz_shared
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..9bd5f51ce28 100644
--- a/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/nested_sequence/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.nested_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Add a library to a task that is not first after the merge sort
diff --git a/acceptance/bundle/config-remote-sync/split/positional/output.txt b/acceptance/bundle/config-remote-sync/split/positional/output.txt
index 23e49c0ed79..10bf0bdf1c8 100644
--- a/acceptance/bundle/config-remote-sync/split/positional/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/positional/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created pipelines.split_pipeline
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Edit num_workers on the top-level cluster and on the target cluster
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..03611d23f1a 100644
--- a/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/remove_field_both_blocks/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.shared_field_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Remove max_retries, which both blocks define
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..58f70cfc3ca 100644
--- a/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/remove_with_unrelated_add/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.unrelated_add_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Remove the two-block task AND add an unrelated new task in one run
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..737a1c9c706 100644
--- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_pairing/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.ambiguous_rename_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === alpha (top-level) -> zzz and beta (target block) -> aaa, bodies identical
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..8871cb0170c 100644
--- a/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/rename_ambiguous_single_block/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.ambiguous_single_block_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Rename alpha -> zzz and beta -> aaa, and point gamma at the new keys
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..42433f62e84 100644
--- a/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/rename_two_removes_one_add/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.two_removes_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Two identical tasks, one in each block; DELETE one (remote), RENAME the other
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..bf1db14790d 100644
--- a/acceptance/bundle/config-remote-sync/split/target_variable/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/target_variable/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.var_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Rename the notebook inside a target-block field that uses a variable
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..4db5423733e 100644
--- a/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt
+++ b/acceptance/bundle/config-remote-sync/split/variable_file_order/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.file_order_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Edit aaa, whose file position differs from its merged position
diff --git a/acceptance/bundle/config-remote-sync/target_override/output.txt b/acceptance/bundle/config-remote-sync/target_override/output.txt
index 3fc95ddbd76..35c6b9b98cd 100644
--- a/acceptance/bundle/config-remote-sync/target_override/output.txt
+++ b/acceptance/bundle/config-remote-sync/target_override/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Modify fields in target override
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..2ebbe21da7a 100644
--- a/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt
+++ b/acceptance/bundle/config-remote-sync/task_rename_revert/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.sample_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Rename task to new_task_2 remotely
diff --git a/acceptance/bundle/config-remote-sync/validation_errors/output.txt b/acceptance/bundle/config-remote-sync/validation_errors/output.txt
index ebbb667b85a..867651f8fc1 100644
--- a/acceptance/bundle/config-remote-sync/validation_errors/output.txt
+++ b/acceptance/bundle/config-remote-sync/validation_errors/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
 Created pipelines.my_pipeline
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Set correct paths and add git info remotely
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..0ad1137275f 100644
--- a/acceptance/bundle/config-remote-sync/variable_reference_parent/output.txt
+++ b/acceptance/bundle/config-remote-sync/variable_reference_parent/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Inject a spark_conf key under a field defined as a complex variable
@@ -31,7 +31,7 @@ Resource: resources.jobs.my_job
 
 === Telemetry
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "save": true,
   "changes_total": 2,
diff --git a/acceptance/bundle/config-remote-sync/variable_reference_parent/script b/acceptance/bundle/config-remote-sync/variable_reference_parent/script
index 3a64e814ab8..00347b093f6 100644
--- a/acceptance/bundle/config-remote-sync/variable_reference_parent/script
+++ b/acceptance/bundle/config-remote-sync/variable_reference_parent/script
@@ -5,7 +5,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 cleanup() {
   trace $CLI bundle destroy --auto-approve
   # destroy records requests too; drop the recorded file so it is not compared.
-  rm -f out.requests.txt
+  rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -37,4 +37,4 @@ title "Telemetry"
 echo
 # The engine name is dropped because both EnvMatrix variants share this output.
 # skipped_changes_count reflects the spark_conf change skipped under a variable reference.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null) | del(.engine)'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null) | del(.engine)'
diff --git a/acceptance/bundle/deploy/empty-bundle/output.txt b/acceptance/bundle/deploy/empty-bundle/output.txt
index f0f54303479..47446c662e4 100644
--- a/acceptance/bundle/deploy/empty-bundle/output.txt
+++ b/acceptance/bundle/deploy/empty-bundle/output.txt
@@ -1,7 +1,7 @@
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/deploy/fail-on-active-runs/output.txt b/acceptance/bundle/deploy/fail-on-active-runs/output.txt
index e92bc0e92f1..fd549f6af05 100644
--- a/acceptance/bundle/deploy/fail-on-active-runs/output.txt
+++ b/acceptance/bundle/deploy/fail-on-active-runs/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> errcode [CLI] bundle deploy --fail-on-active-runs
@@ -12,7 +12,7 @@ Error: job [NUMID] is running
 Exit code: 1
 
 === Expecting only 1 delete request to artifact_path/.internal folder from the first deploy
->>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal")) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace/delete",
diff --git a/acceptance/bundle/deploy/fail-on-active-runs/script b/acceptance/bundle/deploy/fail-on-active-runs/script
index bedb035e2e7..19e7b09a113 100644
--- a/acceptance/bundle/deploy/fail-on-active-runs/script
+++ b/acceptance/bundle/deploy/fail-on-active-runs/script
@@ -5,6 +5,6 @@ trace $CLI bundle deploy
 trace errcode $CLI bundle deploy --fail-on-active-runs
 
 title "Expecting only 1 delete request to artifact_path/.internal folder from the first deploy"
-trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/workspace/delete") | select(.body.path | test(".*/artifacts/.internal"))' "$OUT_REQUESTS"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt b/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt
index b17cf0f620a..2254e966f74 100644
--- a/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt
+++ b/acceptance/bundle/deploy/files/no-snapshot-sync/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.foo
-Files: 9 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Check that test file is in workspace
@@ -44,7 +44,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 7 uploaded, 2 deleted
+Files: 6 uploaded, 2 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 === Check that removed files are not in the workspace anymore
diff --git a/acceptance/bundle/deploy/files/out-of-band-delete/output.txt b/acceptance/bundle/deploy/files/out-of-band-delete/output.txt
index fa773f68557..c99e644285a 100644
--- a/acceptance/bundle/deploy/files/out-of-band-delete/output.txt
+++ b/acceptance/bundle/deploy/files/out-of-band-delete/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === After the initial deploy the python_file exists
@@ -18,7 +18,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 === Redeploy reuses the stale snapshot, so the python_file is NOT re-uploaded
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files...
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> musterr [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py
@@ -29,7 +29,7 @@ Error: Path (/Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/file
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] workspace get-status /Workspace/Users/[USERNAME]/.bundle/out-of-band-delete/default/files/hello_world.py
diff --git a/acceptance/bundle/deploy/force-lock-config/output.txt b/acceptance/bundle/deploy/force-lock-config/output.txt
index c74a02c31a6..c0fd8a654b3 100644
--- a/acceptance/bundle/deploy/force-lock-config/output.txt
+++ b/acceptance/bundle/deploy/force-lock-config/output.txt
@@ -6,5 +6,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-force-lock/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/deploy/immutable-no-artifacts/script b/acceptance/bundle/deploy/immutable-no-artifacts/script
index 6f8f5f97bd6..893398f555f 100644
--- a/acceptance/bundle/deploy/immutable-no-artifacts/script
+++ b/acceptance/bundle/deploy/immutable-no-artifacts/script
@@ -1,7 +1,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..4af18fe65c1 100644
--- a/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt
+++ b/acceptance/bundle/deploy/partial-summary-on-push-fail/output.txt
@@ -8,13 +8,13 @@ HTTP Status: 403 Forbidden
 API error_code: INJECTED
 API message: Fault injected by test.
 
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 
 Exit code: 1
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/deploy/pipeline-config-dots/output.txt b/acceptance/bundle/deploy/pipeline-config-dots/output.txt
index 4692d68e2d9..b64e2ec0ff2 100644
--- a/acceptance/bundle/deploy/pipeline-config-dots/output.txt
+++ b/acceptance/bundle/deploy/pipeline-config-dots/output.txt
@@ -12,7 +12,7 @@ Validation OK!
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.my_pipeline
 Created schemas.my_schema
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/deploy/readplan/basic/output.txt b/acceptance/bundle/deploy/readplan/basic/output.txt
index b47a16f11ed..b312d4f195b 100644
--- a/acceptance/bundle/deploy/readplan/basic/output.txt
+++ b/acceptance/bundle/deploy/readplan/basic/output.txt
@@ -6,7 +6,7 @@
 >>> [CLI] bundle deploy --plan tmp.plan_create.json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --get //jobs
@@ -41,7 +41,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy --plan tmp.plan_skip.json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --get //jobs
diff --git a/acceptance/bundle/deploy/readplan/basic/script b/acceptance/bundle/deploy/readplan/basic/script
index b73ca75bf25..690e34fdfeb 100644
--- a/acceptance/bundle/deploy/readplan/basic/script
+++ b/acceptance/bundle/deploy/readplan/basic/script
@@ -17,4 +17,4 @@ trace $CLI bundle deploy --plan tmp.plan_skip.json
 trace print_requests.py --get //jobs | nostamp | contains.py "!GET" "!POST"
 
 trace $CLI bundle destroy --auto-approve
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt b/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt
index 7d6f07a44cd..57512f1167f 100644
--- a/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt
+++ b/acceptance/bundle/deploy/readplan/cli-version-mismatch/output.txt
@@ -5,7 +5,7 @@
 Warn: Plan was created with CLI version 1.2.3 but current version is [CLI_VERSION]
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "method": "POST",
diff --git a/acceptance/bundle/deploy/readplan/cli-version-mismatch/script b/acceptance/bundle/deploy/readplan/cli-version-mismatch/script
index e87a023055c..321e3489401 100644
--- a/acceptance/bundle/deploy/readplan/cli-version-mismatch/script
+++ b/acceptance/bundle/deploy/readplan/cli-version-mismatch/script
@@ -4,4 +4,4 @@ trace $CLI bundle deploy --plan plan.json
 rm plan.json
 print_requests.py //jobs | nostamp
 trace $CLI bundle destroy --auto-approve
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt b/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt
index 68a8439c550..7d46526422c 100644
--- a/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt
+++ b/acceptance/bundle/deploy/readplan/grants-remove-principal/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created schemas.myschema
 Created schemas.myschema.grants
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog/permissions --sort
@@ -43,7 +43,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 }
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated schemas.myschema.grants
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //unity-catalog/permissions --sort
diff --git a/acceptance/bundle/deploy/readplan/grants-remove-principal/script b/acceptance/bundle/deploy/readplan/grants-remove-principal/script
index e7dd63bce56..567724792c8 100644
--- a/acceptance/bundle/deploy/readplan/grants-remove-principal/script
+++ b/acceptance/bundle/deploy/readplan/grants-remove-principal/script
@@ -1,6 +1,6 @@
 cleanup() {
     $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/deploy/readplan/postgres_role/output.txt b/acceptance/bundle/deploy/readplan/postgres_role/output.txt
index 4d42b75aaea..58479ea3a73 100644
--- a/acceptance/bundle/deploy/readplan/postgres_role/output.txt
+++ b/acceptance/bundle/deploy/readplan/postgres_role/output.txt
@@ -6,7 +6,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Created postgres_branches.branch
 Created postgres_projects.project
 Created postgres_roles.role
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //roles
diff --git a/acceptance/bundle/deploy/readplan/postgres_role/script b/acceptance/bundle/deploy/readplan/postgres_role/script
index 8d46d700aef..dff65642595 100644
--- a/acceptance/bundle/deploy/readplan/postgres_role/script
+++ b/acceptance/bundle/deploy/readplan/postgres_role/script
@@ -20,4 +20,4 @@ trace print_requests.py //roles
 trace $CLI bundle plan
 
 trace $CLI bundle destroy --auto-approve
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt b/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt
index 02c4439f2eb..16e8ce21788 100644
--- a/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt
+++ b/acceptance/bundle/deploy/readplan/serial-mismatch/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan -o json
diff --git a/acceptance/bundle/deploy/readplan/whl-not-uploaded/output.txt b/acceptance/bundle/deploy/readplan/whl-not-uploaded/output.txt
index b8606589cbf..981e942ee4f 100644
--- a/acceptance/bundle/deploy/readplan/whl-not-uploaded/output.txt
+++ b/acceptance/bundle/deploy/readplan/whl-not-uploaded/output.txt
@@ -4,7 +4,7 @@
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/whl-not-uploaded/default/files...
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //artifacts/.internal --del-field raw_body
@@ -30,7 +30,7 @@ Destroy: 1 deleted
 >>> [CLI] bundle deploy --plan tmp.plan.json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/whl-not-uploaded/default/files...
 Created jobs.my_job
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //artifacts/.internal --del-field raw_body
diff --git a/acceptance/bundle/deploy/readplan/whl-not-uploaded/script b/acceptance/bundle/deploy/readplan/whl-not-uploaded/script
index 753216001cc..bfcfeafca9e 100644
--- a/acceptance/bundle/deploy/readplan/whl-not-uploaded/script
+++ b/acceptance/bundle/deploy/readplan/whl-not-uploaded/script
@@ -12,7 +12,7 @@ trace print_requests.py //artifacts/.internal --del-field raw_body
 
 trace $CLI bundle destroy --auto-approve
 # Discard destroy's requests so the saved-plan deploy below starts from a clean recording.
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "bundle deploy --plan does NOT upload the wheel (bug)"
 trace $CLI bundle plan -o json > tmp.plan.json
@@ -25,4 +25,4 @@ trace $CLI bundle deploy --plan tmp.plan.json
 trace print_requests.py //artifacts/.internal --del-field raw_body
 
 trace $CLI bundle destroy --auto-approve
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/deploy/resource-max-wait-zero/script b/acceptance/bundle/deploy/resource-max-wait-zero/script
index 7f1e8ce3b9a..2ec5cee9bf9 100644
--- a/acceptance/bundle/deploy/resource-max-wait-zero/script
+++ b/acceptance/bundle/deploy/resource-max-wait-zero/script
@@ -1,10 +1,10 @@
 cleanup() {
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 title "Zero cap: the create wait is skipped entirely"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace DATABRICKS_BUNDLE_RESOURCE_MAX_WAIT=0 $CLI bundle deploy
 
 # Only the create POST is recorded. No GET means the cluster was left PENDING: the
@@ -15,7 +15,7 @@ trace print_requests.py --get --unique --oneline --del-field body,q //clusters
 trace $CLI bundle destroy --auto-approve
 
 title "No cap: the deployment polls until the cluster is RUNNING"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 trace print_requests.py --get --unique --oneline --del-field body,q //clusters
diff --git a/acceptance/bundle/deploy/snapshot-comparison/script b/acceptance/bundle/deploy/snapshot-comparison/script
index d15616e642a..c0a83c947f1 100755
--- a/acceptance/bundle/deploy/snapshot-comparison/script
+++ b/acceptance/bundle/deploy/snapshot-comparison/script
@@ -18,7 +18,7 @@ cleanup() {
     title "Cleanup bundle 2"
     (cd bundle2 && unset DATABRICKS_BUNDLE_ENGINE && trace $CLI bundle destroy --auto-approve)
 
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/deploy/spark-jar-task/output.txt b/acceptance/bundle/deploy/spark-jar-task/output.txt
index 34360cc0b49..acc087fd5d3 100644
--- a/acceptance/bundle/deploy/spark-jar-task/output.txt
+++ b/acceptance/bundle/deploy/spark-jar-task/output.txt
@@ -4,7 +4,7 @@ Building my_java_code...
 Uploading myjar/PrintArgs.jar...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/spark-jar-task-[UNIQUE_NAME]/default/files...
 Created jobs.jar_job
-Files: 9 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run jar_job
diff --git a/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt b/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt
index f24d2764418..e9762bf4cb6 100644
--- a/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt
+++ b/acceptance/bundle/deploy/wal/corrupted-wal-entry/output.txt
@@ -11,7 +11,7 @@ Warn: Saved 1 corrupted WAL entries to [TEST_TMP_DIR]/.databricks/bundle/default
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-corrupted-test/default/files...
 Created jobs.another_valid
 Created jobs.valid_job
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle summary
diff --git a/acceptance/bundle/deploy/wal/empty-wal/output.txt b/acceptance/bundle/deploy/wal/empty-wal/output.txt
index 4ba404407ce..d42e0150467 100644
--- a/acceptance/bundle/deploy/wal/empty-wal/output.txt
+++ b/acceptance/bundle/deploy/wal/empty-wal/output.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-empty-test/default/files...
 Created jobs.test_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt b/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt
index f2a61f5a23d..194a223a02c 100644
--- a/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt
+++ b/acceptance/bundle/deploy/wal/failed-plan-no-wal/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Deploy 2 (planning fails, must not leave a WAL)
@@ -18,7 +18,7 @@ API message: Fault injected by test.
 
 Error: planning failed
 
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 
 Exit code: 1
 
@@ -36,7 +36,7 @@ API message: Fault injected by test.
 
 Error: planning failed
 
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 
 Exit code: 1
 
@@ -45,5 +45,5 @@ Exit code: 1
 === Deploy 4 (fault expired: recovers and succeeds)
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
diff --git a/acceptance/bundle/deploy/wal/header-only-wal/output.txt b/acceptance/bundle/deploy/wal/header-only-wal/output.txt
index da8c1bdc1f3..3d4eb38635d 100644
--- a/acceptance/bundle/deploy/wal/header-only-wal/output.txt
+++ b/acceptance/bundle/deploy/wal/header-only-wal/output.txt
@@ -23,7 +23,7 @@ Exit code: [KILLED]
 >>> errcode [CLI] bundle deploy --force-lock
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> errcode assert_not_exists.py .databricks/bundle/default/resources.json.wal
diff --git a/acceptance/bundle/deploy/wal/stale-wal/output.txt b/acceptance/bundle/deploy/wal/stale-wal/output.txt
index b02ec60c0ba..2ca5c81f624 100644
--- a/acceptance/bundle/deploy/wal/stale-wal/output.txt
+++ b/acceptance/bundle/deploy/wal/stale-wal/output.txt
@@ -6,7 +6,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-stale-test/default/files...
 Updated jobs.test_job
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 === Checking WAL file after deploy ===
 Stale WAL deleted (expected)
diff --git a/acceptance/bundle/deploy/wal/wal-with-delete/output.txt b/acceptance/bundle/deploy/wal/wal-with-delete/output.txt
index 74af6e61cbc..06747107384 100644
--- a/acceptance/bundle/deploy/wal/wal-with-delete/output.txt
+++ b/acceptance/bundle/deploy/wal/wal-with-delete/output.txt
@@ -5,7 +5,7 @@
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/wal-delete-test/default/files...
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 === Final state (should have no jobs) ===
 
diff --git a/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt b/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt
index e348a4ec101..f4c284e8c81 100644
--- a/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt
+++ b/acceptance/bundle/deploy/yaml-sync-empty-grants/output.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/yaml-sync-empty-grants/default/files...
 Created schemas.schema1
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/deployment/bind/catalog/output.txt b/acceptance/bundle/deployment/bind/catalog/output.txt
index 56576c70780..b5b10e03d47 100644
--- a/acceptance/bundle/deployment/bind/catalog/output.txt
+++ b/acceptance/bundle/deployment/bind/catalog/output.txt
@@ -13,7 +13,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 >>> [CLI] bundle deploy --force-lock --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated catalogs.foo
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] catalogs get test-catalog-[UNIQUE_NAME]
diff --git a/acceptance/bundle/deployment/bind/dashboard/output.txt b/acceptance/bundle/deployment/bind/dashboard/output.txt
index 6e6ded5fc83..8cb10c92120 100644
--- a/acceptance/bundle/deployment/bind/dashboard/output.txt
+++ b/acceptance/bundle/deployment/bind/dashboard/output.txt
@@ -4,7 +4,7 @@ Successfully bound dashboard with an id '[DASHBOARD_ID]'
 Run 'bundle deploy' to deploy changes to your workspace
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated dashboards.dashboard1
-Files: 13 uploaded, 0 deleted
+Files: 12 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] lakeview get [DASHBOARD_ID]
diff --git a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt
index 21ebc31d7dd..d1aee793bb0 100644
--- a/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt
+++ b/acceptance/bundle/deployment/bind/dashboard/recreation/output.txt
@@ -19,14 +19,14 @@ Error: the deployment requires destructive actions, but the current console does
 Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed.
 To proceed, use --auto-approve after reviewing the plan above.
 
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 
 Exit code: 1
 
 >>> [CLI] bundle deployment unbind dashboard1
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created dashboards.dashboard1
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] lakeview get [DASHBOARD_ID]
diff --git a/acceptance/bundle/deployment/bind/experiment/output.txt b/acceptance/bundle/deployment/bind/experiment/output.txt
index acf9b03cb51..7e21e744202 100644
--- a/acceptance/bundle/deployment/bind/experiment/output.txt
+++ b/acceptance/bundle/deployment/bind/experiment/output.txt
@@ -5,7 +5,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy --force-lock --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] experiments get-experiment [NUMID]
diff --git a/acceptance/bundle/deployment/bind/external_location/output.txt b/acceptance/bundle/deployment/bind/external_location/output.txt
index b973aaf8340..059458db8fb 100644
--- a/acceptance/bundle/deployment/bind/external_location/output.txt
+++ b/acceptance/bundle/deployment/bind/external_location/output.txt
@@ -14,7 +14,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 >>> [CLI] bundle deploy --force-lock --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated external_locations.test_location
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] external-locations get test-location-[UNIQUE_NAME]
diff --git a/acceptance/bundle/deployment/bind/genie_space/output.txt b/acceptance/bundle/deployment/bind/genie_space/output.txt
index 0164a5131f7..78d6f45f923 100644
--- a/acceptance/bundle/deployment/bind/genie_space/output.txt
+++ b/acceptance/bundle/deployment/bind/genie_space/output.txt
@@ -8,7 +8,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] genie get-space [GENIE_SPACE_ID]
diff --git a/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt b/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt
index 7faa15705b4..22583d2bca7 100644
--- a/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt
+++ b/acceptance/bundle/deployment/bind/job/already-managed-different/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs create --json {"name": "My Job"}
diff --git a/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt b/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt
index bcd1067762f..81deec26af2 100644
--- a/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt
+++ b/acceptance/bundle/deployment/bind/job/already-managed-same/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt b/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt
index bb51f8af0ce..31667507c71 100644
--- a/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt
+++ b/acceptance/bundle/deployment/bind/job/engine-from-config/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/engine-from-config/default/files...
 Created jobs.job_1
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 === State files after deploy ===
 .databricks/bundle/default/resources.json
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..7f99d54ea55 100644
--- a/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt
+++ b/acceptance/bundle/deployment/bind/job/generate-and-bind/output.txt
@@ -23,7 +23,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-generate-bind-[UNIQUE_NAME]/files...
 Updated jobs.test_job_key
-Files: 8 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt b/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt
index f3b7b7b44b3..babee6b8cc1 100644
--- a/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt
+++ b/acceptance/bundle/deployment/bind/job/job-abort-bind/output.txt
@@ -13,7 +13,7 @@ Exit code: 1
 >>> [CLI] bundle deploy --force-lock
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bind-job-[UNIQUE_NAME]/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Check that job is not bound and not updated with config from bundle:
diff --git a/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt b/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt
index 9f058496a7c..aef2020e3f9 100644
--- a/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt
+++ b/acceptance/bundle/deployment/bind/job/job-spark-python-task/output.txt
@@ -14,7 +14,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 >>> [CLI] bundle deploy --force-lock --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bind-job-[UNIQUE_NAME]/files...
 Updated jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Read the pre-defined job:
diff --git a/acceptance/bundle/deployment/bind/job/noop-job/output.txt b/acceptance/bundle/deployment/bind/job/noop-job/output.txt
index 00d5a8807b2..c4037054a11 100644
--- a/acceptance/bundle/deployment/bind/job/noop-job/output.txt
+++ b/acceptance/bundle/deployment/bind/job/noop-job/output.txt
@@ -8,7 +8,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
 Updated jobs.job_1
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs get [NUMID] --output json
diff --git a/acceptance/bundle/deployment/bind/job/python-job/output.txt b/acceptance/bundle/deployment/bind/job/python-job/output.txt
index 093435a89b1..f8971fd9420 100644
--- a/acceptance/bundle/deployment/bind/job/python-job/output.txt
+++ b/acceptance/bundle/deployment/bind/job/python-job/output.txt
@@ -8,7 +8,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
 Updated jobs.job_1
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs get [NUMID] --output json
diff --git a/acceptance/bundle/deployment/bind/job/stale-state/output.txt b/acceptance/bundle/deployment/bind/job/stale-state/output.txt
index a41382543f4..1604fe9becb 100644
--- a/acceptance/bundle/deployment/bind/job/stale-state/output.txt
+++ b/acceptance/bundle/deployment/bind/job/stale-state/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/stale_state_test/default/files...
 Created jobs.job_1
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Step 2: Save stale local state (has only job_1, serial=1)
@@ -11,7 +11,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/stale_state_test/default/files...
 Created jobs.job_2
-Files: 3 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
 === Step 4: Record deployed job_2 ID from stateDeployed job_2 ID: [JOB_2_ID]
diff --git a/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt b/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt
index 59dff22488b..f2123169826 100644
--- a/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt
+++ b/acceptance/bundle/deployment/bind/model-serving-endpoint/output.txt
@@ -34,7 +34,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] serving-endpoints get test-endpoint-[UNIQUE_NAME]
diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt b/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt
index 32f89f53a1f..ac517cb9363 100644
--- a/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt
+++ b/acceptance/bundle/deployment/bind/pipelines/recreate/output.txt
@@ -20,7 +20,7 @@ Error: the deployment requires destructive actions, but the current console does
 Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed.
 To proceed, use --auto-approve after reviewing the plan above.
 
-Files: 12 uploaded, 0 deleted
+Files: 10 uploaded, 0 deleted
 
 >>> [CLI] bundle deploy --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-recreate-[UNIQUE_NAME]/default/files...
@@ -31,7 +31,7 @@ restore the defined STs and MVs through full refresh. Note that recreation is ne
 properties such as the 'catalog' or 'storage' are changed:
   recreate resources.pipelines.foo
 Recreated pipelines.foo
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py ^//import-file/ ^//workspace/ ^//telemetry-ext
diff --git a/acceptance/bundle/deployment/bind/pipelines/recreate/script b/acceptance/bundle/deployment/bind/pipelines/recreate/script
index 749e8ff916d..64489d919ff 100644
--- a/acceptance/bundle/deployment/bind/pipelines/recreate/script
+++ b/acceptance/bundle/deployment/bind/pipelines/recreate/script
@@ -4,11 +4,11 @@ envsubst < pipeline.json.tmpl > pipeline.json
 NEW_PIPELINE_ID=$($CLI pipelines create --json @pipeline.json | jq -r .pipeline_id)
 add_repl $NEW_PIPELINE_ID NEW_PIPELINE_ID
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace musterr $CLI bundle deployment bind foo $NEW_PIPELINE_ID &> out.bind-fail.$DATABRICKS_BUNDLE_ENGINE.txt
 print_requests.py '^//import-file/' '^//workspace/'
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.txt
 trace print_requests.py '^//import-file/' '^//workspace/'
 
@@ -17,6 +17,6 @@ trace $CLI bundle plan
 
 trace musterr $CLI bundle deploy
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy --auto-approve
 trace print_requests.py '^//import-file/' '^//workspace/' '^//telemetry-ext' > out.deploy.requests.json
diff --git a/acceptance/bundle/deployment/bind/pipelines/update/output.txt b/acceptance/bundle/deployment/bind/pipelines/update/output.txt
index 72de9c9187a..55546319f5f 100644
--- a/acceptance/bundle/deployment/bind/pipelines/update/output.txt
+++ b/acceptance/bundle/deployment/bind/pipelines/update/output.txt
@@ -16,7 +16,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-recreate/default/files...
 Updated pipelines.foo
-Files: 10 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py ^//import-file/ ^//workspace/delete ^//telemetry-ext
diff --git a/acceptance/bundle/deployment/bind/pipelines/update/script b/acceptance/bundle/deployment/bind/pipelines/update/script
index d3df0a767ed..fc1590c43f7 100644
--- a/acceptance/bundle/deployment/bind/pipelines/update/script
+++ b/acceptance/bundle/deployment/bind/pipelines/update/script
@@ -1,17 +1,17 @@
 NEW_PIPELINE_ID=$($CLI pipelines create --json @pipeline.json | jq -r .pipeline_id)
 add_repl $NEW_PIPELINE_ID NEW_PIPELINE_ID
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace musterr $CLI bundle deployment bind foo $NEW_PIPELINE_ID &> out.bind-fail.$DATABRICKS_BUNDLE_ENGINE.txt
 print_requests.py '^//import-file/' '^//workspace/delete'
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deployment bind foo $NEW_PIPELINE_ID --auto-approve &> out.bind-success.txt
 print_requests.py '^//import-file/' '^//workspace/delete'
 
 trace $CLI bundle summary -o json > out.summary.json
 trace $CLI bundle plan
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy --auto-approve
 trace print_requests.py '^//import-file/' '^//workspace/delete' '^//telemetry-ext' > out.deploy.requests.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/deployment/bind/quality-monitor/output.txt b/acceptance/bundle/deployment/bind/quality-monitor/output.txt
index 117f211ce4e..bbb0254c51e 100644
--- a/acceptance/bundle/deployment/bind/quality-monitor/output.txt
+++ b/acceptance/bundle/deployment/bind/quality-monitor/output.txt
@@ -18,5 +18,5 @@ Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/bind-quality-monitor-test-localonly/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
diff --git a/acceptance/bundle/deployment/bind/registered-model/output.txt b/acceptance/bundle/deployment/bind/registered-model/output.txt
index a13f31aba74..48f74051620 100644
--- a/acceptance/bundle/deployment/bind/registered-model/output.txt
+++ b/acceptance/bundle/deployment/bind/registered-model/output.txt
@@ -20,7 +20,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] registered-models get main.test-schema-rmodel-[UNIQUE_NAME].test-registered-model-[UNIQUE_NAME]
diff --git a/acceptance/bundle/deployment/bind/schema/output.txt b/acceptance/bundle/deployment/bind/schema/output.txt
index d88bf960591..1973c7789be 100644
--- a/acceptance/bundle/deployment/bind/schema/output.txt
+++ b/acceptance/bundle/deployment/bind/schema/output.txt
@@ -11,7 +11,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 
 === Deploy bundle: Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated schemas.schema1
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Read the pre-defined schema: {
diff --git a/acceptance/bundle/deployment/bind/volume/output.txt b/acceptance/bundle/deployment/bind/volume/output.txt
index 5475e85facf..dbd0b0dd76d 100644
--- a/acceptance/bundle/deployment/bind/volume/output.txt
+++ b/acceptance/bundle/deployment/bind/volume/output.txt
@@ -12,7 +12,7 @@ Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] volumes read main.test-schema-[UNIQUE_NAME].volume-[UNIQUE_NAME]
diff --git a/acceptance/bundle/deployment/unbind/engine-from-config/output.txt b/acceptance/bundle/deployment/unbind/engine-from-config/output.txt
index f1668120e66..833d404790b 100644
--- a/acceptance/bundle/deployment/unbind/engine-from-config/output.txt
+++ b/acceptance/bundle/deployment/unbind/engine-from-config/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/engine-from-config/default/files...
 Created jobs.job_1
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 === State files after deploy ===
 .databricks/bundle/default/resources.json
diff --git a/acceptance/bundle/deployment/unbind/grants/output.txt b/acceptance/bundle/deployment/unbind/grants/output.txt
index 191681970c1..f264708c02d 100644
--- a/acceptance/bundle/deployment/unbind/grants/output.txt
+++ b/acceptance/bundle/deployment/unbind/grants/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created schemas.schema_1
 Created schemas.schema_1.grants
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] grants get schema main.test-schema-[UNIQUE_NAME] --output json
@@ -21,7 +21,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created schemas.schema_1
 Created schemas.schema_1.grants
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Grants should be the same as before unbind
diff --git a/acceptance/bundle/deployment/unbind/job/output.txt b/acceptance/bundle/deployment/unbind/job/output.txt
index 99fd2b6b161..c985b8c68ac 100644
--- a/acceptance/bundle/deployment/unbind/job/output.txt
+++ b/acceptance/bundle/deployment/unbind/job/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy --var job_name=My Job
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
 Created jobs.job_1
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle summary --var job_name=My Job --output json
@@ -12,7 +12,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy --var job_name=Updated Job
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
 Created jobs.job_1
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs get [NUMID] --output json
diff --git a/acceptance/bundle/deployment/unbind/permissions/output.txt b/acceptance/bundle/deployment/unbind/permissions/output.txt
index ee5587fdeca..7b5cfea2f66 100644
--- a/acceptance/bundle/deployment/unbind/permissions/output.txt
+++ b/acceptance/bundle/deployment/unbind/permissions/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.job_1
 Created jobs.job_1.permissions
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle summary --output json
@@ -25,7 +25,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.job_1
 Created jobs.job_1.permissions
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Permissions should be the same as before unbind
diff --git a/acceptance/bundle/deployment/unbind/python-job/output.txt b/acceptance/bundle/deployment/unbind/python-job/output.txt
index c96d3d11110..349967c0082 100644
--- a/acceptance/bundle/deployment/unbind/python-job/output.txt
+++ b/acceptance/bundle/deployment/unbind/python-job/output.txt
@@ -2,7 +2,7 @@
 >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deploy --var job_name=My Job
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
 Created jobs.job_1
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle summary --var job_name=My Job --output json
@@ -12,7 +12,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> uv run --with [DATABRICKS_BUNDLES_WHEEL] -q [CLI] bundle deploy --var job_name=Updated Job
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/my_project/default/files...
 Created jobs.job_1
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs get [NUMID] --output json
diff --git a/acceptance/bundle/destroy/all-resources/output.txt b/acceptance/bundle/destroy/all-resources/output.txt
index eed7625730b..b51a714c75f 100644
--- a/acceptance/bundle/destroy/all-resources/output.txt
+++ b/acceptance/bundle/destroy/all-resources/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.my_pipeline
 Created schemas.my_schema
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/destroy/force-lock-node-limit/output.txt b/acceptance/bundle/destroy/force-lock-node-limit/output.txt
index 97a2a8bda56..91ebb8a374e 100644
--- a/acceptance/bundle/destroy/force-lock-node-limit/output.txt
+++ b/acceptance/bundle/destroy/force-lock-node-limit/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === destroy without --force-lock (lock write hits the node limit: aborts)
diff --git a/acceptance/bundle/destroy/jobs-and-pipeline/output.txt b/acceptance/bundle/destroy/jobs-and-pipeline/output.txt
index ceb94eee711..f89c99c2050 100644
--- a/acceptance/bundle/destroy/jobs-and-pipeline/output.txt
+++ b/acceptance/bundle/destroy/jobs-and-pipeline/output.txt
@@ -6,7 +6,7 @@ Directory does not exist
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.foo
 Created pipelines.bar
-Files: 9 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert the snapshot file exists
diff --git a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt
index ae0b07d901b..74c75a901b8 100644
--- a/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt
+++ b/acceptance/bundle/destroy/lineage-mismatch-after-redeploy/output.txt
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lineage-mismatch-after-redeploy/default/files...
 Created jobs.test_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
@@ -20,7 +20,7 @@ Destroy: 1 deleted
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lineage-mismatch-after-redeploy/default/files...
 Created jobs.test_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Machine A: any command that pulls remote state now fails
diff --git a/acceptance/bundle/destroy/root-path-name-target/output.txt b/acceptance/bundle/destroy/root-path-name-target/output.txt
index b880722ba81..e8d3329d53c 100644
--- a/acceptance/bundle/destroy/root-path-name-target/output.txt
+++ b/acceptance/bundle/destroy/root-path-name-target/output.txt
@@ -1,7 +1,7 @@
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/explicit-[UNIQUE_NAME]/test-bundle/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/destroy/root-path-not-scoped/output.txt b/acceptance/bundle/destroy/root-path-not-scoped/output.txt
index 539e7d5d5e4..96b27261dd5 100644
--- a/acceptance/bundle/destroy/root-path-not-scoped/output.txt
+++ b/acceptance/bundle/destroy/root-path-not-scoped/output.txt
@@ -1,7 +1,7 @@
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/custom-root-[UNIQUE_NAME]/inner/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/destroy/sibling-target/output.txt b/acceptance/bundle/destroy/sibling-target/output.txt
index 53cfe9c37e1..090695497d4 100644
--- a/acceptance/bundle/destroy/sibling-target/output.txt
+++ b/acceptance/bundle/destroy/sibling-target/output.txt
@@ -1,12 +1,12 @@
 
 >>> [CLI] bundle deploy -t dev
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/dev/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -t prod
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/prod/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 === Destroy one target while the other is still deployed
diff --git a/acceptance/bundle/dms/bind-unbind-unsupported/output.txt b/acceptance/bundle/dms/bind-unbind-unsupported/output.txt
index 14686850b03..c29a7f9f5b4 100644
--- a/acceptance/bundle/dms/bind-unbind-unsupported/output.txt
+++ b/acceptance/bundle/dms/bind-unbind-unsupported/output.txt
@@ -8,7 +8,7 @@ Error: bind is not supported for a bundle target that records deployment history
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-bind-unbind-[UNIQUE_NAME]/default/files...
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> musterr [CLI] bundle deployment unbind foo
diff --git a/acceptance/bundle/dms/bind-unbind-unsupported/script b/acceptance/bundle/dms/bind-unbind-unsupported/script
index 9af766ca4d3..a7fb6afa20d 100644
--- a/acceptance/bundle/dms/bind-unbind-unsupported/script
+++ b/acceptance/bundle/dms/bind-unbind-unsupported/script
@@ -13,4 +13,4 @@ title "Deploy so the bundle records state, then unbind is refused too"
 trace $CLI bundle deploy
 trace musterr $CLI bundle deployment unbind foo
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/declined-deploy/output.txt b/acceptance/bundle/dms/declined-deploy/output.txt
index 870af8c8858..7a3e4e58bed 100644
--- a/acceptance/bundle/dms/declined-deploy/output.txt
+++ b/acceptance/bundle/dms/declined-deploy/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-declined-deploy-[UNIQUE_NAME]/default/files...
 Created schemas.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms --get //api/2.0/bundle
@@ -115,7 +115,7 @@ Error: the deployment requires destructive actions, but the current console does
 Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed.
 To proceed, use --auto-approve after reviewing the plan above.
 
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 
 === Nothing was recorded for the declined deploy - no version, so none to abort
 >>> print_requests.py --dms --get //api/2.0/bundle
diff --git a/acceptance/bundle/dms/declined-deploy/script b/acceptance/bundle/dms/declined-deploy/script
index 483397ea410..de24d4c764b 100644
--- a/acceptance/bundle/dms/declined-deploy/script
+++ b/acceptance/bundle/dms/declined-deploy/script
@@ -14,7 +14,7 @@ title "A destructive change without --auto-approve is declined: this console can
 # Unity Catalog has no catalog called "other", so make one to move the schema into.
 other_catalog="dms_other_${UNIQUE_NAME}"
 $CLI catalogs create "$other_catalog" &> LOG.catalog
-trap '$CLI catalogs delete "$other_catalog" --force >> LOG.catalog 2>&1; rm -f out.requests.txt' EXIT
+trap '$CLI catalogs delete "$other_catalog" --force >> LOG.catalog 2>&1; rm -f "$OUT_REQUESTS"' EXIT
 trace update_file.py databricks.yml "catalog_name: main" "catalog_name: ${other_catalog}"
 trace musterr $CLI bundle deploy
 
diff --git a/acceptance/bundle/dms/depends-on/output.txt b/acceptance/bundle/dms/depends-on/output.txt
index 4237ad47e7b..50aeb1d46e5 100644
--- a/acceptance/bundle/dms/depends-on/output.txt
+++ b/acceptance/bundle/dms/depends-on/output.txt
@@ -20,7 +20,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-depends-on-[UNIQUE_NAME]/default/files...
 Created jobs.child
 Created jobs.parent
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //versions/1/operations
diff --git a/acceptance/bundle/dms/depends-on/script b/acceptance/bundle/dms/depends-on/script
index 635e83c47f7..d795778f2d9 100644
--- a/acceptance/bundle/dms/depends-on/script
+++ b/acceptance/bundle/dms/depends-on/script
@@ -18,4 +18,4 @@ title "The raw recorded state the service holds for this deployment"
 trace print_state.py --no-dms
 
 trace $CLI bundle destroy --auto-approve
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/deployment-metadata-change/output.txt b/acceptance/bundle/dms/deployment-metadata-change/output.txt
index 29a3fd6366d..e051beeb47d 100644
--- a/acceptance/bundle/dms/deployment-metadata-change/output.txt
+++ b/acceptance/bundle/dms/deployment-metadata-change/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-metadata-before-[UNIQUE_NAME]/dev/files...
 Created schemas.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
@@ -94,7 +94,7 @@ A common practice is to use a username or principal name in this path, i.e. use
   root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target}
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-metadata-after-[UNIQUE_NAME]/prod/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
@@ -159,7 +159,7 @@ A common practice is to use a username or principal name in this path, i.e. use
   root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target}
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-metadata-after-[UNIQUE_NAME]/prod/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
diff --git a/acceptance/bundle/dms/deployment-metadata-change/script b/acceptance/bundle/dms/deployment-metadata-change/script
index 44749821d9d..af091b2ce97 100644
--- a/acceptance/bundle/dms/deployment-metadata-change/script
+++ b/acceptance/bundle/dms/deployment-metadata-change/script
@@ -22,4 +22,4 @@ trace $CLI bundle deploy -t prod
 trace print_requests.py --dms //api/2.0/bundle
 
 trace MSYS_NO_PATHCONV=1 $CLI bundle-deployments list-resources "deployments/${deployment_id}" -o json | jq -S 'map({resource_key, last_version_id, last_action_type})'
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/empty-grants/output.txt b/acceptance/bundle/dms/empty-grants/output.txt
index 81164aaa235..a0db7b41dd6 100644
--- a/acceptance/bundle/dms/empty-grants/output.txt
+++ b/acceptance/bundle/dms/empty-grants/output.txt
@@ -4,7 +4,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-empty-grants-[UNIQUE_NAME]/default/files...
 Created schemas.foo
 Created schemas.foo.grants
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
@@ -84,7 +84,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-empty-grants-[UNIQUE_NAME]/default/files...
 Updated schemas.foo.grants
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
diff --git a/acceptance/bundle/dms/empty-grants/script b/acceptance/bundle/dms/empty-grants/script
index be056eccf54..23cab279e51 100644
--- a/acceptance/bundle/dms/empty-grants/script
+++ b/acceptance/bundle/dms/empty-grants/script
@@ -31,4 +31,4 @@ title "The raw recorded state the service holds for this deployment"
 trace print_state.py --no-dms
 
 trace $CLI bundle destroy --auto-approve
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/existing-state/output.txt b/acceptance/bundle/dms/existing-state/output.txt
index 5fe12f71a85..a8d2f79a989 100644
--- a/acceptance/bundle/dms/existing-state/output.txt
+++ b/acceptance/bundle/dms/existing-state/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-existing-state-[UNIQUE_NAME]/default/files...
 Created jobs.one
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan -o json
@@ -64,7 +64,7 @@ Destroy: 1 deleted
 >>> DATABRICKS_BUNDLE_DEPLOYMENT_HISTORY=true [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-existing-state-[UNIQUE_NAME]/default/files...
 Created jobs.one
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle --oneline
diff --git a/acceptance/bundle/dms/existing-state/script b/acceptance/bundle/dms/existing-state/script
index 64cff3194e3..aca3e87b5bc 100644
--- a/acceptance/bundle/dms/existing-state/script
+++ b/acceptance/bundle/dms/existing-state/script
@@ -31,4 +31,4 @@ trace jq '{state_version, features}' .databricks/bundle/default/resources.json
 
 # The recorded requests are asserted above via print_requests.py; drop whatever the run added after
 # that (telemetry, and the state probes of the non-recording variant) so nothing is left to compare.
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/failed-delete/output.txt b/acceptance/bundle/dms/failed-delete/output.txt
index 6d580163858..4f8de666aa9 100644
--- a/acceptance/bundle/dms/failed-delete/output.txt
+++ b/acceptance/bundle/dms/failed-delete/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-failed-delete-[UNIQUE_NAME]/default/files...
 Created jobs.stuck
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
diff --git a/acceptance/bundle/dms/failed-delete/script b/acceptance/bundle/dms/failed-delete/script
index 29d79de938a..fd72c7bd984 100644
--- a/acceptance/bundle/dms/failed-delete/script
+++ b/acceptance/bundle/dms/failed-delete/script
@@ -31,4 +31,4 @@ title "The state shows the resource still exists but the operation is marked fai
 trace print_state.py --no-dms
 
 # Drain any accumulated requests (plan, state reads) so the harness has nothing to diff.
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/failed-recreate/output.txt b/acceptance/bundle/dms/failed-recreate/output.txt
index c487df25acc..9f354ed381d 100644
--- a/acceptance/bundle/dms/failed-recreate/output.txt
+++ b/acceptance/bundle/dms/failed-recreate/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-failed-recreate-[UNIQUE_NAME]/default/files...
 Created schemas.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
@@ -113,7 +113,7 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: Fault injected by test.
 
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 
 >>> print_requests.py --dms //api/2.0/bundle
 {
diff --git a/acceptance/bundle/dms/failed-recreate/script b/acceptance/bundle/dms/failed-recreate/script
index ccc12f75744..07f802a39b5 100644
--- a/acceptance/bundle/dms/failed-recreate/script
+++ b/acceptance/bundle/dms/failed-recreate/script
@@ -19,7 +19,7 @@ title "A recreate deletes and then fails to create. The delete went through, so
 # fault the schema create so the delete goes through but the create that follows it fails.
 other_catalog="dms_other_${UNIQUE_NAME}"
 $CLI catalogs create "$other_catalog" &> LOG.catalog
-trap '$CLI catalogs delete "$other_catalog" --force >> LOG.catalog 2>&1; rm -f out.requests.txt' EXIT
+trap '$CLI catalogs delete "$other_catalog" --force >> LOG.catalog 2>&1; rm -f "$OUT_REQUESTS"' EXIT
 trace update_file.py databricks.yml "catalog_name: main" "catalog_name: ${other_catalog}"
 trace fault.py "POST /api/2.1/unity-catalog/schemas" 400 0 1 INVALID_PARAMETER_VALUE
 trace musterr $CLI bundle deploy --auto-approve
@@ -36,5 +36,5 @@ trace print_state.py --no-dms
 title "Planning from DMS state alone creates the schema, which is what has to happen: it no longer exists"
 rm -rf .databricks
 $CLI bundle plan &> LOG.plan_final
-# Ensure out.requests.txt is not left behind (RecordRequests creates it when running tests)
-rm -f out.requests.txt
+# Ensure "$OUT_REQUESTS" is not left behind (RecordRequests creates it when running tests)
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/failed-update-permissions/output.txt b/acceptance/bundle/dms/failed-update-permissions/output.txt
index 58e558971bf..8c5be14e0b5 100644
--- a/acceptance/bundle/dms/failed-update-permissions/output.txt
+++ b/acceptance/bundle/dms/failed-update-permissions/output.txt
@@ -4,7 +4,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-failed-update-permissions-[UNIQUE_NAME]/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === The plan records the deployment_history feature and the job
@@ -63,7 +63,7 @@ HTTP Status: 403 Forbidden
 API error_code: PERMISSION_DENIED
 API message: Fault injected by test.
 
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 
 === The service lists the job with the failure
 >>> MSYS_NO_PATHCONV=1 [CLI] bundle-deployments list-resources deployments/[NUMID] -o json
diff --git a/acceptance/bundle/dms/failed-update-permissions/script b/acceptance/bundle/dms/failed-update-permissions/script
index 5cd1a2abf8d..c8b57d339f9 100644
--- a/acceptance/bundle/dms/failed-update-permissions/script
+++ b/acceptance/bundle/dms/failed-update-permissions/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 title "Deploy the job and its permissions"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "The plan records the deployment_history feature and the job"
 dms_plan
diff --git a/acceptance/bundle/dms/multiple-resources/output.txt b/acceptance/bundle/dms/multiple-resources/output.txt
index ec51a77d2c3..04c529b2380 100644
--- a/acceptance/bundle/dms/multiple-resources/output.txt
+++ b/acceptance/bundle/dms/multiple-resources/output.txt
@@ -7,7 +7,7 @@ Created jobs.four
 Created jobs.one
 Created jobs.three
 Created jobs.two
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 5 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //versions/1/operations --sort --del-body state --oneline
@@ -77,7 +77,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 5 unchanged
 === Redeploy with no changes: nothing is applied, so no version is created at all - the deployment's version tracks state changes, like serial
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-multiple-resources-[UNIQUE_NAME]/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 5 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle --sort --oneline
diff --git a/acceptance/bundle/dms/multiple-resources/script b/acceptance/bundle/dms/multiple-resources/script
index 54efc92ce13..8c0145c2508 100644
--- a/acceptance/bundle/dms/multiple-resources/script
+++ b/acceptance/bundle/dms/multiple-resources/script
@@ -28,4 +28,4 @@ trace MSYS_NO_PATHCONV=1 $CLI bundle-deployments list-resources "deployments/${d
 title "The raw recorded state after redeploy"
 trace print_state.py --no-dms
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/no-drift/output.txt b/acceptance/bundle/dms/no-drift/output.txt
index a5e26c6fa8f..4dc8a5c9269 100644
--- a/acceptance/bundle/dms/no-drift/output.txt
+++ b/acceptance/bundle/dms/no-drift/output.txt
@@ -4,7 +4,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-no-drift-[UNIQUE_NAME]/default/files...
 Created jobs.foo
 Created pipelines.bar
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> MSYS_NO_PATHCONV=1 [CLI] bundle-deployments list-resources deployments/[NUMID] -o json
@@ -65,7 +65,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-no-drift-[UNIQUE_NAME]/default/files...
 Updated pipelines.bar
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --dms //api/2.2/jobs //api/2.0/pipelines --sort
diff --git a/acceptance/bundle/dms/no-drift/script b/acceptance/bundle/dms/no-drift/script
index 1c544ce956d..39dff73963d 100644
--- a/acceptance/bundle/dms/no-drift/script
+++ b/acceptance/bundle/dms/no-drift/script
@@ -36,5 +36,5 @@ title "Plan again: no residual drift, and the version stamps are ignored"
 trace $CLI bundle plan | contains.py "Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged"
 
 # The list-resources and plan/state captures above record requests we do not assert on; drop them so
-# out.requests.txt does not become a nondeterministic golden.
-rm -f out.requests.txt
+# "$OUT_REQUESTS" does not become a nondeterministic golden.
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/no-resources/output.txt b/acceptance/bundle/dms/no-resources/output.txt
index 1c7a01d548a..c2b96d2f736 100644
--- a/acceptance/bundle/dms/no-resources/output.txt
+++ b/acceptance/bundle/dms/no-resources/output.txt
@@ -2,7 +2,7 @@
 === First deploy of a bundle with no resources: the deployment is created, and its workspace node identifies it even though no resource state was written
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-no-resources-[UNIQUE_NAME]/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle --get
@@ -59,7 +59,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 0 unchanged
 === Redeploy: the deployment is resolved from that node, so no second deployment is created
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-no-resources-[UNIQUE_NAME]/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle --get
diff --git a/acceptance/bundle/dms/no-resources/script b/acceptance/bundle/dms/no-resources/script
index 54856f2ecae..7f9e9760b5d 100644
--- a/acceptance/bundle/dms/no-resources/script
+++ b/acceptance/bundle/dms/no-resources/script
@@ -29,4 +29,4 @@ trace MSYS_NO_PATHCONV=1 $CLI bundle-deployments list-resources "deployments/${d
 title "The raw recorded state after redeploy"
 trace print_state.py --no-dms
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/operation-upload-fails-once/out.requests.txt b/acceptance/bundle/dms/operation-upload-fails-once/out.requests.txt
deleted file mode 100644
index eb169f26a0c..00000000000
--- a/acceptance/bundle/dms/operation-upload-fails-once/out.requests.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "method": "DELETE",
-  "path": "/api/2.1/unity-catalog/catalogs/dms_other_[UNIQUE_NAME]",
-  "q": {
-    "force": "true"
-  }
-}
diff --git a/acceptance/bundle/dms/operation-upload-fails-once/output.txt b/acceptance/bundle/dms/operation-upload-fails-once/output.txt
index f930196be62..f6e5628ac01 100644
--- a/acceptance/bundle/dms/operation-upload-fails-once/output.txt
+++ b/acceptance/bundle/dms/operation-upload-fails-once/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-upload-fails-once-[UNIQUE_NAME]/default/files...
 Created schemas.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === The plan records the deployment_history feature and the schema
@@ -60,7 +60,7 @@ HTTP Status: 500 Internal Server Error
 API error_code: INJECTED
 API message: Fault injected by test.
 
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 
 === The service lists the schema with the failure
 >>> MSYS_NO_PATHCONV=1 [CLI] bundle-deployments list-resources deployments/[NUMID] -o json
diff --git a/acceptance/bundle/dms/operation-upload-fails-once/script b/acceptance/bundle/dms/operation-upload-fails-once/script
index 2e1a4c7f935..dbe00b7b106 100644
--- a/acceptance/bundle/dms/operation-upload-fails-once/script
+++ b/acceptance/bundle/dms/operation-upload-fails-once/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 title "Deploy so there is a recorded resource to recreate"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "The plan records the deployment_history feature and the schema"
 dms_plan
diff --git a/acceptance/bundle/dms/plan-without-dms/script b/acceptance/bundle/dms/plan-without-dms/script
index f1b1dfbbf82..de35616b74e 100644
--- a/acceptance/bundle/dms/plan-without-dms/script
+++ b/acceptance/bundle/dms/plan-without-dms/script
@@ -12,4 +12,4 @@ bundle:'
 trace musterr $CLI bundle deploy --plan tmp.plan.json
 trace print_requests.py //api/2.0/bundle --get
 
-rm -f tmp.plan.json out.requests.txt
+rm -f tmp.plan.json "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/provenance/output.txt b/acceptance/bundle/dms/provenance/output.txt
index 03ff7c406c2..ffe5cec906e 100644
--- a/acceptance/bundle/dms/provenance/output.txt
+++ b/acceptance/bundle/dms/provenance/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-provenance-[UNIQUE_NAME]/dev/files...
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //versions
diff --git a/acceptance/bundle/dms/provenance/script b/acceptance/bundle/dms/provenance/script
index 3504c899606..4da8761815d 100644
--- a/acceptance/bundle/dms/provenance/script
+++ b/acceptance/bundle/dms/provenance/script
@@ -25,4 +25,4 @@ trace print_state.py --no-dms -t dev
 
 # The deploy uploads files in a nondeterministic order; only the requests above are
 # asserted.
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/record-failure/output.txt b/acceptance/bundle/dms/record-failure/output.txt
index fbcd3135fff..6b16a68b15b 100644
--- a/acceptance/bundle/dms/record-failure/output.txt
+++ b/acceptance/bundle/dms/record-failure/output.txt
@@ -9,7 +9,7 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: Node type nonexistent-node-type is not supported. Supported node types: [NODE_TYPES]
 
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 
 >>> [CLI] bundle plan -o json
 {
diff --git a/acceptance/bundle/dms/record-failure/script b/acceptance/bundle/dms/record-failure/script
index 8ce1bb2696b..51e785895f1 100644
--- a/acceptance/bundle/dms/record-failure/script
+++ b/acceptance/bundle/dms/record-failure/script
@@ -22,4 +22,4 @@ rm -rf .databricks
 trace $CLI bundle plan
 # plan probes the state files concurrently, so the recorded order varies. Only the
 # operations above are asserted; drop the rest rather than diff a racy order.
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/stale-plan/output.txt b/acceptance/bundle/dms/stale-plan/output.txt
index 2ce611c6247..3ccb46a3e11 100644
--- a/acceptance/bundle/dms/stale-plan/output.txt
+++ b/acceptance/bundle/dms/stale-plan/output.txt
@@ -15,7 +15,7 @@ create jobs.foo
 Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-stale-plan-[UNIQUE_NAME]/default/files...
 Created jobs.foo
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> MSYS_NO_PATHCONV=1 [CLI] bundle-deployments list-resources deployments/[NUMID] -o json
@@ -68,7 +68,7 @@ Error: plan lineage "" does not match state lineage "[UUID]"; the state may have
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-stale-plan-[UNIQUE_NAME]/default/files...
 Updated jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> jq {serial} .databricks/bundle/default/resources.json
diff --git a/acceptance/bundle/dms/stale-plan/script b/acceptance/bundle/dms/stale-plan/script
index 2e894c12502..bb6d0b4a598 100644
--- a/acceptance/bundle/dms/stale-plan/script
+++ b/acceptance/bundle/dms/stale-plan/script
@@ -35,4 +35,4 @@ trace jq '{serial}' .databricks/bundle/default/resources.json
 title "Replaying the older plan is rejected: same deployment, outdated version"
 trace musterr $CLI bundle deploy --plan tmp.plan2.json
 
-rm -f tmp.plan.json tmp.plan2.json out.requests.txt
+rm -f tmp.plan.json tmp.plan2.json "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/successful-recreate/out.requests.txt b/acceptance/bundle/dms/successful-recreate/out.requests.txt
deleted file mode 100644
index eb169f26a0c..00000000000
--- a/acceptance/bundle/dms/successful-recreate/out.requests.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "method": "DELETE",
-  "path": "/api/2.1/unity-catalog/catalogs/dms_other_[UNIQUE_NAME]",
-  "q": {
-    "force": "true"
-  }
-}
diff --git a/acceptance/bundle/dms/successful-recreate/output.txt b/acceptance/bundle/dms/successful-recreate/output.txt
index 320369badc3..2257b78cc8c 100644
--- a/acceptance/bundle/dms/successful-recreate/output.txt
+++ b/acceptance/bundle/dms/successful-recreate/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-successful-recreate-[UNIQUE_NAME]/default/files...
 Created schemas.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
@@ -105,7 +105,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dms-successful-rec
 This action will result in the deletion or recreation of the following UC schemas. Any underlying data may be lost:
   recreate resources.schemas.foo
 Recreated schemas.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py --dms //api/2.0/bundle
diff --git a/acceptance/bundle/dms/successful-recreate/script b/acceptance/bundle/dms/successful-recreate/script
index 64aed46b84a..f916841af9e 100644
--- a/acceptance/bundle/dms/successful-recreate/script
+++ b/acceptance/bundle/dms/successful-recreate/script
@@ -37,4 +37,4 @@ trace print_state.py --no-dms
 title "Destroy: the delete is recorded with the id and no state"
 trace $CLI bundle destroy --auto-approve
 trace print_requests.py --dms //api/2.0/bundle
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/dms/version-never-created/output.txt b/acceptance/bundle/dms/version-never-created/output.txt
index 3436a9bf09a..536d226a964 100644
--- a/acceptance/bundle/dms/version-never-created/output.txt
+++ b/acceptance/bundle/dms/version-never-created/output.txt
@@ -9,7 +9,7 @@ HTTP Status: 500 Internal Server Error
 API error_code: INTERNAL_ERROR
 API message: Internal error
 
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 
 >>> [CLI] bundle plan -o json
 {
@@ -51,7 +51,7 @@ HTTP Status: 500 Internal Server Error
 API error_code: INTERNAL_ERROR
 API message: Internal error
 
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 
 >>> print_requests.py --dms //api/2.0/bundle --get --oneline
 {"method": "GET", "path": "/api/2.0/bundle/deployments/[NUMID]/resources"}
diff --git a/acceptance/bundle/empty_string_dropped/output.txt b/acceptance/bundle/empty_string_dropped/output.txt
index 5afa6b8f51d..95f915214f4 100644
--- a/acceptance/bundle/empty_string_dropped/output.txt
+++ b/acceptance/bundle/empty_string_dropped/output.txt
@@ -12,7 +12,7 @@ Created registered_models.my_registered_model
 Created schemas.my_schema
 Created sql_warehouses.my_warehouse
 Created volumes.my_volume
-Files: 11 uploaded, 0 deleted
+Files: 9 uploaded, 0 deleted
 Resources: 11 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy -t direct
@@ -28,5 +28,5 @@ Created registered_models.my_registered_model
 Created schemas.my_schema
 Created sql_warehouses.my_warehouse
 Created volumes.my_volume
-Files: 12 uploaded, 0 deleted
+Files: 10 uploaded, 0 deleted
 Resources: 11 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/environments/dependencies/output.txt b/acceptance/bundle/environments/dependencies/output.txt
index 07984a00858..d078a19d4bd 100644
--- a/acceptance/bundle/environments/dependencies/output.txt
+++ b/acceptance/bundle/environments/dependencies/output.txt
@@ -13,10 +13,10 @@ Uploading dist/test.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dependencies/default/files...
 Created jobs.test_job
 Created pipelines.test_pipeline
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.environments [OUTPUT_DIR]/out.requests.txt
 [
   {
     "environment_key": "test_env",
@@ -53,7 +53,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
   }
 ]
 
->>> jq -s .[] | select(.path=="/api/2.0/pipelines") out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/pipelines") [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/pipelines",
diff --git a/acceptance/bundle/environments/dependencies/script b/acceptance/bundle/environments/dependencies/script
index 00e5fc846cc..1d8ed4a4b18 100644
--- a/acceptance/bundle/environments/dependencies/script
+++ b/acceptance/bundle/environments/dependencies/script
@@ -4,11 +4,11 @@ set -euo pipefail
 trace $CLI bundle validate
 
 trace $CLI bundle deploy
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' out.requests.txt | nostamp
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.environments' "$OUT_REQUESTS" | nostamp
 
-trace jq -s '.[] | select(.path=="/api/2.0/pipelines")' out.requests.txt | nostamp
+trace jq -s '.[] | select(.path=="/api/2.0/pipelines")' "$OUT_REQUESTS" | nostamp
 
 trace $CLI bundle validate -o json | nostamp | jq '.resources.jobs.test_job.environments'
 trace $CLI bundle validate -o json | nostamp | jq '.resources.pipelines.test_pipeline.environment'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/escaped_refs/output.txt b/acceptance/bundle/escaped_refs/output.txt
index 342535d0037..b863c18fbaf 100644
--- a/acceptance/bundle/escaped_refs/output.txt
+++ b/acceptance/bundle/escaped_refs/output.txt
@@ -12,7 +12,7 @@
 === Deploy: payload sent to the jobs API
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.example_ingestion_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/escaped_refs/script b/acceptance/bundle/escaped_refs/script
index c23d01d3e5d..2eacefcf553 100644
--- a/acceptance/bundle/escaped_refs/script
+++ b/acceptance/bundle/escaped_refs/script
@@ -7,7 +7,7 @@ mkdir -p .databricks
 
 cleanup() {
     $CLI bundle destroy --auto-approve &> LOG.destroy
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/generate/auto-bind/output.txt b/acceptance/bundle/generate/auto-bind/output.txt
index 6126b186d14..d8583aa0abd 100644
--- a/acceptance/bundle/generate/auto-bind/output.txt
+++ b/acceptance/bundle/generate/auto-bind/output.txt
@@ -22,7 +22,7 @@ test.py
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/auto-bind-test-[UNIQUE_NAME]/files...
 Updated jobs.test_job
-Files: 8 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Destroy the bundle:
diff --git a/acceptance/bundle/generate/dashboard-inplace/output.txt b/acceptance/bundle/generate/dashboard-inplace/output.txt
index f2ec5b8806c..b4527bd8650 100644
--- a/acceptance/bundle/generate/dashboard-inplace/output.txt
+++ b/acceptance/bundle/generate/dashboard-inplace/output.txt
@@ -6,7 +6,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard update inplace/default/files...
 Created dashboards.test_dashboard
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === update the dashboard
diff --git a/acceptance/bundle/generate/genie_space_inplace/output.txt b/acceptance/bundle/generate/genie_space_inplace/output.txt
index 195662216b1..c4c2d31b332 100644
--- a/acceptance/bundle/generate/genie_space_inplace/output.txt
+++ b/acceptance/bundle/generate/genie_space_inplace/output.txt
@@ -6,7 +6,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie space update inplace/default/files...
 Created genie_spaces.test_genie_space
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === update the genie space
diff --git a/acceptance/bundle/generate/pipeline_and_deploy/output.txt b/acceptance/bundle/generate/pipeline_and_deploy/output.txt
index c081ef6b1af..f4b95b8d01d 100644
--- a/acceptance/bundle/generate/pipeline_and_deploy/output.txt
+++ b/acceptance/bundle/generate/pipeline_and_deploy/output.txt
@@ -22,7 +22,7 @@ include:
 === Deploy the generated bundle
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline_and_deploy-[UNIQUE_NAME]/default/files...
-Files: 10 uploaded, 0 deleted
+Files: 9 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 === Destroy the deployed bundle
diff --git a/acceptance/bundle/generate/python_job_and_deploy/output.txt b/acceptance/bundle/generate/python_job_and_deploy/output.txt
index 61dd0678fbd..649c4016993 100644
--- a/acceptance/bundle/generate/python_job_and_deploy/output.txt
+++ b/acceptance/bundle/generate/python_job_and_deploy/output.txt
@@ -21,7 +21,7 @@ include:
 === Deploy the generated bundle
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/python_job_and_deploy-[UNIQUE_NAME]/default/files...
-Files: 8 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 === Destroy the deployed bundle
diff --git a/acceptance/bundle/integration_whl/base/output.txt b/acceptance/bundle/integration_whl/base/output.txt
index 719ca009f95..f6e7796b577 100644
--- a/acceptance/bundle/integration_whl/base/output.txt
+++ b/acceptance/bundle/integration_whl/base/output.txt
@@ -35,7 +35,7 @@ Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 19 uploaded, 0 deleted
+Files: 18 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
@@ -52,7 +52,7 @@ Got arguments:
 Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 10 uploaded, 0 deleted
+Files: 9 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle run some_other_job
diff --git a/acceptance/bundle/integration_whl/custom_params/output.txt b/acceptance/bundle/integration_whl/custom_params/output.txt
index 279e3f4c6d9..dbf383b9f05 100644
--- a/acceptance/bundle/integration_whl/custom_params/output.txt
+++ b/acceptance/bundle/integration_whl/custom_params/output.txt
@@ -35,7 +35,7 @@ Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 16 uploaded, 0 deleted
+Files: 15 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job --python-params param1,param2
diff --git a/acceptance/bundle/integration_whl/interactive_cluster/output.txt b/acceptance/bundle/integration_whl/interactive_cluster/output.txt
index 8273d81d88a..8d7e5ec8ffd 100644
--- a/acceptance/bundle/integration_whl/interactive_cluster/output.txt
+++ b/acceptance/bundle/integration_whl/interactive_cluster/output.txt
@@ -36,7 +36,7 @@ Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.test_cluster
 Created jobs.some_other_job
-Files: 16 uploaded, 0 deleted
+Files: 15 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
@@ -53,7 +53,7 @@ Got arguments:
 Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 10 uploaded, 0 deleted
+Files: 9 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> [CLI] bundle run some_other_job
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..17a576b8b50 100644
--- a/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt
+++ b/acceptance/bundle/integration_whl/interactive_cluster_dynamic_version/output.txt
@@ -5,7 +5,7 @@ Uploading .databricks/bundle/default/patched_wheels/python_artifact_my_test_code
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.test_cluster
 Created jobs.some_other_job
-Files: 16 uploaded, 0 deleted
+Files: 15 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
diff --git a/acceptance/bundle/integration_whl/interactive_single_user/output.txt b/acceptance/bundle/integration_whl/interactive_single_user/output.txt
index b2d63a874dd..6fcf33f5d71 100644
--- a/acceptance/bundle/integration_whl/interactive_single_user/output.txt
+++ b/acceptance/bundle/integration_whl/interactive_single_user/output.txt
@@ -36,7 +36,7 @@ Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.test_cluster
 Created jobs.some_other_job
-Files: 15 uploaded, 0 deleted
+Files: 14 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
diff --git a/acceptance/bundle/integration_whl/serverless/output.txt b/acceptance/bundle/integration_whl/serverless/output.txt
index 50d2b6fc479..64ed17a4b70 100644
--- a/acceptance/bundle/integration_whl/serverless/output.txt
+++ b/acceptance/bundle/integration_whl/serverless/output.txt
@@ -6,7 +6,7 @@ Building my_test_code...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 17 uploaded, 0 deleted
+Files: 16 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
@@ -23,7 +23,7 @@ Got arguments:
 Building my_test_code...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 10 uploaded, 0 deleted
+Files: 9 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle run some_other_job
diff --git a/acceptance/bundle/integration_whl/serverless_custom_params/output.txt b/acceptance/bundle/integration_whl/serverless_custom_params/output.txt
index 8b11a9ff6e1..66fa9db49e4 100644
--- a/acceptance/bundle/integration_whl/serverless_custom_params/output.txt
+++ b/acceptance/bundle/integration_whl/serverless_custom_params/output.txt
@@ -4,7 +4,7 @@ Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 17 uploaded, 0 deleted
+Files: 16 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
diff --git a/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt b/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt
index 14e9b5dc2c8..ccbc6ee0fb9 100644
--- a/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt
+++ b/acceptance/bundle/integration_whl/serverless_dynamic_version/output.txt
@@ -6,7 +6,7 @@ Building my_test_code...
 Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 17 uploaded, 0 deleted
+Files: 16 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
@@ -24,7 +24,7 @@ Building my_test_code...
 Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][1]-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated jobs.some_other_job
-Files: 10 uploaded, 0 deleted
+Files: 9 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
diff --git a/acceptance/bundle/integration_whl/serverless_extras/output.txt b/acceptance/bundle/integration_whl/serverless_extras/output.txt
index 600f76985bb..d3da2c07568 100644
--- a/acceptance/bundle/integration_whl/serverless_extras/output.txt
+++ b/acceptance/bundle/integration_whl/serverless_extras/output.txt
@@ -4,7 +4,7 @@ Building my_test_code...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 16 uploaded, 0 deleted
+Files: 15 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === The environment dependency keeps its [train] extras suffix
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..7d8030a3821 100644
--- a/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt
+++ b/acceptance/bundle/integration_whl/serverless_extras_dynamic_version/output.txt
@@ -4,7 +4,7 @@ Building my_test_code...
 Uploading .databricks/bundle/default/patched_wheels/my_test_code_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS][0]-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 16 uploaded, 0 deleted
+Files: 15 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === The environment dependency keeps its [train] extras suffix
diff --git a/acceptance/bundle/integration_whl/wrapper/output.txt b/acceptance/bundle/integration_whl/wrapper/output.txt
index 18a3af3b426..749d7fe59b3 100644
--- a/acceptance/bundle/integration_whl/wrapper/output.txt
+++ b/acceptance/bundle/integration_whl/wrapper/output.txt
@@ -35,7 +35,7 @@ Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 18 uploaded, 0 deleted
+Files: 17 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job
diff --git a/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt b/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt
index 1e44f101659..0f71ea9c18f 100644
--- a/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt
+++ b/acceptance/bundle/integration_whl/wrapper_custom_params/output.txt
@@ -35,7 +35,7 @@ Building python_artifact...
 Uploading dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.some_other_job
-Files: 18 uploaded, 0 deleted
+Files: 17 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run some_other_job --python-params param1,param2
diff --git a/acceptance/bundle/libraries/maven/output.txt b/acceptance/bundle/libraries/maven/output.txt
index 41a77848321..63293be0a02 100644
--- a/acceptance/bundle/libraries/maven/output.txt
+++ b/acceptance/bundle/libraries/maven/output.txt
@@ -11,5 +11,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/maven/default/files...
 Created jobs.testjob
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/libraries/maven/script b/acceptance/bundle/libraries/maven/script
index a1ca3622d3e..4001021ac0b 100644
--- a/acceptance/bundle/libraries/maven/script
+++ b/acceptance/bundle/libraries/maven/script
@@ -1,4 +1,4 @@
 trace $CLI bundle validate -o json | jq '.resources.jobs.testjob.tasks[0].libraries'
 trace $CLI bundle deploy
-cat out.requests.txt | jq 'select(.path == "/api/2.2/jobs/create")' | jq '.body.tasks[0].libraries'  > out.job.libraries.txt
-rm out.requests.txt
+cat "$OUT_REQUESTS" | jq 'select(.path == "/api/2.2/jobs/create")' | jq '.body.tasks[0].libraries'  > out.job.libraries.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/libraries/outside_of_bundle_root/output.txt b/acceptance/bundle/libraries/outside_of_bundle_root/output.txt
index 5dc4456761e..43e860f5d8e 100644
--- a/acceptance/bundle/libraries/outside_of_bundle_root/output.txt
+++ b/acceptance/bundle/libraries/outside_of_bundle_root/output.txt
@@ -34,24 +34,24 @@ Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Check that the job libraries are uploaded and the path is correct in the job
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 [
   {
     "whl": "/Workspace/Users/[USERNAME]/.bundle/outside_of_bundle_root/default/artifacts/.internal/test.whl"
   }
 ]
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 [
   "/Workspace/Users/[USERNAME]/.bundle/outside_of_bundle_root/default/artifacts/.internal/test.whl"
 ]
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 [
   "/Workspace/Users/[USERNAME]/.bundle/outside_of_bundle_root/default/artifacts/.internal/test.whl"
 ]
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/outside_of_bundle_root/default/artifacts/.internal/test.whl",
diff --git a/acceptance/bundle/libraries/outside_of_bundle_root/script b/acceptance/bundle/libraries/outside_of_bundle_root/script
index ff72be1b690..df54672eee7 100644
--- a/acceptance/bundle/libraries/outside_of_bundle_root/script
+++ b/acceptance/bundle/libraries/outside_of_bundle_root/script
@@ -8,9 +8,9 @@ trace $CLI bundle deploy
 cd ..
 
 title "Check that the job libraries are uploaded and the path is correct in the job"
-trace cat out.requests.txt | jq 'select(.path == "/api/2.2/jobs/create")' | jq '.body.tasks[0].libraries'
-trace cat out.requests.txt | jq 'select(.path == "/api/2.2/jobs/create")' | jq '.body.environments[0].spec.dependencies'
-trace cat out.requests.txt | jq 'select(.path == "/api/2.0/pipelines" and .method == "POST")' | jq '.body.environment.dependencies'
-trace cat out.requests.txt | jq 'select(.path | test("/api/2.0/workspace-files/import-file/Workspace/Users/.*/.bundle/outside_of_bundle_root/default/artifacts/.internal/test.whl"))'
+trace cat "$OUT_REQUESTS" | jq 'select(.path == "/api/2.2/jobs/create")' | jq '.body.tasks[0].libraries'
+trace cat "$OUT_REQUESTS" | jq 'select(.path == "/api/2.2/jobs/create")' | jq '.body.environments[0].spec.dependencies'
+trace cat "$OUT_REQUESTS" | jq 'select(.path == "/api/2.0/pipelines" and .method == "POST")' | jq '.body.environment.dependencies'
+trace cat "$OUT_REQUESTS" | jq 'select(.path | test("/api/2.0/workspace-files/import-file/Workspace/Users/.*/.bundle/outside_of_bundle_root/default/artifacts/.internal/test.whl"))'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/libraries/pypi/output.txt b/acceptance/bundle/libraries/pypi/output.txt
index 936194367af..e32d9a9329f 100644
--- a/acceptance/bundle/libraries/pypi/output.txt
+++ b/acceptance/bundle/libraries/pypi/output.txt
@@ -11,5 +11,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pypi/default/files...
 Created jobs.testjob
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/libraries/pypi/script b/acceptance/bundle/libraries/pypi/script
index a1ca3622d3e..4001021ac0b 100644
--- a/acceptance/bundle/libraries/pypi/script
+++ b/acceptance/bundle/libraries/pypi/script
@@ -1,4 +1,4 @@
 trace $CLI bundle validate -o json | jq '.resources.jobs.testjob.tasks[0].libraries'
 trace $CLI bundle deploy
-cat out.requests.txt | jq 'select(.path == "/api/2.2/jobs/create")' | jq '.body.tasks[0].libraries'  > out.job.libraries.txt
-rm out.requests.txt
+cat "$OUT_REQUESTS" | jq 'select(.path == "/api/2.2/jobs/create")' | jq '.body.tasks[0].libraries'  > out.job.libraries.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/lifecycle/prevent-destroy/output.txt b/acceptance/bundle/lifecycle/prevent-destroy/output.txt
index 0ec25336cc8..c7e77d1ab4f 100644
--- a/acceptance/bundle/lifecycle/prevent-destroy/output.txt
+++ b/acceptance/bundle/lifecycle/prevent-destroy/output.txt
@@ -12,7 +12,7 @@ Validation OK!
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/prevent-destroy/default/files...
 Created pipelines.my_pipelines
 Created schemas.my_schema
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> errcode [CLI] bundle plan
diff --git a/acceptance/bundle/migrate/added-direct-only/output.txt b/acceptance/bundle/migrate/added-direct-only/output.txt
index d76d90eeeec..3b6e7ae1142 100644
--- a/acceptance/bundle/migrate/added-direct-only/output.txt
+++ b/acceptance/bundle/migrate/added-direct-only/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job_a
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Add a direct-only resource to the config without deploying it
@@ -39,7 +39,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created instance_pools.pool
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //instance-pools/create
diff --git a/acceptance/bundle/migrate/added-direct-only/script b/acceptance/bundle/migrate/added-direct-only/script
index 5302ea89b89..e500a603b6d 100644
--- a/acceptance/bundle/migrate/added-direct-only/script
+++ b/acceptance/bundle/migrate/added-direct-only/script
@@ -16,11 +16,11 @@ title "After migration: plan shows the direct-only resource as \"to add\""
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan
 
 title "Deploy creates it; verify via recorded requests"
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_requests.py //instance-pools/create
 
 title "No further actions planned"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/added/output.txt b/acceptance/bundle/migrate/added/output.txt
index ab12bd15149..609d0237d6e 100644
--- a/acceptance/bundle/migrate/added/output.txt
+++ b/acceptance/bundle/migrate/added/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-added-test/default/files...
 Created jobs.job_a
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate
@@ -23,7 +23,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-added-test/default/files...
 Created jobs.job_b
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //jobs/create
diff --git a/acceptance/bundle/migrate/added/script b/acceptance/bundle/migrate/added/script
index ecf7fec95b6..78846a084bf 100644
--- a/acceptance/bundle/migrate/added/script
+++ b/acceptance/bundle/migrate/added/script
@@ -13,11 +13,11 @@ trace $CLI bundle deployment migrate
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan | contains.py "1 to add"
 
 # Deploy creates job_b; verify via recorded requests
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_requests.py //jobs/create
 
 # No further actions planned
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan | contains.py "2 unchanged"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-clean/output.txt b/acceptance/bundle/migrate/auto-migrate-clean/output.txt
index cccb532bd76..a358b635116 100644
--- a/acceptance/bundle/migrate/auto-migrate-clean/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-clean/output.txt
@@ -3,7 +3,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_migration_telemetry
@@ -17,7 +17,7 @@ direct_drymigrate_warnings false
 >>> [CLI] bundle deploy
 Warn: Direct engine selected via 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: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 Migrating state to direct deployment engine (selected via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)...
 Migrated 1 resource to direct deployment engine.
@@ -46,7 +46,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === Subsequent deploy under direct is a no-op
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_migration_telemetry
@@ -62,7 +62,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 === Deploy picks up the update (with and without --plan)
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_migration_telemetry
diff --git a/acceptance/bundle/migrate/auto-migrate-clean/script b/acceptance/bundle/migrate/auto-migrate-clean/script
index 0f2eb7c1ce1..eb0b970ddc3 100644
--- a/acceptance/bundle/migrate/auto-migrate-clean/script
+++ b/acceptance/bundle/migrate/auto-migrate-clean/script
@@ -1,17 +1,17 @@
 export DATABRICKS_BUNDLE_ENGINE=
 
-# Each call to print_migration_telemetry inspects out.requests.txt; clear
+# Each call to print_migration_telemetry inspects "$OUT_REQUESTS"; clear
 # it after each call so the next deploy's telemetry stands alone.
 title "Initial deploy uses terraform engine (no bundle.engine set, override via env var)"
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Opt in to direct engine via config and redeploy: dry-run is clean, auto-migration triggers"
 trace update_file.py databricks.yml "name: test-bundle" $'name: test-bundle\n  engine: direct'
 trace $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Direct-engine state is now in place; terraform state is backed up\n"
 trace find .databricks/bundle -name "resources.json" -type f
@@ -26,7 +26,7 @@ trace $CLI bundle plan | contains.py "1 unchanged"
 title "Subsequent deploy under direct is a no-op"
 trace $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Modify the config — plan shows the pending update"
 trace update_file.py databricks.yml "Test Auto-Migrate Job" "Test Auto-Migrate Job (renamed)"
@@ -36,8 +36,8 @@ $CLI bundle plan -o json > out.plan_update.direct.json
 title "Deploy picks up the update (with and without --plan)\n"
 $CLI bundle deploy $(readplanarg out.plan_update.direct.json)
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 trace $CLI bundle plan | contains.py "1 unchanged"
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-default/output.txt b/acceptance/bundle/migrate/auto-migrate-default/output.txt
index beedc13e83c..33950c186e3 100644
--- a/acceptance/bundle/migrate/auto-migrate-default/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-default/output.txt
@@ -3,7 +3,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_migration_telemetry
@@ -19,7 +19,7 @@ This bundle will be automatically migrated to use the direct deployment engine a
 Learn more: https://docs.databricks.com/dev-tools/bundles/direct
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 Migrating state to direct deployment engine (selected via default)...
 Migrated 1 resource to direct deployment engine.
@@ -44,7 +44,7 @@ resources.json: remote direct state serial=3 lineage="[UUID]"
 === Subsequent deploy is a no-op on direct
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_migration_telemetry
diff --git a/acceptance/bundle/migrate/auto-migrate-default/script b/acceptance/bundle/migrate/auto-migrate-default/script
index 20111b911bb..eb138273aff 100644
--- a/acceptance/bundle/migrate/auto-migrate-default/script
+++ b/acceptance/bundle/migrate/auto-migrate-default/script
@@ -3,12 +3,12 @@ export DATABRICKS_BUNDLE_ENGINE=
 title "Initial deploy opts out of direct, so it uses the terraform engine"
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Redeploy with nothing set: direct is the default, so auto-migration triggers"
 trace $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Direct-engine state is now in place; terraform state is backed up\n"
 trace find .databricks/bundle -name "resources.json" -type f
@@ -21,4 +21,4 @@ title "Subsequent deploy is a no-op on direct"
 trace $CLI bundle deploy
 trace print_migration_telemetry
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt
index e6974fa95c2..527b9a89921 100644
--- a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/output.txt
@@ -3,7 +3,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job_a
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Add a direct-only resource to the config
@@ -13,7 +13,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Warn: Direct engine selected via DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy.
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 Migrating state to direct deployment engine (selected via DATABRICKS_BUNDLE_ENGINE environment variable)...
 Migrated 1 resource to direct deployment engine.
@@ -30,7 +30,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created instance_pools.pool
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //instance-pools/create
diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/script b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/script
index b605d8edb3c..702cf582a3a 100644
--- a/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/script
+++ b/acceptance/bundle/migrate/auto-migrate-direct-only-envvar/script
@@ -2,7 +2,7 @@ export DATABRICKS_BUNDLE_ENGINE=
 
 title "Deploy with terraform (instance_pools is commented out; terraform cannot deploy it)"
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Add a direct-only resource to the config"
 trace update_file.py databricks.yml "#instance_pools" "instance_pools"
@@ -10,7 +10,7 @@ trace update_file.py databricks.yml "#instance_pools" "instance_pools"
 title "Opt in via env var only: deploy migrates the state, ignoring the direct-only resource"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "The direct-only resource is created on the next deploy"
 trace $CLI bundle plan
@@ -20,4 +20,4 @@ trace print_requests.py //instance-pools/create
 title "No further actions planned"
 trace $CLI bundle plan
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt b/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt
index 402f3847345..513b0254a18 100644
--- a/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-direct-only/output.txt
@@ -3,7 +3,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job_a
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Add a direct-only resource and opt in to the direct engine via config
@@ -23,7 +23,7 @@ json.plan.resources.instance_pools.pool.action = "skip";
 >>> [CLI] bundle deploy
 Warn: Direct engine selected via 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: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 Migrating state to direct deployment engine (selected via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)...
 Migrated 1 resource to direct deployment engine.
@@ -40,7 +40,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created instance_pools.pool
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //instance-pools/create
diff --git a/acceptance/bundle/migrate/auto-migrate-direct-only/script b/acceptance/bundle/migrate/auto-migrate-direct-only/script
index 3d0b91b7713..0725c42d31c 100644
--- a/acceptance/bundle/migrate/auto-migrate-direct-only/script
+++ b/acceptance/bundle/migrate/auto-migrate-direct-only/script
@@ -2,7 +2,7 @@ export DATABRICKS_BUNDLE_ENGINE=
 
 title "Deploy with terraform (instance_pools is commented out; terraform cannot deploy it)"
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Add a direct-only resource and opt in to the direct engine via config"
 trace update_file.py databricks.yml "#instance_pools" "instance_pools"
@@ -15,7 +15,7 @@ trace $CLI bundle plan -o json | nostamp | gron.py | grep instance_pools
 title "Deploy migrates the state, skipping the direct-only resource"
 trace $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "The direct-only resource is created on the next deploy"
 trace $CLI bundle plan
@@ -25,4 +25,4 @@ trace print_requests.py //instance-pools/create
 title "No further actions planned"
 trace $CLI bundle plan
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt
index 792639d8819..06e544ad5fc 100644
--- a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Warn: Direct engine selected via 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: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 Removing empty terraform state; direct engine will be used on the next deploy (selected via bundle.engine setting at [TEST_TMP_DIR]/databricks.yml:3:11)...
 
@@ -23,8 +23,6 @@ direct_migrated_via_config true
 
 >>> print_requests.py //workspace-files/import-file //workspace/delete --sort
 "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/databricks.yml"
-"POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/out.requests.txt"
-"POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/output.txt"
 "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files/script"
 "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock"
 "POST /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock"
@@ -44,7 +42,7 @@ direct_migrated_via_config true
 === Next deploy uses direct engine by default (no more mismatch warning)
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_migration_telemetry
diff --git a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/script b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/script
index 984bbf2fdce..e72b1cadab4 100644
--- a/acceptance/bundle/migrate/auto-migrate-empty-tfstate/script
+++ b/acceptance/bundle/migrate/auto-migrate-empty-tfstate/script
@@ -28,4 +28,4 @@ title "Next deploy uses direct engine by default (no more mismatch warning)"
 trace $CLI bundle deploy 2>&1 | contains.py '!does not match the existing state'
 trace print_migration_telemetry
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-envvar/output.txt b/acceptance/bundle/migrate/auto-migrate-envvar/output.txt
index 90fbc4e0c81..a0f04340420 100644
--- a/acceptance/bundle/migrate/auto-migrate-envvar/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-envvar/output.txt
@@ -3,7 +3,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_migration_telemetry
@@ -14,7 +14,7 @@ direct_drymigrate_warnings false
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Warn: Direct engine selected via DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy.
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 Migrating state to direct deployment engine (selected via DATABRICKS_BUNDLE_ENGINE environment variable)...
 Migrated 1 resource to direct deployment engine.
diff --git a/acceptance/bundle/migrate/auto-migrate-envvar/script b/acceptance/bundle/migrate/auto-migrate-envvar/script
index 5152396e65f..8377687a9b6 100644
--- a/acceptance/bundle/migrate/auto-migrate-envvar/script
+++ b/acceptance/bundle/migrate/auto-migrate-envvar/script
@@ -3,12 +3,12 @@ export DATABRICKS_BUNDLE_ENGINE=
 title "Initial deploy uses terraform engine"
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Opt in via env var only (no bundle.engine in config): auto-migration triggers"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Direct-engine state is now in place; terraform state is backed up\n"
 trace find .databricks/bundle -name "resources.json" -type f
@@ -17,4 +17,4 @@ trace find .databricks/bundle -name "terraform.tfstate*" -type f
 title "Remote state also reflects the migration (force-pull surfaces workspace state)\n"
 trace $CLI bundle debug states --force-pull
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-plan-failure/output.txt b/acceptance/bundle/migrate/auto-migrate-plan-failure/output.txt
index 8de712eb73c..410ec2b580e 100644
--- a/acceptance/bundle/migrate/auto-migrate-plan-failure/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-plan-failure/output.txt
@@ -3,7 +3,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_migration_telemetry
@@ -14,7 +14,7 @@ direct_drymigrate_warnings false
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Warn: Direct engine selected via DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy.
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 Warn: post-deploy dry-run migration to direct: cannot plan resources.jobs.test_job: reading id="[NUMID]": Fault injected by test. (403 INJECTED): Endpoint: GET [DATABRICKS_URL]/api/2.2/jobs/get?job_id=[NUMID]
 HTTP Status: 403 Forbidden
@@ -39,7 +39,7 @@ direct_migrate_plan_error true
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Warn: Direct engine selected via DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy.
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 Migrating state to direct deployment engine (selected via DATABRICKS_BUNDLE_ENGINE environment variable)...
 Migrated 1 resource to direct deployment engine.
diff --git a/acceptance/bundle/migrate/auto-migrate-plan-failure/script b/acceptance/bundle/migrate/auto-migrate-plan-failure/script
index 6c2b0a29e87..0e2e2ead7ed 100644
--- a/acceptance/bundle/migrate/auto-migrate-plan-failure/script
+++ b/acceptance/bundle/migrate/auto-migrate-plan-failure/script
@@ -3,7 +3,7 @@ export DATABRICKS_BUNDLE_ENGINE=
 title "Initial deploy on terraform"
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Inject GET failure so the plan check blocks the migration"
 # The plan check calls GET /api/2.2/jobs/get for each resource to compare
@@ -14,7 +14,7 @@ title "Inject GET failure so the plan check blocks the migration"
 fault.py "GET /api/2.2/jobs/get*" 403 1 1
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Local state was NOT rewritten (still terraform)"
 trace find .databricks/bundle -name "resources.json" -type f
@@ -23,10 +23,10 @@ trace find .databricks/bundle -name "terraform.tfstate*" -type f
 title "Retry: plan check passes this time, migration succeeds"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Local state is now direct"
 trace find .databricks/bundle -name "resources.json" -type f
 trace find .databricks/bundle -name "terraform.tfstate*" -type f
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt b/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt
index 94d30286b16..cf125b4bd74 100644
--- a/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-push-failure/output.txt
@@ -3,7 +3,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_migration_telemetry
@@ -14,7 +14,7 @@ direct_drymigrate_warnings false
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Warn: Direct engine selected via DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy.
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 Migrating state to direct deployment engine (selected via DATABRICKS_BUNDLE_ENGINE environment variable)...
 Warn: automatic migration to direct engine failed: pushing direct state to workspace: access denied: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json
@@ -33,7 +33,7 @@ direct_migrate_commit_error true
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Warn: Direct engine selected via DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy.
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 Migrating state to direct deployment engine (selected via DATABRICKS_BUNDLE_ENGINE environment variable)...
 Migrated 1 resource to direct deployment engine.
diff --git a/acceptance/bundle/migrate/auto-migrate-push-failure/script b/acceptance/bundle/migrate/auto-migrate-push-failure/script
index b1ccb759da5..283398867c7 100644
--- a/acceptance/bundle/migrate/auto-migrate-push-failure/script
+++ b/acceptance/bundle/migrate/auto-migrate-push-failure/script
@@ -3,7 +3,7 @@ export DATABRICKS_BUNDLE_ENGINE=
 title "Initial deploy on terraform"
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Opt in via env var; inject 403 on the resources.json push so commit fails"
 # The auto-migration's commit path uploads resources.json to the workspace
@@ -12,7 +12,7 @@ title "Opt in via env var; inject 403 on the resources.json push so commit fails
 fault.py "POST /api/2.0/workspace-files/import-file/Workspace/Users/$CURRENT_USER_NAME/.bundle/test-bundle/default/state/resources.json" 403 0 1
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Local state was NOT rewritten (still terraform)\n"
 trace find .databricks/bundle -name "resources.json" -type f
@@ -21,10 +21,10 @@ trace find .databricks/bundle -name "terraform.tfstate*" -type f
 title "Retry: auto-migration succeeds this time"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Local state is now direct\n"
 trace find .databricks/bundle -name "resources.json" -type f
 trace find .databricks/bundle -name "terraform.tfstate*" -type f
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt
index ce3f99f0f14..ac27fccbf49 100644
--- a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt
+++ b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/output.txt
@@ -3,7 +3,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_migration_telemetry
@@ -14,7 +14,7 @@ direct_drymigrate_warnings false
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Warn: Direct engine selected via DATABRICKS_BUNDLE_ENGINE environment variable but the existing state uses "terraform". Deploying on "terraform"; will attempt to migrate the state to the direct engine after this deploy.
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 Migrating state to direct deployment engine (selected via DATABRICKS_BUNDLE_ENGINE environment variable)...
 Warn: automatic migration to direct engine failed: pushing direct state to workspace: deleting remote terraform state: Fault injected by test.
@@ -32,7 +32,7 @@ direct_migrate_commit_error true
 === Retry recovers: subsequent deploy re-does the backup and completes
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_migration_telemetry
diff --git a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/script b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/script
index 85d637fa881..426ee04a73b 100644
--- a/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/script
+++ b/acceptance/bundle/migrate/auto-migrate-tfbackup-failure/script
@@ -3,7 +3,7 @@ export DATABRICKS_BUNDLE_ENGINE=
 title "Initial deploy on terraform"
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Opt in via env var; inject 403 on the DELETE of remote terraform.tfstate"
 # resources.json is uploaded successfully; then we back up terraform.tfstate to
@@ -14,7 +14,7 @@ title "Opt in via env var; inject 403 on the DELETE of remote terraform.tfstate"
 fault.py "POST /api/2.0/workspace/delete" 403 1 1
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Local state was NOT rewritten (still terraform)\n"
 trace find .databricks/bundle -name "resources.json" -type f
@@ -23,10 +23,10 @@ trace find .databricks/bundle -name "terraform.tfstate*" -type f
 title "Retry recovers: subsequent deploy re-does the backup and completes"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_migration_telemetry
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Local state is now direct\n"
 trace find .databricks/bundle -name "resources.json" -type f
 trace find .databricks/bundle -name "terraform.tfstate*" -type f
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/basic/output.txt b/acceptance/bundle/migrate/basic/output.txt
index dee4ec58a49..eaaf8daa73e 100644
--- a/acceptance/bundle/migrate/basic/output.txt
+++ b/acceptance/bundle/migrate/basic/output.txt
@@ -9,7 +9,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test
 Created jobs.test_job
 Created pipelines.test_pipeline
 Created volumes.test_volume
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate
@@ -32,7 +32,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 3 unchanged
 
 === Should show that it's already migrated
@@ -74,7 +74,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 3 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 3 unchanged
 
 >>> print_requests.py --get //jobs/get
@@ -112,7 +112,7 @@ Plan: 0 to add, 2 to change, 0 to delete, 1 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files...
 Updated jobs.test_job
 Updated pipelines.test_pipeline
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 2 changed, 0 deleted, 1 unchanged
 
 === Different target, still on terraform
@@ -122,7 +122,7 @@ Created jobs.test_job
 Created pipelines.test_pipeline
 Created schemas.test_schema
 Created volumes.test_volume
-Files: 10 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 4 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle debug states -t prod
diff --git a/acceptance/bundle/migrate/basic/script b/acceptance/bundle/migrate/basic/script
index f1aa9003ed2..a9944a5a4d8 100755
--- a/acceptance/bundle/migrate/basic/script
+++ b/acceptance/bundle/migrate/basic/script
@@ -21,7 +21,7 @@ trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 title "Should show that it's already migrated"
 trace musterr $CLI bundle deployment migrate
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 # Both DATABRICKS_BUNDLE_ENGINE=direct and DATABRICKS_BUNDLE_ENGINE= work
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan | contains.py "3 unchanged"
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle plan | contains.py "3 unchanged"
@@ -38,7 +38,7 @@ trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states --force-pull
 title "Extra plan: should have no drift"
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle plan | contains.py "3 unchanged"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Update databricks.yml, run plan & update"
 trace update_file.py databricks.yml Migration Migrated
@@ -51,4 +51,4 @@ trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy -t prod
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states -t prod
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states -t prod --force-pull
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/dashboards/output.txt b/acceptance/bundle/migrate/dashboards/output.txt
index 369abfa9346..8eca598e43c 100644
--- a/acceptance/bundle/migrate/dashboards/output.txt
+++ b/acceptance/bundle/migrate/dashboards/output.txt
@@ -2,7 +2,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created dashboards.dashboard1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate
@@ -20,7 +20,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle plan
@@ -35,7 +35,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --get //dashboards
diff --git a/acceptance/bundle/migrate/dashboards/script b/acceptance/bundle/migrate/dashboards/script
index efcac87e0fc..68fc6883eb3 100755
--- a/acceptance/bundle/migrate/dashboards/script
+++ b/acceptance/bundle/migrate/dashboards/script
@@ -10,7 +10,7 @@ print_state.py > out.new_state.json
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle plan
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 # Both DATABRICKS_BUNDLE_ENGINE=direct and DATABRICKS_BUNDLE_ENGINE= work
 # Badness: known issue with dashboards, will show up as 'recreate' see https://github.com/databricks/cli/pull/3966
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan | contains.py "1 unchanged"
@@ -26,7 +26,7 @@ trace musterr $CLI bundle deployment migrate
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states --force-pull
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 # Uncomment once 'recreate' bug is fixed
 #title "Update databricks.yml, run plan & update"
@@ -35,4 +35,4 @@ rm out.requests.txt
 #trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle plan -o json | nostamp > out.plan_update.json
 #trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle deploy
 
-#rm out.requests.txt
+#rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/grants/output.txt b/acceptance/bundle/migrate/grants/output.txt
index 7c461a78076..fd5dc4f046c 100644
--- a/acceptance/bundle/migrate/grants/output.txt
+++ b/acceptance/bundle/migrate/grants/output.txt
@@ -7,7 +7,7 @@ Created schemas.my_schema
 Created schemas.my_schema.grants
 Created volumes.my_volume
 Created volumes.my_volume.grants
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 6 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate
@@ -25,7 +25,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 6 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 6 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle plan
@@ -38,7 +38,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 6 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 6 unchanged
 
 >>> print_requests.py --get //unity-catalog/permissions
diff --git a/acceptance/bundle/migrate/grants/script b/acceptance/bundle/migrate/grants/script
index 5686ab0563c..f53b567d1e2 100755
--- a/acceptance/bundle/migrate/grants/script
+++ b/acceptance/bundle/migrate/grants/script
@@ -9,7 +9,7 @@ print_state.py > out.new_state.json
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle plan
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 # Both DATABRICKS_BUNDLE_ENGINE=direct and DATABRICKS_BUNDLE_ENGINE= work
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan | contains.py "6 unchanged"
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle plan | contains.py "6 unchanged"
@@ -23,4 +23,4 @@ trace musterr $CLI bundle deployment migrate
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states --force-pull
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/permissions/output.txt b/acceptance/bundle/migrate/permissions/output.txt
index c6a83b57ba7..913a4bf012e 100644
--- a/acceptance/bundle/migrate/permissions/output.txt
+++ b/acceptance/bundle/migrate/permissions/output.txt
@@ -5,7 +5,7 @@ Created jobs.test_job
 Created jobs.test_job.permissions
 Created pipelines.test_pipeline
 Created pipelines.test_pipeline.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 4 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate
@@ -52,7 +52,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 4 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/default/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 4 unchanged
 
 >>> print_requests.py --get //jobs/get
diff --git a/acceptance/bundle/migrate/permissions/script b/acceptance/bundle/migrate/permissions/script
index 2bc8ca521a4..f2ef76cc34d 100755
--- a/acceptance/bundle/migrate/permissions/script
+++ b/acceptance/bundle/migrate/permissions/script
@@ -6,7 +6,7 @@ print_state.py > out.new_state.json
 
 export DATABRICKS_BUNDLE_ENGINE=
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 # Both DATABRICKS_BUNDLE_ENGINE=direct and DATABRICKS_BUNDLE_ENGINE= work
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan | contains.py "4 unchanged"
 trace $CLI bundle plan | contains.py "4 unchanged"
@@ -20,4 +20,4 @@ trace musterr $CLI bundle deployment migrate
 trace $CLI bundle debug states
 trace $CLI bundle debug states --force-pull
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/profile_arg/output.txt b/acceptance/bundle/migrate/profile_arg/output.txt
index 732a04c7311..01f7e6deb45 100644
--- a/acceptance/bundle/migrate/profile_arg/output.txt
+++ b/acceptance/bundle/migrate/profile_arg/output.txt
@@ -2,7 +2,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/dev/files...
 Created jobs.test_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate -p non_existent321
@@ -19,7 +19,7 @@ To undo the migration, remove [TEST_TMP_DIR]/.databricks/bundle/dev/resources.js
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-basic-test/prod/files...
 Created jobs.test_job
 Created schemas.test_schema
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate -p non_existent321 -t prod
diff --git a/acceptance/bundle/migrate/removed/output.txt b/acceptance/bundle/migrate/removed/output.txt
index 8c9eb4a764b..c9289b973f3 100644
--- a/acceptance/bundle/migrate/removed/output.txt
+++ b/acceptance/bundle/migrate/removed/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-removed-test/default/files...
 Created jobs.job_a
 Created jobs.job_b
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate
@@ -24,7 +24,7 @@ Plan: 0 to add, 0 to change, 1 to delete, 1 unchanged
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-removed-test/default/files...
 Deleted jobs.job_b
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py //jobs/delete
diff --git a/acceptance/bundle/migrate/removed/script b/acceptance/bundle/migrate/removed/script
index c6cea1e2c04..9e53c7991b6 100644
--- a/acceptance/bundle/migrate/removed/script
+++ b/acceptance/bundle/migrate/removed/script
@@ -13,11 +13,11 @@ trace $CLI bundle deployment migrate
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan | contains.py "1 to delete"
 
 # Deploy deletes job_b; verify via recorded requests
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_requests.py //jobs/delete
 
 # No further actions planned
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan | contains.py "1 unchanged"
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/migrate/runas/output.txt b/acceptance/bundle/migrate/runas/output.txt
index fd710079fba..71faf2c5903 100644
--- a/acceptance/bundle/migrate/runas/output.txt
+++ b/acceptance/bundle/migrate/runas/output.txt
@@ -33,7 +33,7 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dabs_revenue-[UNIQUE_NAME]/production/files...
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //pipelines
diff --git a/acceptance/bundle/migrate/runas/script b/acceptance/bundle/migrate/runas/script
index 28af4373735..c852cbfb865 100644
--- a/acceptance/bundle/migrate/runas/script
+++ b/acceptance/bundle/migrate/runas/script
@@ -7,7 +7,7 @@ trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle plan
 
 cleanup() {
     trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 trap cleanup EXIT
diff --git a/acceptance/bundle/migrate/script.prepare b/acceptance/bundle/migrate/script.prepare
index 9de2f19d437..e99f29a8307 100644
--- a/acceptance/bundle/migrate/script.prepare
+++ b/acceptance/bundle/migrate/script.prepare
@@ -1,6 +1,6 @@
 # Filter print_telemetry_bool_values output to auto-migration keys
 # (direct_drymigrate_*, direct_migrate_*, direct_migrated_via_*). Callers
-# clear out.requests.txt themselves; some tests want to keep it for a
+# clear "$OUT_REQUESTS" themselves; some tests want to keep it for a
 # subsequent print_requests.py assertion.
 print_migration_telemetry() {
     print_telemetry_bool_values | grep '^direct_' || true
diff --git a/acceptance/bundle/migrate/var_arg/output.txt b/acceptance/bundle/migrate/var_arg/output.txt
index f3647efb91a..2c883691705 100644
--- a/acceptance/bundle/migrate/var_arg/output.txt
+++ b/acceptance/bundle/migrate/var_arg/output.txt
@@ -2,7 +2,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy --var=job_name=Custom Job Name
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev/files...
 Created jobs.test_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate --var=job_name=Custom Job Name
@@ -32,7 +32,7 @@ Destroy: 1 deleted
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy --var job_name=Custom Job Name
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/migrate-var-test/dev/files...
 Created jobs.test_job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deployment migrate --var job_name=Custom Job Name
diff --git a/acceptance/bundle/open/output.txt b/acceptance/bundle/open/output.txt
index 4faf4514925..e8a8af81490 100644
--- a/acceptance/bundle/open/output.txt
+++ b/acceptance/bundle/open/output.txt
@@ -14,7 +14,7 @@ Exit code: 1
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Use a fake browser that just prints the URL it would have opened
diff --git a/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt b/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt
index 51001423f17..c64b5fffff7 100644
--- a/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt
+++ b/acceptance/bundle/python/mutator-permissions-owner-5682/output.txt
@@ -9,5 +9,5 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created pipelines.my_pipeline
 Created pipelines.my_pipeline.permissions
-Files: 8 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/quiet-levels/output.txt b/acceptance/bundle/quiet-levels/output.txt
index bd445ed09d0..b7076ef801f 100644
--- a/acceptance/bundle/quiet-levels/output.txt
+++ b/acceptance/bundle/quiet-levels/output.txt
@@ -16,7 +16,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created experiments.my_experiment
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve -qq
@@ -24,7 +24,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 === deploy -q: summary only, no per-resource lines
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve -qq
diff --git a/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt b/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt
index b8cb27e1dae..c7dcfd1a1de 100644
--- a/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt
+++ b/acceptance/bundle/resource_deps/bad_syntax/out.deploy.direct.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created volumes.bar
 Created volumes.foo
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 Unexpected success
diff --git a/acceptance/bundle/resource_deps/create_error/script b/acceptance/bundle/resource_deps/create_error/script
index ea426e1876a..908ac8ba975 100644
--- a/acceptance/bundle/resource_deps/create_error/script
+++ b/acceptance/bundle/resource_deps/create_error/script
@@ -11,7 +11,7 @@ replace_ids.py
 title "Plan should still contain foo and bar"
 trace $CLI bundle plan
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 musterr $CLI bundle deploy &> 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
diff --git a/acceptance/bundle/resource_deps/duplicate_ref/output.txt b/acceptance/bundle/resource_deps/duplicate_ref/output.txt
index 13b21a998a3..2e0e71915c0 100644
--- a/acceptance/bundle/resource_deps/duplicate_ref/output.txt
+++ b/acceptance/bundle/resource_deps/duplicate_ref/output.txt
@@ -44,10 +44,10 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Created pipelines.bar
 Created pipelines.baz
 Created pipelines.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq -s [.[] | select(.path=="/api/2.0/pipelines" and .method=="POST") | .body.name] | sort out.requests.txt
+>>> jq -s [.[] | select(.path=="/api/2.0/pipelines" and .method=="POST") | .body.name] | sort [OUTPUT_DIR]/out.requests.txt
 [
   "pbar pfoo pfoo",
   "pbaz [UUID] [UUID]",
diff --git a/acceptance/bundle/resource_deps/duplicate_ref/script b/acceptance/bundle/resource_deps/duplicate_ref/script
index 1d50b164df1..00fb0e235b3 100644
--- a/acceptance/bundle/resource_deps/duplicate_ref/script
+++ b/acceptance/bundle/resource_deps/duplicate_ref/script
@@ -1,5 +1,5 @@
 trace $CLI bundle validate -o json | jq .resources
 trace $CLI bundle plan
 trace $CLI bundle deploy
-trace jq -s '[.[] | select(.path=="/api/2.0/pipelines" and .method=="POST") | .body.name] | sort' out.requests.txt
-rm out.requests.txt
+trace jq -s '[.[] | select(.path=="/api/2.0/pipelines" and .method=="POST") | .body.name] | sort' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resource_deps/escaped_ref/output.txt b/acceptance/bundle/resource_deps/escaped_ref/output.txt
index 5370251a14d..a08cee73869 100644
--- a/acceptance/bundle/resource_deps/escaped_ref/output.txt
+++ b/acceptance/bundle/resource_deps/escaped_ref/output.txt
@@ -15,7 +15,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.bar
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //jobs --sort --nostamp
diff --git a/acceptance/bundle/resource_deps/escaped_ref/script b/acceptance/bundle/resource_deps/escaped_ref/script
index e2c102d942a..459647cb1dc 100644
--- a/acceptance/bundle/resource_deps/escaped_ref/script
+++ b/acceptance/bundle/resource_deps/escaped_ref/script
@@ -1,6 +1,6 @@
 cleanup() {
     $CLI bundle destroy --auto-approve &> LOG.destroy
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resource_deps/grant_ref/output.txt b/acceptance/bundle/resource_deps/grant_ref/output.txt
index efc644e00a3..198de4ecdc6 100644
--- a/acceptance/bundle/resource_deps/grant_ref/output.txt
+++ b/acceptance/bundle/resource_deps/grant_ref/output.txt
@@ -15,5 +15,5 @@ Created schemas.schema_a
 Created schemas.schema_a.grants
 Created schemas.schema_b
 Created schemas.schema_b.grants
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 4 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resource_deps/id_chain/output.txt b/acceptance/bundle/resource_deps/id_chain/output.txt
index 56eaf6f3968..1a2798f2695 100644
--- a/acceptance/bundle/resource_deps/id_chain/output.txt
+++ b/acceptance/bundle/resource_deps/id_chain/output.txt
@@ -19,7 +19,7 @@ Created jobs.b
 Created jobs.c
 Created jobs.d
 Created jobs.e
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 5 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests_short
@@ -53,7 +53,7 @@ Updated jobs.b
 Updated jobs.c
 Updated jobs.d
 Updated jobs.e
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 5 changed, 0 deleted, 0 unchanged
 
 >>> print_requests_short
diff --git a/acceptance/bundle/resource_deps/id_chain/script b/acceptance/bundle/resource_deps/id_chain/script
index bcd103ac2a5..56889f0bc66 100644
--- a/acceptance/bundle/resource_deps/id_chain/script
+++ b/acceptance/bundle/resource_deps/id_chain/script
@@ -1,16 +1,16 @@
 print_all_requests() {
-    jq --sort-keys 'select(.path | contains("/jobs"))' < out.requests.txt
-    rm out.requests.txt
+    jq --sort-keys 'select(.path | contains("/jobs"))' < "$OUT_REQUESTS"
+    rm "$OUT_REQUESTS"
 }
 
 print_requests() {
-    jq --sort-keys 'select(.method != "GET" and (.path | contains("/jobs")))' < out.requests.txt
-    rm out.requests.txt
+    jq --sort-keys 'select(.method != "GET" and (.path | contains("/jobs")))' < "$OUT_REQUESTS"
+    rm "$OUT_REQUESTS"
 }
 
 print_requests_short() {
-    jq --sort-keys 'select(.method != "GET" and (.path | contains("/jobs"))) | (.body.name // .body.new_settings.name // empty)' < out.requests.txt
-    rm out.requests.txt
+    jq --sort-keys 'select(.method != "GET" and (.path | contains("/jobs"))) | (.body.name // .body.new_settings.name // empty)' < "$OUT_REQUESTS"
+    rm "$OUT_REQUESTS"
 }
 
 trace $CLI bundle plan
diff --git a/acceptance/bundle/resource_deps/immutable_field_ref/output.txt b/acceptance/bundle/resource_deps/immutable_field_ref/output.txt
index cfae591ab30..bdb269cfbce 100644
--- a/acceptance/bundle/resource_deps/immutable_field_ref/output.txt
+++ b/acceptance/bundle/resource_deps/immutable_field_ref/output.txt
@@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Created jobs.bar
 Created schemas.schema
 Created volumes.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> update_file.py databricks.yml comment1 comment2
diff --git a/acceptance/bundle/resource_deps/job_id/output.txt b/acceptance/bundle/resource_deps/job_id/output.txt
index e9fa9237a2f..67bcd312cb3 100644
--- a/acceptance/bundle/resource_deps/job_id/output.txt
+++ b/acceptance/bundle/resource_deps/job_id/output.txt
@@ -11,7 +11,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.bar
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs
@@ -64,7 +64,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deleted jobs.bar
 Deleted jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 2 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt
index 7d97a13e269..db1ce154bee 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/output.txt
@@ -13,7 +13,7 @@ Created jobs.independent2
 Created jobs.multi_child
 Created jobs.multi_parent1
 Created jobs.multi_parent2
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 12 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp --sort //jobs
@@ -301,7 +301,7 @@ Deleted jobs.independent2
 Deleted jobs.multi_child
 Deleted jobs.multi_parent1
 Deleted jobs.multi_parent2
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 12 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
index 3256abdda52..d3ddd6dba67 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/delete_all/script
@@ -1,6 +1,5 @@
 cp $TESTDIR/../databricks.yml .
 cp $TESTDIR/../empty.yml .
-echo "*" > .gitignore
 
 trace $CLI bundle deploy
 trace print_requests.py --nostamp --sort //jobs
@@ -16,4 +15,4 @@ trace $CLI bundle plan > out.plan_delete.txt
 trace $CLI bundle deploy
 
 trace $CLI bundle destroy --auto-approve
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
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 d5630cbe32b..fc575181a97 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
@@ -13,7 +13,7 @@ Created jobs.independent2
 Created jobs.multi_child
 Created jobs.multi_parent1
 Created jobs.multi_parent2
-Files: 0 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 12 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp --sort //jobs
diff --git a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
index 2adcf27737d..e9645f97a5a 100644
--- a/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
+++ b/acceptance/bundle/resource_deps/job_id_big_graph/destroy/script
@@ -1,5 +1,4 @@
 cp $TESTDIR/../databricks.yml .
-echo "*" > .gitignore
 
 trace $CLI bundle deploy
 trace print_requests.py --nostamp --sort //jobs
@@ -11,4 +10,4 @@ trace $CLI bundle plan > out.plan_sanity.txt
 
 title "Destroy all via bundle destroy"
 trace $CLI bundle destroy --auto-approve
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
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 299f48c2fc4..4b83ba4fe56 100644
--- a/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt
+++ b/acceptance/bundle/resource_deps/job_id_delete_foo/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.bar
 Created jobs.foo
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs
@@ -56,7 +56,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deleted jobs.foo
-Files: 0 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/job_id_delete_foo/script b/acceptance/bundle/resource_deps/job_id_delete_foo/script
index f5efbd22609..392afced7b4 100644
--- a/acceptance/bundle/resource_deps/job_id_delete_foo/script
+++ b/acceptance/bundle/resource_deps/job_id_delete_foo/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 trace $CLI bundle deploy
 trace print_requests.py --nostamp //jobs
 
diff --git a/acceptance/bundle/resource_deps/job_tasks/output.txt b/acceptance/bundle/resource_deps/job_tasks/output.txt
index bc5cf891c1b..f09bb852e99 100644
--- a/acceptance/bundle/resource_deps/job_tasks/output.txt
+++ b/acceptance/bundle/resource_deps/job_tasks/output.txt
@@ -4,7 +4,7 @@ Uploading hello.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.test_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/bundle/resource_deps/job_tasks/script b/acceptance/bundle/resource_deps/job_tasks/script
index 1634d9f381b..033e3914f07 100644
--- a/acceptance/bundle/resource_deps/job_tasks/script
+++ b/acceptance/bundle/resource_deps/job_tasks/script
@@ -2,4 +2,4 @@ touch hello.whl
 trace $CLI bundle deploy
 trace print_telemetry_bool_values | grep -v direct_drymigrate
 print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.$DATABRICKS_BUNDLE_ENGINE.txt || true
-rm out.requests.txt hello.whl
+rm "$OUT_REQUESTS" hello.whl
diff --git a/acceptance/bundle/resource_deps/jobs_update/script b/acceptance/bundle/resource_deps/jobs_update/script
index f806f2db846..d866a69811b 100644
--- a/acceptance/bundle/resource_deps/jobs_update/script
+++ b/acceptance/bundle/resource_deps/jobs_update/script
@@ -23,11 +23,11 @@ title "Fetch job ID and verify remote state"
 # Badness: output should not be different per engine; investigate if it's the same on cloud
 trace $CLI jobs get $foo_id | nostamp > out.get_foo.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI jobs get $bar_id | nostamp
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 trace $CLI bundle destroy --auto-approve
 trace print_requests.py --nostamp //jobs
 
 trace musterr $CLI jobs get $foo_id
 trace musterr $CLI jobs get $bar_id
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resource_deps/jobs_update_remote/output.txt b/acceptance/bundle/resource_deps/jobs_update_remote/output.txt
index 58adb9698bc..d1fd509f858 100644
--- a/acceptance/bundle/resource_deps/jobs_update_remote/output.txt
+++ b/acceptance/bundle/resource_deps/jobs_update_remote/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.bar
 Created jobs.foo
-Files: 0 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/jobs_update_remote/script b/acceptance/bundle/resource_deps/jobs_update_remote/script
index d456ed8b023..5b4c38fe2ba 100644
--- a/acceptance/bundle/resource_deps/jobs_update_remote/script
+++ b/acceptance/bundle/resource_deps/jobs_update_remote/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy
 trace print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt
index 2af634b343b..6e3100041a0 100644
--- a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt
+++ b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.direct.txt
@@ -1,4 +1,4 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Error: cycle detected: resources.jobs.foo refers to resources.jobs.bar via ${resources.jobs.bar.id} which refers to resources.jobs.foo via ${resources.jobs.foo.id}
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt
index 95a56092383..365063d84df 100644
--- a/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt
+++ b/acceptance/bundle/resource_deps/loop_jobs/out.deploy.terraform.txt
@@ -5,4 +5,4 @@ Error: Cycle: databricks_job.foo, databricks_job.bar
 
 
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt b/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt
index c01fcf47812..84e31413888 100644
--- a/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt
+++ b/acceptance/bundle/resource_deps/loop_self/out.deploy.direct.txt
@@ -1,4 +1,4 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Error: cycle detected: resources.jobs.foo refers to itself via ${resources.jobs.foo.id}
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt
index e85210b2b35..67b028a54a9 100644
--- a/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt
+++ b/acceptance/bundle/resource_deps/loop_self/out.deploy.terraform.txt
@@ -16,4 +16,4 @@ Error: Self-referential block
 Configuration for databricks_job.foo may not refer to itself.
 
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.direct.txt
index b99c41ca46b..6b7b12cd0c4 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,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 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
+Files: 6 uploaded, 0 deleted
 
 Exit code: 1
diff --git a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt
index deb757ec10c..44cae02948c 100644
--- a/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt
+++ b/acceptance/bundle/resource_deps/missing_ingestion_definition/out.deploy.terraform.txt
@@ -12,6 +12,6 @@ The given key does not identify an element in this collection value: the
 collection has no elements.
 
 
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 
 Exit code: 1
diff --git a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.direct.txt
index fe12fac4f34..fdf616b160c 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,4 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files...
 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
+Files: 6 uploaded, 0 deleted
diff --git a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt
index c5225434073..098c70891f0 100644
--- a/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt
+++ b/acceptance/bundle/resource_deps/missing_map_key/out.deploy.terraform.txt
@@ -11,4 +11,4 @@ Error: Missing map element
 This map does not have an element with the key "missing_tag".
 
 
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
diff --git a/acceptance/bundle/resource_deps/missing_string_field/output.txt b/acceptance/bundle/resource_deps/missing_string_field/output.txt
index fcf6e1d2783..d47817c2564 100644
--- a/acceptance/bundle/resource_deps/missing_string_field/output.txt
+++ b/acceptance/bundle/resource_deps/missing_string_field/output.txt
@@ -34,7 +34,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.bar
 Created pipelines.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //pipeline
diff --git a/acceptance/bundle/resource_deps/model_id_ref/output.txt b/acceptance/bundle/resource_deps/model_id_ref/output.txt
index 2d53a5b739c..373a0c8a0b7 100644
--- a/acceptance/bundle/resource_deps/model_id_ref/output.txt
+++ b/acceptance/bundle/resource_deps/model_id_ref/output.txt
@@ -11,7 +11,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.consumer
 Created models.my_model
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //mlflow/registered-models/create //jobs/create --sort
diff --git a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt
index 0a4722f468d..c117064ca6d 100644
--- a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt
+++ b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.direct.txt
@@ -3,4 +3,4 @@ Error: cannot plan resources.volumes.foo: cannot resolve "${resources.volumes.ba
 
 Error: planning failed
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt
index 3ecba7e01e9..ddea4b4a236 100644
--- a/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt
+++ b/acceptance/bundle/resource_deps/non_existent_field/out.deploy.terraform.txt
@@ -10,4 +10,4 @@ This object has no argument, nested block, or exported attribute named
 "non_existent".
 
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resource_deps/permission_ref/output.txt b/acceptance/bundle/resource_deps/permission_ref/output.txt
index e4d08a379f5..830b55fd710 100644
--- a/acceptance/bundle/resource_deps/permission_ref/output.txt
+++ b/acceptance/bundle/resource_deps/permission_ref/output.txt
@@ -15,5 +15,5 @@ Created jobs.job_a
 Created jobs.job_a.permissions
 Created jobs.job_b
 Created jobs.job_b.permissions
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 4 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resource_deps/pipelines_recreate/script b/acceptance/bundle/resource_deps/pipelines_recreate/script
index 691e24279b2..c3a1358dacc 100644
--- a/acceptance/bundle/resource_deps/pipelines_recreate/script
+++ b/acceptance/bundle/resource_deps/pipelines_recreate/script
@@ -25,7 +25,7 @@ title "Fetch resource IDs and verify remote state"
 trace musterr $CLI pipelines get $foo_id
 trace $CLI pipelines get $foo_id_2 | nostamp
 trace $CLI jobs get $bar_id | nostamp| jq 'del(.settings.run_as)'
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Follow up plan & deploy do nothing"
 trace $CLI bundle plan
@@ -39,4 +39,4 @@ trace print_requests.py --nostamp //jobs //pipelines '^//api/2.0/bundle'
 trace musterr $CLI pipelines get $foo_id
 trace musterr $CLI pipelines get $foo_id_2
 trace musterr $CLI jobs get $bar_id
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt
index 9d45d1cf11d..201aa13c6f8 100644
--- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt
+++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.direct.txt
@@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE
 Created schemas.my
 Created volumes.bar
 Created volumes.foo
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt
index 9add1d046ef..4f9221996d1 100644
--- a/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt
+++ b/acceptance/bundle/resource_deps/remote_field_storage_location/out.deploy.terraform.txt
@@ -15,6 +15,6 @@ This is a bug in the provider, which should be reported in the provider's own
 issue tracker.
 
 
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 
 Exit code: 1
diff --git a/acceptance/bundle/resource_deps/remote_pipeline/output.txt b/acceptance/bundle/resource_deps/remote_pipeline/output.txt
index 94f793be5f1..95fdcc9d765 100644
--- a/acceptance/bundle/resource_deps/remote_pipeline/output.txt
+++ b/acceptance/bundle/resource_deps/remote_pipeline/output.txt
@@ -5,7 +5,7 @@ Created pipelines.foo1
 Created pipelines.foo2
 Created pipelines.foo3
 Created pipelines.foo4
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 4 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests
diff --git a/acceptance/bundle/resource_deps/remote_pipeline/script b/acceptance/bundle/resource_deps/remote_pipeline/script
index b8683429aac..55ce2d8d37f 100644
--- a/acceptance/bundle/resource_deps/remote_pipeline/script
+++ b/acceptance/bundle/resource_deps/remote_pipeline/script
@@ -1,6 +1,6 @@
 print_requests() {
-    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipeline"))) | (.body.name // empty)' < out.requests.txt
-    rm out.requests.txt
+    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipeline"))) | (.body.name // empty)' < "$OUT_REQUESTS"
+    rm "$OUT_REQUESTS"
 }
 
 $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resource_deps/resources_var/out.deploy.txt b/acceptance/bundle/resource_deps/resources_var/out.deploy.txt
index 445e6f93e40..f80e858a75e 100644
--- a/acceptance/bundle/resource_deps/resources_var/out.deploy.txt
+++ b/acceptance/bundle/resource_deps/resources_var/out.deploy.txt
@@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/fi
 Created pipelines.mypipeline
 Created volumes.bar
 Created volumes.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resource_deps/resources_var/output.txt b/acceptance/bundle/resource_deps/resources_var/output.txt
index 3edca4ad787..5538dc49ab2 100644
--- a/acceptance/bundle/resource_deps/resources_var/output.txt
+++ b/acceptance/bundle/resource_deps/resources_var/output.txt
@@ -34,7 +34,7 @@
   }
 }
 
->>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name [OUTPUT_DIR]/out.requests.txt
 "[dev [USERNAME]] pipeline for mycatalog.myschema.myname"
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/bundle/resource_deps/resources_var/script b/acceptance/bundle/resource_deps/resources_var/script
index aa48ddcde79..365984de59d 100644
--- a/acceptance/bundle/resource_deps/resources_var/script
+++ b/acceptance/bundle/resource_deps/resources_var/script
@@ -1,7 +1,7 @@
 trace $CLI bundle validate -t dev -o json | jq .resources
 $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 trace errcode $CLI bundle deploy -t dev &> out.deploy.txt
-trace jq -s '.[] | select(.path=="/api/2.0/pipelines") | .body.name' out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/pipelines") | .body.name' "$OUT_REQUESTS"
 trace print_telemetry_bool_values | grep -v direct_drymigrate
 print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.$DATABRICKS_BUNDLE_ENGINE.txt || true
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resource_deps/resources_var_presets/output.txt b/acceptance/bundle/resource_deps/resources_var_presets/output.txt
index 1c4232ec581..87e2d44cf22 100644
--- a/acceptance/bundle/resource_deps/resources_var_presets/output.txt
+++ b/acceptance/bundle/resource_deps/resources_var_presets/output.txt
@@ -33,8 +33,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/fi
 Created pipelines.mypipeline
 Created schemas.bar
 Created schemas.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name [OUTPUT_DIR]/out.requests.txt
 "[dev [USERNAME]] pipeline for mycatalog.dev_[USERNAME]_dev_[USERNAME]_myschema"
diff --git a/acceptance/bundle/resource_deps/resources_var_presets/script b/acceptance/bundle/resource_deps/resources_var_presets/script
index 8d925628015..f4bf642936b 100644
--- a/acceptance/bundle/resource_deps/resources_var_presets/script
+++ b/acceptance/bundle/resource_deps/resources_var_presets/script
@@ -1,4 +1,4 @@
 trace $CLI bundle validate -t dev -o json | jq .resources
 trace $CLI bundle deploy -t dev
-trace jq -s '.[] | select(.path=="/api/2.0/pipelines") | .body.name' out.requests.txt
-rm out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/pipelines") | .body.name' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt
index 677ffa25bb9..3ee5419399b 100644
--- a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt
+++ b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/output.txt
@@ -38,8 +38,8 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/fi
 Created pipelines.mypipeline
 Created schemas.bar
 Created volumes.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/pipelines") | .body.name [OUTPUT_DIR]/out.requests.txt
 "[dev [USERNAME]] pipeline for mycatalog.dev_[USERNAME]_myschema.myname"
diff --git a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/script b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/script
index b34349c6c9c..49b2e660eac 100644
--- a/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/script
+++ b/acceptance/bundle/resource_deps/resources_var_presets_implicit_deps/script
@@ -1,5 +1,5 @@
 trace $CLI bundle validate -t dev -o json | jq .resources
 $CLI bundle plan -o json -t dev | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -t dev
-trace jq -s '.[] | select(.path=="/api/2.0/pipelines") | .body.name' out.requests.txt
-rm out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/pipelines") | .body.name' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt b/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt
index fa9cca5c6d6..9b50d3859c2 100644
--- a/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt
+++ b/acceptance/bundle/resource_deps/tf_path_only_error/out.deploy.terraform.txt
@@ -4,5 +4,5 @@ Warning: "resources.jobs.src.always_running": Terraform-only field; this referen
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.dst
 Created jobs.src
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resource_deps/tf_path_only_error/script b/acceptance/bundle/resource_deps/tf_path_only_error/script
index 0a8edf34210..380f39b1e6b 100644
--- a/acceptance/bundle/resource_deps/tf_path_only_error/script
+++ b/acceptance/bundle/resource_deps/tf_path_only_error/script
@@ -2,4 +2,4 @@ errcode $CLI bundle validate > out.validate.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
 errcode $CLI bundle plan > out.plan.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
 errcode $CLI bundle deploy > out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
 print_telemetry_bool_values > out.telemetry.$DATABRICKS_BUNDLE_ENGINE.txt
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resource_deps/tf_path_renames/output.txt b/acceptance/bundle/resource_deps/tf_path_renames/output.txt
index 62e6b7d4d1d..3a1556f0233 100644
--- a/acceptance/bundle/resource_deps/tf_path_renames/output.txt
+++ b/acceptance/bundle/resource_deps/tf_path_renames/output.txt
@@ -9,7 +9,7 @@ Created jobs.dst_tasks
 Created jobs.src_git
 Created jobs.src_tasks
 Created pipelines.src_pipeline
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 6 created, 0 changed, 0 deleted, 0 unchanged
 /path/to/wheel.whl
 main
diff --git a/acceptance/bundle/resource_deps/underscore_key_reference/output.txt b/acceptance/bundle/resource_deps/underscore_key_reference/output.txt
index 0adb32c28aa..d64126f35c2 100644
--- a/acceptance/bundle/resource_deps/underscore_key_reference/output.txt
+++ b/acceptance/bundle/resource_deps/underscore_key_reference/output.txt
@@ -5,5 +5,5 @@ Created jobs._asset-bundle-deploymentjob
 Created jobs._job
 Created jobs._job.permissions
 Created jobs.ref
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 4 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resource_deps/unicode_reference/output.txt b/acceptance/bundle/resource_deps/unicode_reference/output.txt
index 360f979c010..484d70ad0c7 100644
--- a/acceptance/bundle/resource_deps/unicode_reference/output.txt
+++ b/acceptance/bundle/resource_deps/unicode_reference/output.txt
@@ -19,7 +19,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.变量
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle summary
diff --git a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.txt b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.txt
index 5549d223f29..0f558ddabb3 100644
--- a/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.txt
+++ b/acceptance/bundle/resource_deps/volume_path_contains_id/out.deploy.txt
@@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Created volumes.bar
 Created volumes.baz
 Created volumes.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt b/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt
index fa3c638622e..e029bb35094 100644
--- a/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt
+++ b/acceptance/bundle/resource_deps/volume_path_job_ref/out.deploy.direct.txt
@@ -4,5 +4,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/testbundle-[UNIQUE
 Created jobs.foo
 Created jobs.process
 Created volumes.data
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/alerts/basic/output.txt b/acceptance/bundle/resources/alerts/basic/output.txt
index 94c81a531c8..662c49354d5 100644
--- a/acceptance/bundle/resources/alerts/basic/output.txt
+++ b/acceptance/bundle/resources/alerts/basic/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alerts-basic-[UNIQUE_NAME]/default/files...
 Created alerts.myalert
 Created alerts.myalert.permissions
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [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..9f4edd21542 100644
--- a/acceptance/bundle/resources/alerts/with_file/output.txt
+++ b/acceptance/bundle/resources/alerts/with_file/output.txt
@@ -34,7 +34,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alerts-with-file-[UNIQUE_NAME]/default/files...
 Created alerts.myalert
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] alerts-v2 get-alert [ALERT_ID]
diff --git a/acceptance/bundle/resources/apps/config-drift-stopped/output.txt b/acceptance/bundle/resources/apps/config-drift-stopped/output.txt
index 1a33d51a6f6..2dccf9b39a9 100644
--- a/acceptance/bundle/resources/apps/config-drift-stopped/output.txt
+++ b/acceptance/bundle/resources/apps/config-drift-stopped/output.txt
@@ -4,7 +4,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-drift-stopped-[UNIQUE_NAME]/default/files...
 ✓ Deployment succeeded
 Created apps.myapp
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Change config while running: drift is detected (active deployment present)
diff --git a/acceptance/bundle/resources/apps/config-drift/output.txt b/acceptance/bundle/resources/apps/config-drift/output.txt
index 16e41652081..d0248f81322 100644
--- a/acceptance/bundle/resources/apps/config-drift/output.txt
+++ b/acceptance/bundle/resources/apps/config-drift/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-drift-[UNIQUE_NAME]/default/files...
 Created apps.myapp
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Verify no drift after deploy
@@ -21,7 +21,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-drift-[UNIQUE_NAME]/default/files...
 Updated apps.myapp
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Verify no drift after fix
diff --git a/acceptance/bundle/resources/apps/config-drift/script b/acceptance/bundle/resources/apps/config-drift/script
index 482cf1512b0..76e0203a5d2 100644
--- a/acceptance/bundle/resources/apps/config-drift/script
+++ b/acceptance/bundle/resources/apps/config-drift/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/apps/config-no-deployment/output.txt b/acceptance/bundle/resources/apps/config-no-deployment/output.txt
index 81a1f6c8677..6e0368789ee 100644
--- a/acceptance/bundle/resources/apps/config-no-deployment/output.txt
+++ b/acceptance/bundle/resources/apps/config-no-deployment/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-config-no-deployment/default/files...
 Created apps.myapp
-Files: 0 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op: config/source_code_path drift is skipped while the app has no active deployment
diff --git a/acceptance/bundle/resources/apps/config-no-deployment/script b/acceptance/bundle/resources/apps/config-no-deployment/script
index 503135c881f..226d8350b32 100644
--- a/acceptance/bundle/resources/apps/config-no-deployment/script
+++ b/acceptance/bundle/resources/apps/config-no-deployment/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Deploy: app created with no_compute; config is not deployed until the app starts"
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/apps/create_already_exists/output.txt b/acceptance/bundle/resources/apps/create_already_exists/output.txt
index 9619e49ef8a..198eb96efa8 100644
--- a/acceptance/bundle/resources/apps/create_already_exists/output.txt
+++ b/acceptance/bundle/resources/apps/create_already_exists/output.txt
@@ -37,7 +37,7 @@ HTTP Status: 409 Conflict
 API error_code: RESOURCE_ALREADY_EXISTS
 API message: An app with the same name already exists: test-app-already-exists
 
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 
 >>> [CLI] apps delete test-app-already-exists
 {
diff --git a/acceptance/bundle/resources/apps/default_description/output.txt b/acceptance/bundle/resources/apps/default_description/output.txt
index 1f78fb9801d..92b42ed5ddb 100644
--- a/acceptance/bundle/resources/apps/default_description/output.txt
+++ b/acceptance/bundle/resources/apps/default_description/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created apps.mykey
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //apps
diff --git a/acceptance/bundle/resources/apps/git-source-no-deployment/output.txt b/acceptance/bundle/resources/apps/git-source-no-deployment/output.txt
index 7b6337e33dd..ed026265874 100644
--- a/acceptance/bundle/resources/apps/git-source-no-deployment/output.txt
+++ b/acceptance/bundle/resources/apps/git-source-no-deployment/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-git-source-no-deployment/default/files...
 Created apps.myapp
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op: git_source drift is skipped while the app has no active deployment
diff --git a/acceptance/bundle/resources/apps/git-source-no-deployment/script b/acceptance/bundle/resources/apps/git-source-no-deployment/script
index 9a8c8446eb1..d2ef71d9315 100644
--- a/acceptance/bundle/resources/apps/git-source-no-deployment/script
+++ b/acceptance/bundle/resources/apps/git-source-no-deployment/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Deploy: app created with no_compute; git_source is not deployed until the app starts"
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/apps/immutable/script b/acceptance/bundle/resources/apps/immutable/script
index 968143b2ef5..a64a9bdaf16 100644
--- a/acceptance/bundle/resources/apps/immutable/script
+++ b/acceptance/bundle/resources/apps/immutable/script
@@ -1,7 +1,7 @@
 envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/apps/inline_config/output.txt b/acceptance/bundle/resources/apps/inline_config/output.txt
index 8a82bbec897..5aeb4906d99 100644
--- a/acceptance/bundle/resources/apps/inline_config/output.txt
+++ b/acceptance/bundle/resources/apps/inline_config/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-inline-config-[UNIQUE_NAME]/default/files...
 Created apps.myapp
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] apps get-deployment [UNIQUE_NAME] [DEPLOYMENT_ID]
diff --git a/acceptance/bundle/resources/apps/inline_config/script b/acceptance/bundle/resources/apps/inline_config/script
index 764ab0bc99b..be55ab34fbf 100755
--- a/acceptance/bundle/resources/apps/inline_config/script
+++ b/acceptance/bundle/resources/apps/inline_config/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt
index abe37f235f8..362ed5e8fbb 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt
+++ b/acceptance/bundle/resources/apps/lifecycle-started-omitted/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files...
 Created apps.mykey
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_app_requests
@@ -22,7 +22,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 === (started omitted) -> started: false -> deploy: no start/stop requests
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_app_requests
@@ -30,7 +30,7 @@ Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 === started: false -> (started omitted) -> deploy: no start/stop requests
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_app_requests
@@ -39,7 +39,7 @@ Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files...
 Updated apps.mykey
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_app_requests
@@ -61,7 +61,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-omitted-[UNIQUE_NAME]/default/files...
 Updated apps.mykey
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_app_requests
diff --git a/acceptance/bundle/resources/apps/lifecycle-started-omitted/script b/acceptance/bundle/resources/apps/lifecycle-started-omitted/script
index dd08f33fff5..00b2e1d844f 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started-omitted/script
+++ b/acceptance/bundle/resources/apps/lifecycle-started-omitted/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt
index ef03a4541d9..10b6ec659b4 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt
+++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default/files...
 Created apps.mykey
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_app_requests
@@ -28,7 +28,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default/files...
 Updated apps.mykey
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_app_requests
@@ -55,7 +55,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-toggle-[UNIQUE_NAME]/default/files...
 Updated apps.mykey
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_app_requests
diff --git a/acceptance/bundle/resources/apps/lifecycle-started-toggle/script b/acceptance/bundle/resources/apps/lifecycle-started-toggle/script
index 0b524ad2efa..b2a1ad85a63 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started-toggle/script
+++ b/acceptance/bundle/resources/apps/lifecycle-started-toggle/script
@@ -2,13 +2,13 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 print_app_requests() {
-    jq --sort-keys 'select(.method != "GET" and (.path | contains("/apps")) and (.path | contains("/api/2.0/bundle") | not)) | del(.body.url)' < out.requests.txt
-    rm out.requests.txt
+    jq --sort-keys 'select(.method != "GET" and (.path | contains("/apps")) and (.path | contains("/api/2.0/bundle") | not)) | del(.body.url)' < "$OUT_REQUESTS"
+    rm "$OUT_REQUESTS"
 }
 
 title "Deploy with started=false: app created without compute (no_compute=true)"
diff --git a/acceptance/bundle/resources/apps/lifecycle-started/output.txt b/acceptance/bundle/resources/apps/lifecycle-started/output.txt
index 324f734dd56..ceb780dac8d 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started/output.txt
+++ b/acceptance/bundle/resources/apps/lifecycle-started/output.txt
@@ -3,7 +3,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files...
 Created apps.myapp
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //apps
@@ -33,7 +33,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files...
 Updated apps.myapp
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //deployments ^//api/2.0/bundle
@@ -59,7 +59,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files...
 Updated apps.myapp
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Stop app externally, then deploy with started=false: app stays stopped
@@ -73,7 +73,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files...
 Updated apps.myapp
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //apps
@@ -105,7 +105,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/lifecycle-started-[UNIQUE_NAME]/default/files...
 Updated apps.myapp
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //apps
diff --git a/acceptance/bundle/resources/apps/lifecycle-started/script b/acceptance/bundle/resources/apps/lifecycle-started/script
index 15a9197c3c5..20d8a9e6fd7 100644
--- a/acceptance/bundle/resources/apps/lifecycle-started/script
+++ b/acceptance/bundle/resources/apps/lifecycle-started/script
@@ -2,21 +2,21 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 title "Deploy with started=true: app created with compute running"
 trace errcode $CLI bundle deploy
 trace print_requests.py //apps
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI apps get $UNIQUE_NAME | jq '.compute_status.state'; } || true
 
 title "Re-deploy with description change: code deployed again"
 trace update_file.py databricks.yml my_app_description MY_APP_DESCRIPTION
 trace errcode $CLI bundle deploy
 trace print_requests.py //deployments ^//api/2.0/bundle
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Stop app externally while config says started=true: plan detects drift"
 { trace errcode $CLI apps stop $UNIQUE_NAME | jq '.compute_status.state'; } || true
@@ -24,7 +24,7 @@ trace $CLI bundle plan
 
 title "Deploy fixes the drift: compute restarted"
 trace errcode $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Stop app externally, then deploy with started=false: app stays stopped"
 { trace errcode $CLI apps stop $UNIQUE_NAME | jq '.compute_status.state'; } || true
@@ -32,7 +32,7 @@ trace update_file.py databricks.yml "started: true" "started: false"
 trace update_file.py databricks.yml MY_APP_DESCRIPTION MY_APP_DESCRIPTION_2
 trace errcode $CLI bundle deploy
 trace print_requests.py //apps
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI apps get $UNIQUE_NAME | jq '.compute_status.state'; } || true
 
 title "Deploy with started=true: compute restarted and code deployed"
@@ -40,5 +40,5 @@ trace update_file.py databricks.yml "started: false" "started: true"
 trace update_file.py databricks.yml MY_APP_DESCRIPTION_2 MY_APP_DESCRIPTION_3
 trace errcode $CLI bundle deploy
 trace print_requests.py //apps
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI apps get $UNIQUE_NAME | jq '.compute_status.state'; } || true
diff --git a/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt b/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt
index 1677b668672..02f706bb298 100644
--- a/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt
+++ b/acceptance/bundle/resources/apps/readplan-lifecycle/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created apps.myapp
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //apps/myapp/start
@@ -12,7 +12,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> update_file.py databricks.yml description: initial description: updated
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated apps.myapp
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //apps/myapp/start
diff --git a/acceptance/bundle/resources/apps/readplan-lifecycle/script b/acceptance/bundle/resources/apps/readplan-lifecycle/script
index f3e11eced2d..4730191ec66 100644
--- a/acceptance/bundle/resources/apps/readplan-lifecycle/script
+++ b/acceptance/bundle/resources/apps/readplan-lifecycle/script
@@ -1,6 +1,6 @@
 cleanup() {
     $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/apps/resource-refs/output.txt b/acceptance/bundle/resources/apps/resource-refs/output.txt
index 14fcdcb0972..a55179156c9 100644
--- a/acceptance/bundle/resources/apps/resource-refs/output.txt
+++ b/acceptance/bundle/resources/apps/resource-refs/output.txt
@@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/resource-refs/defa
 Created apps.data_app
 Created jobs.example_job
 Created schemas.example
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run data_app
diff --git a/acceptance/bundle/resources/apps/uc-securable-drift/output.txt b/acceptance/bundle/resources/apps/uc-securable-drift/output.txt
index aa4af5ba44a..598990aaf24 100644
--- a/acceptance/bundle/resources/apps/uc-securable-drift/output.txt
+++ b/acceptance/bundle/resources/apps/uc-securable-drift/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/apps-uc-securable-drift/default/files...
 Created apps.myapp
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Re-plan is clean: the TABLE securable's server-computed securable_kind is output-only and must not drift
diff --git a/acceptance/bundle/resources/apps/update/output.txt b/acceptance/bundle/resources/apps/update/output.txt
index 406295a6b07..4f0a93a5abd 100644
--- a/acceptance/bundle/resources/apps/update/output.txt
+++ b/acceptance/bundle/resources/apps/update/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created apps.mykey
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests
@@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated apps.mykey
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests
@@ -75,7 +75,7 @@ Resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Recreated apps.mykey
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests
diff --git a/acceptance/bundle/resources/catalogs/auto-approve/output.txt b/acceptance/bundle/resources/catalogs/auto-approve/output.txt
index bf16801b4a4..03a59924a75 100644
--- a/acceptance/bundle/resources/catalogs/auto-approve/output.txt
+++ b/acceptance/bundle/resources/catalogs/auto-approve/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created catalogs.bar
 Created schemas.foo
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert the catalog is created
@@ -42,7 +42,7 @@ Error: cannot plan resources.schemas.foo: cannot resolve "${resources.catalogs.b
 
 Error: planning failed
 
-Files: 2 uploaded, 1 deleted
+Files: 1 uploaded, 1 deleted
 
 === Test cleanup
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/catalogs/basic/output.txt b/acceptance/bundle/resources/catalogs/basic/output.txt
index c4d144b3666..b5a83ffb948 100644
--- a/acceptance/bundle/resources/catalogs/basic/output.txt
+++ b/acceptance/bundle/resources/catalogs/basic/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created catalogs.test_catalog
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert the catalog is created
@@ -21,7 +21,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated catalogs.test_catalog
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Assert the catalog comment is updated
diff --git a/acceptance/bundle/resources/catalogs/drift/managed_properties/output.txt b/acceptance/bundle/resources/catalogs/drift/managed_properties/output.txt
index 149273ebc54..01b9aacaa42 100644
--- a/acceptance/bundle/resources/catalogs/drift/managed_properties/output.txt
+++ b/acceptance/bundle/resources/catalogs/drift/managed_properties/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created catalogs.catalog1
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op despite UC auto-populating managed properties
diff --git a/acceptance/bundle/resources/catalogs/drift/managed_properties/script b/acceptance/bundle/resources/catalogs/drift/managed_properties/script
index fc5b46ebe68..9f8dd43d38b 100644
--- a/acceptance/bundle/resources/catalogs/drift/managed_properties/script
+++ b/acceptance/bundle/resources/catalogs/drift/managed_properties/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Initial deployment"
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/catalogs/empty-name/output.txt b/acceptance/bundle/resources/catalogs/empty-name/output.txt
index 51b04630435..d9b6555b7ad 100644
--- a/acceptance/bundle/resources/catalogs/empty-name/output.txt
+++ b/acceptance/bundle/resources/catalogs/empty-name/output.txt
@@ -8,4 +8,4 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: Invalid input: RPC CreateCatalog Field managedcatalog.CatalogInfo.name: name "" is not a valid name. Valid names cannot contain spaces, periods, forward slashes, or control characters.
 
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
diff --git a/acceptance/bundle/resources/catalogs/with-schemas/output.txt b/acceptance/bundle/resources/catalogs/with-schemas/output.txt
index 22037eb01b8..4c6c584c319 100644
--- a/acceptance/bundle/resources/catalogs/with-schemas/output.txt
+++ b/acceptance/bundle/resources/catalogs/with-schemas/output.txt
@@ -4,7 +4,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created catalogs.test_catalog
 Created schemas.test_schema
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert the catalog is created
@@ -31,7 +31,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated catalogs.test_catalog
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 === Assert catalog comment is updated
diff --git a/acceptance/bundle/resources/cluster_policies/backend_normalization/output.txt b/acceptance/bundle/resources/cluster_policies/backend_normalization/output.txt
index 994a3c0fc9f..68219cf3c74 100644
--- a/acceptance/bundle/resources/cluster_policies/backend_normalization/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/backend_normalization/output.txt
@@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/file
 Created cluster_policies.json_string
 Created cluster_policies.multiline
 Created cluster_policies.yaml
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 === [json_string] definition returned by the backend (GET)
diff --git a/acceptance/bundle/resources/cluster_policies/basic/output.txt b/acceptance/bundle/resources/cluster_policies/basic/output.txt
index 9141e7bf3cc..c7a87818892 100644
--- a/acceptance/bundle/resources/cluster_policies/basic/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/basic/output.txt
@@ -31,7 +31,7 @@ Resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created cluster_policies.test_cluster_policy
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Verify the create request
@@ -63,7 +63,7 @@ Resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated cluster_policies.test_cluster_policy
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Verify the update request
diff --git a/acceptance/bundle/resources/cluster_policies/basic/script b/acceptance/bundle/resources/cluster_policies/basic/script
index eff090af8ad..66c9a860c39 100644
--- a/acceptance/bundle/resources/cluster_policies/basic/script
+++ b/acceptance/bundle/resources/cluster_policies/basic/script
@@ -7,7 +7,7 @@ trace $CLI bundle summary
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/cluster_policies/definition_and_family_conflict/output.txt b/acceptance/bundle/resources/cluster_policies/definition_and_family_conflict/output.txt
index 22279ae6568..562b425a78d 100644
--- a/acceptance/bundle/resources/cluster_policies/definition_and_family_conflict/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/definition_and_family_conflict/output.txt
@@ -8,4 +8,4 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: policy_family_id and definition cannot be used together
 
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
diff --git a/acceptance/bundle/resources/cluster_policies/definition_multiline/output.txt b/acceptance/bundle/resources/cluster_policies/definition_multiline/output.txt
index 1436fd014e5..8a0d7208761 100644
--- a/acceptance/bundle/resources/cluster_policies/definition_multiline/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/definition_multiline/output.txt
@@ -10,7 +10,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created cluster_policies.pol
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Create body preserves the block-scalar definition as a newline-escaped string
diff --git a/acceptance/bundle/resources/cluster_policies/definition_multiline/script b/acceptance/bundle/resources/cluster_policies/definition_multiline/script
index 35dd81e04fc..79e4cad76d7 100644
--- a/acceptance/bundle/resources/cluster_policies/definition_multiline/script
+++ b/acceptance/bundle/resources/cluster_policies/definition_multiline/script
@@ -8,4 +8,4 @@ title "Create body preserves the block-scalar definition as a newline-escaped st
 trace print_requests.py //policies/clusters
 
 trace $CLI bundle destroy --auto-approve
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/cluster_policies/definition_yaml/output.txt b/acceptance/bundle/resources/cluster_policies/definition_yaml/output.txt
index c5edec39e9a..2411f1486fc 100644
--- a/acceptance/bundle/resources/cluster_policies/definition_yaml/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/definition_yaml/output.txt
@@ -10,7 +10,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created cluster_policies.pol
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Native YAML definition serializes to compact JSON, preserving numbers and booleans as JSON types (not quoted strings)
diff --git a/acceptance/bundle/resources/cluster_policies/definition_yaml/script b/acceptance/bundle/resources/cluster_policies/definition_yaml/script
index 92b030b5031..53bc344cb60 100644
--- a/acceptance/bundle/resources/cluster_policies/definition_yaml/script
+++ b/acceptance/bundle/resources/cluster_policies/definition_yaml/script
@@ -8,4 +8,4 @@ title "Native YAML definition serializes to compact JSON, preserving numbers and
 trace print_requests.py //policies/clusters
 
 trace $CLI bundle destroy --auto-approve
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/cluster_policies/job_ref/output.txt b/acceptance/bundle/resources/cluster_policies/job_ref/output.txt
index e6682a0bb4b..ce9526f795b 100644
--- a/acceptance/bundle/resources/cluster_policies/job_ref/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/job_ref/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/cluster_policy_job_ref/default/files...
 Created cluster_policies.pol
 Created jobs.j
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Deploy requests in dependency order: policy create precedes job create, job carries resolved policy id
@@ -53,7 +53,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/cluster_policy_job_ref/default/files...
 Updated cluster_policies.pol
 Updated jobs.j
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 2 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //policies/clusters //jobs --nostamp
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..32d56c0326d 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
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created cluster_policies.test_cluster_policy
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op immediately after deploy
@@ -22,7 +22,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated cluster_policies.test_cluster_policy
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Verify the edit request restored the configured definition
diff --git a/acceptance/bundle/resources/cluster_policies/out_of_band_change/script b/acceptance/bundle/resources/cluster_policies/out_of_band_change/script
index 2f603a2b4fa..24e5fb79dac 100644
--- a/acceptance/bundle/resources/cluster_policies/out_of_band_change/script
+++ b/acceptance/bundle/resources/cluster_policies/out_of_band_change/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -21,7 +21,7 @@ trace $CLI cluster-policies edit --json '{"policy_id":"'"$policy_id"'","name":"m
 
 # Discard the out-of-band request so the verification below captures only the
 # reconciling edit issued by the redeploy.
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Plan detects the drift"
 trace $CLI bundle plan
diff --git a/acceptance/bundle/resources/cluster_policies/permissions/levels/output.txt b/acceptance/bundle/resources/cluster_policies/permissions/levels/output.txt
index 40fccf6448b..e9726aecfed 100644
--- a/acceptance/bundle/resources/cluster_policies/permissions/levels/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/permissions/levels/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/cluster-policy-permission-levels-[UNIQUE_NAME]/default/files...
 Created cluster_policies.test_cluster_policy
 Created cluster_policies.test_cluster_policy.permissions
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //permissions/cluster-policies
diff --git a/acceptance/bundle/resources/cluster_policies/permissions/levels/script b/acceptance/bundle/resources/cluster_policies/permissions/levels/script
index bb5762483b1..a8ea0271534 100644
--- a/acceptance/bundle/resources/cluster_policies/permissions/levels/script
+++ b/acceptance/bundle/resources/cluster_policies/permissions/levels/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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 60305286bbf..ac59fe14f24 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
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_cluster_policy_permissions_recreate/default/files...
 Created cluster_policies.test_cluster_policy
 Created cluster_policies.test_cluster_policy.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Permissions are set on the live policy
diff --git a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/script b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/script
index fa6e94b8732..cf8240a9c1c 100644
--- a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/script
+++ b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_deletion/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..df36bda6b49 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
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_cluster_policy_permissions_drift/default/files...
 Created cluster_policies.test_cluster_policy
 Created cluster_policies.test_cluster_policy.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op immediately after deploy
@@ -48,7 +48,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_cluster_policy_permissions_drift/default/files...
 Updated cluster_policies.test_cluster_policy.permissions
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //permissions/cluster-policies
diff --git a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/script b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/script
index fad8a31a138..fd69a6ee970 100644
--- a/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/script
+++ b/acceptance/bundle/resources/cluster_policies/permissions/out_of_band_grant/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -20,7 +20,7 @@ trace $CLI cluster-policies set-permissions "$policy_id" --json '{"access_contro
 
 # Discard the out-of-band request so the verification below captures only the
 # reconciling Set issued by the redeploy.
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Plan detects the permission drift"
 trace $CLI bundle plan
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..9f3026a70d0 100644
--- a/acceptance/bundle/resources/cluster_policies/policy_family_definition/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/policy_family_definition/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created cluster_policies.family_policy
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op after deploy (server-computed definition is not drift)
@@ -12,7 +12,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 === Redeploy issues no edit
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //policies/clusters/edit
diff --git a/acceptance/bundle/resources/cluster_policies/policy_family_definition/script b/acceptance/bundle/resources/cluster_policies/policy_family_definition/script
index 055fcaf6d26..cb47db97a91 100644
--- a/acceptance/bundle/resources/cluster_policies/policy_family_definition/script
+++ b/acceptance/bundle/resources/cluster_policies/policy_family_definition/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -16,6 +16,6 @@ title "Plan is a no-op after deploy (server-computed definition is not drift)"
 trace $CLI bundle plan
 
 title "Redeploy issues no edit"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 trace print_requests.py //policies/clusters/edit
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..e1980a2c505 100644
--- a/acceptance/bundle/resources/cluster_policies/policy_family_overrides/output.txt
+++ b/acceptance/bundle/resources/cluster_policies/policy_family_overrides/output.txt
@@ -23,7 +23,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/file
 Created cluster_policies.json_string
 Created cluster_policies.multiline
 Created cluster_policies.yaml
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 === Create bodies carry policy_family_id and overrides as a JSON string (YAML normalized, JSON preserved)
diff --git a/acceptance/bundle/resources/cluster_policies/policy_family_overrides/script b/acceptance/bundle/resources/cluster_policies/policy_family_overrides/script
index 8f842f37b7d..fcd1d1ec322 100644
--- a/acceptance/bundle/resources/cluster_policies/policy_family_overrides/script
+++ b/acceptance/bundle/resources/cluster_policies/policy_family_overrides/script
@@ -4,7 +4,7 @@ trace $CLI bundle validate -o json | jq ".resources.cluster_policies"
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 trace $CLI bundle deploy
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..7473ac6f6d2 100644
--- a/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/data_security_mode/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.test_cluster
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
@@ -10,7 +10,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt b/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt
index 5cffdc78da1..7d235833e95 100644
--- a/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/instance_pool/output.txt
@@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluste
 Created clusters.cluster1
 Created clusters.cluster2
 Created clusters.cluster3
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters/create
diff --git a/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt b/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt
index d0b68dae46a..a2192d1082a 100644
--- a/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/instance_pool_and_node_type/output.txt
@@ -2,7 +2,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-instance-pool/default/files...
 Created clusters.cluster1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters/create
diff --git a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt
index 1042e292508..1eaac4d81a8 100644
--- a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-ssd-count-0-[UNIQUE_NAME]/default/files...
 Created clusters.test_cluster
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Cluster should exist after bundle deployment:
diff --git a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/script b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/script
index aa76b105bf0..e6994c1eb01 100644
--- a/acceptance/bundle/resources/clusters/deploy/local_ssd_count/script
+++ b/acceptance/bundle/resources/clusters/deploy/local_ssd_count/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt b/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt
index dafe1cac085..d29d4ff6c83 100644
--- a/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/num_workers_absent/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-num-workers-absent/default/files...
 Created clusters.cluster1
 Created clusters.cluster2
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters/create
diff --git a/acceptance/bundle/resources/clusters/deploy/simple/output.txt b/acceptance/bundle/resources/clusters/deploy/simple/output.txt
index 3c51a254649..c8bf45588b5 100644
--- a/acceptance/bundle/resources/clusters/deploy/simple/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/simple/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.test_cluster
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Cluster should exist after bundle deployment:
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..33c04f1580c 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/update-after-create/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.test_cluster
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Cluster should exist after bundle deployment:
@@ -21,7 +21,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated clusters.test_cluster
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/clusters/deploy/update-after-create/script b/acceptance/bundle/resources/clusters/deploy/update-after-create/script
index 83f25cd2404..b39329621e4 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-after-create/script
+++ b/acceptance/bundle/resources/clusters/deploy/update-after-create/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..5de12861f62 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/output.txt
@@ -1,7 +1,7 @@
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Cluster should exist with num_workers after bundle deployment:
@@ -20,10 +20,10 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.1/clusters/edit",
@@ -54,10 +54,10 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.1/clusters/edit",
@@ -108,10 +108,10 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.1/clusters/resize",
@@ -138,10 +138,10 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.1/clusters/resize",
diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script
index ae75fc4170d..60cc69d7038 100755
--- a/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script
+++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize-autoscale/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -28,8 +28,8 @@ update_file.py databricks.yml "      num_workers: 2" "      autoscale:
 $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
 $CLI bundle plan -o json | nostamp >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
-trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' out.requests.txt
-rm out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
 
 title "Cluster should have autoscale\n"
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers,autoscale}'
@@ -40,8 +40,8 @@ update_file.py databricks.yml "max_workers: 4" "max_workers: 5"
 $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
 $CLI bundle plan -o json | nostamp >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
-trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' out.requests.txt
-rm out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
 
 title "Cluster should have new autoscale\n"
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers,autoscale}'
@@ -55,8 +55,8 @@ update_file.py databricks.yml "max_workers: 5" "max_workers: 6"
 $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
 $CLI bundle plan -o json | nostamp >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
-trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' out.requests.txt
-rm out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
 
 title "Cluster should have new autoscale\n"
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers,autoscale}'
@@ -68,8 +68,8 @@ update_file.py databricks.yml "      autoscale:
 $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
 $CLI bundle plan -o json | nostamp >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
-trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' out.requests.txt
-rm out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
 
 title "Cluster should have num_workers\n"
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers,autoscale}'
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..006cff9bb2f 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/output.txt
@@ -1,7 +1,7 @@
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Cluster should exist after bundle deployment:
@@ -14,10 +14,10 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) [OUTPUT_DIR]/out.requests.txt
 
 === Cluster should have new num_workers
 {
@@ -48,10 +48,10 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/clusters/resize"))) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.1/clusters/resize",
@@ -71,10 +71,10 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
->>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.1/clusters/edit",
diff --git a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script
index 5e2cf3022ab..f4ca0459540 100644
--- a/acceptance/bundle/resources/clusters/deploy/update-and-resize/script
+++ b/acceptance/bundle/resources/clusters/deploy/update-and-resize/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -23,8 +23,8 @@ update_file.py databricks.yml "num_workers: 2" "num_workers: 3"
 $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
 $CLI bundle plan -o json | nostamp >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
-trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' out.requests.txt
-rm out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
 
 title "Cluster should have new num_workers\n"
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers}'
@@ -37,8 +37,8 @@ update_file.py databricks.yml "num_workers: 3" "num_workers: 4"
 $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
 $CLI bundle plan -o json | nostamp >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
-trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' out.requests.txt
-rm out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/clusters/resize")))' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
 
 title "Cluster should have new num_workers\n"
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers}'
@@ -49,8 +49,8 @@ update_file.py databricks.yml '"spark.executor.memory": "2g"' '"spark.executor.m
 $CLI bundle plan >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.txt
 $CLI bundle plan -o json | nostamp >> out.plan_.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI bundle deploy -q
-trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' out.requests.txt
-rm out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/clusters/edit"))) | del(.body.aws_attributes, .body.driver_node_type_id, .body.data_security_mode, .body.enable_elastic_disk)' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
 
 title "Cluster should have new num_workers and spark_conf\n"
 $CLI clusters get "${CLUSTER_ID}" | jq '{cluster_name,num_workers,spark_conf}'
diff --git a/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt b/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt
index 1dccf7b20dc..48ce3fe4456 100644
--- a/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt
+++ b/acceptance/bundle/resources/clusters/deploy/workload_type/output.txt
@@ -2,7 +2,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-deploy-cluster-workload-type/default/files...
 Created clusters.cluster1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters/create
diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt
index 4ece922a78e..70782820350 100644
--- a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt
+++ b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/output.txt
@@ -3,7 +3,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.mycluster
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters
@@ -35,7 +35,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated clusters.mycluster
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters
@@ -56,7 +56,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated clusters.mycluster
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters
diff --git a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/script b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/script
index 27a8e73a3ba..f539ed54c85 100644
--- a/acceptance/bundle/resources/clusters/lifecycle-started-toggle/script
+++ b/acceptance/bundle/resources/clusters/lifecycle-started-toggle/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,19 +10,19 @@ title "Deploy with started=false: cluster created and then stopped"
 trace errcode $CLI bundle deploy
 CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.mycluster.id')
 trace print_requests.py //clusters
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI clusters get "$CLUSTER_ID" | jq '.state'; } || true
 
 title "Toggle started=false -> started=true: only Start should be called, no Edit"
 trace update_file.py databricks.yml "started: false" "started: true"
 trace errcode $CLI bundle deploy
 trace print_requests.py //clusters
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI clusters get "$CLUSTER_ID" | jq '.state'; } || true
 
 title "Toggle started=true -> started=false: only Stop should be called, no Edit"
 trace update_file.py databricks.yml "started: true" "started: false"
 trace errcode $CLI bundle deploy
 trace print_requests.py //clusters
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI clusters get "$CLUSTER_ID" | jq '.state'; } || true
diff --git a/acceptance/bundle/resources/clusters/lifecycle-started/output.txt b/acceptance/bundle/resources/clusters/lifecycle-started/output.txt
index d902c63731d..16ac8d5c221 100644
--- a/acceptance/bundle/resources/clusters/lifecycle-started/output.txt
+++ b/acceptance/bundle/resources/clusters/lifecycle-started/output.txt
@@ -3,7 +3,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.mycluster
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters
@@ -35,7 +35,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated clusters.mycluster
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters
@@ -65,7 +65,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //clusters
@@ -86,7 +86,7 @@ Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated clusters.mycluster
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters
diff --git a/acceptance/bundle/resources/clusters/lifecycle-started/script b/acceptance/bundle/resources/clusters/lifecycle-started/script
index 871f70407f8..5fbde2e4d27 100644
--- a/acceptance/bundle/resources/clusters/lifecycle-started/script
+++ b/acceptance/bundle/resources/clusters/lifecycle-started/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ title "Deploy with started=true: cluster created and running"
 trace errcode $CLI bundle deploy
 CLUSTER_ID=$($CLI bundle summary -o json | jq -r '.resources.clusters.mycluster.id')
 trace print_requests.py //clusters
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI clusters get "$CLUSTER_ID" | jq '.state'; } || true
 
 title "Stop cluster externally while config says started=true: plan detects drift"
@@ -20,7 +20,7 @@ trace $CLI bundle plan
 title "Deploy fixes the drift: cluster restarted"
 trace errcode $CLI bundle deploy
 trace print_requests.py //clusters
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI clusters get "$CLUSTER_ID" | jq '.state'; } || true
 
 title "Deploy with started=false while cluster is stopped: cluster stays terminated"
@@ -28,12 +28,12 @@ title "Deploy with started=false while cluster is stopped: cluster stays termina
 trace update_file.py databricks.yml "started: true" "started: false"
 trace errcode $CLI bundle deploy
 trace print_requests.py //clusters
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI clusters get "$CLUSTER_ID" | jq '.state'; } || true
 
 title "Deploy with started=true: cluster restarted"
 trace update_file.py databricks.yml "started: false" "started: true"
 trace errcode $CLI bundle deploy
 trace print_requests.py //clusters
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI clusters get "$CLUSTER_ID" | jq '.state'; } || true
diff --git a/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt b/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt
index cee977be92d..73b7115f598 100644
--- a/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt
+++ b/acceptance/bundle/resources/clusters/readplan-lifecycle/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created clusters.mycluster
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters/start
@@ -12,7 +12,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> update_file.py databricks.yml env: original env: updated
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated clusters.mycluster
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters/start
diff --git a/acceptance/bundle/resources/clusters/readplan-lifecycle/script b/acceptance/bundle/resources/clusters/readplan-lifecycle/script
index cfd5f75de30..383316d33ba 100644
--- a/acceptance/bundle/resources/clusters/readplan-lifecycle/script
+++ b/acceptance/bundle/resources/clusters/readplan-lifecycle/script
@@ -1,6 +1,6 @@
 cleanup() {
     $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt b/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt
index 5bcd056b2c9..00847a896fa 100644
--- a/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt
+++ b/acceptance/bundle/resources/clusters/resize-terminated-fallback/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.test_cluster
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Create a plan while cluster is running: should show resize
@@ -23,7 +23,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy --plan plan.json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Resized clusters.test_cluster
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters/resize //clusters/edit
diff --git a/acceptance/bundle/resources/clusters/resize-terminated-fallback/script b/acceptance/bundle/resources/clusters/resize-terminated-fallback/script
index eff7c541b94..72399f2e419 100644
--- a/acceptance/bundle/resources/clusters/resize-terminated-fallback/script
+++ b/acceptance/bundle/resources/clusters/resize-terminated-fallback/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..0213de47580 100644
--- a/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt
+++ b/acceptance/bundle/resources/clusters/run/spark_python_task/output.txt
@@ -7,7 +7,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created clusters.test_cluster
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run foo
diff --git a/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt b/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt
index f0c44299a8c..7ccec6b8570 100644
--- a/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt
+++ b/acceptance/bundle/resources/dashboards/change-embed-credentials/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-embed-credentials-[UNIQUE_NAME]/default/files...
 Created dashboards.my_dashboard
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "display_name": "test dashboard",
@@ -32,7 +32,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-embed-credentials-[UNIQUE_NAME]/default/files...
 Updated dashboards.my_dashboard
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 {
   "display_name": "test dashboard",
diff --git a/acceptance/bundle/resources/dashboards/change-embed-credentials/script b/acceptance/bundle/resources/dashboards/change-embed-credentials/script
index 75046150329..ec9e046bf3b 100755
--- a/acceptance/bundle/resources/dashboards/change-embed-credentials/script
+++ b/acceptance/bundle/resources/dashboards/change-embed-credentials/script
@@ -2,7 +2,7 @@ export EMBED_CREDENTIALS="false"
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -32,12 +32,12 @@ deploy_dashboard
 # Print API requests made to create parent_path or create / update the dashboard.
 # Terraform serialized OUTPUT_ONLY fields in the request body while direct does not.
 # That's why we write the requests to separate files.
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "PATCH")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.patch.requests.$DATABRICKS_BUNDLE_ENGINE.txt
 
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "POST")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.post.requests.txt
diff --git a/acceptance/bundle/resources/dashboards/change-name/output.txt b/acceptance/bundle/resources/dashboards/change-name/output.txt
index 4d83d9bc3b7..5e92367617d 100644
--- a/acceptance/bundle/resources/dashboards/change-name/output.txt
+++ b/acceptance/bundle/resources/dashboards/change-name/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-name-[UNIQUE_NAME]/default/files...
 Created dashboards.my_dashboard
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "display_name": "dashboard1",
@@ -26,7 +26,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-name-[UNIQUE_NAME]/default/files...
 Updated dashboards.my_dashboard
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 {
   "display_name": "dashboard2",
diff --git a/acceptance/bundle/resources/dashboards/change-name/script b/acceptance/bundle/resources/dashboards/change-name/script
index f361ed4417f..ac6f1d260b7 100644
--- a/acceptance/bundle/resources/dashboards/change-name/script
+++ b/acceptance/bundle/resources/dashboards/change-name/script
@@ -2,7 +2,7 @@ export NAME="dashboard1"
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -33,12 +33,12 @@ deploy_dashboard
 # Print API requests made to create parent_path or create / update the dashboard.
 # Terraform serialized OUTPUT_ONLY fields in the request body while direct does not.
 # That's why we write the requests to separate files.
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "PATCH")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.patch.requests.$DATABRICKS_BUNDLE_ENGINE.txt
 
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "POST")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.post.requests.txt
diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/output.txt b/acceptance/bundle/resources/dashboards/change-parent-path/output.txt
index e1627105be5..9c4a9959969 100644
--- a/acceptance/bundle/resources/dashboards/change-parent-path/output.txt
+++ b/acceptance/bundle/resources/dashboards/change-parent-path/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-parent-path-[UNIQUE_NAME]/default/files...
 Created dashboards.my_dashboard
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> retry [CLI] lakeview get [ORIGINAL_DASHBOARD_ID]
@@ -32,7 +32,7 @@ This action will result in the deletion or recreation of the following dashboard
 This will result in changed IDs and permanent URLs of the dashboards that will be recreated:
   recreate resources.dashboards.my_dashboard
 Recreated dashboards.my_dashboard
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> retry [CLI] lakeview get [NEW_DASHBOARD_ID]
diff --git a/acceptance/bundle/resources/dashboards/change-parent-path/script b/acceptance/bundle/resources/dashboards/change-parent-path/script
index 4440d5f1321..353e0e1fa9b 100755
--- a/acceptance/bundle/resources/dashboards/change-parent-path/script
+++ b/acceptance/bundle/resources/dashboards/change-parent-path/script
@@ -5,7 +5,7 @@ export PARENT_PATH=" /Users/$USERNAME/.bundle/change-parent-path-$UNIQUE_NAME/de
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 # Deploy the dashboard and capture the ID
@@ -33,7 +33,7 @@ new_dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboa
 add_repl "$new_dashboard_id" NEW_DASHBOARD_ID
 
 # Print API requests made to create parent_path or create / update / delete the dashboard.
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "POST" or .method == "PATCH" or .method == "DELETE")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.dashboardrequests.txt
diff --git a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt
index 525a432aabb..f87c9866644 100644
--- a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt
+++ b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/output.txt
@@ -5,7 +5,7 @@ create dashboards.my_dashboard
 Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-serialized-dashboard-[UNIQUE_NAME]/default/files...
 Created dashboards.my_dashboard
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "display_name": "test dashboard",
@@ -26,7 +26,7 @@ update dashboards.my_dashboard
 Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-serialized-dashboard-[UNIQUE_NAME]/default/files...
 Updated dashboards.my_dashboard
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 {
   "display_name": "test dashboard",
diff --git a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script
index 43327a7ff19..94029a94818 100755
--- a/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script
+++ b/acceptance/bundle/resources/dashboards/change-serialized-dashboard/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -36,13 +36,13 @@ deploy_dashboard
 # Terraform serialized OUTPUT_ONLY fields in the request body while direct does not.
 # That's why we write the requests to separate files.
 # Normalize \r\n to \n in the serialized_dashboard field to handle Windows line endings.
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "PATCH")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' | \
  sed 's/\\r\\n/\\n/g' \
  > out.patch.requests.$DATABRICKS_BUNDLE_ENGINE.txt
 
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "POST")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' | \
  sed 's/\\r\\n/\\n/g' \
diff --git a/acceptance/bundle/resources/dashboards/change-serialized-inline/output.txt b/acceptance/bundle/resources/dashboards/change-serialized-inline/output.txt
index d8537af591b..cc9dcfb91a8 100644
--- a/acceptance/bundle/resources/dashboards/change-serialized-inline/output.txt
+++ b/acceptance/bundle/resources/dashboards/change-serialized-inline/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-serialized-inline-[UNIQUE_NAME]/default/files...
 Created dashboards.inline_dash
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
@@ -15,7 +15,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 === deploy the change
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/change-serialized-inline-[UNIQUE_NAME]/default/files...
 Updated dashboards.inline_dash
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/dashboards/change-serialized-inline/script b/acceptance/bundle/resources/dashboards/change-serialized-inline/script
index 432cab045c8..12a45b9420e 100644
--- a/acceptance/bundle/resources/dashboards/change-serialized-inline/script
+++ b/acceptance/bundle/resources/dashboards/change-serialized-inline/script
@@ -3,7 +3,7 @@ unset MSYS_NO_PATHCONV
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -11,7 +11,7 @@ trap cleanup EXIT
 envsubst < databricks.yml.tmpl > databricks.yml
 trace $CLI bundle deploy
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 dashboard_id=$($CLI bundle summary --output json | jq -r '.resources.dashboards.inline_dash.id')
 add_repl "$dashboard_id" DASHBOARD_ID
diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt
index 5260bb9b490..e877e377b39 100644
--- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt
+++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-dataset-test-[UNIQUE_NAME]/default/files...
 Created dashboards.dashboard1
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "lifecycle_state": "ACTIVE",
diff --git a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script
index 8d9c7610c3b..ac838ddf56a 100755
--- a/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script
+++ b/acceptance/bundle/resources/dashboards/dataset-catalog-schema/script
@@ -10,7 +10,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -46,7 +46,7 @@ fi
 
 # Print API requests made to create the dashboard.
 # This verifies that dataset_catalog and dataset_schema are passed to the API.
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "POST")' | \
  jq 'select(.path | contains("/api/2.0/lakeview/dashboards"))' | \
  jq 'select(.path | contains("/published") | not)' \
diff --git a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt
index 10c55b9831c..60581603c0e 100644
--- a/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt
+++ b/acceptance/bundle/resources/dashboards/delete-trashed-out-of-band/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/delete-trashed-out-of-band-[UNIQUE_NAME]/default/files...
 Created dashboards.dashboard1
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "lifecycle_state": "ACTIVE",
diff --git a/acceptance/bundle/resources/dashboards/destroy/output.txt b/acceptance/bundle/resources/dashboards/destroy/output.txt
index 525941139c3..8433aa0f4e1 100644
--- a/acceptance/bundle/resources/dashboards/destroy/output.txt
+++ b/acceptance/bundle/resources/dashboards/destroy/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/destroy-dashboard-[UNIQUE_NAME]/default/files...
 Created dashboards.dashboard1
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> retry [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 bf83fc15de2..97e00d8f573 100644
--- a/acceptance/bundle/resources/dashboards/detect-change/output.txt
+++ b/acceptance/bundle/resources/dashboards/detect-change/output.txt
@@ -13,7 +13,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created dashboards.file_reference
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert that the dashboard exists at the expected path and is, indeed, a dashboard:
@@ -103,7 +103,7 @@ Exit code: 1
 >>> errcode [CLI] bundle deploy --force
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated dashboards.file_reference
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/dashboards/detect-change/script b/acceptance/bundle/resources/dashboards/detect-change/script
index 16b1b2b773b..9407afafed0 100644
--- a/acceptance/bundle/resources/dashboards/detect-change/script
+++ b/acceptance/bundle/resources/dashboards/detect-change/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -49,13 +49,13 @@ trace errcode $CLI bundle deploy --force
 # Extract PATCH requests. These differ between terraform and direct modes:
 # - Terraform includes output-only fields (create_time, dashboard_id, etag, lifecycle_state, path, update_time)
 # - Direct mode only sends input fields (display_name, parent_path, serialized_dashboard, warehouse_id)
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "PATCH")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.patch.requests.$DATABRICKS_BUNDLE_ENGINE.txt
 
 # POST requests are the same across both modes
-cat out.requests.txt | \
+cat "$OUT_REQUESTS" | \
  jq 'select(.method == "POST")' | \
  jq 'select( (.path | contains("/api/2.0/lakeview/dashboards")) or ((.path == "/api/2.0/workspace/mkdirs") and (.body.path | contains("/default/resources"))))' \
  > out.post.requests.txt
diff --git a/acceptance/bundle/resources/dashboards/generate_inplace/output.txt b/acceptance/bundle/resources/dashboards/generate_inplace/output.txt
index a1e52a4b293..5856faffdad 100644
--- a/acceptance/bundle/resources/dashboards/generate_inplace/output.txt
+++ b/acceptance/bundle/resources/dashboards/generate_inplace/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard-replace-[UNIQUE_NAME]/default/files...
 Created dashboards.already_exists
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Get current dashboard
diff --git a/acceptance/bundle/resources/dashboards/nested-folders/output.txt b/acceptance/bundle/resources/dashboards/nested-folders/output.txt
index 26c1181a0cf..e71a278152e 100644
--- a/acceptance/bundle/resources/dashboards/nested-folders/output.txt
+++ b/acceptance/bundle/resources/dashboards/nested-folders/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-nested-folders-[UNIQUE_NAME]/default/files...
 Created dashboards.dashboard1
-Files: 9 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> retry [CLI] lakeview get [DASHBOARD_ID]
diff --git a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt
index b1f4510ca36..17a44ab5fdf 100644
--- a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt
+++ b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.direct.txt
@@ -6,6 +6,6 @@ HTTP Status: 400 Bad Request
 API error_code: RESOURCE_DOES_NOT_EXIST
 API message: Warehouse doesnotexist does not exist
 
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 
 Exit code: 1
diff --git a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt
index e6da6ec72c7..8ba5e3511f3 100644
--- a/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt
+++ b/acceptance/bundle/resources/dashboards/publish-failure-cleans-up-dashboard/out.deploy.terraform.txt
@@ -9,6 +9,6 @@ Error: cannot create dashboard: Warehouse doesnotexist does not exist
 
 
 
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 
 Exit code: 1
diff --git a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt
index d8daf7b8a0c..a67e732ffdc 100644
--- a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt
+++ b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default/files...
 Created dashboards.dashboard1
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "display_name": "my dashboard",
@@ -32,7 +32,7 @@ HTTP Status: 400 Bad Request
 API error_code: INJECTED
 API message: Fault injected by test.
 
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 
 Exit code: 1
 
@@ -126,7 +126,7 @@ Exit code: 1
 >>> [CLI] bundle deploy --force
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-publish-failure-stale-content/default/files...
 Updated dashboards.dashboard1
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //lakeview/dashboards
diff --git a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script
index c6f930f95dd..325b4afb422 100644
--- a/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script
+++ b/acceptance/bundle/resources/dashboards/publish-failure-stale-content/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -17,7 +17,7 @@ add_repl "$ETAG_1" ETAG_1
 echo "$DASHBOARD" | jq '{display_name, etag}'
 trace $CLI lakeview get-published $DASHBOARD_ID | jq '{display_name}'
 trace $CLI bundle plan -o json | nostamp | gron.py | grep -E "etag|published"
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 # Inject a single publish failure for the update below.
 fault.py "POST /api/2.0/lakeview/dashboards/*" 400 0 1
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..c18ad79bb64 100644
--- a/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt
+++ b/acceptance/bundle/resources/dashboards/republish-after-draft-update/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created dashboards.dashboard1
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan right after deploy -- published is current, no change:
diff --git a/acceptance/bundle/resources/dashboards/serialized-inline/output.txt b/acceptance/bundle/resources/dashboards/serialized-inline/output.txt
index f469ff494a4..eb92e3eb290 100644
--- a/acceptance/bundle/resources/dashboards/serialized-inline/output.txt
+++ b/acceptance/bundle/resources/dashboards/serialized-inline/output.txt
@@ -5,7 +5,7 @@ create dashboards.inline_dash
 Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard-serialized-inline-[UNIQUE_NAME]/default/files...
 Created dashboards.inline_dash
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //api/2.0/lakeview/dashboards
diff --git a/acceptance/bundle/resources/dashboards/serialized-inline/script b/acceptance/bundle/resources/dashboards/serialized-inline/script
index 78c6503704b..95b91370efd 100644
--- a/acceptance/bundle/resources/dashboards/serialized-inline/script
+++ b/acceptance/bundle/resources/dashboards/serialized-inline/script
@@ -6,7 +6,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 cleanup() {
     # Cleanup; direct's destroy 404s on the stale GET and diverges, so keep it out of the diff.
     $CLI bundle destroy --auto-approve &> LOG.destroy
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/dashboards/simple/output.txt b/acceptance/bundle/resources/dashboards/simple/output.txt
index 12a9c3f2042..803d277eaa6 100644
--- a/acceptance/bundle/resources/dashboards/simple/output.txt
+++ b/acceptance/bundle/resources/dashboards/simple/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-dashboard-test-[UNIQUE_NAME]/default/files...
 Created dashboards.dashboard1
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "lifecycle_state": "ACTIVE",
diff --git a/acceptance/bundle/resources/database_catalogs/basic/output.txt b/acceptance/bundle/resources/database_catalogs/basic/output.txt
index 73164574d89..eb663662393 100644
--- a/acceptance/bundle/resources/database_catalogs/basic/output.txt
+++ b/acceptance/bundle/resources/database_catalogs/basic/output.txt
@@ -26,7 +26,7 @@ Resources:
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-[UNIQUE_NAME]/default/files...
 Created database_catalogs.my_catalog
 Created database_instances.my_instance
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle summary
diff --git a/acceptance/bundle/resources/database_catalogs/recreate/output.txt b/acceptance/bundle/resources/database_catalogs/recreate/output.txt
index 3af23a6caad..2aacf5037e6 100644
--- a/acceptance/bundle/resources/database_catalogs/recreate/output.txt
+++ b/acceptance/bundle/resources/database_catalogs/recreate/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-recreate-[UNIQUE_NAME]/default/files...
 Created database_catalogs.my_catalog
 Created database_instances.my_instance
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Change an immutable catalog field: no update API, so the plan recreates it
@@ -15,7 +15,7 @@ Plan: 1 to add, 0 to change, 1 to delete, 1 unchanged
 >>> [CLI] bundle deploy --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-catalog-recreate-[UNIQUE_NAME]/default/files...
 Recreated database_catalogs.my_catalog
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/database_catalogs/recreate/script b/acceptance/bundle/resources/database_catalogs/recreate/script
index 78243de7042..893d9965553 100644
--- a/acceptance/bundle/resources/database_catalogs/recreate/script
+++ b/acceptance/bundle/resources/database_catalogs/recreate/script
@@ -1,13 +1,13 @@
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 envsubst < databricks.yml.tmpl | sed "s/DBNAME_PLACEHOLDER/my_database/" > databricks.yml
 
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Change an immutable catalog field: no update API, so the plan recreates it"
 sed "s/my_database/my_database_v2/" databricks.yml > databricks.yml.new
@@ -18,5 +18,5 @@ trace $CLI bundle deploy --auto-approve
 
 # The change must be a DELETE of the old catalog plus a POST creating the new
 # one. A PATCH would return 501 (the bug this guards against).
-jq --sort-keys 'select(.method != "GET" and (.path | contains("/database/catalogs")))' < out.requests.txt > out.requests.recreate.txt
-rm -f out.requests.txt
+jq --sort-keys 'select(.method != "GET" and (.path | contains("/database/catalogs")))' < "$OUT_REQUESTS" > out.requests.recreate.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/database_instances/recreate/script b/acceptance/bundle/resources/database_instances/recreate/script
index e331f9ee6ac..a30de3c86cf 100644
--- a/acceptance/bundle/resources/database_instances/recreate/script
+++ b/acceptance/bundle/resources/database_instances/recreate/script
@@ -1,13 +1,13 @@
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 envsubst < databricks.yml.tmpl | sed "s/NAME_PLACEHOLDER/test-db-old-${UNIQUE_NAME}/" > databricks.yml
 
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Rename the instance: name is immutable, so the plan recreates it"
 sed "s/test-db-old-${UNIQUE_NAME}/test-db-new-${UNIQUE_NAME}/" databricks.yml > databricks.yml.new
@@ -18,5 +18,5 @@ trace $CLI bundle deploy --auto-approve
 
 # The rename must be a DELETE of the old instance plus a POST creating the new
 # one. A PATCH to the renamed instance would 404 (the bug this guards against).
-jq --sort-keys 'select(.method != "GET" and (.path | contains("/database/instances")))' < out.requests.txt > out.requests.rename.txt
-rm -f out.requests.txt
+jq --sort-keys 'select(.method != "GET" and (.path | contains("/database/instances")))' < "$OUT_REQUESTS" > out.requests.rename.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/database_instances/single-instance/output.txt b/acceptance/bundle/resources/database_instances/single-instance/output.txt
index 95b9e492938..437d81bda3f 100644
--- a/acceptance/bundle/resources/database_instances/single-instance/output.txt
+++ b/acceptance/bundle/resources/database_instances/single-instance/output.txt
@@ -23,7 +23,7 @@ Resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-single-instance-[UNIQUE_NAME]/default/files...
 Created database_instances.my_database
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] database get-database-instance test-db-instance-single-[UNIQUE_NAME]
diff --git a/acceptance/bundle/resources/external_locations/output.txt b/acceptance/bundle/resources/external_locations/output.txt
index d228250cc50..903ac3e2e4e 100644
--- a/acceptance/bundle/resources/external_locations/output.txt
+++ b/acceptance/bundle/resources/external_locations/output.txt
@@ -14,7 +14,7 @@ Created catalogs.test_catalog
 Created catalogs.test_catalog.grants
 Created external_locations.test_location
 Created external_locations.test_location.grants
-Files: 9 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 4 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert the catalog is created with grants
@@ -72,7 +72,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 3 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated external_locations.test_location
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 3 unchanged
 
 === Assert the external location comment is updated
@@ -92,7 +92,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 3 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated catalogs.test_catalog
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 3 unchanged
 
 === Assert the catalog comment is updated
diff --git a/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt b/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt
index a1a00972860..c604814dc1b 100644
--- a/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt
+++ b/acceptance/bundle/resources/genie_spaces/delete_warning/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-delete-warning-[UNIQUE_NAME]/default/files...
 Created genie_spaces.sales_analytics
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Deploying without the genie space warns before deleting it (chat history loss)
@@ -13,7 +13,7 @@ This action will result in the deletion or recreation of the following Genie spa
 The conversation history attached to a deleted space is permanently lost:
   delete resources.genie_spaces.sales_analytics
 Deleted genie_spaces.sales_analytics
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/genie_spaces/inline/output.txt b/acceptance/bundle/resources/genie_spaces/inline/output.txt
index d7539b973b9..42bcdd42f87 100644
--- a/acceptance/bundle/resources/genie_spaces/inline/output.txt
+++ b/acceptance/bundle/resources/genie_spaces/inline/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-inline-[UNIQUE_NAME]/default/files...
 Created genie_spaces.sales_analytics
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan -o json
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..1af467e4ede 100644
--- a/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt
+++ b/acceptance/bundle/resources/genie_spaces/parent_path_update/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/update-genie-space-[UNIQUE_NAME]/default/files...
 Created genie_spaces.update_target
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan after changing parent_path should show update
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 d7fdd89d8a1..b171d724e4f 100644
--- a/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt
+++ b/acceptance/bundle/resources/genie_spaces/recreate_when_gone/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/recreate-gone-genie-space-[UNIQUE_NAME]/default/files...
 Created genie_spaces.sales_analytics
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] genie trash-space [GENIE_SPACE_ID]
diff --git a/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt b/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt
index 702c283f5a0..364e368375f 100644
--- a/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt
+++ b/acceptance/bundle/resources/genie_spaces/serialized_space/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-serialized-space-[UNIQUE_NAME]/default/files...
 Created genie_spaces.from_file
 Created genie_spaces.from_inline
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/genie_spaces/serialized_space/script b/acceptance/bundle/resources/genie_spaces/serialized_space/script
index bf5aea4c21d..4e098a67e7d 100644
--- a/acceptance/bundle/resources/genie_spaces/serialized_space/script
+++ b/acceptance/bundle/resources/genie_spaces/serialized_space/script
@@ -2,11 +2,11 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Capture the serialized_space sent to the Genie create API:
@@ -17,5 +17,5 @@ jq -s '[.[] | select(.method == "POST" and .path == "/api/2.0/genie/spaces")
         | {title: .body.title,
            serialized_space: .body.serialized_space,
            parsed: (.body.serialized_space | fromjson)}]
-       | sort_by(.title)' out.requests.txt > out.create_requests.json
-rm -f out.requests.txt
+       | sort_by(.title)' "$OUT_REQUESTS" > out.create_requests.json
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/genie_spaces/simple/output.txt b/acceptance/bundle/resources/genie_spaces/simple/output.txt
index 129ab135efd..f68e23454dc 100644
--- a/acceptance/bundle/resources/genie_spaces/simple/output.txt
+++ b/acceptance/bundle/resources/genie_spaces/simple/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-genie-space-test-[UNIQUE_NAME]/default/files...
 Created genie_spaces.sales_analytics
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] genie get-space [GENIE_SPACE_ID]
diff --git a/acceptance/bundle/resources/genie_spaces/version_migration/output.txt b/acceptance/bundle/resources/genie_spaces/version_migration/output.txt
index 1842d77156f..5d0f6b99c1e 100644
--- a/acceptance/bundle/resources/genie_spaces/version_migration/output.txt
+++ b/acceptance/bundle/resources/genie_spaces/version_migration/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/genie-version-migration-[UNIQUE_NAME]/default/files...
 Created genie_spaces.foo
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan after deploy is drift-free despite the version 1 -> version 2 migration
diff --git a/acceptance/bundle/resources/grants/catalogs/output.txt b/acceptance/bundle/resources/grants/catalogs/output.txt
index ede2dfee69a..e8996f5f7d2 100644
--- a/acceptance/bundle/resources/grants/catalogs/output.txt
+++ b/acceptance/bundle/resources/grants/catalogs/output.txt
@@ -13,7 +13,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/catalog-grants-[UNIQUE_NAME]/default/files...
 Created catalogs.grants_catalog
 Created catalogs.grants_catalog.grants
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //permissions
@@ -53,7 +53,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/catalog-grants-[UNIQUE_NAME]/default/files...
 Updated catalogs.grants_catalog.grants
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> 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..17daaa01a12 100644
--- a/acceptance/bundle/resources/grants/registered_models/output.txt
+++ b/acceptance/bundle/resources/grants/registered_models/output.txt
@@ -8,7 +8,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-
 Created registered_models.my_registered_model
 Created registered_models.my_registered_model.grants
 Created schemas.my_schema
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> 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..e8c0dcc1e27 100644
--- a/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt
+++ b/acceptance/bundle/resources/grants/schemas/all_privileges/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files...
 Created schemas.apps_schema
 Created schemas.apps_schema.grants
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges/script b/acceptance/bundle/resources/grants/schemas/all_privileges/script
index e8f6e243dd9..23e484a8b24 100644
--- a/acceptance/bundle/resources/grants/schemas/all_privileges/script
+++ b/acceptance/bundle/resources/grants/schemas/all_privileges/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..07baebc5bb5 100644
--- a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt
+++ b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-all-privileges-coexist-[UNIQUE_NAME]/default/files...
 Created schemas.grants_schema
 Created schemas.grants_schema.grants
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] grants update schema main.schema_all_priv_coexist_[UNIQUE_NAME] --json @update.resolved.json
diff --git a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/script b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/script
index 073de9a99f2..4e6e6eab932 100644
--- a/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/script
+++ b/acceptance/bundle/resources/grants/schemas/all_privileges_coexist/script
@@ -4,7 +4,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace errcode $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt b/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt
index 371eeb7eaa3..c7d6a132fe6 100644
--- a/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt
+++ b/acceptance/bundle/resources/grants/schemas/change_privilege/output.txt
@@ -13,7 +13,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default/files...
 Created schemas.grants_schema
 Created schemas.grants_schema.grants
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //permissions
@@ -53,7 +53,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default/files...
 Updated schemas.grants_schema.grants
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> 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..887c37ebb0f 100644
--- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt
+++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files...
 Created schemas.apps_schema
 Created schemas.apps_schema.grants
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan -o json
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_principals/script b/acceptance/bundle/resources/grants/schemas/duplicate_principals/script
index 17130a374c7..cac858c1e68 100644
--- a/acceptance/bundle/resources/grants/schemas/duplicate_principals/script
+++ b/acceptance/bundle/resources/grants/schemas/duplicate_principals/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt
index d503d211362..36a1884849c 100644
--- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt
+++ b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-dup-grants-[UNIQUE_NAME]/default/files...
 Created schemas.apps_schema
 Created schemas.apps_schema.grants
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script
index b1244a4c78c..4180fa13154 100644
--- a/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script
+++ b/acceptance/bundle/resources/grants/schemas/duplicate_privileges/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..5639d5ec6c5 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
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-out-of-band-principal-[UNIQUE_NAME]/default/files...
 Created schemas.grants_schema
 Created schemas.grants_schema.grants
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] grants update schema main.schema_out_of_band_principal_[UNIQUE_NAME] --json @update.json
@@ -13,7 +13,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-out-of-band-principal-[UNIQUE_NAME]/default/files...
 Updated schemas.grants_schema.grants
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle plan -o json
diff --git a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/script b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/script
index a46332ca187..4ee1e5c2dbf 100644
--- a/acceptance/bundle/resources/grants/schemas/out_of_band_principal/script
+++ b/acceptance/bundle/resources/grants/schemas/out_of_band_principal/script
@@ -5,7 +5,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace errcode $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/out.plan.txt b/acceptance/bundle/resources/grants/schemas/remove_all/out.plan.txt
index 6d9c506d164..354cac9a8a4 100644
--- a/acceptance/bundle/resources/grants/schemas/remove_all/out.plan.txt
+++ b/acceptance/bundle/resources/grants/schemas/remove_all/out.plan.txt
@@ -4,7 +4,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-all-[UNIQUE_NAME]/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/output.txt b/acceptance/bundle/resources/grants/schemas/remove_all/output.txt
index cf9b411eb62..91160fab2a0 100644
--- a/acceptance/bundle/resources/grants/schemas/remove_all/output.txt
+++ b/acceptance/bundle/resources/grants/schemas/remove_all/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-all-[UNIQUE_NAME]/default/files...
 Created schemas.grants_schema
 Created schemas.grants_schema.grants
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] grants get schema main.schema_remove_all_[UNIQUE_NAME]
diff --git a/acceptance/bundle/resources/grants/schemas/remove_all/script b/acceptance/bundle/resources/grants/schemas/remove_all/script
index 6a16dafff30..9b872c25d77 100644
--- a/acceptance/bundle/resources/grants/schemas/remove_all/script
+++ b/acceptance/bundle/resources/grants/schemas/remove_all/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace errcode $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt b/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt
index 0f2c26acf6c..0adb3f7fa1a 100644
--- a/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt
+++ b/acceptance/bundle/resources/grants/schemas/remove_principal/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default/files...
 Created schemas.grants_schema
 Created schemas.grants_schema.grants
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] grants get schema main.schema_remove_principal_[UNIQUE_NAME]
@@ -15,7 +15,7 @@ json.privilege_assignments[].privileges[] = "USE_SCHEMA";
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default/files...
 Updated schemas.grants_schema.grants
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] grants get schema main.schema_remove_principal_[UNIQUE_NAME]
@@ -25,7 +25,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-remove-principal-[UNIQUE_NAME]/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/grants/schemas/remove_principal/script b/acceptance/bundle/resources/grants/schemas/remove_principal/script
index ca74a621374..fd2153ccc9d 100644
--- a/acceptance/bundle/resources/grants/schemas/remove_principal/script
+++ b/acceptance/bundle/resources/grants/schemas/remove_principal/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace errcode $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/grants/volumes/output.txt b/acceptance/bundle/resources/grants/volumes/output.txt
index ef31432f8b0..13b3f6c2ce0 100644
--- a/acceptance/bundle/resources/grants/volumes/output.txt
+++ b/acceptance/bundle/resources/grants/volumes/output.txt
@@ -6,7 +6,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNI
 Created schemas.grants_schema
 Created volumes.grants_volume
 Created volumes.grants_volume.grants
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //permissions
@@ -29,7 +29,7 @@ Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/schema-grants-[UNIQUE_NAME]/default/files...
 Updated volumes.grants_volume.grants
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 2 unchanged
 
 >>> print_requests.py //permissions
diff --git a/acceptance/bundle/resources/independent/output.txt b/acceptance/bundle/resources/independent/output.txt
index dc9ba046b56..8311427b86a 100644
--- a/acceptance/bundle/resources/independent/output.txt
+++ b/acceptance/bundle/resources/independent/output.txt
@@ -2,5 +2,5 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Created jobs.foo
 Created pipelines.my
 Created volumes.volume1
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/instance_pools/output.txt b/acceptance/bundle/resources/instance_pools/output.txt
index ac7a7d4ce92..05f0319f550 100644
--- a/acceptance/bundle/resources/instance_pools/output.txt
+++ b/acceptance/bundle/resources/instance_pools/output.txt
@@ -34,11 +34,11 @@ Resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_instance_pool/default/files...
 Created instance_pools.test_instance_pool
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Verify the create request
->>> jq select(.method == "POST" and (.path | contains("/instance-pools/create"))) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/instance-pools/create"))) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/instance-pools/create",
@@ -69,11 +69,11 @@ Resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_instance_pool/default/files...
 Updated instance_pools.test_instance_pool
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Verify the update request
->>> jq select(.method == "POST" and (.path | contains("/instance-pools/edit"))) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/instance-pools/edit"))) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/instance-pools/edit",
@@ -109,7 +109,7 @@ All files and directories at the following location will be deleted: /Workspace/
 Destroy: 1 deleted
 
 === Verify the destroy request
->>> jq select(.method == "POST" and (.path | contains("/instance-pools/delete"))) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/instance-pools/delete"))) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/instance-pools/delete",
diff --git a/acceptance/bundle/resources/instance_pools/script b/acceptance/bundle/resources/instance_pools/script
index 208a61abc1b..59bdf382361 100644
--- a/acceptance/bundle/resources/instance_pools/script
+++ b/acceptance/bundle/resources/instance_pools/script
@@ -5,13 +5,13 @@ trace $CLI bundle summary
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 trace $CLI bundle deploy
 
 title "Verify the create request"
-trace jq 'select(.method == "POST" and (.path | contains("/instance-pools/create")))' out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/instance-pools/create")))' "$OUT_REQUESTS"
 
 trace $CLI bundle summary
 
@@ -20,7 +20,7 @@ trace update_file.py databricks.yml my_instance_pool my_instance_pool_2
 trace $CLI bundle deploy
 
 title "Verify the update request"
-trace jq 'select(.method == "POST" and (.path | contains("/instance-pools/edit")))' out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/instance-pools/edit")))' "$OUT_REQUESTS"
 
 trace $CLI bundle summary
 
@@ -28,6 +28,6 @@ title "Destroy the instance pool"
 trace $CLI bundle destroy --auto-approve
 
 title "Verify the destroy request"
-trace jq 'select(.method == "POST" and (.path | contains("/instance-pools/delete")))' out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/instance-pools/delete")))' "$OUT_REQUESTS"
 
 trace $CLI bundle summary
diff --git a/acceptance/bundle/resources/job_runs/basic/output.txt b/acceptance/bundle/resources/job_runs/basic/output.txt
index 64625c59277..343bd691112 100644
--- a/acceptance/bundle/resources/job_runs/basic/output.txt
+++ b/acceptance/bundle/resources/job_runs/basic/output.txt
@@ -37,12 +37,12 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 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
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-basic/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/job_runs/basic/script b/acceptance/bundle/resources/job_runs/basic/script
index 1c69eb547b4..689bfcbb386 100644
--- a/acceptance/bundle/resources/job_runs/basic/script
+++ b/acceptance/bundle/resources/job_runs/basic/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    # destroy deletes the triggered run via jobs/runs/delete (also unlinks out.requests.txt)
+    # destroy deletes the triggered run via jobs/runs/delete (also unlinks "$OUT_REQUESTS")
     trace print_requests.py //jobs/runs/delete
 }
 trap cleanup EXIT
diff --git a/acceptance/bundle/resources/job_runs/destroy_unfinished_run/output.txt b/acceptance/bundle/resources/job_runs/destroy_unfinished_run/output.txt
index 1b1fd310b0c..81e9ae5941e 100644
--- a/acceptance/bundle/resources/job_runs/destroy_unfinished_run/output.txt
+++ b/acceptance/bundle/resources/job_runs/destroy_unfinished_run/output.txt
@@ -9,7 +9,7 @@ HTTP Status: 403 Forbidden
 API error_code: INJECTED
 API message: Fault injected by test.
 
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 
 Exit code: 1
 
diff --git a/acceptance/bundle/resources/job_runs/destroy_unfinished_run/script b/acceptance/bundle/resources/job_runs/destroy_unfinished_run/script
index 61074d97eea..14851e756b6 100644
--- a/acceptance/bundle/resources/job_runs/destroy_unfinished_run/script
+++ b/acceptance/bundle/resources/job_runs/destroy_unfinished_run/script
@@ -1,5 +1,5 @@
 cleanup() {
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/failed_run/output.txt b/acceptance/bundle/resources/job_runs/failed_run/output.txt
index f8b8dbf4398..6c63605f488 100644
--- a/acceptance/bundle/resources/job_runs/failed_run/output.txt
+++ b/acceptance/bundle/resources/job_runs/failed_run/output.txt
@@ -9,7 +9,7 @@ run page: [RUN_URL]
 
 Error: cannot create resources.jobs.downstream_job: dependency failed: resources.job_runs.my_run
 
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 
 === the failed run is recorded, and not having succeeded is drift
 >>> read_id.py my_run
@@ -63,7 +63,7 @@ run page: [RUN_URL]
 
 Error: cannot create resources.jobs.downstream_job: dependency failed: resources.job_runs.my_run
 
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 
 === run-now was issued once per deploy, and the recreate deleted the failed run
 >>> print_requests.py --keep //jobs/run-now
diff --git a/acceptance/bundle/resources/job_runs/failed_run/script b/acceptance/bundle/resources/job_runs/failed_run/script
index 78d1cc07b42..0534b126248 100644
--- a/acceptance/bundle/resources/job_runs/failed_run/script
+++ b/acceptance/bundle/resources/job_runs/failed_run/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt
index 2e1d9cacd7a..97799b032f4 100644
--- a/acceptance/bundle/resources/job_runs/interrupted_run/output.txt
+++ b/acceptance/bundle/resources/job_runs/interrupted_run/output.txt
@@ -9,7 +9,7 @@ HTTP Status: 403 Forbidden
 API error_code: INJECTED
 API message: Fault injected by test.
 
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 
 Exit code: 1
 
@@ -62,7 +62,7 @@ Exit code: 1
 === Badness: the next deploy does not wait for that run
 >>> [CLI] bundle deploy --plan tmp.plan.json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-interrupted-run/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 === the same run is still tracked, and nothing was cancelled, deleted or triggered
diff --git a/acceptance/bundle/resources/job_runs/interrupted_run/script b/acceptance/bundle/resources/job_runs/interrupted_run/script
index 68338c1d217..5d82c41ff49 100644
--- a/acceptance/bundle/resources/job_runs/interrupted_run/script
+++ b/acceptance/bundle/resources/job_runs/interrupted_run/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/job_parameters/output.txt b/acceptance/bundle/resources/job_runs/job_parameters/output.txt
index e35d03c12c6..74e6571e4ff 100644
--- a/acceptance/bundle/resources/job_runs/job_parameters/output.txt
+++ b/acceptance/bundle/resources/job_runs/job_parameters/output.txt
@@ -6,7 +6,7 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 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
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //jobs/run-now
diff --git a/acceptance/bundle/resources/job_runs/job_parameters/script b/acceptance/bundle/resources/job_runs/job_parameters/script
index 16eedf5d7dc..d73122d07f2 100644
--- a/acceptance/bundle/resources/job_runs/job_parameters/script
+++ b/acceptance/bundle/resources/job_runs/job_parameters/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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 f69c5934d83..7f79f6b0e1c 100644
--- a/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt
+++ b/acceptance/bundle/resources/job_runs/on_bundle_deploy/output.txt
@@ -6,7 +6,7 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 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
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> read_id.py my_job
@@ -49,7 +49,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-bundle
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_2]?o=[NUMID]
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: SUCCESS
 Recreated job_runs.my_run
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> [CLI] bundle summary
@@ -104,7 +104,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 
 === bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-bundle-deploy/default/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> print_requests.py //jobs/run-now
diff --git a/acceptance/bundle/resources/job_runs/on_bundle_deploy/script b/acceptance/bundle/resources/job_runs/on_bundle_deploy/script
index 0ce2a6bbb52..10f95d176f4 100644
--- a/acceptance/bundle/resources/job_runs/on_bundle_deploy/script
+++ b/acceptance/bundle/resources/job_runs/on_bundle_deploy/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/on_file_change/output.txt b/acceptance/bundle/resources/job_runs/on_file_change/output.txt
index 37e4b63a2bc..2baf8856eca 100644
--- a/acceptance/bundle/resources/job_runs/on_file_change/output.txt
+++ b/acceptance/bundle/resources/job_runs/on_file_change/output.txt
@@ -6,7 +6,7 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS
 Created job_runs.my_run
 Created jobs.my_job
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> read_id.py my_job
@@ -25,7 +25,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 === redeploy with unchanged file plans nothing
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-change/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> print_requests.py //jobs/run-now
@@ -33,7 +33,7 @@ Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 === touch without content change plans nothing
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-change/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> print_requests.py //jobs/run-now
@@ -94,7 +94,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-c
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_2]?o=[NUMID]
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: SUCCESS
 Recreated job_runs.my_run
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py --keep //jobs/runs/delete
@@ -181,7 +181,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-c
 Output from job_runs.my_run: id=[MY_RUN_ID_3]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_3]?o=[NUMID]
 Output from job_runs.my_run: id=[MY_RUN_ID_3]: SUCCESS
 Recreated job_runs.my_run
-Files: 4 uploaded, 1 deleted
+Files: 2 uploaded, 1 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py //jobs/run-now
@@ -206,7 +206,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-c
 Output from job_runs.my_run: id=[MY_RUN_ID_4]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_4]?o=[NUMID]
 Output from job_runs.my_run: id=[MY_RUN_ID_4]: SUCCESS
 Recreated job_runs.my_run
-Files: 4 uploaded, 1 deleted
+Files: 2 uploaded, 1 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py //jobs/run-now
@@ -228,7 +228,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 
 === bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-change/default/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> print_requests.py //jobs/run-now
@@ -248,7 +248,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 
 >>> [CLI] bundle plan -o json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-change/default/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/job_runs/on_file_change/script b/acceptance/bundle/resources/job_runs/on_file_change/script
index 53758e64a30..6a3121450c8 100644
--- a/acceptance/bundle/resources/job_runs/on_file_change/script
+++ b/acceptance/bundle/resources/job_runs/on_file_change/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/on_file_change_build/output.txt b/acceptance/bundle/resources/job_runs/on_file_change_build/output.txt
index b674e4063a7..4f39c0a280c 100644
--- a/acceptance/bundle/resources/job_runs/on_file_change_build/output.txt
+++ b/acceptance/bundle/resources/job_runs/on_file_change_build/output.txt
@@ -7,7 +7,7 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS
 Created job_runs.my_run
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> read_id.py my_job
@@ -30,7 +30,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-c
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_2]?o=[NUMID]
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: SUCCESS
 Recreated job_runs.my_run
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py //jobs/run-now
diff --git a/acceptance/bundle/resources/job_runs/on_file_change_build/script b/acceptance/bundle/resources/job_runs/on_file_change_build/script
index e350d2ba6e6..3e145d0f908 100644
--- a/acceptance/bundle/resources/job_runs/on_file_change_build/script
+++ b/acceptance/bundle/resources/job_runs/on_file_change_build/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/on_file_change_glob/output.txt b/acceptance/bundle/resources/job_runs/on_file_change_glob/output.txt
index 5349b686287..4bbf9f4ac5b 100644
--- a/acceptance/bundle/resources/job_runs/on_file_change_glob/output.txt
+++ b/acceptance/bundle/resources/job_runs/on_file_change_glob/output.txt
@@ -6,7 +6,7 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS
 Created job_runs.my_run
 Created jobs.my_job
-Files: 10 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> read_id.py my_job
@@ -45,7 +45,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-c
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_2]?o=[NUMID]
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: SUCCESS
 Recreated job_runs.my_run
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py --keep //jobs/runs/delete
@@ -143,7 +143,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-change-glob/default/files...
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> print_requests.py //jobs/run-now
diff --git a/acceptance/bundle/resources/job_runs/on_file_change_glob/script b/acceptance/bundle/resources/job_runs/on_file_change_glob/script
index 324efdb49a9..04a951a4bc2 100644
--- a/acceptance/bundle/resources/job_runs/on_file_change_glob/script
+++ b/acceptance/bundle/resources/job_runs/on_file_change_glob/script
@@ -3,7 +3,7 @@ mv dot_gitignore .gitignore
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/on_file_change_predeploy/output.txt b/acceptance/bundle/resources/job_runs/on_file_change_predeploy/output.txt
index 4778b7e19d7..f29f6621593 100644
--- a/acceptance/bundle/resources/job_runs/on_file_change_predeploy/output.txt
+++ b/acceptance/bundle/resources/job_runs/on_file_change_predeploy/output.txt
@@ -7,7 +7,7 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 Output from job_runs.my_run: id=[MY_RUN_ID]: SUCCESS
 Created job_runs.my_run
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> read_id.py my_job
@@ -30,7 +30,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-on-file-c
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_2]?o=[NUMID]
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: SUCCESS
 Recreated job_runs.my_run
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py //jobs/run-now
diff --git a/acceptance/bundle/resources/job_runs/on_file_change_predeploy/script b/acceptance/bundle/resources/job_runs/on_file_change_predeploy/script
index 80661900eab..6a816dbf0b0 100644
--- a/acceptance/bundle/resources/job_runs/on_file_change_predeploy/script
+++ b/acceptance/bundle/resources/job_runs/on_file_change_predeploy/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/redeploy/output.txt b/acceptance/bundle/resources/job_runs/redeploy/output.txt
index 06129f79373..ac2d5cbcabd 100644
--- a/acceptance/bundle/resources/job_runs/redeploy/output.txt
+++ b/acceptance/bundle/resources/job_runs/redeploy/output.txt
@@ -6,7 +6,7 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 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
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle summary
@@ -99,7 +99,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/job-runs-redeploy/
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: Run URL: [DATABRICKS_URL]/jobs/[MY_JOB_ID]/runs/[MY_RUN_ID_2]?o=[NUMID]
 Output from job_runs.my_run: id=[MY_RUN_ID_2]: SUCCESS
 Recreated job_runs.my_run
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> [CLI] bundle summary
diff --git a/acceptance/bundle/resources/job_runs/redeploy/script b/acceptance/bundle/resources/job_runs/redeploy/script
index 95e280bd8aa..1812eea0ca7 100644
--- a/acceptance/bundle/resources/job_runs/redeploy/script
+++ b/acceptance/bundle/resources/job_runs/redeploy/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..870a3ecfb05 100644
--- a/acceptance/bundle/resources/job_runs/retried_run_now/output.txt
+++ b/acceptance/bundle/resources/job_runs/retried_run_now/output.txt
@@ -6,7 +6,7 @@ Output from job_runs.my_run: id=[MY_RUN_ID]: Run URL: [DATABRICKS_URL]/jobs/[MY_
 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
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === run-now was sent twice, both times with the same token
diff --git a/acceptance/bundle/resources/job_runs/retried_run_now/script b/acceptance/bundle/resources/job_runs/retried_run_now/script
index 0d69e76df6a..9e258912528 100644
--- a/acceptance/bundle/resources/job_runs/retried_run_now/script
+++ b/acceptance/bundle/resources/job_runs/retried_run_now/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/job_runs/wait/output.txt b/acceptance/bundle/resources/job_runs/wait/output.txt
index 80f36fe3ce8..1c581ed2c34 100644
--- a/acceptance/bundle/resources/job_runs/wait/output.txt
+++ b/acceptance/bundle/resources/job_runs/wait/output.txt
@@ -7,7 +7,7 @@ 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
+Files: 5 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> read_id.py my_run
@@ -25,7 +25,7 @@ resources.jobs.my_job skip
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 3 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/jobs/alert-task/output.txt b/acceptance/bundle/resources/jobs/alert-task/output.txt
index 3b01790e4cc..b760722e6a1 100644
--- a/acceptance/bundle/resources/jobs/alert-task/output.txt
+++ b/acceptance/bundle/resources/jobs/alert-task/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/alert-task-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs get [JOB_ID]
diff --git a/acceptance/bundle/resources/jobs/big_id/output.txt b/acceptance/bundle/resources/jobs/big_id/output.txt
index cabb74f5aab..fd32d3e1741 100644
--- a/acceptance/bundle/resources/jobs/big_id/output.txt
+++ b/acceptance/bundle/resources/jobs/big_id/output.txt
@@ -4,7 +4,7 @@
 >>> [CLI] bundle plan -o json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/jobs/check-metadata/output.txt b/acceptance/bundle/resources/jobs/check-metadata/output.txt
index cda7d2c87de..94b04721a6c 100644
--- a/acceptance/bundle/resources/jobs/check-metadata/output.txt
+++ b/acceptance/bundle/resources/jobs/check-metadata/output.txt
@@ -10,7 +10,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.bar
 Created jobs.foo
-Files: 9 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Second summary, should have id and modified status should be absent
diff --git a/acceptance/bundle/resources/jobs/create-error/output.txt b/acceptance/bundle/resources/jobs/create-error/output.txt
index bad8cede5d2..78c889b139e 100644
--- a/acceptance/bundle/resources/jobs/create-error/output.txt
+++ b/acceptance/bundle/resources/jobs/create-error/output.txt
@@ -8,7 +8,7 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: Shared job cluster feature is only supported in multi-task jobs.
 
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 
 >>> musterr [CLI] bundle deploy --force-lock -q
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
@@ -19,7 +19,7 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: Shared job cluster feature is only supported in multi-task jobs.
 
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 
 >>> musterr [CLI] bundle deploy --force-lock -qq
 Error: cannot create resources.jobs.foo: Shared job cluster feature is only supported in multi-task jobs. (400 INVALID_PARAMETER_VALUE)
diff --git a/acceptance/bundle/resources/jobs/delete_job/output.txt b/acceptance/bundle/resources/jobs/delete_job/output.txt
index 2dd69e51883..59e09c12abe 100644
--- a/acceptance/bundle/resources/jobs/delete_job/output.txt
+++ b/acceptance/bundle/resources/jobs/delete_job/output.txt
@@ -2,13 +2,13 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deleted jobs.job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 0 unchanged
 {
   "method": "POST",
diff --git a/acceptance/bundle/resources/jobs/delete_task/output.txt b/acceptance/bundle/resources/jobs/delete_task/output.txt
index 50c5346d6e9..6c1c397fd82 100644
--- a/acceptance/bundle/resources/jobs/delete_task/output.txt
+++ b/acceptance/bundle/resources/jobs/delete_task/output.txt
@@ -1,6 +1,6 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> cat databricks.yml
@@ -24,5 +24,5 @@ resources:
                 - whl: /Workspace/Users/foo@bar.test/mywheel.whl
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated jobs.job
-Files: 3 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt b/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt
index a92373777fb..903ccb294f0 100644
--- a/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt
+++ b/acceptance/bundle/resources/jobs/double-underscore-keys/output.txt
@@ -12,7 +12,7 @@ Validation OK!
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-test-[UNIQUE_NAME]/default/files...
 Created jobs.foo
 Created jobs.foo__bar
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..99e0eaca29a 100644
--- a/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt
+++ b/acceptance/bundle/resources/jobs/fail-on-active-runs/output.txt
@@ -12,14 +12,14 @@ Validation OK!
 >>> [CLI] bundle deploy --fail-on-active-runs
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-active-runs-test-[UNIQUE_NAME]/default/files...
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Remove .databricks directory to simulate a fresh deployment
 === deploy empty bundle again
 >>> [CLI] bundle deploy --fail-on-active-runs
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-jobs-active-runs-test-[UNIQUE_NAME]/default/files...
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt
index 944f1f79e84..9c87ffa710d 100644
--- a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt
+++ b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/output.txt
@@ -44,10 +44,10 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.some_other_job
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | .body.tasks [OUTPUT_DIR]/out.requests.txt
 [
   {
     "new_cluster": {
diff --git a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/script b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/script
index 4f39d94ce7b..9bca2b48655 100644
--- a/acceptance/bundle/resources/jobs/instance_pool_and_node_type/script
+++ b/acceptance/bundle/resources/jobs/instance_pool_and_node_type/script
@@ -3,5 +3,5 @@ trace $CLI bundle summary -o json | jq .resources.jobs.some_other_job.tasks
 
 trace $CLI bundle deploy
 
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' out.requests.txt
-rm out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | .body.tasks' "$OUT_REQUESTS"
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt
index a6e1fef22f3..f82291e0268 100644
--- a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt
+++ b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.direct.txt
@@ -12,6 +12,6 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: git_source.git_provider must be one of: github,gitlab,bitbucketcloud,gitlabenterpriseedition,bitbucketserver,azuredevopsservices,githubenterprise,awscodecommit
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 
 Exit code: 1
diff --git a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt
index fd005af59d8..df5f838399e 100644
--- a/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt
+++ b/acceptance/bundle/resources/jobs/no-git-provider/out.deploy.terraform.txt
@@ -6,5 +6,5 @@ Warning: required field "git_provider" is not set
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/jobs/num_workers/output.txt b/acceptance/bundle/resources/jobs/num_workers/output.txt
index 9004ecb3b95..999abb2afb1 100644
--- a/acceptance/bundle/resources/jobs/num_workers/output.txt
+++ b/acceptance/bundle/resources/jobs/num_workers/output.txt
@@ -18,7 +18,7 @@ are correctly set in the cluster specification:
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.sample_job
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/jobs/num_workers/script b/acceptance/bundle/resources/jobs/num_workers/script
index a9f612ccbdb..68ae9ed8479 100644
--- a/acceptance/bundle/resources/jobs/num_workers/script
+++ b/acceptance/bundle/resources/jobs/num_workers/script
@@ -3,4 +3,4 @@ trace $CLI bundle deploy
 trace print_requests.py //jobs --nostamp
 
 trace $CLI bundle plan
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt b/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt
index 23f7a8266da..48f776a281c 100644
--- a/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt
+++ b/acceptance/bundle/resources/jobs/on_failure_empty_slice/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/usage_logs/dev/files...
 Created jobs.refresh_usage_logs
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan -o json
diff --git a/acceptance/bundle/resources/jobs/remote_add_tag/output.txt b/acceptance/bundle/resources/jobs/remote_add_tag/output.txt
index 2f81cf00cf6..267a888c162 100644
--- a/acceptance/bundle/resources/jobs/remote_add_tag/output.txt
+++ b/acceptance/bundle/resources/jobs/remote_add_tag/output.txt
@@ -4,7 +4,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading hello.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 update jobs.foo
 
diff --git a/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt b/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt
index 62d5ea05c1e..877d8ee8290 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt
+++ b/acceptance/bundle/resources/jobs/remote_delete/deploy/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs delete [NUMID]
@@ -18,5 +18,5 @@ create jobs.foo
 Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt b/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt
index b6a773035fe..7ee4306ab35 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt
+++ b/acceptance/bundle/resources/jobs/remote_delete/destroy/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs delete [NUMID]
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt
index caad3eb16bc..345b16e2ebe 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt
+++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.direct.txt
@@ -3,5 +3,5 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Deleted jobs.foo
 Deleted pipelines.bar
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 2 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt
index 7d9f83ba8ae..be8b0698ea5 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt
+++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/out.deploy_removed.terraform.txt
@@ -1,5 +1,5 @@
 
 >>> [CLI] bundle deploy --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt
index 3472511c2f3..8fcf15de0ba 100644
--- a/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt
+++ b/acceptance/bundle/resources/jobs/remote_delete/removed_from_config/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created pipelines.bar
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] jobs delete [NUMID]
@@ -17,7 +17,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 0 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 === No delete API calls for resources that are already gone remotely
diff --git a/acceptance/bundle/resources/jobs/remote_matches_config/output.txt b/acceptance/bundle/resources/jobs/remote_matches_config/output.txt
index 34cee3283a4..849274f4d59 100644
--- a/acceptance/bundle/resources/jobs/remote_matches_config/output.txt
+++ b/acceptance/bundle/resources/jobs/remote_matches_config/output.txt
@@ -5,7 +5,7 @@ create jobs.my_job
 Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.my_job
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
@@ -19,7 +19,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/jobs/remote_matches_config/script b/acceptance/bundle/resources/jobs/remote_matches_config/script
index 9ca6a0655b6..b8108be15cf 100755
--- a/acceptance/bundle/resources/jobs/remote_matches_config/script
+++ b/acceptance/bundle/resources/jobs/remote_matches_config/script
@@ -15,7 +15,7 @@ EOF
 trace $CLI bundle plan
 $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 # XXX READPLAN
 trace $CLI bundle deploy
 trace print_requests.py //jobs --nostamp
diff --git a/acceptance/bundle/resources/jobs/shared-root-path/output.txt b/acceptance/bundle/resources/jobs/shared-root-path/output.txt
index 28dee8868cd..6af1832d32b 100644
--- a/acceptance/bundle/resources/jobs/shared-root-path/output.txt
+++ b/acceptance/bundle/resources/jobs/shared-root-path/output.txt
@@ -6,7 +6,7 @@ The bundle is configured to use /Workspace/Shared, which will give read/write ac
 
 Uploading bundle files to /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -q
@@ -15,7 +15,7 @@ Warning: the bundle root path /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME]
 The bundle is configured to use /Workspace/Shared, which will give read/write access to all users. If this is intentional, add CAN_MANAGE for 'group_name: users' permission to your bundle configuration. If the deployment should be restricted, move it to a restricted folder such as /Workspace/Users/<username or principal name>.
 
 Uploading bundle files to /Workspace/Shared/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle deploy -qq
diff --git a/acceptance/bundle/resources/jobs/tags_empty_map/output.txt b/acceptance/bundle/resources/jobs/tags_empty_map/output.txt
index 2621c0f462d..8fd60f7b724 100644
--- a/acceptance/bundle/resources/jobs/tags_empty_map/output.txt
+++ b/acceptance/bundle/resources/jobs/tags_empty_map/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/tags_empty_map/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan -o json
diff --git a/acceptance/bundle/resources/jobs/task-source/output.txt b/acceptance/bundle/resources/jobs/task-source/output.txt
index f4bca25e349..177264399d4 100644
--- a/acceptance/bundle/resources/jobs/task-source/output.txt
+++ b/acceptance/bundle/resources/jobs/task-source/output.txt
@@ -7,12 +7,12 @@ Warning: invalid value "github" for enum field. Valid values are [awsCodeCommit
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/task-source/default/files...
 Created jobs.git_job
 Created jobs.workspace_job
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body | del(.deployment.deployment_id, .deployment.version_id) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body | del(.deployment.deployment_id, .deployment.version_id) [OUTPUT_DIR]/out.requests.txt
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="workspace_job") | .body | del(.deployment.deployment_id, .deployment.version_id) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="workspace_job") | .body | del(.deployment.deployment_id, .deployment.version_id) [OUTPUT_DIR]/out.requests.txt
 
 >>> [CLI] bundle plan
 update jobs.git_job
@@ -22,9 +22,9 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/task-source/default/files...
 Updated jobs.git_job
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id) [OUTPUT_DIR]/out.requests.txt
 
->>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="workspace_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id) out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="workspace_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id) [OUTPUT_DIR]/out.requests.txt
diff --git a/acceptance/bundle/resources/jobs/task-source/script b/acceptance/bundle/resources/jobs/task-source/script
index e8908986c50..56a1acd6da7 100644
--- a/acceptance/bundle/resources/jobs/task-source/script
+++ b/acceptance/bundle/resources/jobs/task-source/script
@@ -2,9 +2,9 @@ trace $CLI bundle deploy
 
 # For terraform we expect the task source to be explicitly set always
 # For direct we do not expect it to be set unless explicitly specified in the bundle config
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body | del(.deployment.deployment_id, .deployment.version_id)' out.requests.txt | jq --sort-keys > out.git_job.$DATABRICKS_BUNDLE_ENGINE.txt
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="workspace_job") | .body | del(.deployment.deployment_id, .deployment.version_id)' out.requests.txt | jq --sort-keys > out.workspace_job.$DATABRICKS_BUNDLE_ENGINE.txt
-rm out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="git_job") | .body | del(.deployment.deployment_id, .deployment.version_id)' "$OUT_REQUESTS" | jq --sort-keys > out.git_job.$DATABRICKS_BUNDLE_ENGINE.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/create") | select(.body.name=="workspace_job") | .body | del(.deployment.deployment_id, .deployment.version_id)' "$OUT_REQUESTS" | jq --sort-keys > out.workspace_job.$DATABRICKS_BUNDLE_ENGINE.txt
+rm "$OUT_REQUESTS"
 
 # Removing the git_source block and deploying again
 update_file.py databricks.yml '<<: *git_source' ''
@@ -13,7 +13,7 @@ trace $CLI bundle deploy
 
 # In direct mode update should not contain source unless explicitly specified in the bundle config
 # In terraform mode update should always contain source field
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id)' out.requests.txt | jq --sort-keys >> out.git_job.$DATABRICKS_BUNDLE_ENGINE.txt
-trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="workspace_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id)' out.requests.txt | jq --sort-keys >> out.workspace_job.$DATABRICKS_BUNDLE_ENGINE.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="git_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id)' "$OUT_REQUESTS" | jq --sort-keys >> out.git_job.$DATABRICKS_BUNDLE_ENGINE.txt
+trace jq -s '.[] | select(.path=="/api/2.2/jobs/reset") | select(.body.new_settings.name=="workspace_job") | .body | del(.new_settings.deployment.deployment_id, .new_settings.deployment.version_id)' "$OUT_REQUESTS" | jq --sort-keys >> out.workspace_job.$DATABRICKS_BUNDLE_ENGINE.txt
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt b/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt
index 7ad52bc6a45..4058204ebd3 100644
--- a/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt
+++ b/acceptance/bundle/resources/jobs/tasks-reorder-locally/output.txt
@@ -7,7 +7,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
@@ -18,7 +18,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt b/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt
index be2801ace32..6a6eb192d41 100644
--- a/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt
+++ b/acceptance/bundle/resources/jobs/unknown-terraform-field/output.txt
@@ -6,5 +6,5 @@ Warning: unknown field: autotermination_minutes
   in databricks.yml:14:13
 
 Created jobs.job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/jobs/update/script b/acceptance/bundle/resources/jobs/update/script
index 2ad2ae4d14f..e621ed23a77 100644
--- a/acceptance/bundle/resources/jobs/update/script
+++ b/acceptance/bundle/resources/jobs/update/script
@@ -32,11 +32,11 @@ title "Fetch job ID and verify remote state"
 ppid=`read_id.py foo`
 
 trace $CLI jobs get $ppid | jq 'del(.settings.run_as)' | nostamp
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Destroy the job and verify that it's removed from the state and from remote"
 trace $CLI bundle destroy --auto-approve
 trace print_requests.py //jobs --nostamp
 
 trace musterr $CLI jobs get $ppid
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/jobs/update_single_node/script b/acceptance/bundle/resources/jobs/update_single_node/script
index 4deefe32bbc..fdf48fa2242 100644
--- a/acceptance/bundle/resources/jobs/update_single_node/script
+++ b/acceptance/bundle/resources/jobs/update_single_node/script
@@ -20,11 +20,11 @@ title "Fetch job ID and verify remote state"
 ppid=`read_id.py foo`
 
 trace $CLI jobs get $ppid | jq 'del(.settings.run_as, .settings.deployment.deployment_id, .settings.deployment.version_id)'
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Destroy the job and verify that it's removed from the state and from remote"
 trace $CLI bundle destroy --auto-approve
 trace print_requests.py //jobs --nostamp
 
 trace musterr $CLI jobs get $ppid
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt b/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt
index f0fdccbb1db..bf3c6bd1e60 100644
--- a/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt
+++ b/acceptance/bundle/resources/jobs/webhook-reorder-remote/output.txt
@@ -5,7 +5,7 @@ create jobs.my_job
 Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.my_job
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/jobs/whole-block-overlap/output.txt b/acceptance/bundle/resources/jobs/whole-block-overlap/output.txt
index 18594b98f95..b4d6428628a 100644
--- a/acceptance/bundle/resources/jobs/whole-block-overlap/output.txt
+++ b/acceptance/bundle/resources/jobs/whole-block-overlap/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.my_job
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/model_services/basic/output.txt b/acceptance/bundle/resources/model_services/basic/output.txt
index af2231f70aa..0290d00123f 100644
--- a/acceptance/bundle/resources/model_services/basic/output.txt
+++ b/acceptance/bundle/resources/model_services/basic/output.txt
@@ -15,7 +15,7 @@ Error: Resource catalog.ModelService not found: main.myschema.myservice
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created model_services.ms1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
@@ -51,7 +51,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated model_services.ms1
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
diff --git a/acceptance/bundle/resources/model_services/lifecycle/output.txt b/acceptance/bundle/resources/model_services/lifecycle/output.txt
index 7538b2d32b6..5973230802e 100644
--- a/acceptance/bundle/resources/model_services/lifecycle/output.txt
+++ b/acceptance/bundle/resources/model_services/lifecycle/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-model-service-test-[UNIQUE_NAME]/default/files...
 Created model_services.ms
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] ai-gateway get-model-service model-services/main.default.test_ms_[UNIQUE_NAME]
diff --git a/acceptance/bundle/resources/model_services/remote-delete/output.txt b/acceptance/bundle/resources/model_services/remote-delete/output.txt
index c7f74e3b69f..7fd5b677146 100644
--- a/acceptance/bundle/resources/model_services/remote-delete/output.txt
+++ b/acceptance/bundle/resources/model_services/remote-delete/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created model_services.ms1
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Delete the resource out of band
diff --git a/acceptance/bundle/resources/model_serving_endpoints/basic/script b/acceptance/bundle/resources/model_serving_endpoints/basic/script
index 18f67a7f5b1..18ccf9f62f6 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/basic/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/basic/script
@@ -4,7 +4,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script
index 3f26d4a0738..7765657e47a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/recreated_same_name/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/output.txt b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/output.txt
index f4c7bbac418..da59c3c5b49 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/output.txt
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created model_serving_endpoints.endpoint1
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Configure telemetry out of band
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/script b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/script
index 81c14d8d89f..ea0fabd6338 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_unmanaged/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Deploy without telemetry_config"
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/output.txt b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/output.txt
index fd06fd3f80b..6b2d524c1e3 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/output.txt
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/output.txt
@@ -3,14 +3,14 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created model_serving_endpoints.endpoint1
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Update config and telemetry_config
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated model_serving_endpoints.endpoint1
-Files: 0 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Plan converges
@@ -30,7 +30,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated model_serving_endpoints.endpoint1
-Files: 0 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] api get /api/2.0/serving-endpoints/test-endpoint
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/script b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/script
index 3df97d41e8c..9b8bb3d543d 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/telemetry_config_with_config_update/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Initial deployment"
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/output.txt b/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/output.txt
index 08545523f61..1f36ff2ad69 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/output.txt
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created model_serving_endpoints.endpoint1
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op despite write-only secret and burst_scaling_enabled not round-tripping
diff --git a/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/script b/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/script
index 4a526e23325..4cdc317a5e0 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/drift/write_only/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Initial deployment"
 trace $CLI bundle deploy
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..4c719dc91df 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
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
@@ -46,7 +46,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Recreated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script
index 7b4a3bcc755..d4cc67d38b7 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/catalog-name/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..8bc684a4e6b 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
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
@@ -41,7 +41,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Recreated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script
index b88559e2af8..d919dd277f4 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/name-change/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..14f1106ea6b 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
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] serving-endpoints get [ORIGINAL_ENDPOINT_ID]
@@ -16,7 +16,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Recreated model_serving_endpoints.test_endpoint
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script
index 53b4cb2d5c9..c8fbf25bd45 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/route-optimized/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..b115344cadc 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
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
@@ -46,7 +46,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Recreated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script
index 00e8b6083a1..e866e95b47c 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/schema-name/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..2436f5260cc 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
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
@@ -46,7 +46,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Recreated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script
index 5e50980c97b..fe8455252a1 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/recreate/table-prefix/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..f4c44300780 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt
+++ b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/output.txt
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files...
 Created model_serving_endpoints.my_endpoint
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/script b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/script
index 42b3c65b25a..170908e58b1 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/running-endpoint/script
@@ -4,7 +4,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..fc205bdd968 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
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] serving-endpoints get [ENDPOINT_ID]
@@ -19,7 +19,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script
index a5ff92c4a71..8f85f256593 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/ai-gateway/script
@@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..e7499a8782e 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
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] serving-endpoints get [ENDPOINT_ID]
@@ -40,7 +40,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script
index cc063273592..46fcbbe4dac 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/both_gateway_and_tags/script
@@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..55dc514b20a 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] serving-endpoints get [ENDPOINT_ID]
@@ -37,7 +37,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/config/script b/acceptance/bundle/resources/model_serving_endpoints/update/config/script
index b542e1a02b1..0a80ec4b0ff 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/update/config/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/config/script
@@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..ea7812ea810 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
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] serving-endpoints get [ENDPOINT_ID]
@@ -19,7 +19,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === There a bug in TF where it does not actually update the email notifications for a serving endpoint.
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script
index 7d1c53fb189..ec9671e3277 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/email-notifications/script
@@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..0834f55c013 100644
--- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created model_serving_endpoints.test_endpoint
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] serving-endpoints get [ENDPOINT_ID]
@@ -20,7 +20,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated model_serving_endpoints.test_endpoint
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //serving-endpoints
diff --git a/acceptance/bundle/resources/model_serving_endpoints/update/tags/script b/acceptance/bundle/resources/model_serving_endpoints/update/tags/script
index 3369736ce5a..725f2ef9a5c 100755
--- a/acceptance/bundle/resources/model_serving_endpoints/update/tags/script
+++ b/acceptance/bundle/resources/model_serving_endpoints/update/tags/script
@@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt b/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt
index 50232dbed92..f3b0b279dae 100644
--- a/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt
+++ b/acceptance/bundle/resources/models/empty-name/out.deploy.direct.txt
@@ -8,4 +8,4 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: Got an invalid name ''. Registered Model names cannot be empty strings.
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt b/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt
index adb61687bf8..8f8d5d389df 100644
--- a/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt
+++ b/acceptance/bundle/resources/models/empty-name/out.deploy.terraform.txt
@@ -11,4 +11,4 @@ Error: cannot create mlflow model: Got an invalid name ''. Registered Model name
 
 
 
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resources/models/readplan-permissions/output.txt b/acceptance/bundle/resources/models/readplan-permissions/output.txt
index e65f9b2a560..632ed865cb1 100644
--- a/acceptance/bundle/resources/models/readplan-permissions/output.txt
+++ b/acceptance/bundle/resources/models/readplan-permissions/output.txt
@@ -4,7 +4,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created models.mymodel
 Created models.mymodel.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //permissions/registered-models
@@ -32,7 +32,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 === Remove manager permission and description, deploy from planUploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated models.mymodel
 Updated models.mymodel.permissions
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 2 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //permissions/registered-models
diff --git a/acceptance/bundle/resources/models/readplan-permissions/script b/acceptance/bundle/resources/models/readplan-permissions/script
index f8be26409e3..a7a2d16db97 100644
--- a/acceptance/bundle/resources/models/readplan-permissions/script
+++ b/acceptance/bundle/resources/models/readplan-permissions/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/permissions/_script b/acceptance/bundle/resources/permissions/_script
index df20dfd2fa9..13d76538a40 100644
--- a/acceptance/bundle/resources/permissions/_script
+++ b/acceptance/bundle/resources/permissions/_script
@@ -1,14 +1,14 @@
 trace $CLI bundle validate -o json | nostamp.py | jq .resources.$RESOURCE.foo.permissions
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 $CLI bundle plan -o json | nostamp.py > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 print_requests() {
-    jq -c < out.requests.txt | jq 'select(.method != "GET" and (.path | contains("permissions")) and (.path | contains("/api/2.0/bundle") | not))'
-    rm out.requests.txt
+    jq -c < "$OUT_REQUESTS" | jq 'select(.method != "GET" and (.path | contains("permissions")) and (.path | contains("/api/2.0/bundle") | not))'
+    rm "$OUT_REQUESTS"
 }
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace $CLI bundle deploy
 print_requests > out.requests.deploy.$DATABRICKS_BUNDLE_ENGINE.json
 
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..1f7f62b54bf 100644
--- a/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt
+++ b/acceptance/bundle/resources/permissions/apps/current_can_manage/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created apps.foo
 Created apps.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..1f7f62b54bf 100644
--- a/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt
+++ b/acceptance/bundle/resources/permissions/apps/other_can_manage/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created apps.foo
 Created apps.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..188eb1ffa14 100644
--- a/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt
+++ b/acceptance/bundle/resources/permissions/clusters/current_can_manage/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created clusters.foo
 Created clusters.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/clusters/target/output.txt b/acceptance/bundle/resources/permissions/clusters/target/output.txt
index f470559fb9f..4e080d4dfca 100644
--- a/acceptance/bundle/resources/permissions/clusters/target/output.txt
+++ b/acceptance/bundle/resources/permissions/clusters/target/output.txt
@@ -61,7 +61,7 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files...
 Created clusters.cluster1
 Created clusters.cluster1.permissions
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //clusters
diff --git a/acceptance/bundle/resources/permissions/dashboards/create/output.txt b/acceptance/bundle/resources/permissions/dashboards/create/output.txt
index d2faac5a681..21898a9b620 100644
--- a/acceptance/bundle/resources/permissions/dashboards/create/output.txt
+++ b/acceptance/bundle/resources/permissions/dashboards/create/output.txt
@@ -15,7 +15,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/dashboard-perm-[UNIQUE_NAME]/default/files...
 Created dashboards.foo
 Created dashboards.foo.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/dashboards/create/script b/acceptance/bundle/resources/permissions/dashboards/create/script
index 2992e2c4e12..aca0f41e099 100644
--- a/acceptance/bundle/resources/permissions/dashboards/create/script
+++ b/acceptance/bundle/resources/permissions/dashboards/create/script
@@ -5,11 +5,11 @@ fi
 envsubst < databricks.yml.tmpl > databricks.yml
 
 trace $CLI bundle validate -o json | jq .resources.dashboards.foo.permissions
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 $CLI bundle plan --output json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Add all resource IDs to runtime replacements to avoid pattern matching ambiguity
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..9917494265d 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
@@ -47,7 +47,7 @@ Warning: unknown field: instance_profile_arn
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created database_instances.foo
 Created database_instances.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..85553c835f7 100644
--- a/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt
+++ b/acceptance/bundle/resources/permissions/experiments/current_can_manage/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created experiments.foo
 Created experiments.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/factcheck/output.txt b/acceptance/bundle/resources/permissions/factcheck/output.txt
index ae6df5bd275..0165a24b458 100644
--- a/acceptance/bundle/resources/permissions/factcheck/output.txt
+++ b/acceptance/bundle/resources/permissions/factcheck/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_bundle_[UNIQUE_NAME]/default/files...
 Created jobs.job
 Created sql_warehouses.warehouse
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Permissions API simply takes the latest level in the request for a given principal
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..de41bec159e 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
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created genie_spaces.foo
 Created genie_spaces.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script
index e589a40bd5b..b63c7b26aa0 100644
--- a/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script
+++ b/acceptance/bundle/resources/permissions/genie_spaces/current_can_manage/script
@@ -1,9 +1,9 @@
 trace $CLI bundle validate -o json | jq .resources.genie_spaces.foo.permissions
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace $CLI bundle deploy
 # Genie space IDs are random; normalize them in the recorded requests.
 replace_ids.py
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 e2a8af52883..187e679c824 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
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created genie_spaces.foo
 Created genie_spaces.foo.permissions
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Permissions are set on the live space
diff --git a/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt
index c5b7cc5cc71..596766d4748 100644
--- a/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/added_remotely/output.txt
@@ -9,7 +9,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job_with_permissions
 Created jobs.job_with_permissions.permissions
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
@@ -115,7 +115,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated jobs.job_with_permissions.permissions
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> [CLI] bundle plan
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..4d823061ced 100644
--- a/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/current_can_manage/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..9e90df5dc8c 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
@@ -28,7 +28,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green/files...
 Created jobs.interim_gold_layer_job
 Created jobs.interim_gold_layer_job.permissions
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan -o json -t green
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..b41f2835115 100644
--- a/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/current_is_owner/output.txt
@@ -11,7 +11,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt b/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt
index 0a09e858c7e..85e3864f4a0 100644
--- a/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/delete_one/output.txt
@@ -5,7 +5,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.job_with_permissions
 Created jobs.job_with_permissions.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
@@ -16,7 +16,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated jobs.job_with_permissions.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> errcode [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/jobs/delete_one/script b/acceptance/bundle/resources/permissions/jobs/delete_one/script
index 1f0aa1c80a7..06e81a6129c 100644
--- a/acceptance/bundle/resources/permissions/jobs/delete_one/script
+++ b/acceptance/bundle/resources/permissions/jobs/delete_one/script
@@ -6,7 +6,7 @@ if [ -n "$CLOUD_ENV" ]; then
     $CLI users create --user-name test-dabs-2@databricks.com &> /dev/null || true
     $CLI groups create --display-name test-dabs-group-1 &> /dev/null || true
 fi
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 trace $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 
@@ -24,7 +24,7 @@ trace $CLI bundle plan
 job_id="$(read_id.py job_with_permissions)"
 # display_name is omitted from cloud responses for freshly-created principals; drop it for parity with local mock.
 $CLI permissions get jobs "$job_id" | gron.py --sort-arrays access_control_list | grep -v display_name > out.permissions_create.txt
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Delete one permission and deploy again\n"
 grep -v DELETE databricks.yml > tmp.yml && mv tmp.yml databricks.yml
@@ -32,4 +32,4 @@ trace $CLI bundle deploy
 print_requests.py --nostamp //jobs/ | gron.py --sort-arrays access_control_list > out.requests_update.txt
 
 $CLI permissions get jobs "$job_id" | gron.py --sort-arrays access_control_list | grep -v display_name > out.permissions_update.txt
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt
index 306af15c4e3..99b081c6ab8 100644
--- a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/output.txt
@@ -5,7 +5,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-deleted-remotely/default/files...
 Created jobs.job_with_permissions
 Created jobs.job_with_permissions.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs/
@@ -109,7 +109,7 @@ Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-deleted-remotely/default/files...
 Updated jobs.job_with_permissions.permissions
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //jobs/
diff --git a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/script b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/script
index cce4d71d0ce..02eddde0ccc 100644
--- a/acceptance/bundle/resources/permissions/jobs/deleted_remotely/script
+++ b/acceptance/bundle/resources/permissions/jobs/deleted_remotely/script
@@ -5,7 +5,7 @@ trace print_requests.py --nostamp //jobs/ > out.requests_create.json
 job_id="$(read_id.py job_with_permissions)"
 
 trace $CLI permissions get jobs "$job_id"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Delete permissions remotely"
 trace $CLI permissions set jobs "$job_id" --json @remote_delete.json
@@ -16,4 +16,4 @@ trace $CLI bundle deploy
 trace print_requests.py --nostamp //jobs/ > out.requests_restore.json
 
 trace $CLI permissions get jobs "$job_id"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt
index 1e2f44ad666..a8559e3755c 100644
--- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/with_permissions/output.txt
@@ -14,7 +14,7 @@ No active deployment found to destroy!
 Uploading bundle files to /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] permissions set jobs [NUMID] --json @take_ownership.json
diff --git a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt
index ec72e5c3aeb..69c896a48de 100644
--- a/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/destroy_without_mgmtperms/without_permissions/output.txt
@@ -13,7 +13,7 @@ No active deployment found to destroy!
 >>> as-test-sp [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[TEST_SP_APPLICATION_ID]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created jobs.foo
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] permissions set jobs [NUMID] --json @take_ownership.json
diff --git a/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt b/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt
index 4a1625e9921..f533c28af7e 100644
--- a/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/empty_list/output.txt
@@ -5,7 +5,7 @@ null
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..4d823061ced 100644
--- a/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/other_can_manage/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..3b31df441c7 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
@@ -32,7 +32,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/green/files...
 Created jobs.interim_gold_layer_job
 Created jobs.interim_gold_layer_job.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> errcode [CLI] bundle destroy -t green --auto-approve
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..0901ab97c3a 100644
--- a/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/other_is_owner/output.txt
@@ -15,7 +15,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt b/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt
index 4b638d3689d..7177605e5cb 100644
--- a/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/reorder_locally/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
@@ -11,7 +11,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt b/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt
index 69a74214c05..bc1b1bd79dd 100644
--- a/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/reorder_remotely/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/permissions/jobs/update/output.txt b/acceptance/bundle/resources/permissions/jobs/update/output.txt
index 86bf9effa02..415de04d6b0 100644
--- a/acceptance/bundle/resources/permissions/jobs/update/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/update/output.txt
@@ -11,7 +11,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files...
 Created jobs.job_with_permissions
 Created jobs.job_with_permissions.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs/
@@ -77,7 +77,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files...
 Updated jobs.job_with_permissions.permissions
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //jobs/
@@ -92,7 +92,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files...
 Updated jobs.job_with_permissions.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //jobs/
@@ -107,7 +107,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files...
 Deleted jobs.job_with_permissions.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //jobs/
@@ -135,7 +135,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files...
 Created jobs.job_with_permissions.permissions
-Files: 4 uploaded, 1 deleted
+Files: 2 uploaded, 1 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //jobs/
@@ -150,7 +150,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/jobs-permissions-test/default/files...
 Deleted jobs.job_with_permissions.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //jobs/
diff --git a/acceptance/bundle/resources/permissions/jobs/update/script b/acceptance/bundle/resources/permissions/jobs/update/script
index 28f2c121f2b..944f85722a3 100644
--- a/acceptance/bundle/resources/permissions/jobs/update/script
+++ b/acceptance/bundle/resources/permissions/jobs/update/script
@@ -9,7 +9,7 @@ trace $CLI bundle plan -o json | nostamp > out.plan_post_create.$DATABRICKS_BUND
 job_id="$(read_id.py job_with_permissions)"
 
 trace $CLI permissions get jobs "$job_id"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Update one permission and deploy again\n"
 update_file.py databricks.yml CAN_VIEW CAN_MANAGE
diff --git a/acceptance/bundle/resources/permissions/jobs/viewers/output.txt b/acceptance/bundle/resources/permissions/jobs/viewers/output.txt
index 69ab0ef32a4..8cae6715de1 100644
--- a/acceptance/bundle/resources/permissions/jobs/viewers/output.txt
+++ b/acceptance/bundle/resources/permissions/jobs/viewers/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt b/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt
index df6d261f19f..21a767cc790 100644
--- a/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt
+++ b/acceptance/bundle/resources/permissions/models/current_can_manage/out.deploy.txt
@@ -3,5 +3,5 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created models.foo
 Created models.foo.permissions
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/permissions/models/current_can_manage/script b/acceptance/bundle/resources/permissions/models/current_can_manage/script
index 0a6935c20b8..5f2fa0c32cd 100644
--- a/acceptance/bundle/resources/permissions/models/current_can_manage/script
+++ b/acceptance/bundle/resources/permissions/models/current_can_manage/script
@@ -1,9 +1,9 @@
 trace $CLI bundle validate -o json | jq .resources.$RESOURCE.foo.permissions
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace errcode $CLI bundle deploy &> out.deploy.txt
 
 # Register the model's numeric ID for output replacement.
diff --git a/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt
index a38fa993af1..e11c047fea9 100644
--- a/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/504/create/output.txt
@@ -2,7 +2,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 Warn: deploying resources.pipelines.foo.permissions: retrying after 504 Gateway Timeout from PUT /api/2.0/permissions/pipelines/[UUID]
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //api/2.0/permissions/pipelines
diff --git a/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt
index 4d502728ab0..fffa9dc1f9f 100644
--- a/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/504/plan/output.txt
@@ -1,7 +1,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/permissions/pipelines/504/plan/script b/acceptance/bundle/resources/permissions/pipelines/504/plan/script
index 10225da19ce..12e65049dd1 100644
--- a/acceptance/bundle/resources/permissions/pipelines/504/plan/script
+++ b/acceptance/bundle/resources/permissions/pipelines/504/plan/script
@@ -1,6 +1,6 @@
 # Deploy first so the permissions resource exists; plan reads it on subsequent runs.
 $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 fault.py "GET /api/2.0/permissions/pipelines/*" 504 0 1
 trace $CLI bundle plan
diff --git a/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt b/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt
index c5d3e763110..5e503ba833d 100644
--- a/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/504/update/output.txt
@@ -3,14 +3,14 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Warn: deploying resources.pipelines.foo.permissions: retrying after 504 Gateway Timeout from PUT /api/2.0/permissions/pipelines/[UUID]
 Updated pipelines.foo.permissions
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //api/2.0/permissions/pipelines
diff --git a/acceptance/bundle/resources/permissions/pipelines/504/update/script b/acceptance/bundle/resources/permissions/pipelines/504/update/script
index ed50417534c..07f5b3dccf2 100644
--- a/acceptance/bundle/resources/permissions/pipelines/504/update/script
+++ b/acceptance/bundle/resources/permissions/pipelines/504/update/script
@@ -6,7 +6,7 @@ update_file.py databricks.yml CAN_VIEW CAN_MANAGE
 # The retrying adapter should retry after DATABRICKS_BUNDLE_RETRY_INTERVAL_MS and succeed.
 fault.py "PUT /api/2.0/permissions/pipelines/*" 504 0 1
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Two PUT requests should appear: the initial 504 and the successful retry.
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..5398633bbfd 100644
--- a/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/current_can_manage/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..b2de6f365e6 100644
--- a/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/current_is_owner/output.txt
@@ -11,7 +11,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt b/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt
index 7ebaf7080a7..664b5afb0da 100644
--- a/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/empty_list/output.txt
@@ -5,7 +5,7 @@ null
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..5398633bbfd 100644
--- a/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/other_can_manage/output.txt
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..b8b061870c1 100644
--- a/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/other_is_owner/output.txt
@@ -15,7 +15,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/pipelines/update/output.txt b/acceptance/bundle/resources/permissions/pipelines/update/output.txt
index c2a0571b83f..c0c65518a1d 100644
--- a/acceptance/bundle/resources/permissions/pipelines/update/output.txt
+++ b/acceptance/bundle/resources/permissions/pipelines/update/output.txt
@@ -5,7 +5,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files...
 Created pipelines.foo
 Created pipelines.foo.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle
@@ -57,7 +57,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files...
 Updated pipelines.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle
@@ -72,7 +72,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files...
 Updated pipelines.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle
@@ -96,7 +96,7 @@ resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files...
 Deleted pipelines.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle --sort
@@ -111,7 +111,7 @@ Plan: 0 to add, 0 to change, 0 to delete, 1 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/permissions-test/default/files...
 Created pipelines.foo.permissions
-Files: 4 uploaded, 1 deleted
+Files: 2 uploaded, 1 deleted
 Resources: 1 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --nostamp //pipeline ^//api/2.0/bundle
diff --git a/acceptance/bundle/resources/permissions/pipelines/update/script b/acceptance/bundle/resources/permissions/pipelines/update/script
index 9ace44addb4..6cd4b2993cf 100644
--- a/acceptance/bundle/resources/permissions/pipelines/update/script
+++ b/acceptance/bundle/resources/permissions/pipelines/update/script
@@ -7,7 +7,7 @@ trace $CLI bundle plan
 pipeline_id="$(read_id.py foo)"
 
 trace $CLI permissions get pipelines "$pipeline_id"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Update one permission and deploy again\n"
 update_file.py databricks.yml CAN_VIEW CAN_MANAGE
@@ -40,4 +40,4 @@ trace $CLI bundle plan
 
 trace $CLI bundle destroy --auto-approve
 print_requests.py --nostamp //pipeline '^//api/2.0/bundle' > out.requests_destroy.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
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..adc2a9847e0 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
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created postgres_projects.foo
 Created postgres_projects.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..b3f44c0c496 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
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created sql_warehouses.foo
 Created sql_warehouses.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/permissions/target_permissions/output.txt b/acceptance/bundle/resources/permissions/target_permissions/output.txt
index b5e9c911998..502af4ade34 100644
--- a/acceptance/bundle/resources/permissions/target_permissions/output.txt
+++ b/acceptance/bundle/resources/permissions/target_permissions/output.txt
@@ -9,7 +9,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/test-bundle/files...
 Created jobs.foo
 Created jobs.foo.permissions
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
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..ed62ae876d4 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
@@ -23,7 +23,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created vector_search_endpoints.foo
 Created vector_search_endpoints.foo.permissions
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt
index 4ddbabbe7ed..e97efa84df6 100644
--- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt
+++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-bundle-deploy-pipeline-duplicate-names-[UNIQUE_NAME]/default/files...
 Created pipelines.pipeline_one
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //pipelines --nostamp
diff --git a/acceptance/bundle/resources/pipelines/allow-duplicate-names/script b/acceptance/bundle/resources/pipelines/allow-duplicate-names/script
index ec26ce55407..f1e8108b55c 100644
--- a/acceptance/bundle/resources/pipelines/allow-duplicate-names/script
+++ b/acceptance/bundle/resources/pipelines/allow-duplicate-names/script
@@ -5,7 +5,7 @@ touch foo.py
 cleanup() {
   trace $CLI bundle destroy --auto-approve
   trace $CLI pipelines delete ${PIPELINE_ID}
-  rm out.requests.txt
+  rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/pipelines/auto-approve/output.txt b/acceptance/bundle/resources/pipelines/auto-approve/output.txt
index 0b6b9441db5..7b5b1c73f3e 100644
--- a/acceptance/bundle/resources/pipelines/auto-approve/output.txt
+++ b/acceptance/bundle/resources/pipelines/auto-approve/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created jobs.foo
 Created pipelines.bar
-Files: 9 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert the pipeline is created
@@ -55,7 +55,7 @@ Error: the deployment requires destructive actions, but the current console does
 Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed.
 To proceed, use --auto-approve after reviewing the plan above.
 
-Files: 1 uploaded, 1 deleted
+Files: 0 uploaded, 1 deleted
 
 Exit code: 1
 
diff --git a/acceptance/bundle/resources/pipelines/drift/parameters/output.txt b/acceptance/bundle/resources/pipelines/drift/parameters/output.txt
index 5cdecffe532..9c743342b1b 100644
--- a/acceptance/bundle/resources/pipelines/drift/parameters/output.txt
+++ b/acceptance/bundle/resources/pipelines/drift/parameters/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline-parameters/default/files...
 Created pipelines.my
-Files: 0 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op: pipeline parameters round-trip on read
diff --git a/acceptance/bundle/resources/pipelines/drift/parameters/script b/acceptance/bundle/resources/pipelines/drift/parameters/script
index 1d9fd0f2c02..167c70e560d 100644
--- a/acceptance/bundle/resources/pipelines/drift/parameters/script
+++ b/acceptance/bundle/resources/pipelines/drift/parameters/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Initial deployment"
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt
index 8c25edb6b9e..a52a392388c 100644
--- a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt
+++ b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/output.txt
@@ -11,10 +11,10 @@ Validation OK!
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-lakeflow-pipeline-[UNIQUE_NAME]/default/files...
 Created pipelines.foo
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> jq -s .[] | select(.path=="/api/2.0/pipelines" and .method == "POST") | .body out.requests.txt
+>>> jq -s .[] | select(.path=="/api/2.0/pipelines" and .method == "POST") | .body [OUTPUT_DIR]/out.requests.txt
 {
   "channel": "CURRENT",
   "deployment": {
diff --git a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script
index a319f62fb18..61832825754 100644
--- a/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script
+++ b/acceptance/bundle/resources/pipelines/lakeflow-pipeline/script
@@ -3,10 +3,10 @@ trace $CLI bundle validate
 
 cleanup() {
   trace $CLI bundle destroy --auto-approve
-  rm out.requests.txt
+  rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 trace $CLI bundle deploy
 
-trace jq -s '.[] | select(.path=="/api/2.0/pipelines" and .method == "POST") | .body' out.requests.txt | nostamp
-rm out.requests.txt
+trace jq -s '.[] | select(.path=="/api/2.0/pipelines" and .method == "POST") | .body' "$OUT_REQUESTS" | nostamp
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.txt
index 039a1ce989c..af8f1cda0c0 100644
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.txt
+++ b/acceptance/bundle/resources/pipelines/num-workers-zero/out.deploy.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/num-workers-zero/default/files...
 Created pipelines.my
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/output.txt b/acceptance/bundle/resources/pipelines/num-workers-zero/output.txt
index 825621b4559..8025f179cb0 100644
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/output.txt
+++ b/acceptance/bundle/resources/pipelines/num-workers-zero/output.txt
@@ -1,2 +1,2 @@
 
->>> errcode jq -s .[] | select(.method == "POST" and (.path | contains("/pipelines"))) out.requests.txt
+>>> errcode jq -s .[] | select(.method == "POST" and (.path | contains("/pipelines"))) [OUTPUT_DIR]/out.requests.txt
diff --git a/acceptance/bundle/resources/pipelines/num-workers-zero/script b/acceptance/bundle/resources/pipelines/num-workers-zero/script
index d23c1e063de..c6b80aea392 100644
--- a/acceptance/bundle/resources/pipelines/num-workers-zero/script
+++ b/acceptance/bundle/resources/pipelines/num-workers-zero/script
@@ -1,3 +1,3 @@
 trace $CLI bundle deploy > out.deploy.txt 2>&1
-trace errcode jq -s '.[] | select(.method == "POST" and (.path | contains("/pipelines")))' out.requests.txt | nostamp > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
-rm out.requests.txt
+trace errcode jq -s '.[] | select(.method == "POST" and (.path | contains("/pipelines")))' "$OUT_REQUESTS" | nostamp > out.requests.$DATABRICKS_BUNDLE_ENGINE.txt 2>&1
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/pipelines/photon-true/output.txt b/acceptance/bundle/resources/pipelines/photon-true/output.txt
index 4dd3f036c63..a218e139310 100644
--- a/acceptance/bundle/resources/pipelines/photon-true/output.txt
+++ b/acceptance/bundle/resources/pipelines/photon-true/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/photon-true/default/files...
 Created pipelines.my
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 {
   "method": "POST",
diff --git a/acceptance/bundle/resources/pipelines/recreate-add-whole-block/output.txt b/acceptance/bundle/resources/pipelines/recreate-add-whole-block/output.txt
index 1227deacb91..4fb1129a44e 100644
--- a/acceptance/bundle/resources/pipelines/recreate-add-whole-block/output.txt
+++ b/acceptance/bundle/resources/pipelines/recreate-add-whole-block/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files...
 Created pipelines.my
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> update_file.py databricks.yml #TO_ADD:  
diff --git a/acceptance/bundle/resources/pipelines/recreate-add-whole-block/script b/acceptance/bundle/resources/pipelines/recreate-add-whole-block/script
index d137348fea9..9d56b42744f 100644
--- a/acceptance/bundle/resources/pipelines/recreate-add-whole-block/script
+++ b/acceptance/bundle/resources/pipelines/recreate-add-whole-block/script
@@ -14,4 +14,4 @@ trace update_file.py databricks.yml "#TO_ADD: " ""
 # rule on the connection_name leaf. See the per-engine "changes"/"action" in the JSON.
 $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/pipelines/recreate-keys/_script b/acceptance/bundle/resources/pipelines/recreate-keys/_script
index 1121836f497..00be2fd3e53 100644
--- a/acceptance/bundle/resources/pipelines/recreate-keys/_script
+++ b/acceptance/bundle/resources/pipelines/recreate-keys/_script
@@ -10,8 +10,8 @@ ppid1=`read_id.py my`
 print_requests() {
     # Excludes /api/2.0/bundle: a DMS operation path embeds the resource key, so it also
     # contains "/pipelines".
-    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipelines")) and (.path | contains("/api/2.0/bundle") | not))' < out.requests.txt | nostamp.py
-    rm -f out.requests.txt
+    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipelines")) and (.path | contains("/api/2.0/bundle") | not))' < "$OUT_REQUESTS" | nostamp.py
+    rm -f "$OUT_REQUESTS"
 }
 
 trace print_requests
@@ -35,4 +35,4 @@ trace $CLI bundle destroy --auto-approve
 
 trace print_requests
 trace musterr $CLI pipelines get $ppid2
-rm out.requests.txt
+rm "$OUT_REQUESTS"
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..00f7bea1300 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
@@ -22,7 +22,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files...
 Created pipelines.my
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests
@@ -69,7 +69,7 @@ restore the defined STs and MVs through full refresh. Note that recreation is ne
 properties such as the 'catalog' or 'storage' are changed:
   recreate resources.pipelines.my
 Recreated pipelines.my
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> 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..cfd5f551fae 100644
--- a/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt
+++ b/acceptance/bundle/resources/pipelines/recreate-keys/change-storage/output.txt
@@ -22,7 +22,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files...
 Created pipelines.my
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests
@@ -64,7 +64,7 @@ restore the defined STs and MVs through full refresh. Note that recreation is ne
 properties such as the 'catalog' or 'storage' are changed:
   recreate resources.pipelines.my
 Recreated pipelines.my
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests
diff --git a/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/output.txt b/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/output.txt
index dc99dd6f740..03124b664d0 100644
--- a/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/output.txt
+++ b/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/output.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files...
 Created pipelines.my
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/script b/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/script
index 416cd19e2df..edc3801d5ca 100644
--- a/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/script
+++ b/acceptance/bundle/resources/pipelines/recreate-remove-whole-block/script
@@ -14,4 +14,4 @@ grep -v '# TO_DELETE' databricks.yml > databricks.yml.tmp && mv databricks.yml.t
 # rule on the connection_name leaf. See the per-engine "changes"/"action" in the JSON.
 $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/pipelines/recreate/output.txt b/acceptance/bundle/resources/pipelines/recreate/output.txt
index 993909f9db3..e19c431df32 100644
--- a/acceptance/bundle/resources/pipelines/recreate/output.txt
+++ b/acceptance/bundle/resources/pipelines/recreate/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created pipelines.foo
 Created schemas.bar
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert the pipeline is created with catalog
@@ -54,7 +54,7 @@ Error: the deployment requires destructive actions, but the current console does
 Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed.
 To proceed, use --auto-approve after reviewing the plan above.
 
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 
 Exit code: 1
 
diff --git a/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt b/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt
index 9974f540860..13f90be0da7 100644
--- a/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt
+++ b/acceptance/bundle/resources/pipelines/remote_matches_config/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created pipelines.my_pipeline
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Make local change: run_as user -> changed@example.test
diff --git a/acceptance/bundle/resources/pipelines/remote_matches_config/script b/acceptance/bundle/resources/pipelines/remote_matches_config/script
index 6a6a334022e..a7a8ad692aa 100644
--- a/acceptance/bundle/resources/pipelines/remote_matches_config/script
+++ b/acceptance/bundle/resources/pipelines/remote_matches_config/script
@@ -17,4 +17,4 @@ EOF
 trace $CLI bundle plan
 $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/pipelines/update/output.txt b/acceptance/bundle/resources/pipelines/update/output.txt
index 7fdaa732497..893c814c68f 100644
--- a/acceptance/bundle/resources/pipelines/update/output.txt
+++ b/acceptance/bundle/resources/pipelines/update/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files...
 Created pipelines.my
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests
@@ -33,7 +33,7 @@ pipelines my id='[MY_ID]' name='test-pipeline-[UNIQUE_NAME]'
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/acc-[UNIQUE_NAME]/default/files...
 Updated pipelines.my
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Fetch pipeline ID and verify remote state
diff --git a/acceptance/bundle/resources/pipelines/update/script b/acceptance/bundle/resources/pipelines/update/script
index d9eb259cbb9..14a2aa0c94d 100644
--- a/acceptance/bundle/resources/pipelines/update/script
+++ b/acceptance/bundle/resources/pipelines/update/script
@@ -16,17 +16,17 @@ trace $CLI bundle deploy
 # fields that it previously received from the backend.
 # The get call below verifies that it does not matter -- the pipeline is the same in the end.
 #trace print_requests
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Fetch pipeline ID and verify remote state"
 
 ppid=`read_id.py my`
 trace $CLI pipelines get $ppid | nostamp
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Destroy the pipeline and verify that it's removed from the state and from remote"
 trace $CLI bundle destroy --auto-approve
 
 trace print_requests
 trace musterr $CLI pipelines get $ppid
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt b/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt
index c3199af2d35..29ca1e4ad29 100644
--- a/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt
+++ b/acceptance/bundle/resources/pipelines/zero-value-fields/output.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/zero-value-fields/default/files...
 Created pipelines.my
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/postgres_branches/basic/script b/acceptance/bundle/resources/postgres_branches/basic/script
index 56af9987f86..62f1e62c390 100644
--- a/acceptance/bundle/resources/postgres_branches/basic/script
+++ b/acceptance/bundle/resources/postgres_branches/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Get branch details
diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete/script b/acceptance/bundle/resources/postgres_branches/purge_on_delete/script
index bd6d3a4ae51..1b45f3f0d55 100644
--- a/acceptance/bundle/resources/postgres_branches/purge_on_delete/script
+++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete/script
@@ -10,13 +10,13 @@ cleanup() {
    $CLI postgres delete-branch --purge "${hard_branch}" 2>>LOG.delete-branch || true
    $CLI postgres delete-branch --purge "${soft_branch}" 2>>LOG.delete-branch || true
    $CLI postgres delete-project --purge "${project_name}" 2>>LOG.delete-project || true
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 trace $CLI bundle validate
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 trace $CLI postgres get-branch "${hard_branch}" | branch_fields
diff --git a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/script b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/script
index f743dc45177..916f33dc3a9 100644
--- a/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/script
+++ b/acceptance/bundle/resources/postgres_branches/purge_on_delete_transitions/script
@@ -8,7 +8,7 @@ cleanup() {
    # so the trash entry doesn't linger past the test.
    $CLI postgres delete-branch --purge "${branch_name}" 2>>LOG.delete-branch || true
    $CLI postgres delete-project --purge "${project_name}" 2>>LOG.delete-project || true
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -38,7 +38,7 @@ update_file.py databricks.yml "purge_on_delete: false" "# PURGE_ON_DELETE"
 trace $CLI bundle deploy
 trace get_purge
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "bundle destroy (branch DELETE must be a plain DELETE, no ?purge=true)"
 $CLI bundle destroy --auto-approve > out.destroy.txt 2>&1 || true
diff --git a/acceptance/bundle/resources/postgres_branches/recreate/script b/acceptance/bundle/resources/postgres_branches/recreate/script
index 6219513017b..d1d00d8f284 100755
--- a/acceptance/bundle/resources/postgres_branches/recreate/script
+++ b/acceptance/bundle/resources/postgres_branches/recreate/script
@@ -6,7 +6,7 @@ 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
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -16,7 +16,7 @@ envsubst < databricks.yml.tmpl | sed "s/BRANCH_ID_PLACEHOLDER/old-branch-${UNIQU
 trace cat databricks.yml
 
 trace $CLI bundle plan
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 branch_id_1=`read_id.py main`
diff --git a/acceptance/bundle/resources/postgres_branches/recreate_source_branch_time/script b/acceptance/bundle/resources/postgres_branches/recreate_source_branch_time/script
index a9fde00c2b7..9226792166d 100644
--- a/acceptance/bundle/resources/postgres_branches/recreate_source_branch_time/script
+++ b/acceptance/bundle/resources/postgres_branches/recreate_source_branch_time/script
@@ -2,18 +2,18 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 title "Initial deployment"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Change the fork point: source_branch_time is immutable, so this recreates"
 trace update_file.py databricks.yml "2026-01-01T00:00:00Z" "2026-02-01T00:00:00Z"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_branches.dev_branch" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy --auto-approve
 trace print_requests.py --del-body project_id,branch_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/postgres_branches/replace_existing/script b/acceptance/bundle/resources/postgres_branches/replace_existing/script
index d64adec24ab..c2e891fc326 100644
--- a/acceptance/bundle/resources/postgres_branches/replace_existing/script
+++ b/acceptance/bundle/resources/postgres_branches/replace_existing/script
@@ -3,13 +3,13 @@ envsubst < databricks.yml.tmpl > databricks.yml
 cleanup() {
    # Belt-and-braces in case bundle destroy was skipped or partially failed.
    $CLI postgres delete-project "projects/test-pg-proj-${UNIQUE_NAME}" 2>/dev/null || true
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 trace $CLI bundle validate
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Confirm the implicit production branch is now under management.
diff --git a/acceptance/bundle/resources/postgres_branches/update_expire_time/script b/acceptance/bundle/resources/postgres_branches/update_expire_time/script
index 7137f6820ac..7a91ddb441b 100644
--- a/acceptance/bundle/resources/postgres_branches/update_expire_time/script
+++ b/acceptance/bundle/resources/postgres_branches/update_expire_time/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ branch_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/dev-branch"
 
 title "Initial deployment"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI postgres get-branch "${branch_name}" | branch_fields
 
 title "Change expire_time and re-deploy"
@@ -20,7 +20,7 @@ trace update_file.py databricks.yml "2030-01-01T00:00:00Z" "2031-06-15T12:00:00Z
 # expiration oneof, and the direct engine masks it under its own name. See test.toml.
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_branches.dev_branch" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 trace print_requests.py --del-body project_id,branch_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI postgres get-branch "${branch_name}" | branch_fields
diff --git a/acceptance/bundle/resources/postgres_branches/update_protected/script b/acceptance/bundle/resources/postgres_branches/update_protected/script
index 1566c885831..03cb63d3501 100755
--- a/acceptance/bundle/resources/postgres_branches/update_protected/script
+++ b/acceptance/bundle/resources/postgres_branches/update_protected/script
@@ -2,21 +2,21 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 print_requests() {
     local name=$1
     trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.${name}.$DATABRICKS_BUNDLE_ENGINE.json
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_branches.dev_branch" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -29,7 +29,7 @@ trace $CLI postgres get-branch "${branch_name}" | branch_fields
 title "Verify no_change (no changes)"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests no_change
@@ -40,7 +40,7 @@ trace cat databricks.yml
 
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests update
@@ -52,7 +52,7 @@ title "Restore is_protected to false"
 trace update_file.py databricks.yml "is_protected: true" "is_protected: false"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '(.plan."resources.postgres_branches.dev_branch" // .) | del(.remote_state.status.logical_size_bytes)' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests restore
diff --git a/acceptance/bundle/resources/postgres_branches/update_ttl/script b/acceptance/bundle/resources/postgres_branches/update_ttl/script
index 4260c6513fa..dc8f09e67b1 100644
--- a/acceptance/bundle/resources/postgres_branches/update_ttl/script
+++ b/acceptance/bundle/resources/postgres_branches/update_ttl/script
@@ -6,13 +6,13 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 title "Initial deployment"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Change ttl and re-deploy"
 trace update_file.py databricks.yml "ttl: 604800s" "ttl: 259200s"
@@ -25,6 +25,6 @@ trace update_file.py databricks.yml "ttl: 604800s" "ttl: 259200s"
 # The update_mask each engine sends is what this test is about.
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_branches.dev_branch" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 trace print_requests.py --del-body project_id,branch_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.$DATABRICKS_BUNDLE_ENGINE.json
diff --git a/acceptance/bundle/resources/postgres_branches/without_branch_id/script b/acceptance/bundle/resources/postgres_branches/without_branch_id/script
index 519a143b445..6b718a8f22f 100755
--- a/acceptance/bundle/resources/postgres_branches/without_branch_id/script
+++ b/acceptance/bundle/resources/postgres_branches/without_branch_id/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    $CLI bundle destroy --auto-approve > /dev/null 2>&1 || true
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_catalogs/basic/script b/acceptance/bundle/resources/postgres_catalogs/basic/script
index 48f54855709..1863fcfce53 100644
--- a/acceptance/bundle/resources/postgres_catalogs/basic/script
+++ b/acceptance/bundle/resources/postgres_catalogs/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Get catalog details. Hide volatile fields so cloud and local match.
diff --git a/acceptance/bundle/resources/postgres_catalogs/recreate/script b/acceptance/bundle/resources/postgres_catalogs/recreate/script
index 4d9de784299..7eeb291608f 100644
--- a/acceptance/bundle/resources/postgres_catalogs/recreate/script
+++ b/acceptance/bundle/resources/postgres_catalogs/recreate/script
@@ -1,6 +1,6 @@
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_databases/basic/script b/acceptance/bundle/resources/postgres_databases/basic/script
index 0fed53dfcf9..03877c7260b 100644
--- a/acceptance/bundle/resources/postgres_databases/basic/script
+++ b/acceptance/bundle/resources/postgres_databases/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Get database details
diff --git a/acceptance/bundle/resources/postgres_databases/recreate/script b/acceptance/bundle/resources/postgres_databases/recreate/script
index 578e6df92b1..108ac2f69d1 100644
--- a/acceptance/bundle/resources/postgres_databases/recreate/script
+++ b/acceptance/bundle/resources/postgres_databases/recreate/script
@@ -7,7 +7,7 @@ cleanup() {
    $CLI postgres delete-database "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/databases/test-database-${UNIQUE_NAME}" 2>/dev/null || true
    $CLI postgres delete-database "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/databases/test-database-${UNIQUE_NAME}-v2" 2>/dev/null || true
 
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_databases/replace_existing/script b/acceptance/bundle/resources/postgres_databases/replace_existing/script
index 65db8cd6ae7..799abd4493c 100644
--- a/acceptance/bundle/resources/postgres_databases/replace_existing/script
+++ b/acceptance/bundle/resources/postgres_databases/replace_existing/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -18,7 +18,7 @@ title "Plan after unbind: the bundle wants to (re-)create the database"
 trace $CLI bundle plan
 
 title "Re-deploy: replace_existing adopts the already-existing database instead of erroring"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 title "Confirm the database is under management again"
diff --git a/acceptance/bundle/resources/postgres_databases/update/script b/acceptance/bundle/resources/postgres_databases/update/script
index bdbad2b67c6..54c76aa8d59 100644
--- a/acceptance/bundle/resources/postgres_databases/update/script
+++ b/acceptance/bundle/resources/postgres_databases/update/script
@@ -2,21 +2,21 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 print_requests() {
     local name=$1
     trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.${name}.$DATABRICKS_BUNDLE_ENGINE.json
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -30,7 +30,7 @@ trace $CLI postgres get-database "${database_name}" | database_fields
 title "Verify no changes"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests no_change
@@ -41,7 +41,7 @@ trace cat databricks.yml
 
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests update
@@ -53,7 +53,7 @@ title "Restore postgres_database to original value"
 trace update_file.py databricks.yml "postgres_database: renamed_db_name" "postgres_database: initial_db_name"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_databases.my_database" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests restore
diff --git a/acceptance/bundle/resources/postgres_endpoints/add_settings/script b/acceptance/bundle/resources/postgres_endpoints/add_settings/script
index ceeea8f6008..049a4f663be 100644
--- a/acceptance/bundle/resources/postgres_endpoints/add_settings/script
+++ b/acceptance/bundle/resources/postgres_endpoints/add_settings/script
@@ -2,13 +2,13 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 title "Initial deployment with no settings block"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Add a settings block and re-deploy"
 # Going from absent to present leaves one change path, settings, with no children,
diff --git a/acceptance/bundle/resources/postgres_endpoints/basic/script b/acceptance/bundle/resources/postgres_endpoints/basic/script
index 7a2be07d9f5..92fb20fc004 100755
--- a/acceptance/bundle/resources/postgres_endpoints/basic/script
+++ b/acceptance/bundle/resources/postgres_endpoints/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Get endpoint details
diff --git a/acceptance/bundle/resources/postgres_endpoints/recreate/script b/acceptance/bundle/resources/postgres_endpoints/recreate/script
index 6d4e7d62e1a..2339fb590df 100755
--- a/acceptance/bundle/resources/postgres_endpoints/recreate/script
+++ b/acceptance/bundle/resources/postgres_endpoints/recreate/script
@@ -7,7 +7,7 @@ cleanup() {
    $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
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/script b/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/script
index 006dea166e1..ba38c4a714e 100644
--- a/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/script
+++ b/acceptance/bundle/resources/postgres_endpoints/remove_suspend_timeout/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ endpoint_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/main/endpoints/my-e
 
 title "Initial deployment with suspend_timeout_duration: 300s"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields
 
 title "Remove suspend_timeout_duration: neither engine can apply it"
@@ -23,7 +23,7 @@ trace update_file.py databricks.yml "      suspend_timeout_duration: 300s" ""
 # test.toml.
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 errcode $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
 trace print_requests.py --del-body project_id,branch_id,endpoint_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.$DATABRICKS_BUNDLE_ENGINE.json
 
diff --git a/acceptance/bundle/resources/postgres_endpoints/replace_existing/script b/acceptance/bundle/resources/postgres_endpoints/replace_existing/script
index 4c88b1f8f18..05016df6a1e 100644
--- a/acceptance/bundle/resources/postgres_endpoints/replace_existing/script
+++ b/acceptance/bundle/resources/postgres_endpoints/replace_existing/script
@@ -3,13 +3,13 @@ envsubst < databricks.yml.tmpl > databricks.yml
 cleanup() {
    # Belt-and-braces in case bundle destroy was skipped or partially failed.
    $CLI postgres delete-project "projects/test-pg-proj-${UNIQUE_NAME}" 2>/dev/null || true
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 trace $CLI bundle validate
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # The implicit primary endpoint inherits suspend_timeout_duration from the
diff --git a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script
index f2506c21a01..3feacc57539 100755
--- a/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script
+++ b/acceptance/bundle/resources/postgres_endpoints/update_autoscaling/script
@@ -2,21 +2,21 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 print_requests() {
     local name=$1
     trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.${name}.$DATABRICKS_BUNDLE_ENGINE.json
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -30,7 +30,7 @@ trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields
 title "Verify no changes"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests no_change
@@ -41,7 +41,7 @@ trace cat databricks.yml
 
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests update
@@ -53,7 +53,7 @@ title "Restore endpoint autoscaling to original value"
 trace update_file.py databricks.yml "autoscaling_limit_max_cu: 4" "autoscaling_limit_max_cu: 8"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" // . | del(.remote_state)' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests restore
diff --git a/acceptance/bundle/resources/postgres_endpoints/update_pg_settings/script b/acceptance/bundle/resources/postgres_endpoints/update_pg_settings/script
index ef58063e368..22e28508fba 100644
--- a/acceptance/bundle/resources/postgres_endpoints/update_pg_settings/script
+++ b/acceptance/bundle/resources/postgres_endpoints/update_pg_settings/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ endpoint_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/main/endpoints/my-e
 
 title "Initial deployment with pg_settings.statement_timeout: 8000"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Change the value of one pg_settings key"
 trace update_file.py databricks.yml "statement_timeout: 8000" "statement_timeout: 16000"
@@ -23,7 +23,7 @@ trace update_file.py databricks.yml "statement_timeout: 8000" "statement_timeout
 # 400 "Unknown field path in update_mask".
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # The mask each engine sends: direct names the map, terraform replaces the whole spec.
diff --git a/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/script b/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/script
index 72697dacbea..41637c130e6 100644
--- a/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/script
+++ b/acceptance/bundle/resources/postgres_endpoints/update_suspend_timeout/script
@@ -7,7 +7,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -15,7 +15,7 @@ endpoint_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/main/endpoints/my-e
 
 title "Initial deployment with suspend_timeout_duration: 300s"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI postgres get-endpoint "${endpoint_name}" | endpoint_fields
 
 title "Change suspend_timeout_duration to 600s"
@@ -27,7 +27,7 @@ title "Plan and deploy"
 # is the one per-engine file left.
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_endpoints.my_endpoint" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # The update_mask each engine sends is the whole point of this test.
diff --git a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/script b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/script
index 519a143b445..6b718a8f22f 100755
--- a/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/script
+++ b/acceptance/bundle/resources/postgres_endpoints/without_endpoint_id/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    $CLI bundle destroy --auto-approve > /dev/null 2>&1 || true
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/script b/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/script
index cbb95d03073..9a86e0ac38b 100644
--- a/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/script
+++ b/acceptance/bundle/resources/postgres_projects/add_default_endpoint_settings/script
@@ -2,13 +2,13 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 title "Initial deployment with no default_endpoint_settings block"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Add the whole default_endpoint_settings block and re-deploy"
 trace update_file.py databricks.yml "#TO_ADD: " ""
diff --git a/acceptance/bundle/resources/postgres_projects/basic/script b/acceptance/bundle/resources/postgres_projects/basic/script
index f2ac6abbcfe..fe9968ef048 100755
--- a/acceptance/bundle/resources/postgres_projects/basic/script
+++ b/acceptance/bundle/resources/postgres_projects/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Direct mode already waits for the project to be READY during deployment
@@ -20,5 +20,5 @@ trace $CLI postgres get-project "projects/test-pg-proj-${UNIQUE_NAME}" | project
 trace $CLI bundle summary
 
 # Filter requests to only show postgres API operations (exclude workspace, telemetry, and operation polling)
-# Keep the original out.requests.txt for debugging
+# Keep the original "$OUT_REQUESTS" for debugging
 trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.json
diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete/script b/acceptance/bundle/resources/postgres_projects/purge_on_delete/script
index 12fc3d5cb1e..5d965405116 100644
--- a/acceptance/bundle/resources/postgres_projects/purge_on_delete/script
+++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete/script
@@ -5,13 +5,13 @@ cleanup() {
    # The soft-delete case leaves a record in the trash; --purge clears it.
    $CLI postgres delete-project --purge "projects/test-pg-proj-hard-${UNIQUE_NAME}" 2>>LOG.delete-project || true
    $CLI postgres delete-project --purge "projects/test-pg-proj-soft-${UNIQUE_NAME}" 2>>LOG.delete-project || true
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 trace $CLI bundle validate
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 trace $CLI postgres get-project "projects/test-pg-proj-hard-${UNIQUE_NAME}" | project_fields
diff --git a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/script b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/script
index 958d4e2d980..e80b4922cd9 100644
--- a/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/script
+++ b/acceptance/bundle/resources/postgres_projects/purge_on_delete_transitions/script
@@ -4,7 +4,7 @@ cleanup() {
    # After this test the destroy should be a soft delete; --purge here so the
    # trash entry doesn't linger past the test.
    $CLI postgres delete-project --purge "projects/test-pg-proj-${UNIQUE_NAME}" 2>>LOG.delete-project || true
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -34,7 +34,7 @@ update_file.py databricks.yml "purge_on_delete: false" "# PURGE_ON_DELETE"
 trace $CLI bundle deploy
 trace get_purge
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "bundle destroy (must be a plain DELETE, no ?purge=true)"
 $CLI bundle destroy --auto-approve > out.destroy.txt 2>&1 || true
diff --git a/acceptance/bundle/resources/postgres_projects/recreate/script b/acceptance/bundle/resources/postgres_projects/recreate/script
index 7ed7fdd0f2d..e4fd06727dc 100644
--- a/acceptance/bundle/resources/postgres_projects/recreate/script
+++ b/acceptance/bundle/resources/postgres_projects/recreate/script
@@ -6,7 +6,7 @@ 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
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -16,7 +16,7 @@ envsubst < databricks.yml.tmpl | sed "s/PROJECT_ID_PLACEHOLDER/test-pg-old-${UNI
 trace cat databricks.yml
 
 trace $CLI bundle plan
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 project_id_1=`read_id.py my_project`
diff --git a/acceptance/bundle/resources/postgres_projects/remove_history_retention/script b/acceptance/bundle/resources/postgres_projects/remove_history_retention/script
index 31a3bbcc223..90fc57abea5 100644
--- a/acceptance/bundle/resources/postgres_projects/remove_history_retention/script
+++ b/acceptance/bundle/resources/postgres_projects/remove_history_retention/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,14 +10,14 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}"
 
 title "Initial deployment with history_retention_duration: 604800s"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI postgres get-project "${project_name}" | project_fields
 
 title "Remove history_retention_duration and re-deploy"
 trace update_file.py databricks.yml "      history_retention_duration: 604800s" ""
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 errcode $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
 trace print_requests.py --del-body project_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.$DATABRICKS_BUNDLE_ENGINE.json
 
diff --git a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/script b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/script
index 24a37740c5c..a00ce644da6 100644
--- a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/script
+++ b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_autoscaling/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}"
 
 title "Initial deployment"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Change one field inside default_endpoint_settings"
 # The bundle declares no suspension field, which is what makes this a regression test:
diff --git a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/script b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/script
index e90f3099d79..2125a4af7fe 100644
--- a/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/script
+++ b/acceptance/bundle/resources/postgres_projects/update_default_endpoint_suspend/script
@@ -7,7 +7,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -15,7 +15,7 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}"
 
 title "Initial deployment"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI postgres get-project "${project_name}" | project_fields
 
 title "Change default_endpoint_settings.suspend_timeout_duration and re-deploy"
@@ -26,7 +26,7 @@ trace update_file.py databricks.yml "suspend_timeout_duration: 300s" "suspend_ti
 # direct engine masks it under its own name. See test.toml.
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 trace print_requests.py --del-body project_id --sort '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.$DATABRICKS_BUNDLE_ENGINE.json
 trace $CLI postgres get-project "${project_name}" | project_fields
diff --git a/acceptance/bundle/resources/postgres_projects/update_display_name/script b/acceptance/bundle/resources/postgres_projects/update_display_name/script
index 657eca21869..f06754b9790 100755
--- a/acceptance/bundle/resources/postgres_projects/update_display_name/script
+++ b/acceptance/bundle/resources/postgres_projects/update_display_name/script
@@ -2,21 +2,21 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 print_requests() {
     local name=$1
     trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.${name}.$DATABRICKS_BUNDLE_ENGINE.json
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -28,7 +28,7 @@ trace $CLI postgres get-project "${project_name}" | project_fields
 title "Verify no changes"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests no_change
@@ -39,7 +39,7 @@ trace cat databricks.yml
 
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests update
@@ -51,7 +51,7 @@ title "Restore display_name to original value"
 trace update_file.py databricks.yml "Updated Name" "Original Name"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests restore
diff --git a/acceptance/bundle/resources/postgres_projects/update_history_retention/script b/acceptance/bundle/resources/postgres_projects/update_history_retention/script
index 7eb2c95f0a8..b1a703f3732 100644
--- a/acceptance/bundle/resources/postgres_projects/update_history_retention/script
+++ b/acceptance/bundle/resources/postgres_projects/update_history_retention/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,14 +10,14 @@ project_name="projects/test-pg-proj-${UNIQUE_NAME}"
 
 title "Initial deployment with history_retention_duration: 604800s"
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI postgres get-project "${project_name}" | project_fields
 
 title "Change history_retention_duration to 259200s and re-deploy"
 trace update_file.py databricks.yml "history_retention_duration: 604800s" "history_retention_duration: 259200s"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_projects.my_project" | {action, changes}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Unlike the suspension oneof, history_retention_duration is masked under its own
diff --git a/acceptance/bundle/resources/postgres_roles/basic/script b/acceptance/bundle/resources/postgres_roles/basic/script
index bd91b06dd39..8d9c88c73b6 100644
--- a/acceptance/bundle/resources/postgres_roles/basic/script
+++ b/acceptance/bundle/resources/postgres_roles/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Get role details
diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/script b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/script
index d98aed3e270..f078f512b16 100644
--- a/acceptance/bundle/resources/postgres_roles/inherited-role-bind/script
+++ b/acceptance/bundle/resources/postgres_roles/inherited-role-bind/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/script b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/script
index 0999984022d..4b2c909d32b 100644
--- a/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/script
+++ b/acceptance/bundle/resources/postgres_roles/inherited-role-conflict/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script
index 18041234f7a..bcbb56aad86 100644
--- a/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script
+++ b/acceptance/bundle/resources/postgres_roles/recreate-postgres-role/script
@@ -4,7 +4,7 @@ cleanup() {
    # Best-effort cleanup if a deploy left the role behind.
    $CLI postgres delete-role "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/roles/test-role-${UNIQUE_NAME}" 2>/dev/null || true
 
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_roles/recreate/script b/acceptance/bundle/resources/postgres_roles/recreate/script
index 922b5abaa16..74c3a7362e7 100644
--- a/acceptance/bundle/resources/postgres_roles/recreate/script
+++ b/acceptance/bundle/resources/postgres_roles/recreate/script
@@ -5,7 +5,7 @@ cleanup() {
    $CLI postgres delete-role "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/roles/test-role-${UNIQUE_NAME}" 2>/dev/null || true
    $CLI postgres delete-role "projects/test-pg-proj-${UNIQUE_NAME}/branches/main/roles/test-role-${UNIQUE_NAME}-v2" 2>/dev/null || true
 
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_roles/replace_existing/script b/acceptance/bundle/resources/postgres_roles/replace_existing/script
index b7a64f0cc49..81cdb4b7924 100644
--- a/acceptance/bundle/resources/postgres_roles/replace_existing/script
+++ b/acceptance/bundle/resources/postgres_roles/replace_existing/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -18,7 +18,7 @@ title "Plan after unbind: the bundle wants to (re-)create the role"
 trace $CLI bundle plan
 
 title "Re-deploy: replace_existing adopts the already-existing role instead of erroring"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 title "Confirm the role is under management again"
diff --git a/acceptance/bundle/resources/postgres_roles/update/script b/acceptance/bundle/resources/postgres_roles/update/script
index 5eea84136a6..6073dd3a11f 100644
--- a/acceptance/bundle/resources/postgres_roles/update/script
+++ b/acceptance/bundle/resources/postgres_roles/update/script
@@ -2,21 +2,21 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 print_requests() {
     local name=$1
     trace print_requests.py --del-body project_id,branch_id,endpoint_id,database_id,role_id,catalog_id,synced_table_id --keep --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.${name}.$DATABRICKS_BUNDLE_ENGINE.json
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 title "Initial deployment"
 trace $CLI bundle validate
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.create.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -29,7 +29,7 @@ trace $CLI postgres get-role "${role_name}" | role_fields
 title "Verify no changes"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.no_change.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests no_change
@@ -40,7 +40,7 @@ trace cat databricks.yml
 
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.update.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests update
@@ -51,7 +51,7 @@ title "Restore attributes.createdb to original value"
 trace update_file.py databricks.yml "createdb: true" "createdb: false"
 trace $CLI bundle plan
 trace $CLI bundle plan -o json | nostamp | jq '.plan."resources.postgres_roles.my_role" // .' > out.plan.restore.$DATABRICKS_BUNDLE_ENGINE.json
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests restore
diff --git a/acceptance/bundle/resources/postgres_snapshot_schedules/basic/script b/acceptance/bundle/resources/postgres_snapshot_schedules/basic/script
index 856fbfe2ee0..7f0fb2587c5 100644
--- a/acceptance/bundle/resources/postgres_snapshot_schedules/basic/script
+++ b/acceptance/bundle/resources/postgres_snapshot_schedules/basic/script
@@ -1,6 +1,6 @@
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -8,7 +8,7 @@ schedule_name="projects/test-pg-proj-${UNIQUE_NAME}/branches/production/snapshot
 
 title "Create with a snapshot schedule"
 envsubst < databricks.yml.tmpl > databricks.yml
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 trace $CLI postgres get-snapshot-schedule "${schedule_name}" | snapshot_schedule_fields
 print_requests.py --del-body parent,project_id,branch_id --sort --get '//postgres' '^//workspace-files/' '^//workspace/' '^//telemetry-ext' '^//operations/' > out.requests.create.txt
diff --git a/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/script b/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/script
index b97e30fd848..1f83eee1657 100644
--- a/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/script
+++ b/acceptance/bundle/resources/postgres_snapshot_schedules/out-of-band/script
@@ -1,6 +1,6 @@
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/postgres_synced_tables/basic/script b/acceptance/bundle/resources/postgres_synced_tables/basic/script
index 68b04d83301..7ce35fa0fbd 100644
--- a/acceptance/bundle/resources/postgres_synced_tables/basic/script
+++ b/acceptance/bundle/resources/postgres_synced_tables/basic/script
@@ -16,7 +16,7 @@ cleanup() {
     echo "Cleaning up temporary source table"
     $CLI tables delete main.source_$UNIQUE_NAME.trips_source || true
     $CLI schemas delete main.source_$UNIQUE_NAME || true
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -24,7 +24,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Keep only the deterministic identity + provisioning-state. detailed_state
diff --git a/acceptance/bundle/resources/postgres_synced_tables/recreate/script b/acceptance/bundle/resources/postgres_synced_tables/recreate/script
index de437c0c151..988e186b35e 100644
--- a/acceptance/bundle/resources/postgres_synced_tables/recreate/script
+++ b/acceptance/bundle/resources/postgres_synced_tables/recreate/script
@@ -12,7 +12,7 @@ cleanup() {
     echo "Cleaning up temporary source table"
     $CLI tables delete main.source_$UNIQUE_NAME.trips_source || true
     $CLI schemas delete main.source_$UNIQUE_NAME || true
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.direct.txt b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.direct.txt
index 1df75fb382e..d260584b524 100644
--- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.direct.txt
+++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.direct.txt
@@ -2,5 +2,5 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files...
 Recreated quality_monitors.monitor1
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.terraform.txt b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.terraform.txt
index 7f8eac349e8..f10ff7b9f90 100644
--- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.terraform.txt
+++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/out.deploy.terraform.txt
@@ -16,6 +16,6 @@ This is a bug in the provider, which should be reported in the provider's own
 issue tracker.
 
 
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 
 Exit code: 1
diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt b/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt
index 15c9c619892..77463a68c7b 100644
--- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt
+++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/output.txt
@@ -17,7 +17,7 @@ Table main.qm_test_[UNIQUE_NAME].test_table is now visible (catalog_name=main)
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files...
 Created quality_monitors.monitor1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/quality_monitors/change_assets_dir/script b/acceptance/bundle/resources/quality_monitors/change_assets_dir/script
index 46ca61613f3..cb01f841677 100644
--- a/acceptance/bundle/resources/quality_monitors/change_assets_dir/script
+++ b/acceptance/bundle/resources/quality_monitors/change_assets_dir/script
@@ -11,7 +11,7 @@ cleanup() {
     trace $CLI bundle destroy --auto-approve
     $CLI schemas delete "$SCHEMA_NAME" --force 2>/dev/null || true
     $CLI schemas delete "qm_test_${UNIQUE_NAME}_2" --force 2>/dev/null || true
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -29,7 +29,7 @@ trace errcode $CLI bundle plan &> out.plan.$DATABRICKS_BUNDLE_ENGINE.txt
 errcode $CLI bundle plan -o json &> .databricks/tmp.plan.json
 nostamp < .databricks/tmp.plan.json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace errcode $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
 trace print_requests.py '^//api/2.0/bundle' '^//import-file/' '^//workspace/' '^//telemetry-ext' > out.deploy.requests.$DATABRICKS_BUNDLE_ENGINE.json
 trace errcode $CLI bundle plan &> out.plan_after_deploy.$DATABRICKS_BUNDLE_ENGINE.txt
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 39440e27097..c1a88b69bd2 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
@@ -17,7 +17,7 @@ Table main.qm_test_[UNIQUE_NAME].test_table is now visible (catalog_name=main)
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files...
 Created quality_monitors.monitor1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
@@ -33,7 +33,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files...
 Updated quality_monitors.monitor1
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py ^//api/2.0/bundle ^//import-file/ ^//workspace/ ^//telemetry-ext
diff --git a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/script b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/script
index df938d45ea2..08e1e8e3ffd 100644
--- a/acceptance/bundle/resources/quality_monitors/change_output_schema_name/script
+++ b/acceptance/bundle/resources/quality_monitors/change_output_schema_name/script
@@ -9,7 +9,7 @@ cleanup() {
     trace $CLI bundle destroy --auto-approve
     $CLI schemas delete "$SCHEMA_NAME" --force 2>/dev/null || true
     $CLI schemas delete "qm_test_${UNIQUE_NAME}_2" --force 2>/dev/null || true
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -24,7 +24,7 @@ update_file.py databricks.yml "output_schema_name: main.qm_test_${UNIQUE_NAME}"
 trace $CLI bundle plan | contains.py "1 to change"
 trace $CLI bundle plan -o json | nostamp > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace $CLI bundle deploy
 # dashboard_id is output only field that terraform adds
 trace print_requests.py '^//api/2.0/bundle' '^//import-file/' '^//workspace/' '^//telemetry-ext' | grep -v '"dashboard_id":' > out.deploy.requests.json
diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/out.deploy.direct.txt b/acceptance/bundle/resources/quality_monitors/change_table_name/out.deploy.direct.txt
index 1df75fb382e..d260584b524 100644
--- a/acceptance/bundle/resources/quality_monitors/change_table_name/out.deploy.direct.txt
+++ b/acceptance/bundle/resources/quality_monitors/change_table_name/out.deploy.direct.txt
@@ -2,5 +2,5 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files...
 Recreated quality_monitors.monitor1
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt b/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt
index a4cf55d5c37..0051a52528f 100644
--- a/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt
+++ b/acceptance/bundle/resources/quality_monitors/change_table_name/output.txt
@@ -17,7 +17,7 @@ Table main.qm_test_[UNIQUE_NAME].test_table_2 is now visible (catalog_name=main)
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files...
 Created quality_monitors.monitor1
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle plan
diff --git a/acceptance/bundle/resources/quality_monitors/change_table_name/script b/acceptance/bundle/resources/quality_monitors/change_table_name/script
index b607150e70e..7f9093dbdfa 100644
--- a/acceptance/bundle/resources/quality_monitors/change_table_name/script
+++ b/acceptance/bundle/resources/quality_monitors/change_table_name/script
@@ -11,7 +11,7 @@ cleanup() {
     trace $CLI bundle destroy --auto-approve
     $CLI schemas delete "$SCHEMA_NAME" --force 2>/dev/null || true
     $CLI schemas delete "qm_test_${UNIQUE_NAME}_2" --force 2>/dev/null || true
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -29,7 +29,7 @@ trace errcode $CLI bundle plan &> out.plan.$DATABRICKS_BUNDLE_ENGINE.txt
 errcode $CLI bundle plan -o json &> .databricks/tmp.plan.json
 nostamp < .databricks/tmp.plan.json > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace errcode $CLI bundle deploy &> out.deploy.$DATABRICKS_BUNDLE_ENGINE.txt
 trace print_requests.py '^//api/2.0/bundle' '^//import-file/' '^//workspace/' '^//telemetry-ext' > out.deploy.requests.$DATABRICKS_BUNDLE_ENGINE.json
 trace errcode $CLI bundle plan &> out.plan_after_deploy.$DATABRICKS_BUNDLE_ENGINE.txt
diff --git a/acceptance/bundle/resources/quality_monitors/create/out.deploy.txt b/acceptance/bundle/resources/quality_monitors/create/out.deploy.txt
index dbddf27fb68..82c6314589e 100644
--- a/acceptance/bundle/resources/quality_monitors/create/out.deploy.txt
+++ b/acceptance/bundle/resources/quality_monitors/create/out.deploy.txt
@@ -2,5 +2,5 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/quality-monitor-update-[UNIQUE_NAME]/default/files...
 Created quality_monitors.monitor1
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/resources/quality_monitors/create/script b/acceptance/bundle/resources/quality_monitors/create/script
index ca80c3552f5..e3466c9a386 100644
--- a/acceptance/bundle/resources/quality_monitors/create/script
+++ b/acceptance/bundle/resources/quality_monitors/create/script
@@ -11,7 +11,7 @@ cleanup() {
     # Clean up schemas and table (suppress errors since they may already be gone)
     $CLI schemas delete "$SCHEMA_NAME" --force 2>/dev/null || true
     $CLI schemas delete "qm_test_${UNIQUE_NAME}_2" --force 2>/dev/null || true
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -19,7 +19,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 trace $CLI bundle plan -o json | nostamp > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace $CLI bundle deploy &> out.deploy.txt
 trace print_requests.py '^//api/2.0/bundle' '^//import-file/' '^//workspace/' '^//telemetry-ext' > out.deploy.requests.json
 
diff --git a/acceptance/bundle/resources/registered_models/aliases_converge/output.txt b/acceptance/bundle/resources/registered_models/aliases_converge/output.txt
index 3f201aa8149..b0a3baf8c8d 100644
--- a/acceptance/bundle/resources/registered_models/aliases_converge/output.txt
+++ b/acceptance/bundle/resources/registered_models/aliases_converge/output.txt
@@ -5,7 +5,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-aliases-[UNIQUE_NAME]/default/files...
 Created registered_models.my_registered_model
-Files: 0 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op: GET never echoes aliases, so they must not drift
@@ -40,7 +40,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-aliases-[UNIQUE_NAME]/default/files...
 Updated registered_models.my_registered_model
-Files: 0 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Re-plan after the edit converges: no further changes
diff --git a/acceptance/bundle/resources/registered_models/aliases_converge/script b/acceptance/bundle/resources/registered_models/aliases_converge/script
index 599559cd631..5e5f70f5cc7 100644
--- a/acceptance/bundle/resources/registered_models/aliases_converge/script
+++ b/acceptance/bundle/resources/registered_models/aliases_converge/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 trace export COMMENT="original comment"
 envsubst < databricks.yml.tmpl > databricks.yml
diff --git a/acceptance/bundle/resources/registered_models/basic/output.txt b/acceptance/bundle/resources/registered_models/basic/output.txt
index b6173728333..b4f3c05ad6f 100644
--- a/acceptance/bundle/resources/registered_models/basic/output.txt
+++ b/acceptance/bundle/resources/registered_models/basic/output.txt
@@ -27,7 +27,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files...
 Created registered_models.my_registered_model
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] registered-models get main.default.my-registered-model-[UNIQUE_NAME]
@@ -47,7 +47,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files...
 Updated registered_models.my_registered_model
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] registered-models get main.default.my-registered-model-[UNIQUE_NAME]
@@ -67,7 +67,7 @@ Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files...
 Recreated registered_models.my_registered_model
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> [CLI] registered-models get main.default.my-registered-model-updated-[UNIQUE_NAME]
@@ -87,7 +87,7 @@ Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files...
 Recreated registered_models.my_registered_model
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> [CLI] registered-models get mycatalog-[UNIQUE_NAME].default.my-registered-model-updated-[UNIQUE_NAME]
@@ -107,7 +107,7 @@ Plan: 1 to add, 0 to change, 1 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-registered-models-basic-[UNIQUE_NAME]/default/files...
 Recreated registered_models.my_registered_model
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> [CLI] registered-models get mycatalog-[UNIQUE_NAME].myschema-[UNIQUE_NAME].my-registered-model-updated-[UNIQUE_NAME]
diff --git a/acceptance/bundle/resources/registered_models/drift/browse_only/output.txt b/acceptance/bundle/resources/registered_models/drift/browse_only/output.txt
index 7254f7b1f0f..1928b848bb3 100644
--- a/acceptance/bundle/resources/registered_models/drift/browse_only/output.txt
+++ b/acceptance/bundle/resources/registered_models/drift/browse_only/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created registered_models.model1
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op despite the backend computing browse_only
diff --git a/acceptance/bundle/resources/registered_models/drift/browse_only/script b/acceptance/bundle/resources/registered_models/drift/browse_only/script
index 43b100b2fc1..e6db1dad545 100644
--- a/acceptance/bundle/resources/registered_models/drift/browse_only/script
+++ b/acceptance/bundle/resources/registered_models/drift/browse_only/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Initial deployment"
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/schemas/auto-approve/output.txt b/acceptance/bundle/resources/schemas/auto-approve/output.txt
index 0cf3d6fe0de..9a925613e6c 100644
--- a/acceptance/bundle/resources/schemas/auto-approve/output.txt
+++ b/acceptance/bundle/resources/schemas/auto-approve/output.txt
@@ -3,7 +3,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created pipelines.foo
 Created schemas.bar
-Files: 8 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === Assert the schema is created
@@ -62,7 +62,7 @@ Error: the deployment requires destructive actions, but the current console does
 Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed.
 To proceed, use --auto-approve after reviewing the plan above.
 
-Files: 2 uploaded, 1 deleted
+Files: 1 uploaded, 1 deleted
 
 === Test cleanup
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/schemas/drift/managed_properties/output.txt b/acceptance/bundle/resources/schemas/drift/managed_properties/output.txt
index 53d54f1357c..8977fef99ba 100644
--- a/acceptance/bundle/resources/schemas/drift/managed_properties/output.txt
+++ b/acceptance/bundle/resources/schemas/drift/managed_properties/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created schemas.schema1
-Files: 0 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Plan is a no-op despite UC auto-populating managed properties
diff --git a/acceptance/bundle/resources/schemas/drift/managed_properties/script b/acceptance/bundle/resources/schemas/drift/managed_properties/script
index 9fc669456a9..858650e72a1 100644
--- a/acceptance/bundle/resources/schemas/drift/managed_properties/script
+++ b/acceptance/bundle/resources/schemas/drift/managed_properties/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 
 title "Initial deployment"
 trace $CLI bundle deploy
diff --git a/acceptance/bundle/resources/schemas/recreate/output.txt b/acceptance/bundle/resources/schemas/recreate/output.txt
index 696f9785fce..d3b3cab14ac 100644
--- a/acceptance/bundle/resources/schemas/recreate/output.txt
+++ b/acceptance/bundle/resources/schemas/recreate/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created schemas.schema1
-Files: 0 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
@@ -41,7 +41,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/defaul
 This action will result in the deletion or recreation of the following UC schemas. Any underlying data may be lost:
   recreate resources.schemas.schema1
 Recreated schemas.schema1
-Files: 0 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py //unity
diff --git a/acceptance/bundle/resources/schemas/recreate/script b/acceptance/bundle/resources/schemas/recreate/script
index 11b4e91c010..9d9c8dd8cdb 100644
--- a/acceptance/bundle/resources/schemas/recreate/script
+++ b/acceptance/bundle/resources/schemas/recreate/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 trace $CLI bundle deploy
 
 trace print_requests.py //unity
@@ -13,4 +12,4 @@ trace print_requests.py //unity
 trace musterr $CLI schemas get main.myschema
 # updated_at/updated_by reflect UC's post-create system write that populates managed defaults, so on managed-defaults clouds they show a system principal rather than the creator; drop them (the managed properties map is pruned automatically).
 trace $CLI schemas get newmain.myschema | normalize_uc_payload.py updated_at updated_by
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/schemas/update/output.txt b/acceptance/bundle/resources/schemas/update/output.txt
index f41957f0f78..c2d0153a7f2 100644
--- a/acceptance/bundle/resources/schemas/update/output.txt
+++ b/acceptance/bundle/resources/schemas/update/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created schemas.schema1
-Files: 0 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
@@ -23,7 +23,7 @@ schemas schema1 id='main.myschema' name='myschema' catalog_name='main' comment='
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated schemas.schema1
-Files: 0 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
@@ -38,7 +38,7 @@ schemas schema1 id='main.myschema' name='myschema' catalog_name='main' comment='
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated schemas.schema1
-Files: 0 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
diff --git a/acceptance/bundle/resources/schemas/update/script b/acceptance/bundle/resources/schemas/update/script
index 733ed7eb9df..cab501fcd12 100644
--- a/acceptance/bundle/resources/schemas/update/script
+++ b/acceptance/bundle/resources/schemas/update/script
@@ -1,4 +1,3 @@
-echo "*" > .gitignore
 trace $CLI bundle deploy
 
 trace print_requests.py //unity
@@ -18,4 +17,4 @@ trace $CLI bundle deploy
 trace print_requests.py //unity | gron.py | grep -v enable_predictive_optimization
 read_state.py schemas schema1 id name catalog_name comment
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/secret_scopes/basic/script b/acceptance/bundle/resources/secret_scopes/basic/script
index f8f530afa47..e62f873b129 100755
--- a/acceptance/bundle/resources/secret_scopes/basic/script
+++ b/acceptance/bundle/resources/secret_scopes/basic/script
@@ -4,7 +4,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/secret_scopes/delete_scope/script b/acceptance/bundle/resources/secret_scopes/delete_scope/script
index 0b5e9343484..f9e0b9676a3 100755
--- a/acceptance/bundle/resources/secret_scopes/delete_scope/script
+++ b/acceptance/bundle/resources/secret_scopes/delete_scope/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -12,7 +12,7 @@ trace $CLI bundle deploy -qq
 grep -v DELETE < databricks.yml > databricks.yml.tmp && mv databricks.yml.tmp databricks.yml
 
 trace $CLI bundle plan &> out.plan.$DATABRICKS_BUNDLE_ENGINE.txt
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 trace $CLI bundle deploy -qq
 trace print_requests.py '^//api/2.0/bundle' '^//import-file/' '^//workspace/' '^//telemetry-ext' &> out.deploy.requests.txt
diff --git a/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt b/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt
index 2bb8eb57dcc..9b8873f86e9 100644
--- a/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt
+++ b/acceptance/bundle/resources/secret_scopes/permissions-collapse/output.txt
@@ -6,7 +6,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/secret-scope-collapse-[UNIQUE_NAME]/default/files...
 Created secret_scopes.my_scope
 Created secret_scopes.my_scope.permissions
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] secrets list-scopes -o json
diff --git a/acceptance/bundle/resources/secrets/basic/output.txt b/acceptance/bundle/resources/secrets/basic/output.txt
index 95fd4f5b1b0..b9342c64aff 100644
--- a/acceptance/bundle/resources/secrets/basic/output.txt
+++ b/acceptance/bundle/resources/secrets/basic/output.txt
@@ -35,7 +35,7 @@ Resources:
 >>> [CLI] bundle deploy --var secret_value=initial-secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created secrets.secret1
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
@@ -58,7 +58,7 @@ secrets secret1 catalog_name='main' schema_name='default' name='test_secret_[UNI
 >>> [CLI] bundle deploy --var secret_value=initial-secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated secrets.secret1
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
@@ -84,7 +84,7 @@ secrets secret1 catalog_name='main' schema_name='default' name='test_secret_[UNI
 >>> [CLI] bundle deploy --var secret_value=initial-secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated secrets.secret1
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
diff --git a/acceptance/bundle/resources/secrets/basic/script b/acceptance/bundle/resources/secrets/basic/script
index 07ddb03ddf5..f3e21135353 100755
--- a/acceptance/bundle/resources/secrets/basic/script
+++ b/acceptance/bundle/resources/secrets/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve --var secret_value=initial-secret-value
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -29,4 +29,4 @@ trace $CLI bundle deploy --var secret_value=initial-secret-value
 trace print_requests.py //unity-catalog
 read_state.py secrets secret1 catalog_name schema_name name comment value effective_value
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/secrets/remove-expire-time/output.txt b/acceptance/bundle/resources/secrets/remove-expire-time/output.txt
index 23454ffc288..2e88809ebcf 100644
--- a/acceptance/bundle/resources/secrets/remove-expire-time/output.txt
+++ b/acceptance/bundle/resources/secrets/remove-expire-time/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy --var secret_value=secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created secrets.secret1
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
@@ -32,7 +32,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy --var secret_value=secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated secrets.secret1
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
diff --git a/acceptance/bundle/resources/secrets/remove-expire-time/script b/acceptance/bundle/resources/secrets/remove-expire-time/script
index d21659a08d4..1659dfb2fee 100644
--- a/acceptance/bundle/resources/secrets/remove-expire-time/script
+++ b/acceptance/bundle/resources/secrets/remove-expire-time/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve --var secret_value=initial-secret-value
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -22,4 +22,4 @@ title "Plan again to record any drift the removal leaves behind"
 trace $CLI bundle plan --var secret_value=secret-value
 trace $CLI bundle plan --var secret_value=secret-value -o json | nostamp | jq '.plan."resources.secrets.secret1" | {action, changes}' > out.plan.drift.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/secrets/update-expire-time/output.txt b/acceptance/bundle/resources/secrets/update-expire-time/output.txt
index 60ad63187fc..f99e32fcd31 100644
--- a/acceptance/bundle/resources/secrets/update-expire-time/output.txt
+++ b/acceptance/bundle/resources/secrets/update-expire-time/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy --var secret_value=secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Created secrets.secret1
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
@@ -32,7 +32,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy --var secret_value=secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
 Updated secrets.secret1
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
diff --git a/acceptance/bundle/resources/secrets/update-expire-time/script b/acceptance/bundle/resources/secrets/update-expire-time/script
index 9ae12430845..fe58d8c30c0 100644
--- a/acceptance/bundle/resources/secrets/update-expire-time/script
+++ b/acceptance/bundle/resources/secrets/update-expire-time/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve --var secret_value=initial-secret-value
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -18,4 +18,4 @@ trace $CLI bundle deploy --var secret_value=secret-value
 trace print_requests.py //unity-catalog
 read_state.py secrets secret1 name expire_time
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/secrets/update-value/output.txt b/acceptance/bundle/resources/secrets/update-value/output.txt
index bb8db84a11e..b24136be638 100644
--- a/acceptance/bundle/resources/secrets/update-value/output.txt
+++ b/acceptance/bundle/resources/secrets/update-value/output.txt
@@ -22,7 +22,7 @@
 >>> [CLI] bundle deploy --var secret_value=initial-secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created secrets.secret1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
@@ -94,7 +94,7 @@ secrets secret1 catalog_name='main' schema_name='default' name='test_secret' com
 >>> [CLI] bundle deploy --var secret_value=updated-secret-value
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated secrets.secret1
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity-catalog
diff --git a/acceptance/bundle/resources/secrets/update-value/script b/acceptance/bundle/resources/secrets/update-value/script
index 5e40b5409b4..4ac8c946a23 100755
--- a/acceptance/bundle/resources/secrets/update-value/script
+++ b/acceptance/bundle/resources/secrets/update-value/script
@@ -13,4 +13,4 @@ read_state.py secrets secret1 catalog_name schema_name name comment value
 title "Verify state does not contain actual secret value"
 { trace print_state.py | jq .state | contains.py "!initial-secret-value" "!updated-secret-value"; } || true
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
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..c334bbb35fa 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/output.txt
@@ -3,7 +3,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created sql_warehouses.mywarehouse
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //sql/warehouses
@@ -34,7 +34,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated sql_warehouses.mywarehouse
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //sql/warehouses
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script
index 5d444c6e4e9..53b32751b1f 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-edit/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -11,7 +11,7 @@ trace errcode $CLI bundle deploy
 WAREHOUSE_ID=$($CLI bundle summary -o json | jq -r '.resources.sql_warehouses.mywarehouse.id')
 add_repl "$WAREHOUSE_ID" "WAREHOUSE_ID"
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
 
 # Editing a warehouse restarts it: Edit's long-running op waits for RUNNING
@@ -21,5 +21,5 @@ title "Edit a field with started=false: Edit restarts the warehouse, so a Stop m
 trace update_file.py databricks.yml "auto_stop_mins: 10" "auto_stop_mins: 20"
 trace errcode $CLI bundle deploy
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
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..455cd946a55 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/output.txt
@@ -3,7 +3,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created sql_warehouses.mywarehouse
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //sql/warehouses
@@ -34,7 +34,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated sql_warehouses.mywarehouse
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //sql/warehouses
@@ -53,7 +53,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated sql_warehouses.mywarehouse
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //sql/warehouses
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script
index c9e7b940f13..779c194e1bf 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started-toggle/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -11,19 +11,19 @@ trace errcode $CLI bundle deploy
 WAREHOUSE_ID=$($CLI bundle summary -o json | jq -r '.resources.sql_warehouses.mywarehouse.id')
 add_repl "$WAREHOUSE_ID" "WAREHOUSE_ID"
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
 
 title "Toggle started=false -> started=true: only Start should be called, no Edit"
 trace update_file.py databricks.yml "started: false" "started: true"
 trace errcode $CLI bundle deploy
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
 
 title "Toggle started=true -> started=false: only Stop should be called, no Edit"
 trace update_file.py databricks.yml "started: true" "started: false"
 trace errcode $CLI bundle deploy
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt
index 7ccad8a5480..c3aae251c29 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/output.txt
@@ -3,7 +3,7 @@
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Created sql_warehouses.mywarehouse
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //sql/warehouses
@@ -36,7 +36,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated sql_warehouses.mywarehouse
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //sql/warehouses
@@ -62,7 +62,7 @@ Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py //sql/warehouses
@@ -81,7 +81,7 @@ Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 >>> errcode [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/[UNIQUE_NAME]/files...
 Updated sql_warehouses.mywarehouse
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //sql/warehouses
diff --git a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script
index 369839f4769..b9cf6cd8e05 100644
--- a/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script
+++ b/acceptance/bundle/resources/sql_warehouses/lifecycle-started/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -12,7 +12,7 @@ WAREHOUSE_ID=$($CLI bundle summary -o json | jq -r '.resources.sql_warehouses.my
 add_repl "$WAREHOUSE_ID" "WAREHOUSE_ID"
 
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
 
 title "Stop warehouse externally while config says started=true: plan detects drift"
@@ -22,7 +22,7 @@ trace $CLI bundle plan
 title "Deploy fixes the drift: warehouse restarted"
 trace errcode $CLI bundle deploy
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
 
 title "Deploy with started=false while warehouse is stopped: warehouse stays stopped"
@@ -30,12 +30,12 @@ title "Deploy with started=false while warehouse is stopped: warehouse stays sto
 trace update_file.py databricks.yml "started: true" "started: false"
 trace errcode $CLI bundle deploy
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
 
 title "Deploy with started=true: warehouse restarted"
 trace update_file.py databricks.yml "started: false" "started: true"
 trace errcode $CLI bundle deploy
 trace print_requests.py //sql/warehouses
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 { trace errcode $CLI warehouses get "$WAREHOUSE_ID" | jq '.state'; } || true
diff --git a/acceptance/bundle/resources/sql_warehouses/output.txt b/acceptance/bundle/resources/sql_warehouses/output.txt
index 4b8141d0946..986c9822bbc 100644
--- a/acceptance/bundle/resources/sql_warehouses/output.txt
+++ b/acceptance/bundle/resources/sql_warehouses/output.txt
@@ -37,11 +37,11 @@ Resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_sql_warehouse/default/files...
 Created sql_warehouses.test_sql_warehouse
-Files: 21 uploaded, 0 deleted
+Files: 19 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Verify the create request
->>> jq select(.method == "POST" and (.path | contains("/sql/warehouses"))) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/sql/warehouses"))) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/sql/warehouses",
@@ -75,11 +75,11 @@ Resources:
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test_sql_warehouse/default/files...
 Updated sql_warehouses.test_sql_warehouse
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 === Verify the update request
->>> jq select(.method == "POST" and (.path | contains("/sql/warehouses")) and (.body."name" == "sql_warehouse_name_2")) | del(.body.creator_name, .body.warehouse_type) out.requests.txt
+>>> jq select(.method == "POST" and (.path | contains("/sql/warehouses")) and (.body."name" == "sql_warehouse_name_2")) | del(.body.creator_name, .body.warehouse_type) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "POST",
   "path": "/api/2.0/sql/warehouses/[UUID]/edit",
@@ -117,7 +117,7 @@ All files and directories at the following location will be deleted: /Workspace/
 Destroy: 1 deleted
 
 === Verify the destroy request
->>> jq select(.method == "DELETE" and (.path | contains("/sql/warehouses"))) out.requests.txt
+>>> jq select(.method == "DELETE" and (.path | contains("/sql/warehouses"))) [OUTPUT_DIR]/out.requests.txt
 {
   "method": "DELETE",
   "path": "/api/2.0/sql/warehouses/[UUID]"
diff --git a/acceptance/bundle/resources/sql_warehouses/script b/acceptance/bundle/resources/sql_warehouses/script
index b1d488f36da..9b105e04fff 100644
--- a/acceptance/bundle/resources/sql_warehouses/script
+++ b/acceptance/bundle/resources/sql_warehouses/script
@@ -5,13 +5,13 @@ trace $CLI bundle summary
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm out.requests.txt
+    rm "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 trace $CLI bundle deploy
 
 title "Verify the create request"
-trace jq 'select(.method == "POST" and (.path | contains("/sql/warehouses")))' out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/sql/warehouses")))' "$OUT_REQUESTS"
 
 trace $CLI bundle summary
 
@@ -20,7 +20,7 @@ trace update_file.py databricks.yml sql_warehouse_name sql_warehouse_name_2
 trace $CLI bundle deploy
 
 title "Verify the update request"
-trace jq 'select(.method == "POST" and (.path | contains("/sql/warehouses")) and (.body."name" == "sql_warehouse_name_2")) | del(.body.creator_name, .body.warehouse_type)' out.requests.txt
+trace jq 'select(.method == "POST" and (.path | contains("/sql/warehouses")) and (.body."name" == "sql_warehouse_name_2")) | del(.body.creator_name, .body.warehouse_type)' "$OUT_REQUESTS"
 
 trace $CLI bundle summary
 
@@ -28,8 +28,8 @@ title "Destroy the warehouse"
 trace $CLI bundle destroy --auto-approve
 
 title "Verify the destroy request"
-trace jq 'select(.method == "DELETE" and (.path | contains("/sql/warehouses")))' out.requests.txt
+trace jq 'select(.method == "DELETE" and (.path | contains("/sql/warehouses")))' "$OUT_REQUESTS"
 
 trace $CLI bundle summary
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/synced_database_tables/basic/output.txt b/acceptance/bundle/resources/synced_database_tables/basic/output.txt
index 13104690bbe..c3de761473e 100644
--- a/acceptance/bundle/resources/synced_database_tables/basic/output.txt
+++ b/acceptance/bundle/resources/synced_database_tables/basic/output.txt
@@ -37,7 +37,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-sy
 Created database_catalogs.my_catalog
 Created database_instances.my_instance
 Created synced_database_tables.my_synced_table
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle summary
diff --git a/acceptance/bundle/resources/synced_database_tables/recreate/output.txt b/acceptance/bundle/resources/synced_database_tables/recreate/output.txt
index 6b6a43e57c5..a0af7751e47 100644
--- a/acceptance/bundle/resources/synced_database_tables/recreate/output.txt
+++ b/acceptance/bundle/resources/synced_database_tables/recreate/output.txt
@@ -4,7 +4,7 @@ Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-lakebase-sy
 Created database_catalogs.my_catalog
 Created database_instances.my_instance
 Created synced_database_tables.my_synced_table
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 3 created, 0 changed, 0 deleted, 0 unchanged
 
 === Change an immutable synced-table field: no update API, so the plan recreates it
@@ -20,7 +20,7 @@ This action will result in the deletion or recreation of the following synced da
 The synced data in the destination database will be lost (the source table is preserved):
   recreate resources.synced_database_tables.my_synced_table
 Recreated synced_database_tables.my_synced_table
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 2 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/resources/synced_database_tables/recreate/script b/acceptance/bundle/resources/synced_database_tables/recreate/script
index f77695bcd53..7dc60584037 100644
--- a/acceptance/bundle/resources/synced_database_tables/recreate/script
+++ b/acceptance/bundle/resources/synced_database_tables/recreate/script
@@ -1,13 +1,13 @@
 cleanup() {
    trace $CLI bundle destroy --auto-approve
-   rm -f out.requests.txt
+   rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 envsubst < databricks.yml.tmpl | sed "s/POLICY_PLACEHOLDER/SNAPSHOT/" > databricks.yml
 
 trace $CLI bundle deploy
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Change an immutable synced-table field: no update API, so the plan recreates it"
 sed "s/scheduling_policy: SNAPSHOT/scheduling_policy: TRIGGERED/" databricks.yml > databricks.yml.new
@@ -18,5 +18,5 @@ trace $CLI bundle deploy --auto-approve
 
 # The change must be a DELETE of the old synced table plus a POST creating the
 # new one. A PATCH would return 501 (the bug this guards against).
-jq --sort-keys 'select(.method != "GET" and (.path | contains("/database/synced_tables")))' < out.requests.txt > out.requests.recreate.txt
-rm -f out.requests.txt
+jq --sort-keys 'select(.method != "GET" and (.path | contains("/database/synced_tables")))' < "$OUT_REQUESTS" > out.requests.recreate.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/vector_search_endpoints/basic/script b/acceptance/bundle/resources/vector_search_endpoints/basic/script
index e68232aab32..b4402e1208b 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/basic/script
+++ b/acceptance/bundle/resources/vector_search_endpoints/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Get endpoint details
diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/script b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/script
index 40328247a30..e6f59f2b7a0 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/script
+++ b/acceptance/bundle/resources/vector_search_endpoints/drift/budget_policy/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script
index 9c834c66e55..e1546a019b1 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script
+++ b/acceptance/bundle/resources/vector_search_endpoints/drift/recreated_same_name/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/script b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/script
index 0a7af73073b..e6c3ad0e40d 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/script
+++ b/acceptance/bundle/resources/vector_search_endpoints/drift/target_qps/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -19,7 +19,7 @@ trace $CLI bundle plan | contains.py "Plan: 0 to add, 1 to change, 0 to delete,
 $CLI bundle plan --output json | nostamp | jq '{plan: .plan | map_values({action, changes})}' > out.plan.$DATABRICKS_BUNDLE_ENGINE.json
 
 title "Deploy restores target_qps to 1"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 trace print_requests.py '//vector-search/endpoints'
 
diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/script b/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/script
index b48a7e7a3cf..0cf8fb3ea01 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/script
+++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/create-fails/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve || true
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/script b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/script
index b3920cacbbd..309e21a3a49 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/script
+++ b/acceptance/bundle/resources/vector_search_endpoints/recreate/endpoint_type/script
@@ -2,18 +2,18 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 print_requests() {
     local name=$1
     trace print_requests.py --keep '//vector-search/endpoints' > out.requests.${name}.$DATABRICKS_BUNDLE_ENGINE.json
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 title "Initial deployment with STANDARD endpoint_type"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -22,7 +22,7 @@ title "Change endpoint_type (should trigger recreation)"
 trace update_file.py databricks.yml "endpoint_type: STANDARD" "endpoint_type: STORAGE_OPTIMIZED"
 
 trace $CLI bundle plan
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy --auto-approve
 
 print_requests recreate
diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/script b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/script
index 8d19b9f60c8..f02a2bc6725 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/script
+++ b/acceptance/bundle/resources/vector_search_endpoints/update/budget_policy/script
@@ -2,18 +2,18 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 print_requests() {
     local name=$1
     trace print_requests.py --keep '//vector-search/endpoints' > out.requests.${name}.$DATABRICKS_BUNDLE_ENGINE.json
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 title "Initial deployment (no budget policy)"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -23,7 +23,7 @@ trace update_file.py databricks.yml "endpoint_type: STANDARD" "endpoint_type: ST
       budget_policy_id: test-policy-id"
 
 trace $CLI bundle plan
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests update
diff --git a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/script b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/script
index c17c8adfedc..07e6927c28a 100644
--- a/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/script
+++ b/acceptance/bundle/resources/vector_search_endpoints/update/target_qps/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -12,7 +12,7 @@ print_requests() {
 }
 
 title "Initial deployment"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -24,7 +24,7 @@ title "Update target_qps"
 trace update_file.py databricks.yml "target_qps: 1" "target_qps: 2"
 
 trace $CLI bundle plan
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests update
diff --git a/acceptance/bundle/resources/vector_search_indexes/basic/script b/acceptance/bundle/resources/vector_search_indexes/basic/script
index 2e513d8ea6f..7732c307e5e 100644
--- a/acceptance/bundle/resources/vector_search_indexes/basic/script
+++ b/acceptance/bundle/resources/vector_search_indexes/basic/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -10,7 +10,7 @@ trace $CLI bundle validate
 
 trace $CLI bundle summary
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 # Get index details
diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/script b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/script
index f92a79a1eff..50b3b373bb7 100644
--- a/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/script
+++ b/acceptance/bundle/resources/vector_search_indexes/drift/deleted_remotely/script
@@ -3,7 +3,7 @@ index_name="main.default.vs_index_${UNIQUE_NAME}"
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/script b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/script
index d3470f38414..bc72cc66b8f 100644
--- a/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/script
+++ b/acceptance/bundle/resources/vector_search_indexes/drift/orphaned_endpoint/script
@@ -4,7 +4,7 @@ index_name="main.default.vs_index_${UNIQUE_NAME}"
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/vector_search_indexes/grants/select/script b/acceptance/bundle/resources/vector_search_indexes/grants/select/script
index 5e3062f7e4f..693d346208e 100644
--- a/acceptance/bundle/resources/vector_search_indexes/grants/select/script
+++ b/acceptance/bundle/resources/vector_search_indexes/grants/select/script
@@ -3,13 +3,13 @@ index_name="main.default.vs_index_${UNIQUE_NAME}"
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 trace $CLI bundle plan
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 trace $CLI bundle plan
diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/script b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/script
index c56fb89841f..2f603f37141 100644
--- a/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/script
+++ b/acceptance/bundle/resources/vector_search_indexes/recreate/embedding_dimension/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -15,11 +15,11 @@ print_requests() {
     # --unique collapses the repeated identical poll GETs (one on the testserver,
     # many on a real workspace that provisions asynchronously) to a stable count.
     trace print_requests.py --get --unique '//vector-search/indexes' > out.requests.${name}.$DATABRICKS_BUNDLE_ENGINE.json
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 
 title "Initial deployment"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 print_requests create
@@ -28,7 +28,7 @@ title "Change embedding_dimension (should trigger recreation)"
 trace update_file.py databricks.yml "embedding_dimension: 768" "embedding_dimension: 384"
 
 trace $CLI bundle plan
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy --auto-approve
 
 print_requests recreate
diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/script b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/script
index a17ef34ae50..738f6a07761 100644
--- a/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/script
+++ b/acceptance/bundle/resources/vector_search_indexes/recreate/pending_deletion/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
@@ -12,7 +12,7 @@ trace $CLI bundle deploy
 title "Change embedding_dimension (recreate: DELETE then CREATE the same name)"
 trace update_file.py databricks.yml "embedding_dimension: 768" "embedding_dimension: 384"
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy --auto-approve
 
 # The name is released only after the index stops being visible on GET, so
diff --git a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/script b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/script
index de76bf2c773..8089346de21 100644
--- a/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/script
+++ b/acceptance/bundle/resources/vector_search_indexes/recreate/with_endpoint/script
@@ -2,12 +2,12 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
 title "Initial deployment with STANDARD endpoint_type"
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy
 
 title "Change endpoint_type (recreates endpoint; index recreate cascade is not yet implemented)"
@@ -15,7 +15,7 @@ trace update_file.py databricks.yml "endpoint_type: STANDARD" "endpoint_type: ST
 
 trace $CLI bundle plan
 trace $CLI bundle plan --output json | nostamp
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 trace $CLI bundle deploy --auto-approve
 
 # Verify final state of both resources.
diff --git a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/script b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/script
index 02a84e6a3ee..ecc3022f080 100644
--- a/acceptance/bundle/resources/vector_search_indexes/schema_normalization/script
+++ b/acceptance/bundle/resources/vector_search_indexes/schema_normalization/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/resources/volumes/change-comment/output.txt b/acceptance/bundle/resources/volumes/change-comment/output.txt
index ac715b86983..e31791f97da 100644
--- a/acceptance/bundle/resources/volumes/change-comment/output.txt
+++ b/acceptance/bundle/resources/volumes/change-comment/output.txt
@@ -18,7 +18,7 @@ Error: Volume 'main.myschema.myvolume' does not exist.
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created volumes.volume1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
@@ -73,7 +73,7 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated volumes.volume1
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
diff --git a/acceptance/bundle/resources/volumes/change-comment/script b/acceptance/bundle/resources/volumes/change-comment/script
index 03254877b79..913d5acdf90 100644
--- a/acceptance/bundle/resources/volumes/change-comment/script
+++ b/acceptance/bundle/resources/volumes/change-comment/script
@@ -33,4 +33,4 @@ trace print_requests.py //unity
 trace musterr $CLI volumes read main.myschema.myvolume
 $CLI bundle summary -o json | jq .resources.volumes.volume1
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/volumes/change-name/output.txt b/acceptance/bundle/resources/volumes/change-name/output.txt
index bb5fec8b623..78eee53edb0 100644
--- a/acceptance/bundle/resources/volumes/change-name/output.txt
+++ b/acceptance/bundle/resources/volumes/change-name/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created volumes.volume1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
@@ -45,7 +45,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Updated volumes.volume1
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
diff --git a/acceptance/bundle/resources/volumes/change-name/script b/acceptance/bundle/resources/volumes/change-name/script
index 396ffb15155..55c6b990b8c 100644
--- a/acceptance/bundle/resources/volumes/change-name/script
+++ b/acceptance/bundle/resources/volumes/change-name/script
@@ -16,4 +16,4 @@ trace print_requests.py //unity
 
 trace $CLI volumes read main.myschema.mynewvolume
 trace musterr $CLI volumes read main.myschema.myvolume
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/volumes/change-schema-name/out.requests.txt b/acceptance/bundle/resources/volumes/change-schema-name/out.requests.txt
deleted file mode 100644
index 0c03eb00fd1..00000000000
--- a/acceptance/bundle/resources/volumes/change-schema-name/out.requests.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "method": "GET",
-  "path": "/api/2.1/unity-catalog/volumes/main.myschema.myvolume"
-}
-{
-  "method": "GET",
-  "path": "/api/2.1/unity-catalog/volumes/main.myschema.mynewvolume"
-}
diff --git a/acceptance/bundle/resources/volumes/change-schema-name/output.txt b/acceptance/bundle/resources/volumes/change-schema-name/output.txt
index bfbd9d6ac9a..9a987f412ca 100644
--- a/acceptance/bundle/resources/volumes/change-schema-name/output.txt
+++ b/acceptance/bundle/resources/volumes/change-schema-name/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created volumes.volume1
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //unity
@@ -51,7 +51,7 @@ cloud tenant within 30 days. For external volumes, the metadata about the volume
 is removed from the catalog, but the underlying files are not deleted:
   recreate resources.volumes.volume1
 Recreated volumes.volume1
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 1 deleted, 0 unchanged
 
 >>> print_requests.py //unity
diff --git a/acceptance/bundle/resources/volumes/change-schema-name/script b/acceptance/bundle/resources/volumes/change-schema-name/script
index ec078b39c61..c369e53fff9 100644
--- a/acceptance/bundle/resources/volumes/change-schema-name/script
+++ b/acceptance/bundle/resources/volumes/change-schema-name/script
@@ -14,4 +14,4 @@ trace print_requests.py //unity
 
 trace musterr $CLI volumes read main.myschema.myvolume
 trace $CLI volumes read main.myschema.mynewvolume
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/resources/volumes/recreate/output.txt b/acceptance/bundle/resources/volumes/recreate/output.txt
index fc94847412b..fed59b1a868 100644
--- a/acceptance/bundle/resources/volumes/recreate/output.txt
+++ b/acceptance/bundle/resources/volumes/recreate/output.txt
@@ -45,7 +45,7 @@ Error: the deployment requires destructive actions, but the current console does
 Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed.
 To proceed, use --auto-approve after reviewing the plan above.
 
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 
 Exit code: 1
 
diff --git a/acceptance/bundle/resources/volumes/remote-change-name/output.txt b/acceptance/bundle/resources/volumes/remote-change-name/output.txt
index e8b87fd9c29..29199691b51 100644
--- a/acceptance/bundle/resources/volumes/remote-change-name/output.txt
+++ b/acceptance/bundle/resources/volumes/remote-change-name/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created volumes.foo
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] volumes update mycatalog.myschema.myname --json {"new_name": "my_new_name"}
diff --git a/acceptance/bundle/resources/volumes/remote-delete/output.txt b/acceptance/bundle/resources/volumes/remote-delete/output.txt
index e9517fd2cb1..8da7ba62f90 100644
--- a/acceptance/bundle/resources/volumes/remote-delete/output.txt
+++ b/acceptance/bundle/resources/volumes/remote-delete/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created volumes.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] volumes delete mycatalog.myschema.myname
diff --git a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.direct.txt
index c5237fefbd5..a4849041971 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
@@ -8,4 +8,4 @@ HTTP Status: 400 Bad Request
 API error_code: INVALID_PARAMETER_VALUE
 API message: CreateVolume storage_location can not be provided.
 
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt
index cfa2c2e608e..27230dcc397 100644
--- a/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt
+++ b/acceptance/bundle/resources/volumes/set-storage-location/out.deploy.terraform.txt
@@ -11,4 +11,4 @@ Error: cannot create volume: CreateVolume storage_location can not be provided.
 
 
 
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
diff --git a/acceptance/bundle/resources/volumes/set-volume-path/out.requests.txt b/acceptance/bundle/resources/volumes/set-volume-path/out.requests.txt
deleted file mode 100644
index 12576f503d5..00000000000
--- a/acceptance/bundle/resources/volumes/set-volume-path/out.requests.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
diff --git a/acceptance/bundle/resources/volumes/uppercase-name/script b/acceptance/bundle/resources/volumes/uppercase-name/script
index 154ac1347e9..d40e5b42af4 100644
--- a/acceptance/bundle/resources/volumes/uppercase-name/script
+++ b/acceptance/bundle/resources/volumes/uppercase-name/script
@@ -3,7 +3,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     $CLI bundle destroy --auto-approve &> LOG.destroy
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/run/app-with-job/output.txt b/acceptance/bundle/run/app-with-job/output.txt
index 718a16a873a..0b7ef1e4175 100644
--- a/acceptance/bundle/run/app-with-job/output.txt
+++ b/acceptance/bundle/run/app-with-job/output.txt
@@ -12,7 +12,7 @@ Validation OK!
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-with-job-[UNIQUE_NAME]/files...
 Created apps.test_app
 Created jobs.foo
-Files: 8 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 
 === App should exist after bundle deployment
@@ -85,7 +85,7 @@ env:
 === Redeploy it again just to check that it can be redeployed
 >>> [CLI] bundle deploy --force-lock --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/app-with-job-[UNIQUE_NAME]/files...
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/run/basic/output.txt b/acceptance/bundle/run/basic/output.txt
index 28e3b226804..83981607062 100644
--- a/acceptance/bundle/run/basic/output.txt
+++ b/acceptance/bundle/run/basic/output.txt
@@ -9,7 +9,7 @@ Exit code: 1
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run foo
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/out.requests.txt b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/out.requests.txt
deleted file mode 100644
index 0c01e54a7b1..00000000000
--- a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/out.requests.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/output.txt b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/output.txt
index 0962b43283c..1a1ce7f1c67 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/output.txt
+++ b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/output.txt
@@ -4,3 +4,46 @@
   "id": "[USERID]",
   "userName": "[USERNAME]"
 }
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/script b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/script
index 41049c25f48..3d593f18a1a 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/script
+++ b/acceptance/bundle/run/inline-script/databricks-cli/profile-is-passed/from_flag/script
@@ -8,3 +8,5 @@ unset DATABRICKS_TOKEN
 
 # This should use myprofile, which uses oauth.
 trace $CLI bundle run --profile myprofile -- $CLI current-user me
+
+trace print_requests.py --get //
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.requests.txt b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.requests.txt
deleted file mode 100644
index 0c815411ae9..00000000000
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/out.requests.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/pat/files"
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "POST",
-  "path": "/api/2.0/workspace/mkdirs",
-  "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/pat/files"
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/pat/files"
-  }
-}
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/output.txt b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/output.txt
index 513329a539b..067706823b6 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/output.txt
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/output.txt
@@ -1,3 +1,54 @@
 
 >>> [CLI] bundle run -- [CLI] bundle validate -o json
 "pat"
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/pat/files"
+  }
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "POST",
+  "path": "/api/2.0/workspace/mkdirs",
+  "body": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/pat/files"
+  }
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/pat/files"
+  }
+}
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/script b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/script
index 16b75725145..39d64d5d4ab 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/script
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/default/script
@@ -8,3 +8,5 @@ unset DATABRICKS_TOKEN
 
 # Should use default target, which is pat based authentication
 trace $CLI bundle run -- $CLI bundle validate -o json| jq .bundle.target
+
+trace print_requests.py --get //
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.requests.txt b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.requests.txt
deleted file mode 100644
index 6ba1aad2544..00000000000
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/out.requests.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/oauth/files"
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "POST",
-  "path": "/api/2.0/workspace/mkdirs",
-  "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/oauth/files"
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/oauth/files"
-  }
-}
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/output.txt b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/output.txt
index fb8a3292890..dcc90ffb748 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/output.txt
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/output.txt
@@ -1,3 +1,82 @@
 
 >>> [CLI] bundle run -t oauth -- [CLI] bundle validate -o json
 "oauth"
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/oauth/files"
+  }
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "POST",
+  "path": "/api/2.0/workspace/mkdirs",
+  "body": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/oauth/files"
+  }
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/oauth/files"
+  }
+}
diff --git a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/script b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/script
index 62c438ff012..2c6a71c7954 100644
--- a/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/script
+++ b/acceptance/bundle/run/inline-script/databricks-cli/target-is-passed/from_flag/script
@@ -8,3 +8,5 @@ unset DATABRICKS_TOKEN
 
 # Explicitly select oauth target
 trace $CLI bundle run -t oauth -- $CLI bundle validate -o json| jq .bundle.target
+
+trace print_requests.py --get //
diff --git a/acceptance/bundle/run/jobs/partial_run/output.txt b/acceptance/bundle/run/jobs/partial_run/output.txt
index 0733a4d88ce..8d6813e18a9 100644
--- a/acceptance/bundle/run/jobs/partial_run/output.txt
+++ b/acceptance/bundle/run/jobs/partial_run/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/partial_run/default/files...
 Created jobs.my_job
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run my_job --only task_1
diff --git a/acceptance/bundle/run/refresh-flags/output.txt b/acceptance/bundle/run/refresh-flags/output.txt
index 6650e685574..e7a7202e0bb 100644
--- a/acceptance/bundle/run/refresh-flags/output.txt
+++ b/acceptance/bundle/run/refresh-flags/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-run-flags/default/files...
 Created pipelines.my_pipeline
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Running pipeline with --refresh flag and specific tables
diff --git a/acceptance/bundle/run/refresh-flags/script b/acceptance/bundle/run/refresh-flags/script
index 90283c5facd..7c788c42239 100644
--- a/acceptance/bundle/run/refresh-flags/script
+++ b/acceptance/bundle/run/refresh-flags/script
@@ -1,5 +1,5 @@
 trace $CLI bundle deploy
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Running pipeline with --refresh flag and specific tables"
 trace $CLI bundle run my_pipeline --refresh table1,table2
diff --git a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/out.requests.txt b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/out.requests.txt
deleted file mode 100644
index 90cb7d14ba0..00000000000
--- a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/out.requests.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
diff --git a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/output.txt b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/output.txt
index c64ea6b2ea0..2d9c8b6521d 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/output.txt
+++ b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/output.txt
@@ -4,3 +4,59 @@
   "id": "[USERID]",
   "userName": "[USERNAME]"
 }
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
diff --git a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/script b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/script
index b6846aec15b..6127ba341ce 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/script
+++ b/acceptance/bundle/run/scripts/databricks-cli/profile-is-passed/from_flag/script
@@ -8,3 +8,5 @@ unset DATABRICKS_TOKEN
 
 # This should use myprofile, which uses oauth.
 trace $CLI bundle run me --profile myprofile
+
+trace print_requests.py --get //
diff --git a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/out.requests.txt b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/out.requests.txt
deleted file mode 100644
index 93542472ac5..00000000000
--- a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/out.requests.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/pat/files"
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "POST",
-  "path": "/api/2.0/workspace/mkdirs",
-  "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/pat/files"
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/pat/files"
-  }
-}
diff --git a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/output.txt b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/output.txt
index 891c4628862..64073379aa6 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/output.txt
+++ b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/output.txt
@@ -1,3 +1,67 @@
 
 >>> [CLI] bundle run validate
 "pat"
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/pat/files"
+  }
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "POST",
+  "path": "/api/2.0/workspace/mkdirs",
+  "body": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/pat/files"
+  }
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/pat/files"
+  }
+}
diff --git a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/script b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/script
index ce1f6f67a18..d7fcb94402a 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/script
+++ b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/default/script
@@ -8,3 +8,5 @@ unset DATABRICKS_TOKEN
 
 # Should use default target, which is pat based authentication
 trace $CLI bundle run validate | jq .bundle.target
+
+trace print_requests.py --get //
diff --git a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/out.requests.txt b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/out.requests.txt
deleted file mode 100644
index 6ce820c124f..00000000000
--- a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/out.requests.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/oidc/.well-known/oauth-authorization-server"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Basic [ENCODED_AUTH]"
-    ]
-  },
-  "method": "POST",
-  "path": "/oidc/v1/token",
-  "raw_body": "grant_type=client_credentials\u0026scope=all-apis"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/oauth/files"
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "POST",
-  "path": "/api/2.0/workspace/mkdirs",
-  "body": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/oauth/files"
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer oauth-token"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/oauth/files"
-  }
-}
diff --git a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/output.txt b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/output.txt
index 60412ab33db..91d2b39a321 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/output.txt
+++ b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/output.txt
@@ -1,3 +1,95 @@
 
 >>> [CLI] bundle run validate -t oauth
 "oauth"
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/oidc/.well-known/oauth-authorization-server"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Basic [ENCODED_AUTH]"
+    ]
+  },
+  "method": "POST",
+  "path": "/oidc/v1/token",
+  "raw_body": "grant_type=client_credentials&scope=all-apis"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/oauth/files"
+  }
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "POST",
+  "path": "/api/2.0/workspace/mkdirs",
+  "body": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/oauth/files"
+  }
+}
+{
+  "headers": {
+    "Authorization": [
+      "Bearer oauth-token"
+    ]
+  },
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/[USERNAME]/.bundle/foobar/oauth/files"
+  }
+}
diff --git a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/script b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/script
index 64c268ae06e..e06cae7baeb 100644
--- a/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/script
+++ b/acceptance/bundle/run/scripts/databricks-cli/target-is-passed/from_flag/script
@@ -10,3 +10,5 @@ unset DATABRICKS_TOKEN
 # both the right target and the right auth credentials are
 # being passed to the script invocation.
 trace $CLI bundle run validate -t oauth | jq .bundle.target
+
+trace print_requests.py --get //
diff --git a/acceptance/bundle/run/state-wiped/output.txt b/acceptance/bundle/run/state-wiped/output.txt
index d7300076144..1fa39979a81 100644
--- a/acceptance/bundle/run/state-wiped/output.txt
+++ b/acceptance/bundle/run/state-wiped/output.txt
@@ -6,7 +6,7 @@ Error: resource not found or not yet deployed. Did you forget to run 'databricks
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/caterpillar/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle run foo
diff --git a/acceptance/bundle/run_as/job_default/.gitignore b/acceptance/bundle/run_as/job_default/.gitignore
deleted file mode 100644
index ad75d16418e..00000000000
--- a/acceptance/bundle/run_as/job_default/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-out.requests.txt
diff --git a/acceptance/bundle/run_as/job_default/output.txt b/acceptance/bundle/run_as/job_default/output.txt
index 21613bc205a..be509267c5e 100644
--- a/acceptance/bundle/run_as/job_default/output.txt
+++ b/acceptance/bundle/run_as/job_default/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as_job_default_[UNIQUE_NAME]/default/files...
 Created jobs.job_with_run_as
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs
@@ -55,7 +55,7 @@ Plan: 0 to add, 1 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as_job_default_[UNIQUE_NAME]/default/files...
 Updated jobs.job_with_run_as
-Files: 2 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py --nostamp //jobs
diff --git a/acceptance/bundle/run_as/job_default/script b/acceptance/bundle/run_as/job_default/script
index be96b205477..784716b3c90 100644
--- a/acceptance/bundle/run_as/job_default/script
+++ b/acceptance/bundle/run_as/job_default/script
@@ -2,7 +2,7 @@ envsubst < databricks.yml.tmpl > databricks.yml
 
 cleanup() {
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/run_as/pipelines/_script b/acceptance/bundle/run_as/pipelines/_script
index d7cf3f76a2a..5f3d5f1cc8e 100644
--- a/acceptance/bundle/run_as/pipelines/_script
+++ b/acceptance/bundle/run_as/pipelines/_script
@@ -1,6 +1,6 @@
 print_requests() {
-    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipelines")) and (.path | contains("/api/2.0/bundle") | not))' < out.requests.txt | nostamp.py
-    rm out.requests.txt
+    jq --sort-keys 'select(.method != "GET" and (.path | contains("/pipelines")) and (.path | contains("/api/2.0/bundle") | not))' < "$OUT_REQUESTS" | nostamp.py
+    rm "$OUT_REQUESTS"
 }
 
 targets=("t_user_name" "t_user_name_different" "t_service_principal_name" "t_service_principal_name_different")
@@ -18,7 +18,7 @@ for target in "${targets[@]}"; do
     $CLI bundle plan -o json -t $target | nostamp.py > out.plan_$target.$DATABRICKS_BUNDLE_ENGINE.json
 
     # Deploy
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
     trace $CLI bundle deploy -t $target
     print_requests > out.requests_$target.json
 done
diff --git a/acceptance/bundle/run_as/pipelines/regular_user/output.txt b/acceptance/bundle/run_as/pipelines/regular_user/output.txt
index 7487332edfc..423ed3c6864 100644
--- a/acceptance/bundle/run_as/pipelines/regular_user/output.txt
+++ b/acceptance/bundle/run_as/pipelines/regular_user/output.txt
@@ -20,7 +20,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name/files...
 Created pipelines.nyc_taxi_pipeline
 Created pipelines.nyc_taxi_pipeline.permissions
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 \nProcessing target: t_user_name_different
 
@@ -43,7 +43,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name_different/files...
 Created pipelines.nyc_taxi_pipeline
 Created pipelines.nyc_taxi_pipeline.permissions
-Files: 8 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 \nProcessing target: t_service_principal_name
 
@@ -66,7 +66,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name/files...
 Created pipelines.nyc_taxi_pipeline
 Created pipelines.nyc_taxi_pipeline.permissions
-Files: 10 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 \nProcessing target: t_service_principal_name_different
 
@@ -89,5 +89,5 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name_different/files...
 Created pipelines.nyc_taxi_pipeline
 Created pipelines.nyc_taxi_pipeline.permissions
-Files: 12 uploaded, 0 deleted
+Files: 10 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/run_as/pipelines/service_principal/output.txt b/acceptance/bundle/run_as/pipelines/service_principal/output.txt
index 925fc155c23..fce82aed6df 100644
--- a/acceptance/bundle/run_as/pipelines/service_principal/output.txt
+++ b/acceptance/bundle/run_as/pipelines/service_principal/output.txt
@@ -20,7 +20,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name/files...
 Created pipelines.nyc_taxi_pipeline
 Created pipelines.nyc_taxi_pipeline.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 \nProcessing target: t_user_name_different
 
@@ -43,7 +43,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_user_name_different/files...
 Created pipelines.nyc_taxi_pipeline
 Created pipelines.nyc_taxi_pipeline.permissions
-Files: 9 uploaded, 0 deleted
+Files: 7 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 \nProcessing target: t_service_principal_name
 
@@ -66,7 +66,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name/files...
 Created pipelines.nyc_taxi_pipeline
 Created pipelines.nyc_taxi_pipeline.permissions
-Files: 11 uploaded, 0 deleted
+Files: 9 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
 \nProcessing target: t_service_principal_name_different
 
@@ -89,5 +89,5 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/run_as/t_service_principal_name_different/files...
 Created pipelines.nyc_taxi_pipeline
 Created pipelines.nyc_taxi_pipeline.permissions
-Files: 13 uploaded, 0 deleted
+Files: 11 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/scripts/output.txt b/acceptance/bundle/scripts/output.txt
index 126d36a7278..3bb8a4b71f8 100644
--- a/acceptance/bundle/scripts/output.txt
+++ b/acceptance/bundle/scripts/output.txt
@@ -43,7 +43,7 @@ Executing 'predeploy' script
 from myscript.py 0 predeploy: hello stdout!
 from myscript.py 0 predeploy: hello stderr!
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/scripts/default/files...
-Files: 11 uploaded, 0 deleted
+Files: 10 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 Executing 'postdeploy' script
 from myscript.py 0 postdeploy: hello stdout!
@@ -66,7 +66,7 @@ Executing 'predeploy' script
 from myscript.py 0 predeploy: hello stdout!
 from myscript.py 0 predeploy: hello stderr!
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/scripts/default/files...
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 Executing 'postdeploy' script
 from myscript.py 1 postdeploy: hello stdout!
diff --git a/acceptance/bundle/scripts/restricted-execution/output.txt b/acceptance/bundle/scripts/restricted-execution/output.txt
index 93d3a2ab8c4..079c1e11837 100644
--- a/acceptance/bundle/scripts/restricted-execution/output.txt
+++ b/acceptance/bundle/scripts/restricted-execution/output.txt
@@ -12,7 +12,7 @@ postbuild value_from_env
 Executing 'predeploy' script
 predeploy value_from_env
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/scripts_with_restricted_execution/default/files...
-Files: 3 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 Executing 'postdeploy' script
 postdeploy value_from_env
diff --git a/acceptance/bundle/select/basic/output.txt b/acceptance/bundle/select/basic/output.txt
index 1cc1dff5576..2b3938792b8 100644
--- a/acceptance/bundle/select/basic/output.txt
+++ b/acceptance/bundle/select/basic/output.txt
@@ -26,7 +26,7 @@ Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged, 1 not selected
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-[UNIQUE_NAME]/default/files...
 Created jobs.bar
 Created jobs.foo
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 1 not selected
 
 === Telemetry:
@@ -103,7 +103,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 2 unchanged
 === Full deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-[UNIQUE_NAME]/default/files...
 Created jobs.baz
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 2 unchanged
 
 >>> print_requests.py --nostamp --sort //jobs
diff --git a/acceptance/bundle/select/basic/script b/acceptance/bundle/select/basic/script
index e8b7741af95..f4fbd243a54 100644
--- a/acceptance/bundle/select/basic/script
+++ b/acceptance/bundle/select/basic/script
@@ -3,7 +3,7 @@ envsubst '$UNIQUE_NAME' < databricks.yml.tmpl > databricks.yml
 cleanup() {
     title "Destroy"
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/bundle/select/grants_permissions/output.txt b/acceptance/bundle/select/grants_permissions/output.txt
index 0912c16da8b..770a2a69930 100644
--- a/acceptance/bundle/select/grants_permissions/output.txt
+++ b/acceptance/bundle/select/grants_permissions/output.txt
@@ -23,14 +23,14 @@ Error: no such resource: schemas.my_schema.grants
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-subnodes-[UNIQUE_NAME]/default/files...
 Created jobs.my_job
 Created jobs.my_job.permissions
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected
 
 === bundle deploy --select schemas.my_schema
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-subnodes-[UNIQUE_NAME]/default/files...
 Created schemas.my_schema
 Created schemas.my_schema.grants
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 2 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected
 
 >>> print_requests.py --sort //permissions
diff --git a/acceptance/bundle/select/grants_permissions/script b/acceptance/bundle/select/grants_permissions/script
index 1aab6a33fa4..230a9111291 100644
--- a/acceptance/bundle/select/grants_permissions/script
+++ b/acceptance/bundle/select/grants_permissions/script
@@ -3,7 +3,7 @@ envsubst '$UNIQUE_NAME' < databricks.yml.tmpl > databricks.yml
 cleanup() {
     title "Destroy"
     trace $CLI bundle destroy --auto-approve
-    rm -f out.requests.txt
+    rm -f "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
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..a0b253cc6be 100644
--- a/acceptance/bundle/select/plan_file_survives_not_selected/output.txt
+++ b/acceptance/bundle/select/plan_file_survives_not_selected/output.txt
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy --plan plan.json
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/select-plan-[UNIQUE_NAME]/default/files...
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged, 2 not selected
 
 >>> [CLI] bundle destroy --auto-approve
diff --git a/acceptance/bundle/state/basic/output.txt b/acceptance/bundle/state/basic/output.txt
index eb014557b08..3f2c321daf2 100644
--- a/acceptance/bundle/state/basic/output.txt
+++ b/acceptance/bundle/state/basic/output.txt
@@ -2,10 +2,10 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files...
 Created jobs.test
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/state/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
diff --git a/acceptance/bundle/state/basic/script b/acceptance/bundle/state/basic/script
index 0e0ee76891e..a3798ba9722 100644
--- a/acceptance/bundle/state/basic/script
+++ b/acceptance/bundle/state/basic/script
@@ -1,4 +1,4 @@
 trace $CLI bundle deploy
 trace $CLI bundle deploy # We do 2 deploys because only 2nd deploy will pull state from remote after 1st created it
-jq 'select(.path == "/api/2.0/workspace/export" and (.q.path | test("/.bundle/state/default/state/")) and (.q.path | test("deploy.lock") | not))' out.requests.txt > out.state.txt
-rm out.requests.txt
+jq 'select(.path == "/api/2.0/workspace/export" and (.q.path | test("/.bundle/state/default/state/")) and (.q.path | test("deploy.lock") | not))' "$OUT_REQUESTS" > out.state.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/state/engine_default/output.txt b/acceptance/bundle/state/engine_default/output.txt
index ecdfc4d3658..30c003bc55c 100644
--- a/acceptance/bundle/state/engine_default/output.txt
+++ b/acceptance/bundle/state/engine_default/output.txt
@@ -4,7 +4,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-engine-default/default/files...
 Created schemas.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //api/2.1/unity-catalog/schemas
diff --git a/acceptance/bundle/state/feature_flags/output.txt b/acceptance/bundle/state/feature_flags/output.txt
index 1ed17f9b23e..b6385259dd2 100644
--- a/acceptance/bundle/state/feature_flags/output.txt
+++ b/acceptance/bundle/state/feature_flags/output.txt
@@ -15,7 +15,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.my_job
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> gron.py .databricks/bundle/default/resources.json
diff --git a/acceptance/bundle/state/force_pull_commands/output.txt b/acceptance/bundle/state/force_pull_commands/output.txt
index 217f1d3fb20..0ef6ccf69fb 100644
--- a/acceptance/bundle/state/force_pull_commands/output.txt
+++ b/acceptance/bundle/state/force_pull_commands/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/force-pull-commands/default/files...
 Created jobs.foo
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Use a fake browser that just prints the URL it would have opened
diff --git a/acceptance/bundle/state/force_pull_commands/script b/acceptance/bundle/state/force_pull_commands/script
index b4e0017422e..fc287979037 100644
--- a/acceptance/bundle/state/force_pull_commands/script
+++ b/acceptance/bundle/state/force_pull_commands/script
@@ -1,29 +1,29 @@
 trace $CLI bundle deploy > /dev/null
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
 
 title "Use a fake browser that just prints the URL it would have opened"
 export BROWSER="echo_browser.py"
 
-# touch out.requests.txt before each print_requests.py call: the commands without
+# touch "$OUT_REQUESTS" before each print_requests.py call: the commands without
 # --force-pull make zero HTTP requests, so the file is never created and
 # print_requests.py would otherwise exit with "File not found".
 
 title "bundle summary without --force-pull: no remote state read\n"
 trace $CLI bundle summary > /dev/null
-touch out.requests.txt
+touch "$OUT_REQUESTS"
 print_requests.py --get //workspace/export
 
 title "bundle summary --force-pull: remote state read\n"
 trace $CLI bundle summary --force-pull > /dev/null
-touch out.requests.txt
+touch "$OUT_REQUESTS"
 print_requests.py --get //workspace/export
 
 title "bundle open without --force-pull: no remote state read\n"
 trace $CLI bundle open foo > /dev/null
-touch out.requests.txt
+touch "$OUT_REQUESTS"
 print_requests.py --get //workspace/export
 
 title "bundle open --force-pull: remote state read\n"
 trace $CLI bundle open foo --force-pull > /dev/null
-touch out.requests.txt
+touch "$OUT_REQUESTS"
 print_requests.py --get //workspace/export
diff --git a/acceptance/bundle/state/permission_level_migration/output.txt b/acceptance/bundle/state/permission_level_migration/output.txt
index c0729998f5a..e4b00bb73fd 100644
--- a/acceptance/bundle/state/permission_level_migration/output.txt
+++ b/acceptance/bundle/state/permission_level_migration/output.txt
@@ -7,7 +7,7 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.my_job
 Updated jobs.my_job.permissions
-Files: 6 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 1 changed, 0 deleted, 0 unchanged
 
 === Print state after deploy
diff --git a/acceptance/bundle/state/state_present/output.txt b/acceptance/bundle/state/state_present/output.txt
index febc10e400b..fdadb63bf68 100644
--- a/acceptance/bundle/state/state_present/output.txt
+++ b/acceptance/bundle/state/state_present/output.txt
@@ -4,7 +4,7 @@
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created schemas.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //api/2.1/unity-catalog/schemas
@@ -41,7 +41,7 @@ Plan: 1 to add, 0 to change, 0 to delete, 0 unchanged
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created schemas.foo
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle destroy --auto-approve
@@ -58,7 +58,7 @@ Destroy: 1 deleted
 >>> DATABRICKS_BUNDLE_ENGINE=direct [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created schemas.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_requests.py //api/2.1/unity-catalog/schemas
@@ -70,12 +70,12 @@ Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE=terraform [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 2 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
 
 >>> print_requests.py --get //api/2.1/unity-catalog/schemas
diff --git a/acceptance/bundle/state/state_present/script b/acceptance/bundle/state/state_present/script
index 1dad8705619..e58a72ab0bc 100644
--- a/acceptance/bundle/state/state_present/script
+++ b/acceptance/bundle/state/state_present/script
@@ -19,7 +19,7 @@ trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle plan
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle plan
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 title 'Adding resources.json with higher serial, env var mismatch warns but uses state engine\n'
 echo '{"serial": 10, "lineage": "test-lineage"}' > .databricks/bundle/default/resources.json
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle plan
@@ -29,7 +29,7 @@ trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle plan
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle deploy
 trace DATABRICKS_BUNDLE_ENGINE=terraform $CLI bundle destroy --auto-approve
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 trace DATABRICKS_BUNDLE_ENGINE=direct $CLI bundle deploy
 trace print_requests.py //api/2.1/unity-catalog/schemas | jq '.headers["User-Agent"][0]' | contains.py 'engine/direct' '!terraform' '!tf-provider'
 trace print_state.py | jq .serial | contains.py "13"
@@ -44,4 +44,4 @@ trace print_state.py | jq .serial | contains.py "13"
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states
 trace DATABRICKS_BUNDLE_ENGINE= $CLI bundle debug states --force-pull
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/summary/modified_status/output.txt b/acceptance/bundle/summary/modified_status/output.txt
index 9b767f45254..5c398b0b12b 100644
--- a/acceptance/bundle/summary/modified_status/output.txt
+++ b/acceptance/bundle/summary/modified_status/output.txt
@@ -73,7 +73,7 @@ Created alerts.my_alert
 Created pipelines.my_pipeline
 Created schemas.my_schema
 Created sql_warehouses.my_sql_warehouse
-Files: 7 uploaded, 0 deleted
+Files: 6 uploaded, 0 deleted
 Resources: 4 created, 0 changed, 0 deleted, 0 unchanged
 
 === Post-deployment view of resources with id and without modified_status
diff --git a/acceptance/bundle/telemetry/config-remote-sync-error/output.txt b/acceptance/bundle/telemetry/config-remote-sync-error/output.txt
index 2edf3bb39ca..6dd1e517dec 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-error/output.txt
+++ b/acceptance/bundle/telemetry/config-remote-sync-error/output.txt
@@ -4,7 +4,7 @@ Error: state snapshot not available: resources state snapshot not found remotely
 
 Exit code: 1
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "engine": "terraform",
   "state_source": "local",
diff --git a/acceptance/bundle/telemetry/config-remote-sync-error/script b/acceptance/bundle/telemetry/config-remote-sync-error/script
index e48fb6ff123..c47010b543f 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-error/script
+++ b/acceptance/bundle/telemetry/config-remote-sync-error/script
@@ -2,6 +2,6 @@
 # not exist, so the command fails and telemetry reports STATE_NOT_FOUND.
 trace errcode $CLI bundle config-remote-sync
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt b/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt
index e672093a843..69167a12c83 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt
+++ b/acceptance/bundle/telemetry/config-remote-sync-recreate/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-recreate/default/files...
 Created pipelines.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle config-remote-sync
@@ -13,7 +13,7 @@ Resource: resources.pipelines.foo
 
 
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "engine": "direct",
   "changes_total": 1,
diff --git a/acceptance/bundle/telemetry/config-remote-sync-recreate/script b/acceptance/bundle/telemetry/config-remote-sync-recreate/script
index eb6c1773888..2694359afe5 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-recreate/script
+++ b/acceptance/bundle/telemetry/config-remote-sync-recreate/script
@@ -10,6 +10,6 @@ EOF
 
 trace $CLI bundle config-remote-sync
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/config-remote-sync-save/output.txt b/acceptance/bundle/telemetry/config-remote-sync-save/output.txt
index b5a8c39aa30..4338ee9d704 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-save/output.txt
+++ b/acceptance/bundle/telemetry/config-remote-sync-save/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-save/default/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle config-remote-sync --save
@@ -13,7 +13,7 @@ Resource: resources.jobs.foo
 
 
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "save": true,
   "engine": "direct",
diff --git a/acceptance/bundle/telemetry/config-remote-sync-save/script b/acceptance/bundle/telemetry/config-remote-sync-save/script
index 0434f3dc882..43424f7cb26 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-save/script
+++ b/acceptance/bundle/telemetry/config-remote-sync-save/script
@@ -7,6 +7,6 @@ update_file.py databricks.yml "test job" "locally edited job name"
 
 trace $CLI bundle config-remote-sync --save
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/config-remote-sync-skipped-state/output.txt b/acceptance/bundle/telemetry/config-remote-sync-skipped-state/output.txt
index 9cc4a5a3b45..35a1512c44f 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-skipped-state/output.txt
+++ b/acceptance/bundle/telemetry/config-remote-sync-skipped-state/output.txt
@@ -7,7 +7,7 @@
   "changes": {}
 }
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "engine": "terraform",
   "state_source": "local",
diff --git a/acceptance/bundle/telemetry/config-remote-sync-skipped-state/script b/acceptance/bundle/telemetry/config-remote-sync-skipped-state/script
index 5b87bc029ec..6fe42a52411 100644
--- a/acceptance/bundle/telemetry/config-remote-sync-skipped-state/script
+++ b/acceptance/bundle/telemetry/config-remote-sync-skipped-state/script
@@ -3,6 +3,6 @@
 # skipped, but telemetry still records the STATE_NOT_FOUND error payload.
 trace errcode $CLI bundle config-remote-sync -o json
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/config-remote-sync/output.txt b/acceptance/bundle/telemetry/config-remote-sync/output.txt
index a14ae698f6c..64a9cf804eb 100644
--- a/acceptance/bundle/telemetry/config-remote-sync/output.txt
+++ b/acceptance/bundle/telemetry/config-remote-sync/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/config-remote-sync-telemetry/default/files...
 Created jobs.foo
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle config-remote-sync
@@ -13,7 +13,7 @@ Resource: resources.jobs.foo
 
 
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "engine": "direct",
   "changes_total": 1,
diff --git a/acceptance/bundle/telemetry/config-remote-sync/script b/acceptance/bundle/telemetry/config-remote-sync/script
index 18247c96ce6..d0e2b50e11e 100644
--- a/acceptance/bundle/telemetry/config-remote-sync/script
+++ b/acceptance/bundle/telemetry/config-remote-sync/script
@@ -7,6 +7,6 @@ EOF
 
 trace $CLI bundle config-remote-sync
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_config_remote_sync_event | select(. != null)'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt
index 038bb233e00..db642ef17c3 100644
--- a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt
+++ b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/output.txt
@@ -3,10 +3,10 @@
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 ✓ Deployment succeeded
 Created apps.myapp
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "bool_values": [
     {
diff --git a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/script b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/script
index 67a3ba6299e..a454001b8f9 100644
--- a/acceptance/bundle/telemetry/deploy-app-lifecycle-started/script
+++ b/acceptance/bundle/telemetry/deploy-app-lifecycle-started/script
@@ -1,5 +1,5 @@
 trace $CLI bundle deploy
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {bool_values}'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {bool_values}'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt b/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt
index 3bdb9f9a34a..d4d1b4d0f1d 100644
--- a/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt
+++ b/acceptance/bundle/telemetry/deploy-artifact-path-type/output.txt
@@ -1,15 +1,15 @@
 
 >>> [CLI] bundle deploy -t one
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -t two
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/two/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "workspace_artifact_path_type": "WORKSPACE_FILE_SYSTEM"
 }
diff --git a/acceptance/bundle/telemetry/deploy-artifact-path-type/script b/acceptance/bundle/telemetry/deploy-artifact-path-type/script
index d1a63928a67..5a3a68ff114 100644
--- a/acceptance/bundle/telemetry/deploy-artifact-path-type/script
+++ b/acceptance/bundle/telemetry/deploy-artifact-path-type/script
@@ -2,6 +2,6 @@ trace $CLI bundle deploy -t one
 
 trace $CLI bundle deploy -t two
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {workspace_artifact_path_type}'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {workspace_artifact_path_type}'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt b/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt
index 0740e94664e..2f7ea1033fa 100644
--- a/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt
+++ b/acceptance/bundle/telemetry/deploy-artifacts-variables/output.txt
@@ -4,22 +4,22 @@ Building test_artifact...
 Uploading databricks.yml...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-artifacts-variables/dev/files...
 Created jobs.test-job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === No artifact metrics expected
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 
 >>> [CLI] bundle deploy -t prod
 Building test_artifact...
 Uploading databricks.yml...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-artifacts-variables/prod/files...
 Created jobs.test-job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 === Artifact metrics expected
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "key": "artifacts_reference_used",
   "value": true
diff --git a/acceptance/bundle/telemetry/deploy-artifacts-variables/script b/acceptance/bundle/telemetry/deploy-artifacts-variables/script
index 1088102801c..b4b02d07718 100644
--- a/acceptance/bundle/telemetry/deploy-artifacts-variables/script
+++ b/acceptance/bundle/telemetry/deploy-artifacts-variables/script
@@ -1,11 +1,11 @@
 trace $CLI bundle deploy -t dev
 
 title "No artifact metrics expected"
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental.bool_values[] | select(.key == "artifacts_reference_used")'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental.bool_values[] | select(.key == "artifacts_reference_used")'
 
 trace $CLI bundle deploy -t prod
 
 title "Artifact metrics expected"
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental.bool_values[] | select(.key == "artifacts_reference_used")'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental.bool_values[] | select(.key == "artifacts_reference_used")'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-compute-type/output.txt b/acceptance/bundle/telemetry/deploy-compute-type/output.txt
index 5bba6b50219..fc47cfbd506 100644
--- a/acceptance/bundle/telemetry/deploy-compute-type/output.txt
+++ b/acceptance/bundle/telemetry/deploy-compute-type/output.txt
@@ -2,13 +2,13 @@
 >>> [CLI] bundle deploy -t one
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-compute-type/one/files...
 Created jobs.my_job
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -t two
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/deploy-compute-type/two/files...
 Created jobs.my_job
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/bundle/telemetry/deploy-compute-type/script b/acceptance/bundle/telemetry/deploy-compute-type/script
index 6d2a0de0b05..38d14733f68 100644
--- a/acceptance/bundle/telemetry/deploy-compute-type/script
+++ b/acceptance/bundle/telemetry/deploy-compute-type/script
@@ -6,4 +6,4 @@ trace $CLI bundle deploy -t two
 trace print_telemetry_bool_values | grep -v direct_drymigrate
 print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.$DATABRICKS_BUNDLE_ENGINE.txt || true
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-config-file-count/output.txt b/acceptance/bundle/telemetry/deploy-config-file-count/output.txt
index afa8730c60d..b8f46fb5e77 100644
--- a/acceptance/bundle/telemetry/deploy-config-file-count/output.txt
+++ b/acceptance/bundle/telemetry/deploy-config-file-count/output.txt
@@ -1,10 +1,10 @@
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "configuration_file_count": 4
 }
diff --git a/acceptance/bundle/telemetry/deploy-config-file-count/script b/acceptance/bundle/telemetry/deploy-config-file-count/script
index c495bdcb071..a0767f36da3 100644
--- a/acceptance/bundle/telemetry/deploy-config-file-count/script
+++ b/acceptance/bundle/telemetry/deploy-config-file-count/script
@@ -1,5 +1,5 @@
 trace $CLI bundle deploy
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {configuration_file_count}'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {configuration_file_count}'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-error-message/output.txt b/acceptance/bundle/telemetry/deploy-error-message/output.txt
index bb7f609143d..bdb457438c4 100644
--- a/acceptance/bundle/telemetry/deploy-error-message/output.txt
+++ b/acceptance/bundle/telemetry/deploy-error-message/output.txt
@@ -5,5 +5,5 @@ Error: no value assigned to required variable myvar. Variables are usually assig
 
 Exit code: 1
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 no value assigned to required variable myvar. Variables are usually assigned in databricks.yml, and they can be overridden using "--var", the BUNDLE_VAR_myvar environment variable, or [REDACTED_REL_PATH](json)
diff --git a/acceptance/bundle/telemetry/deploy-error-message/script b/acceptance/bundle/telemetry/deploy-error-message/script
index 8c5e853386b..862a6efa2e3 100644
--- a/acceptance/bundle/telemetry/deploy-error-message/script
+++ b/acceptance/bundle/telemetry/deploy-error-message/script
@@ -1,5 +1,5 @@
 errcode trace $CLI bundle deploy
 
-trace cat out.requests.txt | jq -r 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.error_message'
+trace cat "$OUT_REQUESTS" | jq -r 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.error_message'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-error/output.txt b/acceptance/bundle/telemetry/deploy-error/output.txt
index 5728b1d45d4..8382a2832b4 100644
--- a/acceptance/bundle/telemetry/deploy-error/output.txt
+++ b/acceptance/bundle/telemetry/deploy-error/output.txt
@@ -5,4 +5,4 @@ Error: unable to define default workspace root: bundle name not defined
 
 Exit code: 1
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
diff --git a/acceptance/bundle/telemetry/deploy-error/script b/acceptance/bundle/telemetry/deploy-error/script
index 642cb0ef7dc..ebc0e9667fa 100644
--- a/acceptance/bundle/telemetry/deploy-error/script
+++ b/acceptance/bundle/telemetry/deploy-error/script
@@ -1,9 +1,9 @@
 errcode trace $CLI bundle deploy
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log | {execution_context}' > out.telemetry.txt
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log | {execution_context}' > out.telemetry.txt
 
 cmd_exec_id=$(extract_command_exec_id.py)
 
 update_file.py out.telemetry.txt $cmd_exec_id  '[CMD-EXEC-ID]'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-experimental/output.txt b/acceptance/bundle/telemetry/deploy-experimental/output.txt
index 3dab7aeee55..4ce786a044b 100644
--- a/acceptance/bundle/telemetry/deploy-experimental/output.txt
+++ b/acceptance/bundle/telemetry/deploy-experimental/output.txt
@@ -6,7 +6,7 @@ Warning: You are using the legacy mode of run_as. The support for this mode is e
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/bundle/telemetry/deploy-experimental/script b/acceptance/bundle/telemetry/deploy-experimental/script
index 1e32b6c98ea..0510777f9a6 100644
--- a/acceptance/bundle/telemetry/deploy-experimental/script
+++ b/acceptance/bundle/telemetry/deploy-experimental/script
@@ -5,4 +5,4 @@ trace $CLI bundle deploy
 trace print_telemetry_bool_values | grep -v direct_drymigrate
 print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.$DATABRICKS_BUNDLE_ENGINE.txt || true
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-failed-engine-unknown/script b/acceptance/bundle/telemetry/deploy-failed-engine-unknown/script
index db4d56e071f..fe47d66df25 100644
--- a/acceptance/bundle/telemetry/deploy-failed-engine-unknown/script
+++ b/acceptance/bundle/telemetry/deploy-failed-engine-unknown/script
@@ -1,6 +1,6 @@
 errcode trace $CLI bundle deploy
 
-cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson' > telemetry.json
+cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson' > telemetry.json
 
 # The deploy fails before deployCore runs (the deployment-lock write is stubbed to
 # 500), yet resources_metadata still reports state_engine: b.Metrics.StateEngine is
@@ -9,5 +9,5 @@ cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .
 # engine="unknown". state_engine is engine-specific, so capture it per-engine.
 cat telemetry.json | jq '.entry.databricks_cli_log.bundle_deploy_event.resources_metadata' > out.resources_metadata.$DATABRICKS_BUNDLE_ENGINE.txt
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 rm telemetry.json
diff --git a/acceptance/bundle/telemetry/deploy-failed-state-pull/script b/acceptance/bundle/telemetry/deploy-failed-state-pull/script
index 65ae1bf4082..4ecebdc9d5e 100644
--- a/acceptance/bundle/telemetry/deploy-failed-state-pull/script
+++ b/acceptance/bundle/telemetry/deploy-failed-state-pull/script
@@ -1,6 +1,6 @@
 errcode trace $CLI bundle deploy
 
-cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson' > telemetry.json
+cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson' > telemetry.json
 
 # resources_metadata reports state_engine even though the deploy failed while pulling
 # the state: b.Metrics.StateEngine is set from the requested engine before the pull.
@@ -9,5 +9,5 @@ cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .
 # with line-ending conversion across platforms.
 cat telemetry.json | jq '.entry.databricks_cli_log.bundle_deploy_event.resources_metadata | if . then del(.state_file_size_bytes) else . end' > out.resources_metadata.$DATABRICKS_BUNDLE_ENGINE.txt
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 rm telemetry.json
diff --git a/acceptance/bundle/telemetry/deploy-mode/output.txt b/acceptance/bundle/telemetry/deploy-mode/output.txt
index 2f6c4e10115..84d87338e12 100644
--- a/acceptance/bundle/telemetry/deploy-mode/output.txt
+++ b/acceptance/bundle/telemetry/deploy-mode/output.txt
@@ -1,7 +1,7 @@
 
 >>> [CLI] bundle deploy -t dev
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -t prod
@@ -12,10 +12,10 @@ A common practice is to use a username or principal name in this path, i.e. use
   root_path: /Workspace/Users/[USERNAME]/.bundle/${bundle.name}/${bundle.target}
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/prod/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "bundle_mode": "DEVELOPMENT"
 }
diff --git a/acceptance/bundle/telemetry/deploy-mode/script b/acceptance/bundle/telemetry/deploy-mode/script
index f7257769ac1..82299828e12 100644
--- a/acceptance/bundle/telemetry/deploy-mode/script
+++ b/acceptance/bundle/telemetry/deploy-mode/script
@@ -2,6 +2,6 @@ trace $CLI bundle deploy -t dev
 
 trace $CLI bundle deploy -t prod
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {bundle_mode}'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {bundle_mode}'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt b/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt
index 7b6a86612ac..e9e3c891141 100644
--- a/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt
+++ b/acceptance/bundle/telemetry/deploy-name-prefix/custom/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/custom-prefix/default/files...
 Created schemas.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/custom/script b/acceptance/bundle/telemetry/deploy-name-prefix/custom/script
index 1e32b6c98ea..0510777f9a6 100644
--- a/acceptance/bundle/telemetry/deploy-name-prefix/custom/script
+++ b/acceptance/bundle/telemetry/deploy-name-prefix/custom/script
@@ -5,4 +5,4 @@ trace $CLI bundle deploy
 trace print_telemetry_bool_values | grep -v direct_drymigrate
 print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.$DATABRICKS_BUNDLE_ENGINE.txt || true
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt
index 748e566b01b..f0cee00f124 100644
--- a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt
+++ b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/development-prefix/development/files...
 Created schemas.foo
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/script b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/script
index 1e32b6c98ea..0510777f9a6 100644
--- a/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/script
+++ b/acceptance/bundle/telemetry/deploy-name-prefix/mode-development/script
@@ -5,4 +5,4 @@ trace $CLI bundle deploy
 trace print_telemetry_bool_values | grep -v direct_drymigrate
 print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.$DATABRICKS_BUNDLE_ENGINE.txt || true
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-no-uuid/output.txt b/acceptance/bundle/telemetry/deploy-no-uuid/output.txt
index 504928739ce..eb9ca24bfae 100644
--- a/acceptance/bundle/telemetry/deploy-no-uuid/output.txt
+++ b/acceptance/bundle/telemetry/deploy-no-uuid/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.job_one
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
diff --git a/acceptance/bundle/telemetry/deploy-no-uuid/script b/acceptance/bundle/telemetry/deploy-no-uuid/script
index 501b3dd76a9..f560be1b643 100644
--- a/acceptance/bundle/telemetry/deploy-no-uuid/script
+++ b/acceptance/bundle/telemetry/deploy-no-uuid/script
@@ -1,7 +1,7 @@
 trace $CLI bundle deploy
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event | {bundle_uuid}' > out.telemetry.txt
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event | {bundle_uuid}' > out.telemetry.txt
 
 update_file.py out.telemetry.txt "00000000-0000-0000-0000-000000000000"  '[ZERO_UUID]'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-run-as/output.txt b/acceptance/bundle/telemetry/deploy-run-as/output.txt
index b6644233011..30f2307573f 100644
--- a/acceptance/bundle/telemetry/deploy-run-as/output.txt
+++ b/acceptance/bundle/telemetry/deploy-run-as/output.txt
@@ -2,10 +2,10 @@
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
 Created jobs.test_job
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 
 >>> cat telemetry.json
 {
diff --git a/acceptance/bundle/telemetry/deploy-run-as/script b/acceptance/bundle/telemetry/deploy-run-as/script
index 697baaed6f7..7b09b768ccd 100644
--- a/acceptance/bundle/telemetry/deploy-run-as/script
+++ b/acceptance/bundle/telemetry/deploy-run-as/script
@@ -1,8 +1,8 @@
 trace $CLI bundle deploy
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson' > telemetry.json
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson' > telemetry.json
 
 trace cat telemetry.json | jq '.entry.databricks_cli_log.bundle_deploy_event.experimental.bool_values[] | select(.key == "run_as_set")'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 rm telemetry.json
diff --git a/acceptance/bundle/telemetry/deploy-target-count/output.txt b/acceptance/bundle/telemetry/deploy-target-count/output.txt
index 3e2a5d18036..cb7cf4e3e47 100644
--- a/acceptance/bundle/telemetry/deploy-target-count/output.txt
+++ b/acceptance/bundle/telemetry/deploy-target-count/output.txt
@@ -1,10 +1,10 @@
 
 >>> [CLI] bundle deploy -t one
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "target_count": 3
 }
diff --git a/acceptance/bundle/telemetry/deploy-target-count/script b/acceptance/bundle/telemetry/deploy-target-count/script
index 3022a2b5e49..2ec746e3ffd 100644
--- a/acceptance/bundle/telemetry/deploy-target-count/script
+++ b/acceptance/bundle/telemetry/deploy-target-count/script
@@ -1,5 +1,5 @@
 trace $CLI bundle deploy -t one
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {target_count}'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {target_count}'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-variable-count/output.txt b/acceptance/bundle/telemetry/deploy-variable-count/output.txt
index dee95ec234b..8f03a0f6ecb 100644
--- a/acceptance/bundle/telemetry/deploy-variable-count/output.txt
+++ b/acceptance/bundle/telemetry/deploy-variable-count/output.txt
@@ -1,10 +1,10 @@
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "variable_count": 6,
   "lookup_variable_count": 2,
diff --git a/acceptance/bundle/telemetry/deploy-variable-count/script b/acceptance/bundle/telemetry/deploy-variable-count/script
index dad762899a2..ee4f3e29e4a 100644
--- a/acceptance/bundle/telemetry/deploy-variable-count/script
+++ b/acceptance/bundle/telemetry/deploy-variable-count/script
@@ -1,5 +1,5 @@
 trace $CLI bundle deploy
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs.[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {variable_count, lookup_variable_count, complex_variable_count}'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs.[] | fromjson | .entry.databricks_cli_log.bundle_deploy_event.experimental | {variable_count, lookup_variable_count, complex_variable_count}'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt b/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt
index 17f2a710af8..3023fbf9501 100644
--- a/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt
+++ b/acceptance/bundle/telemetry/deploy-whl-artifacts/output.txt
@@ -3,14 +3,14 @@
 Building test...
 Uploading my_test_code/dist/my_test_code-0.0.1-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/one/files...
-Files: 10 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> [CLI] bundle deploy -t two
 Building test...
 Uploading .databricks/bundle/two/patched_wheels/test_my_test_code/my_test_code-0.0.1+[UNIX_TIME_NANOS]-py3-none-any.whl...
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/two/files...
-Files: 10 uploaded, 0 deleted
+Files: 8 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/bundle/telemetry/deploy-whl-artifacts/script b/acceptance/bundle/telemetry/deploy-whl-artifacts/script
index fbe35a7a41f..40b250f5121 100644
--- a/acceptance/bundle/telemetry/deploy-whl-artifacts/script
+++ b/acceptance/bundle/telemetry/deploy-whl-artifacts/script
@@ -11,4 +11,4 @@ trace $CLI bundle deploy -t two
 trace print_telemetry_bool_values | grep -v direct_drymigrate
 print_telemetry_bool_values | grep direct_drymigrate > out.drymigrate.txt || true
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt
index 647d4ad3084..a7a6d02c159 100644
--- a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt
+++ b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/output.txt
@@ -1,7 +1,7 @@
 
 >>> [CLI] bundle deploy -t no_permissions
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/no_permissions/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
@@ -18,7 +18,7 @@ state_path_other false
 
 >>> [CLI] bundle deploy -t user_declared
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/user_declared/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
@@ -47,7 +47,7 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more
   in databricks.yml:23:7
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/user_not_declared/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
@@ -64,7 +64,7 @@ state_path_other false
 
 >>> [CLI] bundle deploy -t other_user_not_declared
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/other_user_not_declared/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
@@ -81,7 +81,7 @@ state_path_other false
 
 >>> [CLI] bundle deploy -t workspace_other
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/workspace_other/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
@@ -110,7 +110,7 @@ See https://docs.databricks.com/dev-tools/bundles/permissions.html to learn more
   in databricks.yml:47:7
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/shared_users_can_manage/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
@@ -127,7 +127,7 @@ state_path_other false
 
 >>> [CLI] bundle deploy -t shared_not_declared
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/shared_not_declared/files...
-Files: 4 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/script b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/script
index e924cd0e2b0..6af35df7846 100644
--- a/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/script
+++ b/acceptance/bundle/telemetry/deploy-workspace-folder-permissions/script
@@ -8,5 +8,5 @@ for target in \
 	shared_not_declared; do
 	trace $CLI bundle deploy -t "$target"
 	trace print_telemetry_bool_values | grep -E "state_path|permissions_section|dms_"
-	rm out.requests.txt
+	rm "$OUT_REQUESTS"
 done
diff --git a/acceptance/bundle/telemetry/deploy/output.txt b/acceptance/bundle/telemetry/deploy/output.txt
index 9d3553b1adb..4802ba571b3 100644
--- a/acceptance/bundle/telemetry/deploy/output.txt
+++ b/acceptance/bundle/telemetry/deploy/output.txt
@@ -9,7 +9,7 @@ Created pipelines.pipeline_two
 Files: 4 uploaded, 0 deleted
 Resources: 5 created, 0 changed, 0 deleted, 0 unchanged
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 
 === Assert that mutator execution times are being recorded
 >>> cat telemetry.json
diff --git a/acceptance/bundle/telemetry/deploy/script b/acceptance/bundle/telemetry/deploy/script
index cd2cf5fed0f..a3aa4c46df2 100644
--- a/acceptance/bundle/telemetry/deploy/script
+++ b/acceptance/bundle/telemetry/deploy/script
@@ -1,6 +1,6 @@
 trace $CLI bundle deploy
 
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson' > telemetry.json
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson' > telemetry.json
 
 # Assert that the telemetry mechanism is working and recording mutator execution times.
 # We only check that at least one mutator execution time is recorded to avoid flakiness on fast machines
@@ -44,5 +44,5 @@ update_file.py out.telemetry.txt $cmd_exec_id  '[CMD-EXEC-ID]'
 update_file.py out.telemetry.txt "11111111-2222-3333-4444-555555555555"  '[BUNDLE_UUID]'
 update_file.py out.telemetry.txt $deployment_id  '[DEPLOYMENT_ID]'
 
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 rm telemetry.json
diff --git a/acceptance/bundle/templates/default-python/classic/script b/acceptance/bundle/templates/default-python/classic/script
index 8de8ff5b22f..ee494960ec9 100644
--- a/acceptance/bundle/templates/default-python/classic/script
+++ b/acceptance/bundle/templates/default-python/classic/script
@@ -10,7 +10,7 @@ trace $CLI bundle plan -t prod
 $CLI bundle plan -o json -t dev | nostamp > ../../out.plan_dev.$DATABRICKS_BUNDLE_ENGINE.json
 $CLI bundle plan -o json -t prod | nostamp > ../../out.plan_prod.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm ../../out.requests.txt
+rm "$OUT_REQUESTS"
 # With --plan variant we don't build artifacts, so we can filter out relevant log lines
 $CLI bundle deploy -t dev $(readplanarg ../../out.plan_dev.direct.json) 2>&1 | grep -vE '^Building python_artifact|^Uploading .databricks'
 print_requests.py --sort '^//import-file/' '^//telemetry-ext' > ../../out.requests.dev.$DATABRICKS_BUNDLE_ENGINE.txt
@@ -27,7 +27,7 @@ mv .gitignore out.gitignore
 rm -r .databricks dist
 
 cd ../../
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 # Calculate the difference from the serverless template
 diff.py $TESTDIR/../serverless/output output/ > out.compare-vs-serverless.diff
diff --git a/acceptance/bundle/templates/default-python/serverless/script b/acceptance/bundle/templates/default-python/serverless/script
index 3fd947a2161..59230a27880 100644
--- a/acceptance/bundle/templates/default-python/serverless/script
+++ b/acceptance/bundle/templates/default-python/serverless/script
@@ -10,7 +10,7 @@ trace $CLI bundle plan -t prod
 $CLI bundle plan -o json -t dev | nostamp > ../../out.plan_dev.$DATABRICKS_BUNDLE_ENGINE.json
 $CLI bundle plan -o json -t prod | nostamp > ../../out.plan_prod.$DATABRICKS_BUNDLE_ENGINE.json
 
-rm ../../out.requests.txt
+rm "$OUT_REQUESTS"
 trace $CLI bundle deploy -t dev
 print_requests.py --sort '^//import-file/' '^//telemetry-ext' > ../../out.requests.dev.$DATABRICKS_BUNDLE_ENGINE.txt
 trace $CLI bundle plan -t dev  # check if if there is drift
@@ -26,4 +26,4 @@ mv .gitignore out.gitignore
 rm -fr .databricks dist
 
 cd ../../
-rm out.requests.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/bundle/templates/telemetry/custom-template/out.requests.txt b/acceptance/bundle/templates/telemetry/custom-template/out.requests.txt
deleted file mode 100644
index 8f811f273c0..00000000000
--- a/acceptance/bundle/templates/telemetry/custom-template/out.requests.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"custom\"}}}}"
-    ]
-  }
-}
diff --git a/acceptance/bundle/templates/telemetry/custom-template/output.txt b/acceptance/bundle/templates/telemetry/custom-template/output.txt
index 201fe6e8bb9..b2382d17e80 100644
--- a/acceptance/bundle/templates/telemetry/custom-template/output.txt
+++ b/acceptance/bundle/templates/telemetry/custom-template/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] bundle init . --config-file input.json --output-dir output
 ✨ Successfully initialized template
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "frontend_log_event_id": "[UUID]",
   "entry": {
diff --git a/acceptance/bundle/templates/telemetry/custom-template/script b/acceptance/bundle/templates/telemetry/custom-template/script
index 893eb1e6759..0ee808e8539 100644
--- a/acceptance/bundle/templates/telemetry/custom-template/script
+++ b/acceptance/bundle/templates/telemetry/custom-template/script
@@ -8,9 +8,9 @@ rm -r output
 cmd_exec_id=$(extract_command_exec_id.py)
 bundle_uuid=$(cat out.databricks.yml | grep -o 'uuid: [^\n]*' | cut -d ' ' -f2)
 
-update_file.py out.requests.txt $cmd_exec_id  '[CMD-EXEC-ID]'
-update_file.py out.requests.txt $bundle_uuid '[BUNDLE-UUID]'
+update_file.py "$OUT_REQUESTS" $cmd_exec_id  '[CMD-EXEC-ID]'
+update_file.py "$OUT_REQUESTS" $bundle_uuid '[BUNDLE-UUID]'
 update_file.py out.databricks.yml $bundle_uuid '[BUNDLE-UUID]'
 
 # pretty print the telemetry payload.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt b/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt
deleted file mode 100644
index 16251481d0d..00000000000
--- a/acceptance/bundle/templates/telemetry/dbt-sql/out.requests.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.1/unity-catalog/current-metastore-assignment"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"dbt-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes\"},{\"key\":\"serverless\",\"value\":\"yes\"}]}}}}"
-    ]
-  }
-}
diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/output.txt b/acceptance/bundle/templates/telemetry/dbt-sql/output.txt
index 38c7800e37b..74e0bac9312 100644
--- a/acceptance/bundle/templates/telemetry/dbt-sql/output.txt
+++ b/acceptance/bundle/templates/telemetry/dbt-sql/output.txt
@@ -9,7 +9,7 @@ If you already have dbt installed, just type 'cd my_dbt_sql; dbt init' to get st
 Refer to the README.md file for full "getting started" guide and production setup instructions.
 
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "frontend_log_event_id": "[UUID]",
   "entry": {
diff --git a/acceptance/bundle/templates/telemetry/dbt-sql/script b/acceptance/bundle/templates/telemetry/dbt-sql/script
index 5669be644e4..cd511570ccc 100644
--- a/acceptance/bundle/templates/telemetry/dbt-sql/script
+++ b/acceptance/bundle/templates/telemetry/dbt-sql/script
@@ -8,9 +8,9 @@ rm -r output
 cmd_exec_id=$(extract_command_exec_id.py)
 bundle_uuid=$(cat out.databricks.yml | grep -o 'uuid: [^\n]*' | cut -d ' ' -f2)
 
-update_file.py out.requests.txt $cmd_exec_id  '[CMD-EXEC-ID]'
-update_file.py out.requests.txt $bundle_uuid '[BUNDLE-UUID]'
+update_file.py "$OUT_REQUESTS" $cmd_exec_id  '[CMD-EXEC-ID]'
+update_file.py "$OUT_REQUESTS" $bundle_uuid '[BUNDLE-UUID]'
 update_file.py out.databricks.yml $bundle_uuid '[BUNDLE-UUID]'
 
 # pretty print the telemetry payload.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
diff --git a/acceptance/bundle/templates/telemetry/default-python/out.requests.txt b/acceptance/bundle/templates/telemetry/default-python/out.requests.txt
deleted file mode 100644
index 5c530e29161..00000000000
--- a/acceptance/bundle/templates/telemetry/default-python/out.requests.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.1/unity-catalog/current-metastore-assignment"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"default-python\",\"template_enum_args\":[{\"key\":\"include_job\",\"value\":\"yes\"},{\"key\":\"include_pipeline\",\"value\":\"yes\"},{\"key\":\"include_python\",\"value\":\"yes\"},{\"key\":\"language\",\"value\":\"python\"},{\"key\":\"personal_schemas\",\"value\":\"yes\"},{\"key\":\"serverless\",\"value\":\"no\"}]}}}}"
-    ]
-  }
-}
diff --git a/acceptance/bundle/templates/telemetry/default-python/output.txt b/acceptance/bundle/templates/telemetry/default-python/output.txt
index 75b77292145..c8212408e6d 100644
--- a/acceptance/bundle/templates/telemetry/default-python/output.txt
+++ b/acceptance/bundle/templates/telemetry/default-python/output.txt
@@ -10,7 +10,7 @@ Note that [DATABRICKS_URL] is used for initialization.
 
 To get started, refer to the project README.md file and the documentation at https://docs.databricks.com/dev-tools/bundles/index.html.
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "frontend_log_event_id": "[UUID]",
   "entry": {
diff --git a/acceptance/bundle/templates/telemetry/default-python/script b/acceptance/bundle/templates/telemetry/default-python/script
index 99def52ca18..d271416661e 100644
--- a/acceptance/bundle/templates/telemetry/default-python/script
+++ b/acceptance/bundle/templates/telemetry/default-python/script
@@ -8,9 +8,9 @@ rm -r output
 cmd_exec_id=$(extract_command_exec_id.py)
 bundle_uuid=$(cat out.databricks.yml | grep -o 'uuid: [^\n]*' | cut -d ' ' -f2)
 
-update_file.py out.requests.txt $cmd_exec_id  '[CMD-EXEC-ID]'
-update_file.py out.requests.txt $bundle_uuid '[BUNDLE-UUID]'
+update_file.py "$OUT_REQUESTS" $cmd_exec_id  '[CMD-EXEC-ID]'
+update_file.py "$OUT_REQUESTS" $bundle_uuid '[BUNDLE-UUID]'
 update_file.py out.databricks.yml $bundle_uuid '[BUNDLE-UUID]'
 
 # pretty print the telemetry payload.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
diff --git a/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt b/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt
deleted file mode 100644
index 33b2dc1e689..00000000000
--- a/acceptance/bundle/templates/telemetry/default-sql/out.requests.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_init cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"bundle_init\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"bundle_init_event\":{\"bundle_uuid\":\"[BUNDLE-UUID]\",\"template_name\":\"default-sql\",\"template_enum_args\":[{\"key\":\"personal_schemas\",\"value\":\"yes\"}]}}}}"
-    ]
-  }
-}
diff --git a/acceptance/bundle/templates/telemetry/default-sql/output.txt b/acceptance/bundle/templates/telemetry/default-sql/output.txt
index 1dda848ea37..775d86933af 100644
--- a/acceptance/bundle/templates/telemetry/default-sql/output.txt
+++ b/acceptance/bundle/templates/telemetry/default-sql/output.txt
@@ -9,7 +9,7 @@ workspace_host: [DATABRICKS_URL]
 Please refer to the README.md file for "getting started" instructions.
 See also the documentation at https://docs.databricks.com/dev-tools/bundles/index.html.
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "frontend_log_event_id": "[UUID]",
   "entry": {
diff --git a/acceptance/bundle/templates/telemetry/default-sql/script b/acceptance/bundle/templates/telemetry/default-sql/script
index d0ca9dae9ab..002638985e8 100644
--- a/acceptance/bundle/templates/telemetry/default-sql/script
+++ b/acceptance/bundle/templates/telemetry/default-sql/script
@@ -8,9 +8,9 @@ rm -r output
 cmd_exec_id=$(extract_command_exec_id.py)
 bundle_uuid=$(cat out.databricks.yml | grep -o 'uuid: [^\n]*' | cut -d ' ' -f2)
 
-update_file.py out.requests.txt $cmd_exec_id  '[CMD-EXEC-ID]'
-update_file.py out.requests.txt $bundle_uuid '[BUNDLE-UUID]'
+update_file.py "$OUT_REQUESTS" $cmd_exec_id  '[CMD-EXEC-ID]'
+update_file.py "$OUT_REQUESTS" $bundle_uuid '[BUNDLE-UUID]'
 update_file.py out.databricks.yml $bundle_uuid '[BUNDLE-UUID]'
 
 # pretty print the telemetry payload.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
diff --git a/acceptance/bundle/validate/grants_required_principal/script b/acceptance/bundle/validate/grants_required_principal/script
index 8e28a75e4c7..7a50a4a6021 100644
--- a/acceptance/bundle/validate/grants_required_principal/script
+++ b/acceptance/bundle/validate/grants_required_principal/script
@@ -4,4 +4,4 @@ musterr trace $CLI bundle validate
 musterr trace $CLI bundle deploy
 trace print_requests.py //unity-catalog
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/validate/secret_scope_required_principal/script b/acceptance/bundle/validate/secret_scope_required_principal/script
index 056ede5170d..e71645276d3 100644
--- a/acceptance/bundle/validate/secret_scope_required_principal/script
+++ b/acceptance/bundle/validate/secret_scope_required_principal/script
@@ -6,4 +6,4 @@ musterr trace $CLI bundle validate
 musterr trace $CLI bundle deploy
 trace print_requests.py //secrets
 
-rm -f out.requests.txt
+rm -f "$OUT_REQUESTS"
diff --git a/acceptance/bundle/validate/sync_patterns/output.txt b/acceptance/bundle/validate/sync_patterns/output.txt
index 4c60cd567f3..985576cb5c6 100644
--- a/acceptance/bundle/validate/sync_patterns/output.txt
+++ b/acceptance/bundle/validate/sync_patterns/output.txt
@@ -23,5 +23,5 @@ Validation OK!
 
 >>> [CLI] bundle deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
diff --git a/acceptance/bundle/validate/sync_patterns/script b/acceptance/bundle/validate/sync_patterns/script
index d2aae85444a..d4cf7169b1b 100644
--- a/acceptance/bundle/validate/sync_patterns/script
+++ b/acceptance/bundle/validate/sync_patterns/script
@@ -1,5 +1,5 @@
 trace $CLI bundle validate
 trace $CLI bundle validate -o json | jq '.sync'
 trace $CLI bundle deploy
-jq 'select(.path | test("dir/test.yml"))' out.requests.txt  > out.sync.txt
-rm out.requests.txt
+jq 'select(.path | test("dir/test.yml"))' "$OUT_REQUESTS"  > out.sync.txt
+rm "$OUT_REQUESTS"
diff --git a/acceptance/cache/simple/output.txt b/acceptance/cache/simple/output.txt
index 4a7dfdc7e1d..649997d499c 100644
--- a/acceptance/cache/simple/output.txt
+++ b/acceptance/cache/simple/output.txt
@@ -17,7 +17,7 @@
 
 >>> [CLI] bundle deploy -p dogfood
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/exploratory-cache-test/default/files...
-Files: 7 uploaded, 0 deleted
+Files: 5 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 0 unchanged
 
 >>> print_telemetry_bool_values
diff --git a/acceptance/cache/simple/script b/acceptance/cache/simple/script
index a2907174bf3..700183f096d 100644
--- a/acceptance/cache/simple/script
+++ b/acceptance/cache/simple/script
@@ -12,5 +12,5 @@ title "Bundle deploy should send telemetry values\n"
 trace $CLI bundle deploy -p dogfood
 
 trace print_telemetry_bool_values | grep "local.cache"
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 rm -rf "${DATABRICKS_CACHE_DIR}"
diff --git a/acceptance/cmd/sync/dryrun-missing-remote/script b/acceptance/cmd/sync/dryrun-missing-remote/script
index 65fb16ed000..ac8d285753d 100644
--- a/acceptance/cmd/sync/dryrun-missing-remote/script
+++ b/acceptance/cmd/sync/dryrun-missing-remote/script
@@ -3,8 +3,6 @@ cat > .gitignore << EOF
 .databricks/
 script
 test.toml
-output.txt
-out.requests.txt
 EOF
 
 # Use an ephemeral remote directory so concurrent test runs do not interfere.
@@ -12,7 +10,7 @@ remote_dir="/Users/$CURRENT_USER_NAME/missing-dir-$UNIQUE_NAME"
 
 cleanup() {
   MSYS_NO_PATHCONV=1 $CLI workspace delete --recursive "$remote_dir" 2>/dev/null || true
-  rm -rf .git .gitignore .databricks out.requests.txt
+  rm -rf .git .gitignore .databricks "$OUT_REQUESTS"
 }
 trap cleanup EXIT
 
diff --git a/acceptance/cmd/sync/dryrun/script b/acceptance/cmd/sync/dryrun/script
index 4018acf8872..6ebb6f180ea 100644
--- a/acceptance/cmd/sync/dryrun/script
+++ b/acceptance/cmd/sync/dryrun/script
@@ -8,7 +8,6 @@ touch "ignored-folder/script.py" "ignored-folder/folder1/script.py" "ignored-fol
 cat > .gitignore << EOF
 ignored-folder/
 script
-output.txt
 EOF
 
 cleanup() {
diff --git a/acceptance/cmd/sync/output.txt b/acceptance/cmd/sync/output.txt
index 95124f3e86b..ecdbd0267fe 100644
--- a/acceptance/cmd/sync/output.txt
+++ b/acceptance/cmd/sync/output.txt
@@ -1,14 +1,16 @@
 
 >>> [CLI] sync . /Users/[USERNAME]
-Action: PUT: .gitignore, dryrun-missing-remote/hello.py, dryrun-missing-remote/out.test.toml, dryrun-missing-remote/test.toml, dryrun/out.test.toml, project-folder/app.py, project-folder/app.yaml, project-folder/query.sql
+Action: PUT: .gitignore, dryrun-missing-remote/hello.py, dryrun-missing-remote/out.test.toml, dryrun-missing-remote/output.txt, dryrun-missing-remote/test.toml, dryrun/out.test.toml, dryrun/output.txt, project-folder/app.py, project-folder/app.yaml, project-folder/query.sql
 Initial Sync Complete
 Uploaded .gitignore
 Uploaded dryrun
 Uploaded dryrun-missing-remote
 Uploaded dryrun-missing-remote/hello.py
 Uploaded dryrun-missing-remote/out.test.toml
+Uploaded dryrun-missing-remote/output.txt
 Uploaded dryrun-missing-remote/test.toml
 Uploaded dryrun/out.test.toml
+Uploaded dryrun/output.txt
 Uploaded project-folder
 Uploaded project-folder/app.py
 Uploaded project-folder/app.yaml
diff --git a/acceptance/cmd/sync/script b/acceptance/cmd/sync/script
index 67edd91facc..10bb63cd5ae 100644
--- a/acceptance/cmd/sync/script
+++ b/acceptance/cmd/sync/script
@@ -8,7 +8,6 @@ touch "ignored-folder/script.py" "ignored-folder/folder1/script.py" "ignored-fol
 cat > .gitignore << EOF
 ignored-folder/
 script
-output.txt
 EOF
 
 cleanup() {
diff --git a/acceptance/cmd/workspace/apps/out.requests.txt b/acceptance/cmd/workspace/apps/out.requests.txt
deleted file mode 100644
index ba4cf8bd6e4..00000000000
--- a/acceptance/cmd/workspace/apps/out.requests.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/apps",
-  "body": {
-    "description": "My app description.",
-    "name": "test-name",
-    "resources": [
-      {
-        "description": "API key for external service.",
-        "name": "api-key",
-        "secret": {
-          "key": "my-key",
-          "permission": "READ",
-          "scope": "my-scope"
-        }
-      }
-    ]
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/apps/test-name"
-}
-{
-  "method": "PATCH",
-  "path": "/api/2.0/apps/test-name",
-  "body": {
-    "description": "My app description.",
-    "name": "test-name",
-    "resources": [
-      {
-        "description": "API key for external service.",
-        "name": "api-key",
-        "secret": {
-          "key": "my-key",
-          "permission": "READ",
-          "scope": "my-scope"
-        }
-      }
-    ]
-  }
-}
diff --git a/acceptance/cmd/workspace/apps/script b/acceptance/cmd/workspace/apps/script
index d7d72e9be86..be072c7aba6 100644
--- a/acceptance/cmd/workspace/apps/script
+++ b/acceptance/cmd/workspace/apps/script
@@ -6,3 +6,5 @@ trace $CLI apps update test-name --json @input.json
 
 title "Apps update with missing parameter"
 trace $CLI apps update --json @input.json
+
+trace print_requests.py //apps
diff --git a/acceptance/experimental/air/run-submit/script b/acceptance/experimental/air/run-submit/script
index c44b50e28a1..1f88a7f56d6 100644
--- a/acceptance/experimental/air/run-submit/script
+++ b/acceptance/experimental/air/run-submit/script
@@ -5,8 +5,8 @@ export GIT_COMMITTER_DATE="2020-01-01T00:00:00Z"
 git-repo-init
 
 # Pin the config to the committed HEAD. git.commit tolerates a dirty working tree
-# (the pinned revision is what gets archived), which matters here because the
-# acceptance harness writes output.txt into the working dir as the script runs.
+# (the pinned revision is what gets archived), which matters here because this
+# script generates run.yaml in the working dir after the commit.
 sed "s/COMMIT_SHA/$(git rev-parse HEAD)/" run.yaml.tmpl > run.yaml
 
 title "submit with a git code_source"
diff --git a/acceptance/pipelines/deploy/auto-approve/output.txt b/acceptance/pipelines/deploy/auto-approve/output.txt
index 2cf23854fa5..2acd80d5910 100644
--- a/acceptance/pipelines/deploy/auto-approve/output.txt
+++ b/acceptance/pipelines/deploy/auto-approve/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-auto-approve/default/files...
 Created pipelines.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
@@ -22,7 +22,7 @@ Error: the deployment requires destructive actions, but the current console does
 Deleting data assets such as schemas, pipelines, or volumes may cause permanent data loss and should be carefully reviewed.
 To proceed, use --auto-approve after reviewing the plan above.
 
-Files: 1 uploaded, 1 deleted
+Files: 0 uploaded, 1 deleted
 
 Exit code: 1
 
@@ -36,5 +36,5 @@ restore the defined STs and MVs through full refresh. Note that recreation is ne
 properties such as the 'catalog' or 'storage' are changed:
   delete resources.pipelines.foo
 Deleted pipelines.foo
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 1 deleted, 0 unchanged
diff --git a/acceptance/pipelines/deploy/create-pipeline/output.txt b/acceptance/pipelines/deploy/create-pipeline/output.txt
index d246bb34a32..767159893d4 100644
--- a/acceptance/pipelines/deploy/create-pipeline/output.txt
+++ b/acceptance/pipelines/deploy/create-pipeline/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-create-pipeline/default/files...
 Created pipelines.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
@@ -30,5 +30,5 @@ View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
 >>> [CLI] pipelines deploy --quiet
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-create-pipeline/default/files...
-Files: 1 uploaded, 0 deleted
+Files: 0 uploaded, 0 deleted
 Resources: 0 created, 0 changed, 0 deleted, 1 unchanged
diff --git a/acceptance/pipelines/deploy/fail-on-active-runs/output.txt b/acceptance/pipelines/deploy/fail-on-active-runs/output.txt
index d23ef8dc134..ab790479962 100644
--- a/acceptance/pipelines/deploy/fail-on-active-runs/output.txt
+++ b/acceptance/pipelines/deploy/fail-on-active-runs/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipeline-fail-on-active-runs/default/files...
 Created pipelines.my_pipeline
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/deploy/force-lock/output.txt b/acceptance/pipelines/deploy/force-lock/output.txt
index fca48cb828e..8245b821e95 100644
--- a/acceptance/pipelines/deploy/force-lock/output.txt
+++ b/acceptance/pipelines/deploy/force-lock/output.txt
@@ -18,6 +18,6 @@ Exit code: 1
 >>> [CLI] pipelines deploy --force-lock
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-force-lock/default/files...
 Created pipelines.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
diff --git a/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt b/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt
index ce9c23bcc49..71e8efdd7e8 100644
--- a/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt
+++ b/acceptance/pipelines/deploy/render-diagnostics-warning/output.txt
@@ -6,7 +6,7 @@ Warning: unknown field: unknown_property
 
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/render-diagnostics-warning-pipeline/default/files...
 Created pipelines.test-pipeline
-Files: 3 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline test-pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 <EOL>
diff --git a/acceptance/pipelines/deploy/var-flag/output.txt b/acceptance/pipelines/deploy/var-flag/output.txt
index 82c4220330f..71cb2c080e3 100644
--- a/acceptance/pipelines/deploy/var-flag/output.txt
+++ b/acceptance/pipelines/deploy/var-flag/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] pipelines deploy --var=catalog=custom_catalog --var=schema=custom_schema --auto-approve
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-var-flag/default/files...
 Created pipelines.foo
-Files: 3 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/destroy/auto-approve/output.txt b/acceptance/pipelines/destroy/auto-approve/output.txt
index 518ba08b816..adccbb51bbb 100644
--- a/acceptance/pipelines/destroy/auto-approve/output.txt
+++ b/acceptance/pipelines/destroy/auto-approve/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default/files...
 Created pipelines.my_pipeline
-Files: 3 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
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..286ae2651ed 100644
--- a/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt
+++ b/acceptance/pipelines/destroy/destroy-pipeline-cascade-state-divergence/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade-divergence/default/files...
 Created pipelines.my_pipeline
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt b/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt
index 16020a0b91b..fee2a0c0c28 100644
--- a/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt
+++ b/acceptance/pipelines/destroy/destroy-pipeline-cascade/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files...
 Created pipelines.my_pipeline
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
@@ -26,7 +26,7 @@ View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files...
 Updated pipelines.my_pipeline
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
@@ -36,7 +36,7 @@ View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files...
 Updated pipelines.my_pipeline
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
@@ -46,7 +46,7 @@ View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy-cascade/default/files...
 Updated pipelines.my_pipeline
-Files: 3 uploaded, 0 deleted
+Files: 1 uploaded, 0 deleted
 Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/destroy/destroy-pipeline/output.txt b/acceptance/pipelines/destroy/destroy-pipeline/output.txt
index 25d35ff3d50..be01acc5c54 100644
--- a/acceptance/pipelines/destroy/destroy-pipeline/output.txt
+++ b/acceptance/pipelines/destroy/destroy-pipeline/output.txt
@@ -3,7 +3,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-destroy/default/files...
 Created pipelines.my_pipeline
-Files: 3 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/destroy/force-lock/output.txt b/acceptance/pipelines/destroy/force-lock/output.txt
index 2b58acb0ff1..cf0344ea200 100644
--- a/acceptance/pipelines/destroy/force-lock/output.txt
+++ b/acceptance/pipelines/destroy/force-lock/output.txt
@@ -2,7 +2,7 @@
 >>> errcode [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-force-lock/default/files...
 Created pipelines.foo
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline foo here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt b/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt
index 4393092f4e1..3af079d70cb 100644
--- a/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt
+++ b/acceptance/pipelines/dry-run/dry-run-pipeline/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run/default/files...
 Created pipelines.my_pipeline
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/dry-run/dry-run-pipeline/script b/acceptance/pipelines/dry-run/dry-run-pipeline/script
index 47157a6d77c..42aa0f8e6b8 100755
--- a/acceptance/pipelines/dry-run/dry-run-pipeline/script
+++ b/acceptance/pipelines/dry-run/dry-run-pipeline/script
@@ -1,5 +1,5 @@
 trace $CLI pipelines deploy
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 title "Dry running pipeline, should have validate_only set to true"
 trace $CLI pipelines dry-run
 print_requests.py //pipelines
diff --git a/acceptance/pipelines/dry-run/no-wait/output.txt b/acceptance/pipelines/dry-run/no-wait/output.txt
index 0bbd6abd94f..52e04a0db40 100644
--- a/acceptance/pipelines/dry-run/no-wait/output.txt
+++ b/acceptance/pipelines/dry-run/no-wait/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files...
 Created pipelines.my_pipeline
-Files: 3 uploaded, 0 deleted
+Files: 2 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/dry-run/restart/output.txt b/acceptance/pipelines/dry-run/restart/output.txt
index c36de93072a..fd458f1d83a 100644
--- a/acceptance/pipelines/dry-run/restart/output.txt
+++ b/acceptance/pipelines/dry-run/restart/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files...
 Created pipelines.my_pipeline
-Files: 5 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/dry-run/restart/script b/acceptance/pipelines/dry-run/restart/script
index caf7bb03d69..5f022da96aa 100644
--- a/acceptance/pipelines/dry-run/restart/script
+++ b/acceptance/pipelines/dry-run/restart/script
@@ -1,5 +1,5 @@
 trace $CLI pipelines deploy
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Dry running pipeline with --restart flag, should stop the current pipeline and start a new run"
 trace $CLI pipelines dry-run --restart
diff --git a/acceptance/pipelines/open/open-after-deployment/output.txt b/acceptance/pipelines/open/open-after-deployment/output.txt
index a6749fc73c9..c320e46ba31 100644
--- a/acceptance/pipelines/open/open-after-deployment/output.txt
+++ b/acceptance/pipelines/open/open-after-deployment/output.txt
@@ -8,7 +8,7 @@ Exit code: 1
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/pipelines-open/default/files...
 Created pipelines.test-pipelines-open
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline test-pipelines-open here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/run/no-wait/output.txt b/acceptance/pipelines/run/no-wait/output.txt
index 8b348f78f11..ee90f8fc9d1 100644
--- a/acceptance/pipelines/run/no-wait/output.txt
+++ b/acceptance/pipelines/run/no-wait/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files...
 Created pipelines.my_pipeline
-Files: 4 uploaded, 0 deleted
+Files: 3 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/run/refresh-flags/output.txt b/acceptance/pipelines/run/refresh-flags/output.txt
index c5ddaf2560f..20c94bc72e4 100644
--- a/acceptance/pipelines/run/refresh-flags/output.txt
+++ b/acceptance/pipelines/run/refresh-flags/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files...
 Created pipelines.my_pipeline
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/run/refresh-flags/script b/acceptance/pipelines/run/refresh-flags/script
index ed4dc511a99..b324074d59f 100644
--- a/acceptance/pipelines/run/refresh-flags/script
+++ b/acceptance/pipelines/run/refresh-flags/script
@@ -1,5 +1,5 @@
 trace $CLI pipelines deploy
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Running pipeline with --refresh flag and specific tables"
 trace $CLI pipelines run --refresh table1,table2
diff --git a/acceptance/pipelines/run/restart/output.txt b/acceptance/pipelines/run/restart/output.txt
index 603377e20ca..de71bd4c032 100644
--- a/acceptance/pipelines/run/restart/output.txt
+++ b/acceptance/pipelines/run/restart/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run-flags/default/files...
 Created pipelines.my_pipeline
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/run/restart/script b/acceptance/pipelines/run/restart/script
index 9c9dd18a347..65f732e8efa 100644
--- a/acceptance/pipelines/run/restart/script
+++ b/acceptance/pipelines/run/restart/script
@@ -1,5 +1,5 @@
 trace $CLI pipelines deploy
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Running pipeline with --restart flag"
 # Should stop the current pipeline and start a new update
diff --git a/acceptance/pipelines/run/run-info/output.txt b/acceptance/pipelines/run/run-info/output.txt
index cd73b119258..c92c6dff36b 100644
--- a/acceptance/pipelines/run/run-info/output.txt
+++ b/acceptance/pipelines/run/run-info/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-run/default/files...
 Created pipelines.my_pipeline
-Files: 5 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/stop/output.txt b/acceptance/pipelines/stop/output.txt
index 959571effea..e0400be1de5 100644
--- a/acceptance/pipelines/stop/output.txt
+++ b/acceptance/pipelines/stop/output.txt
@@ -2,7 +2,7 @@
 >>> [CLI] pipelines deploy
 Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-pipeline-stop/default/files...
 Created pipelines.my_pipeline
-Files: 6 uploaded, 0 deleted
+Files: 4 uploaded, 0 deleted
 Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
 View your pipeline my_pipeline here: [DATABRICKS_URL]/pipelines/[UUID]?w=[NUMID]
 
diff --git a/acceptance/pipelines/stop/script b/acceptance/pipelines/stop/script
index c658f11ebd2..4abb9de67a8 100644
--- a/acceptance/pipelines/stop/script
+++ b/acceptance/pipelines/stop/script
@@ -1,6 +1,6 @@
 trace $CLI pipelines deploy
 trace $CLI pipelines run
-rm out.requests.txt
+rm "$OUT_REQUESTS"
 
 title "Stopping pipeline"
 trace $CLI pipelines stop
diff --git a/acceptance/script.prepare b/acceptance/script.prepare
index 8190d3709b2..e4c6ea53f02 100644
--- a/acceptance/script.prepare
+++ b/acceptance/script.prepare
@@ -126,7 +126,7 @@ nostamp() {
 # variant, so it diverges across the matrix. Drop both here so this shared helper stays
 # engine-agnostic; they are asserted per-engine in bundle/telemetry/deploy.
 print_telemetry_bool_values() {
-    jq -r 'select(.path? == "/telemetry-ext") | (.body.protoLogs // [])[] | fromjson | ( (.entry // .) | (.databricks_cli_log.bundle_deploy_event.experimental.bool_values // []) ) | map("\(.key) \(.value)") | .[]' out.requests.txt | grep -v '^engine_terraform_' | sort
+    jq -r 'select(.path? == "/telemetry-ext") | (.body.protoLogs // [])[] | fromjson | ( (.entry // .) | (.databricks_cli_log.bundle_deploy_event.experimental.bool_values // []) ) | map("\(.key) \(.value)") | .[]' "$OUT_REQUESTS" | grep -v '^engine_terraform_' | sort
 }
 
 sethome() {
diff --git a/acceptance/selftest/record_cloud/basic/out.requests.txt b/acceptance/selftest/record_cloud/basic/out.requests.txt
deleted file mode 100644
index 12576f503d5..00000000000
--- a/acceptance/selftest/record_cloud/basic/out.requests.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
diff --git a/acceptance/selftest/record_cloud/basic/output.txt b/acceptance/selftest/record_cloud/basic/output.txt
index 7f0b941262b..64a0c8e3890 100644
--- a/acceptance/selftest/record_cloud/basic/output.txt
+++ b/acceptance/selftest/record_cloud/basic/output.txt
@@ -1,3 +1,13 @@
 
 >>> [CLI] current-user me
 "[USERNAME]"
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
diff --git a/acceptance/selftest/record_cloud/basic/script b/acceptance/selftest/record_cloud/basic/script
index 523686ce66b..f12bcc208ad 100644
--- a/acceptance/selftest/record_cloud/basic/script
+++ b/acceptance/selftest/record_cloud/basic/script
@@ -1,2 +1,4 @@
 # Proxy server successfully records a requests and returns a response.
 trace $CLI current-user me | jq .userName
+
+trace print_requests.py --get //
diff --git a/acceptance/selftest/record_cloud/error/out.requests.txt b/acceptance/selftest/record_cloud/error/out.requests.txt
deleted file mode 100644
index 4b720276004..00000000000
--- a/acceptance/selftest/record_cloud/error/out.requests.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/api/2.2/jobs/get",
-  "q": {
-    "job_id": "1234"
-  }
-}
diff --git a/acceptance/selftest/record_cloud/error/output.txt b/acceptance/selftest/record_cloud/error/output.txt
index f911ca508fd..510536a783e 100644
--- a/acceptance/selftest/record_cloud/error/output.txt
+++ b/acceptance/selftest/record_cloud/error/output.txt
@@ -3,3 +3,16 @@
 Error: Job 1234 does not exist.
 
 Exit code: 1
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/api/2.2/jobs/get",
+  "q": {
+    "job_id": "1234"
+  }
+}
diff --git a/acceptance/selftest/record_cloud/error/script b/acceptance/selftest/record_cloud/error/script
index 662a0732cca..bd9a4b66c68 100644
--- a/acceptance/selftest/record_cloud/error/script
+++ b/acceptance/selftest/record_cloud/error/script
@@ -1,2 +1,4 @@
 # Proxy server should successfully return non 200 responses.
 errcode trace $CLI jobs get 1234
+
+trace print_requests.py --get //
diff --git a/acceptance/selftest/record_cloud/pipeline-crud/script b/acceptance/selftest/record_cloud/pipeline-crud/script
index 85de4aa3227..4e6ada990d8 100644
--- a/acceptance/selftest/record_cloud/pipeline-crud/script
+++ b/acceptance/selftest/record_cloud/pipeline-crud/script
@@ -1,6 +1,6 @@
 print_requests() {
-    cat out.requests.txt
-    rm out.requests.txt
+    cat "$OUT_REQUESTS"
+    rm "$OUT_REQUESTS"
 }
 
 # Verify that the entire crud lifecycle of a pipeline works.
diff --git a/acceptance/selftest/record_cloud/volume-io/script b/acceptance/selftest/record_cloud/volume-io/script
index 741eec19573..19ccac68ba6 100644
--- a/acceptance/selftest/record_cloud/volume-io/script
+++ b/acceptance/selftest/record_cloud/volume-io/script
@@ -1,6 +1,6 @@
 print_requests() {
-    cat out.requests.txt
-    rm out.requests.txt
+    cat "$OUT_REQUESTS"
+    rm "$OUT_REQUESTS"
 }
 
 trace $CLI schemas create schema-$UNIQUE_NAME main | jq '{full_name, owner}'
diff --git a/acceptance/selftest/record_cloud/workspace-file-io/script b/acceptance/selftest/record_cloud/workspace-file-io/script
index 990b7856914..cd1ac7bd489 100644
--- a/acceptance/selftest/record_cloud/workspace-file-io/script
+++ b/acceptance/selftest/record_cloud/workspace-file-io/script
@@ -6,8 +6,8 @@ export username=$($CLI current-user me | jq -r .userName)
 export MSYS_NO_PATHCONV=1
 
 print_requests() {
-    cat out.requests.txt
-    rm out.requests.txt
+    cat "$OUT_REQUESTS"
+    rm "$OUT_REQUESTS"
 }
 
 title "create a folder"
diff --git a/acceptance/selftest/server/out.requests.txt b/acceptance/selftest/server/out.requests.txt
deleted file mode 100644
index 02cfcd24d8e..00000000000
--- a/acceptance/selftest/server/out.requests.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "method": "GET",
-  "path": "/api/2.0/preview/scim/v2/Me"
-}
-{
-  "method": "GET",
-  "path": "/custom/endpoint",
-  "q": {
-    "query": "param"
-  }
-}
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/a/b/c"
-  }
-}
diff --git a/acceptance/selftest/server/output.txt b/acceptance/selftest/server/output.txt
index 01748017e83..19f581068a8 100644
--- a/acceptance/selftest/server/output.txt
+++ b/acceptance/selftest/server/output.txt
@@ -19,3 +19,27 @@ response
 Error: Path (/a/b/c) doesn't exist.
 
 Exit code: 1
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/api/2.0/preview/scim/v2/Me"
+}
+{
+  "method": "GET",
+  "path": "/custom/endpoint",
+  "q": {
+    "query": "param"
+  }
+}
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/a/b/c"
+  }
+}
diff --git a/acceptance/selftest/server/script b/acceptance/selftest/server/script
index 810ea64b63e..955687a44d4 100644
--- a/acceptance/selftest/server/script
+++ b/acceptance/selftest/server/script
@@ -1,4 +1,6 @@
-trace curl -s $DATABRICKS_HOST/api/2.0/preview/scim/v2/Me
-trace curl -sD - $DATABRICKS_HOST/custom/endpoint?query=param
+MSYS_NO_PATHCONV=1 trace curl -s $DATABRICKS_HOST/api/2.0/preview/scim/v2/Me
+MSYS_NO_PATHCONV=1 trace curl -sD - $DATABRICKS_HOST/custom/endpoint?query=param
 
-trace errcode $CLI workspace get-status /a/b/c
+MSYS_NO_PATHCONV=1 trace errcode $CLI workspace get-status /a/b/c
+
+trace print_requests.py --get //
diff --git a/acceptance/selftest/server/test.toml b/acceptance/selftest/server/test.toml
index 82c459ad692..7b8d16a1872 100644
--- a/acceptance/selftest/server/test.toml
+++ b/acceptance/selftest/server/test.toml
@@ -1,7 +1,5 @@
 RecordRequests = true
 
-Env.MSYS_NO_PATHCONV = "1"
-
 # Ensure that server configuration works with EnvMatrix (regression test for https://github.com/databricks/cli/pull/2758)
 EnvMatrix.VARIABLE_A = ["one", "two"]
 EnvMatrix.VARIABLE_B = ["HELLO", "WORLD"]
diff --git a/acceptance/telemetry/failure/out.requests.txt b/acceptance/telemetry/failure/out.requests.txt
deleted file mode 100644
index 7315a1ab1bb..00000000000
--- a/acceptance/telemetry/failure/out.requests.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "X-Databricks-Workspace-Id": [
-      "[NUMID]"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS][0],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}",
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"
-    ]
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "X-Databricks-Workspace-Id": [
-      "[NUMID]"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS][1],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}",
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"
-    ]
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "X-Databricks-Workspace-Id": [
-      "[NUMID]"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS][2],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}",
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"
-    ]
-  }
-}
diff --git a/acceptance/telemetry/failure/output.txt b/acceptance/telemetry/failure/output.txt
index f8054c355b4..3d754ba24d8 100644
--- a/acceptance/telemetry/failure/output.txt
+++ b/acceptance/telemetry/failure/output.txt
@@ -64,7 +64,7 @@ HH:MM:SS Debug: non-retriable error: Endpoint not implemented. pid=PID sdk=true
 HH:MM:SS Info: Attempt 3 failed due to a server side error. Retrying status code: 501 pid=PID
 HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after three attempts pid=PID
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "frontend_log_event_id": "[UUID]",
   "entry": {
diff --git a/acceptance/telemetry/failure/script b/acceptance/telemetry/failure/script
index 7dbe9a0900b..9439e9ae3b5 100644
--- a/acceptance/telemetry/failure/script
+++ b/acceptance/telemetry/failure/script
@@ -1,4 +1,4 @@
 trace $CLI selftest send-telemetry --debug
 
 # pretty print the telemetry payload.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
diff --git a/acceptance/telemetry/partial-success/out.requests.txt b/acceptance/telemetry/partial-success/out.requests.txt
deleted file mode 100644
index 7315a1ab1bb..00000000000
--- a/acceptance/telemetry/partial-success/out.requests.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "X-Databricks-Workspace-Id": [
-      "[NUMID]"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS][0],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}",
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"
-    ]
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "X-Databricks-Workspace-Id": [
-      "[NUMID]"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS][1],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}",
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"
-    ]
-  }
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "X-Databricks-Workspace-Id": [
-      "[NUMID]"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS][2],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}",
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"
-    ]
-  }
-}
diff --git a/acceptance/telemetry/partial-success/output.txt b/acceptance/telemetry/partial-success/output.txt
index bcd0459afd4..c43506faf8b 100644
--- a/acceptance/telemetry/partial-success/output.txt
+++ b/acceptance/telemetry/partial-success/output.txt
@@ -61,7 +61,7 @@ HH:MM:SS Debug: POST /telemetry-ext
 HH:MM:SS Debug: Attempt 3 was a partial success. Number of logs uploaded: 1 out of 2 pid=PID
 HH:MM:SS Info: telemetry upload failed: failed to upload telemetry logs after three attempts pid=PID
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "frontend_log_event_id": "[UUID]",
   "entry": {
diff --git a/acceptance/telemetry/partial-success/script b/acceptance/telemetry/partial-success/script
index 7dbe9a0900b..9439e9ae3b5 100644
--- a/acceptance/telemetry/partial-success/script
+++ b/acceptance/telemetry/partial-success/script
@@ -1,4 +1,4 @@
 trace $CLI selftest send-telemetry --debug
 
 # pretty print the telemetry payload.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
diff --git a/acceptance/telemetry/skipped/out.requests.txt b/acceptance/telemetry/skipped/out.requests.txt
deleted file mode 100644
index 40bd283a0c3..00000000000
--- a/acceptance/telemetry/skipped/out.requests.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
diff --git a/acceptance/telemetry/skipped/output.txt b/acceptance/telemetry/skipped/output.txt
index 50f28651f1b..f72d02ed475 100644
--- a/acceptance/telemetry/skipped/output.txt
+++ b/acceptance/telemetry/skipped/output.txt
@@ -15,3 +15,9 @@ HH:MM:SS Debug: Resolved cloud from hostname: "AWS" pid=PID sdk=true
 HH:MM:SS Debug: Resolved discovery_url from host metadata: "[DATABRICKS_URL]/oidc/.well-known/oauth-authorization-server" pid=PID sdk=true
 HH:MM:SS Info: completed execution pid=PID exit_code=0
 HH:MM:SS Debug: telemetry upload is disabled. Not uploading any logs. pid=PID
+
+>>> print_requests.py --get //
+{
+  "method": "GET",
+  "path": "/.well-known/databricks-config"
+}
diff --git a/acceptance/telemetry/skipped/script b/acceptance/telemetry/skipped/script
index 247171a6f15..75ada980d20 100644
--- a/acceptance/telemetry/skipped/script
+++ b/acceptance/telemetry/skipped/script
@@ -1,3 +1,5 @@
 export DATABRICKS_CLI_DISABLE_TELEMETRY="true"
 
 trace $CLI selftest send-telemetry --debug
+
+trace print_requests.py --get //
diff --git a/acceptance/telemetry/success/out.requests.txt b/acceptance/telemetry/success/out.requests.txt
deleted file mode 100644
index ade9766ffa9..00000000000
--- a/acceptance/telemetry/success/out.requests.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/selftest_send-telemetry cmd-exec-id/[CMD-EXEC-ID] interactive/none auth/pat"
-    ],
-    "X-Databricks-Workspace-Id": [
-      "[NUMID]"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}",
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[CMD-EXEC-ID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"
-    ]
-  }
-}
diff --git a/acceptance/telemetry/success/output.txt b/acceptance/telemetry/success/output.txt
index 961775fafe9..20aee525f7a 100644
--- a/acceptance/telemetry/success/output.txt
+++ b/acceptance/telemetry/success/output.txt
@@ -30,7 +30,7 @@ HH:MM:SS Debug: POST /telemetry-ext
 < } pid=PID sdk=true
 HH:MM:SS Debug: All 2 logs uploaded successfully pid=PID
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "frontend_log_event_id": "[UUID]",
   "entry": {
diff --git a/acceptance/telemetry/success/script b/acceptance/telemetry/success/script
index 9e924eec5fc..49e4f92ba20 100644
--- a/acceptance/telemetry/success/script
+++ b/acceptance/telemetry/success/script
@@ -1,8 +1,8 @@
 trace $CLI selftest send-telemetry --debug
 
-update_file.py out.requests.txt \
- $(cat out.requests.txt | jq '.headers."User-Agent".[0]'| grep -o 'cmd-exec-id/[^ ]*' | cut -d '/' -f2) \
+update_file.py "$OUT_REQUESTS" \
+ $(cat "$OUT_REQUESTS" | jq '.headers."User-Agent".[0]'| grep -o 'cmd-exec-id/[^ ]*' | cut -d '/' -f2) \
  '[CMD-EXEC-ID]'
 
 # pretty print the telemetry payload.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
diff --git a/acceptance/telemetry/timeout/out.requests.txt b/acceptance/telemetry/timeout/out.requests.txt
deleted file mode 100644
index 6826b4fd60a..00000000000
--- a/acceptance/telemetry/timeout/out.requests.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "X-Databricks-Workspace-Id": [
-      "[NUMID]"
-    ]
-  },
-  "method": "POST",
-  "path": "/telemetry-ext",
-  "body": {
-    "uploadTime": [UNIX_TIME_MILLIS],
-    "items": [],
-    "protoLogs": [
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE1\"}}}}",
-      "{\"frontend_log_event_id\":\"[UUID]\",\"entry\":{\"databricks_cli_log\":{\"execution_context\":{\"cmd_exec_id\":\"[UUID]\",\"version\":\"[CLI_VERSION]\",\"command\":\"selftest_send-telemetry\",\"operating_system\":\"[OS]\",\"execution_time_ms\":\"SMALL_INT\",\"exit_code\":0},\"cli_test_event\":{\"name\":\"VALUE2\"}}}}"
-    ]
-  }
-}
diff --git a/acceptance/telemetry/timeout/output.txt b/acceptance/telemetry/timeout/output.txt
index aec2a558609..1957ad448aa 100644
--- a/acceptance/telemetry/timeout/output.txt
+++ b/acceptance/telemetry/timeout/output.txt
@@ -28,7 +28,7 @@ HH:MM:SS Debug: non-retriable error: Post "[DATABRICKS_URL]/telemetry-ext": cont
 HH:MM:SS Debug: Attempt 1 failed due to a timeout. Will not retry pid=PID
 HH:MM:SS Info: telemetry upload failed: uploading telemetry logs timed out: Post "[DATABRICKS_URL]/telemetry-ext": context deadline exceeded pid=PID
 
->>> cat out.requests.txt
+>>> cat [OUTPUT_DIR]/out.requests.txt
 {
   "frontend_log_event_id": "[UUID]",
   "entry": {
diff --git a/acceptance/telemetry/timeout/script b/acceptance/telemetry/timeout/script
index 807bc51a9b6..f8336d77d47 100644
--- a/acceptance/telemetry/timeout/script
+++ b/acceptance/telemetry/timeout/script
@@ -4,4 +4,4 @@ export DATABRICKS_CLI_TELEMETRY_TIMEOUT=0.1
 trace $CLI selftest send-telemetry --debug
 
 # pretty print the telemetry payload.
-trace cat out.requests.txt | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
+trace cat "$OUT_REQUESTS" | jq 'select(has("path") and .path == "/telemetry-ext") | .body.protoLogs[] | fromjson'
diff --git a/acceptance/workspace/jobs/create-error/out.requests.txt b/acceptance/workspace/jobs/create-error/out.requests.txt
deleted file mode 100644
index 9d7f5dde1ed..00000000000
--- a/acceptance/workspace/jobs/create-error/out.requests.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.2/jobs/create",
-  "body": {
-    "name": "abc"
-  }
-}
diff --git a/acceptance/workspace/jobs/create-error/script b/acceptance/workspace/jobs/create-error/script
index 9ff7b5b87bf..00344560ed8 100644
--- a/acceptance/workspace/jobs/create-error/script
+++ b/acceptance/workspace/jobs/create-error/script
@@ -1 +1,3 @@
 trace $CLI jobs create --json '{"name":"abc"}'
+
+trace print_requests.py //jobs
diff --git a/acceptance/workspace/jobs/create/out.requests.txt b/acceptance/workspace/jobs/create/out.requests.txt
deleted file mode 100644
index 1f093c89d40..00000000000
--- a/acceptance/workspace/jobs/create/out.requests.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "headers": {
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS]"
-    ]
-  },
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "headers": {
-    "Authorization": [
-      "Bearer [DATABRICKS_TOKEN]"
-    ],
-    "User-Agent": [
-      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/jobs_create cmd-exec-id/[UUID] interactive/none auth/pat"
-    ]
-  },
-  "method": "POST",
-  "path": "/api/2.2/jobs/create",
-  "body": {
-    "name": "abc"
-  }
-}
diff --git a/acceptance/workspace/jobs/create/output.txt b/acceptance/workspace/jobs/create/output.txt
index 7b006aa656e..80a25fcf5e0 100644
--- a/acceptance/workspace/jobs/create/output.txt
+++ b/acceptance/workspace/jobs/create/output.txt
@@ -3,3 +3,20 @@
 {
   "job_id": [NUMID]
 }
+
+>>> print_requests.py //jobs
+{
+  "headers": {
+    "Authorization": [
+      "Bearer [DATABRICKS_TOKEN]"
+    ],
+    "User-Agent": [
+      "cli/[CLI_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/jobs_create cmd-exec-id/[UUID] interactive/none auth/pat"
+    ]
+  },
+  "method": "POST",
+  "path": "/api/2.2/jobs/create",
+  "body": {
+    "name": "abc"
+  }
+}
diff --git a/acceptance/workspace/jobs/create/script b/acceptance/workspace/jobs/create/script
index 9ff7b5b87bf..00344560ed8 100644
--- a/acceptance/workspace/jobs/create/script
+++ b/acceptance/workspace/jobs/create/script
@@ -1 +1,3 @@
 trace $CLI jobs create --json '{"name":"abc"}'
+
+trace print_requests.py //jobs
diff --git a/acceptance/workspace/lakeview/publish/out.requests.txt b/acceptance/workspace/lakeview/publish/out.requests.txt
deleted file mode 100644
index e4802babc67..00000000000
--- a/acceptance/workspace/lakeview/publish/out.requests.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/workspace/mkdirs",
-  "body": {
-    "path": "/Users/[USERNAME]"
-  }
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/lakeview/dashboards",
-  "body": {
-    "display_name": "Test Dashboard",
-    "parent_path": "/Users/[USERNAME]",
-    "warehouse_id": "test-warehouse"
-  }
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/lakeview/dashboards/[DASHBOARD_ID]/published",
-  "body": {
-    "embed_credentials": false
-  }
-}
diff --git a/acceptance/workspace/lakeview/publish/output.txt b/acceptance/workspace/lakeview/publish/output.txt
index 3a1ebfc8bdf..16d93882a98 100644
--- a/acceptance/workspace/lakeview/publish/output.txt
+++ b/acceptance/workspace/lakeview/publish/output.txt
@@ -10,3 +10,21 @@
   "revision_create_time": "[TIMESTAMP]",
   "warehouse_id": "test-warehouse"
 }
+
+>>> print_requests.py //lakeview
+{
+  "method": "POST",
+  "path": "/api/2.0/lakeview/dashboards",
+  "body": {
+    "display_name": "Test Dashboard",
+    "parent_path": "/Users/[USERNAME]",
+    "warehouse_id": "test-warehouse"
+  }
+}
+{
+  "method": "POST",
+  "path": "/api/2.0/lakeview/dashboards/[DASHBOARD_ID]/published",
+  "body": {
+    "embed_credentials": false
+  }
+}
diff --git a/acceptance/workspace/lakeview/publish/script b/acceptance/workspace/lakeview/publish/script
index 93b0044ecc1..09e7cbafcc2 100644
--- a/acceptance/workspace/lakeview/publish/script
+++ b/acceptance/workspace/lakeview/publish/script
@@ -1,7 +1,9 @@
-trace $CLI workspace mkdirs /Users/tester@databricks.com
+MSYS_NO_PATHCONV=1 trace $CLI workspace mkdirs /Users/tester@databricks.com
 
-trace $CLI lakeview create --json '{"display_name": "Test Dashboard", "parent_path": "/Users/tester@databricks.com", "warehouse_id": "test-warehouse"}' -o json > tmp.json
+MSYS_NO_PATHCONV=1 trace $CLI lakeview create --json '{"display_name": "Test Dashboard", "parent_path": "/Users/tester@databricks.com", "warehouse_id": "test-warehouse"}' -o json > tmp.json
 dashboard_id=$(jq -r .dashboard_id < tmp.json)
 rm tmp.json
 add_repl "$dashboard_id" DASHBOARD_ID
-trace $CLI lakeview publish $dashboard_id
+MSYS_NO_PATHCONV=1 trace $CLI lakeview publish $dashboard_id
+
+trace print_requests.py //lakeview
diff --git a/acceptance/workspace/lakeview/publish/test.toml b/acceptance/workspace/lakeview/publish/test.toml
index 38598cb69b6..159efe02696 100644
--- a/acceptance/workspace/lakeview/publish/test.toml
+++ b/acceptance/workspace/lakeview/publish/test.toml
@@ -1,3 +1 @@
 RecordRequests = true
-
-Env.MSYS_NO_PATHCONV = "1"
diff --git a/acceptance/workspace/repos/create_with_provider/out.requests.txt b/acceptance/workspace/repos/create_with_provider/out.requests.txt
deleted file mode 100644
index 430eb33fe1b..00000000000
--- a/acceptance/workspace/repos/create_with_provider/out.requests.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/repos",
-  "body": {
-    "path": "/Repos/me@databricks.com/test-repo",
-    "provider": "gitHub",
-    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/repos/[NUMID]"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Repos/me@databricks.com/test-repo"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/repos/[NUMID]"
-}
-{
-  "method": "DELETE",
-  "path": "/api/2.0/repos/[NUMID]"
-}
diff --git a/acceptance/workspace/repos/create_with_provider/output.txt b/acceptance/workspace/repos/create_with_provider/output.txt
index caded4c11dc..ad4824ca645 100644
--- a/acceptance/workspace/repos/create_with_provider/output.txt
+++ b/acceptance/workspace/repos/create_with_provider/output.txt
@@ -25,3 +25,33 @@
 
 === Delete by id should work
 >>> [CLI] repos delete [NUMID]
+
+>>> print_requests.py --get //repos //workspace/get-status
+{
+  "method": "POST",
+  "path": "/api/2.0/repos",
+  "body": {
+    "path": "/Repos/me@databricks.com/test-repo",
+    "provider": "gitHub",
+    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
+  }
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/repos/[NUMID]"
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Repos/me@databricks.com/test-repo"
+  }
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/repos/[NUMID]"
+}
+{
+  "method": "DELETE",
+  "path": "/api/2.0/repos/[NUMID]"
+}
diff --git a/acceptance/workspace/repos/create_with_provider/script b/acceptance/workspace/repos/create_with_provider/script
index 6cf4cf56b95..4f3a49d21b7 100644
--- a/acceptance/workspace/repos/create_with_provider/script
+++ b/acceptance/workspace/repos/create_with_provider/script
@@ -2,13 +2,15 @@ url=https://github.com/databricks/databricks-empty-ide-project.git
 provider=gitHub
 path=/Repos/me@databricks.com/test-repo
 
-repo_id=$(trace $CLI repos create $url $provider --path $path | jq .id -r)
+repo_id=$(MSYS_NO_PATHCONV=1 trace $CLI repos create $url $provider --path $path | jq .id -r)
 
 title "Get by id should work"
-trace $CLI repos get $repo_id -o json
+MSYS_NO_PATHCONV=1 trace $CLI repos get $repo_id -o json
 
 title "Get by path should work"
-trace $CLI repos get $path -o json
+MSYS_NO_PATHCONV=1 trace $CLI repos get $path -o json
 
 title "Delete by id should work"
-trace $CLI repos delete $repo_id
+MSYS_NO_PATHCONV=1 trace $CLI repos delete $repo_id
+
+trace print_requests.py --get //repos //workspace/get-status
diff --git a/acceptance/workspace/repos/create_without_provider/out.requests.txt b/acceptance/workspace/repos/create_without_provider/out.requests.txt
deleted file mode 100644
index eb4819231fe..00000000000
--- a/acceptance/workspace/repos/create_without_provider/out.requests.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/repos",
-  "body": {
-    "path": "/Repos/me@databricks.com/test-repo",
-    "provider": "gitHub",
-    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
-  }
-}
diff --git a/acceptance/workspace/repos/create_without_provider/output.txt b/acceptance/workspace/repos/create_without_provider/output.txt
index d9e71490e8b..b59b7cc614e 100644
--- a/acceptance/workspace/repos/create_without_provider/output.txt
+++ b/acceptance/workspace/repos/create_without_provider/output.txt
@@ -8,3 +8,14 @@
   "provider": "gitHub",
   "url": "https://github.com/databricks/databricks-empty-ide-project.git"
 }
+
+>>> print_requests.py --get //repos //workspace/get-status
+{
+  "method": "POST",
+  "path": "/api/2.0/repos",
+  "body": {
+    "path": "/Repos/me@databricks.com/test-repo",
+    "provider": "gitHub",
+    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
+  }
+}
diff --git a/acceptance/workspace/repos/create_without_provider/script b/acceptance/workspace/repos/create_without_provider/script
index 1953f59568f..a16badd9c3e 100644
--- a/acceptance/workspace/repos/create_without_provider/script
+++ b/acceptance/workspace/repos/create_without_provider/script
@@ -1,4 +1,6 @@
 url=https://github.com/databricks/databricks-empty-ide-project.git
 path=/Repos/me@databricks.com/test-repo
 
-trace $CLI repos create $url --path $path
+MSYS_NO_PATHCONV=1 trace $CLI repos create $url --path $path
+
+trace print_requests.py --get //repos //workspace/get-status
diff --git a/acceptance/workspace/repos/delete_by_path/out.requests.txt b/acceptance/workspace/repos/delete_by_path/out.requests.txt
deleted file mode 100644
index 9fa6916971a..00000000000
--- a/acceptance/workspace/repos/delete_by_path/out.requests.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/repos",
-  "body": {
-    "path": "/Repos/me@databricks.com/test-repo",
-    "provider": "gitHub",
-    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Repos/me@databricks.com/test-repo"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/repos/[NUMID]"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Repos/me@databricks.com/test-repo"
-  }
-}
-{
-  "method": "DELETE",
-  "path": "/api/2.0/repos/[NUMID]"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Repos/me@databricks.com/test-repo"
-  }
-}
diff --git a/acceptance/workspace/repos/delete_by_path/script b/acceptance/workspace/repos/delete_by_path/script
index 2aacc9397b7..6c0d1e404fe 100644
--- a/acceptance/workspace/repos/delete_by_path/script
+++ b/acceptance/workspace/repos/delete_by_path/script
@@ -2,10 +2,12 @@ url=https://github.com/databricks/databricks-empty-ide-project.git
 provider=gitHub
 path=/Repos/me@databricks.com/test-repo
 
-trace $CLI repos create $url $provider --path $path | jq .id -r
+MSYS_NO_PATHCONV=1 trace $CLI repos create $url $provider --path $path | jq .id -r
 
-trace $CLI repos get $path -o json
+MSYS_NO_PATHCONV=1 trace $CLI repos get $path -o json
 
-trace $CLI repos delete $path
+MSYS_NO_PATHCONV=1 trace $CLI repos delete $path
 
-trace $CLI repos get $path -o json
+MSYS_NO_PATHCONV=1 trace $CLI repos get $path -o json
+
+trace print_requests.py --get //repos //workspace/get-status
diff --git a/acceptance/workspace/repos/get_errors/out.requests.txt b/acceptance/workspace/repos/get_errors/out.requests.txt
deleted file mode 100644
index ed3cb2661e7..00000000000
--- a/acceptance/workspace/repos/get_errors/out.requests.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Repos/me@databricks.com/doesnotexist"
-  }
-}
diff --git a/acceptance/workspace/repos/get_errors/output.txt b/acceptance/workspace/repos/get_errors/output.txt
index 9055734262b..3e59d6440e2 100644
--- a/acceptance/workspace/repos/get_errors/output.txt
+++ b/acceptance/workspace/repos/get_errors/output.txt
@@ -1,3 +1,12 @@
 
 >>> [CLI] repos get /Repos/me@databricks.com/doesnotexist -o json
 Error: failed to look up repo by path: Path (/Repos/me@databricks.com/doesnotexist) doesn't exist.
+
+>>> print_requests.py --get //repos //workspace/get-status
+{
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Repos/me@databricks.com/doesnotexist"
+  }
+}
diff --git a/acceptance/workspace/repos/get_errors/script b/acceptance/workspace/repos/get_errors/script
index 6050aa1cfc8..0ac489de76a 100644
--- a/acceptance/workspace/repos/get_errors/script
+++ b/acceptance/workspace/repos/get_errors/script
@@ -1 +1,3 @@
-musterr trace $CLI repos get /Repos/me@databricks.com/doesnotexist -o json
+MSYS_NO_PATHCONV=1 musterr trace $CLI repos get /Repos/me@databricks.com/doesnotexist -o json
+
+trace print_requests.py --get //repos //workspace/get-status
diff --git a/acceptance/workspace/repos/git_cli_folder/out.requests.txt b/acceptance/workspace/repos/git_cli_folder/out.requests.txt
deleted file mode 100644
index 50626ea4e4b..00000000000
--- a/acceptance/workspace/repos/git_cli_folder/out.requests.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/repos",
-  "body": {
-    "path": "/Workspace/Users/me@databricks.com/test-repo",
-    "provider": "gitHub",
-    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/me@databricks.com/test-repo"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/repos/[NUMID]"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/me@databricks.com/test-repo"
-  }
-}
-{
-  "method": "PATCH",
-  "path": "/api/2.0/repos/[NUMID]",
-  "body": {
-    "branch": "update-by-path"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Workspace/Users/me@databricks.com/test-repo"
-  }
-}
-{
-  "method": "DELETE",
-  "path": "/api/2.0/repos/[NUMID]"
-}
diff --git a/acceptance/workspace/repos/git_cli_folder/output.txt b/acceptance/workspace/repos/git_cli_folder/output.txt
index e661587937f..956b55259d0 100644
--- a/acceptance/workspace/repos/git_cli_folder/output.txt
+++ b/acceptance/workspace/repos/git_cli_folder/output.txt
@@ -18,3 +18,50 @@
 
 === Delete by path resolves a Git CLI folder
 >>> [CLI] repos delete /Workspace/Users/me@databricks.com/test-repo
+
+>>> print_requests.py --get //repos //workspace/get-status
+{
+  "method": "POST",
+  "path": "/api/2.0/repos",
+  "body": {
+    "path": "/Workspace/Users/me@databricks.com/test-repo",
+    "provider": "gitHub",
+    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
+  }
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/me@databricks.com/test-repo"
+  }
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/repos/[NUMID]"
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/me@databricks.com/test-repo"
+  }
+}
+{
+  "method": "PATCH",
+  "path": "/api/2.0/repos/[NUMID]",
+  "body": {
+    "branch": "update-by-path"
+  }
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Workspace/Users/me@databricks.com/test-repo"
+  }
+}
+{
+  "method": "DELETE",
+  "path": "/api/2.0/repos/[NUMID]"
+}
diff --git a/acceptance/workspace/repos/git_cli_folder/script b/acceptance/workspace/repos/git_cli_folder/script
index 6e617d6f798..46661bafb63 100644
--- a/acceptance/workspace/repos/git_cli_folder/script
+++ b/acceptance/workspace/repos/git_cli_folder/script
@@ -4,13 +4,15 @@ provider=gitHub
 # DIRECTORY, not a REPO. Path-based commands must still resolve it to a repo ID.
 path=/Workspace/Users/me@databricks.com/test-repo
 
-trace $CLI repos create $url $provider --path $path | jq .id -r
+MSYS_NO_PATHCONV=1 trace $CLI repos create $url $provider --path $path | jq .id -r
 
 title "Get by path resolves a Git CLI folder"
-trace $CLI repos get $path -o json
+MSYS_NO_PATHCONV=1 trace $CLI repos get $path -o json
 
 title "Update by path resolves a Git CLI folder"
-trace $CLI repos update $path --branch update-by-path
+MSYS_NO_PATHCONV=1 trace $CLI repos update $path --branch update-by-path
 
 title "Delete by path resolves a Git CLI folder"
-trace $CLI repos delete $path
+MSYS_NO_PATHCONV=1 trace $CLI repos delete $path
+
+trace print_requests.py --get //repos //workspace/get-status
diff --git a/acceptance/workspace/repos/test.toml b/acceptance/workspace/repos/test.toml
index ce16d8885ae..159efe02696 100644
--- a/acceptance/workspace/repos/test.toml
+++ b/acceptance/workspace/repos/test.toml
@@ -1,6 +1 @@
 RecordRequests = true
-
-# MSYS2 automatically converts absolute paths like /Repos/me@databricks.com/test-repo to
-# C:/Program Files/Git/Repos/me@databricks.com/test-repo before passing it to the CLI
-# Setting this environment variable prevents that conversion on windows.
-Env.MSYS_NO_PATHCONV = "1"
diff --git a/acceptance/workspace/repos/update/out.requests.txt b/acceptance/workspace/repos/update/out.requests.txt
deleted file mode 100644
index fa5a518dad8..00000000000
--- a/acceptance/workspace/repos/update/out.requests.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "method": "GET",
-  "path": "/.well-known/databricks-config"
-}
-{
-  "method": "POST",
-  "path": "/api/2.0/repos",
-  "body": {
-    "path": "/Repos/me@databricks.com/test-repo",
-    "provider": "gitHub",
-    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
-  }
-}
-{
-  "method": "PATCH",
-  "path": "/api/2.0/repos/[NUMID]",
-  "body": {
-    "branch": "update-by-id"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/repos/[NUMID]"
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/workspace/get-status",
-  "q": {
-    "path": "/Repos/me@databricks.com/test-repo"
-  }
-}
-{
-  "method": "PATCH",
-  "path": "/api/2.0/repos/[NUMID]",
-  "body": {
-    "branch": "update-by-path"
-  }
-}
-{
-  "method": "GET",
-  "path": "/api/2.0/repos/[NUMID]"
-}
diff --git a/acceptance/workspace/repos/update/output.txt b/acceptance/workspace/repos/update/output.txt
index af6e590f3fe..9532d356c46 100644
--- a/acceptance/workspace/repos/update/output.txt
+++ b/acceptance/workspace/repos/update/output.txt
@@ -24,3 +24,43 @@
   "provider": "gitHub",
   "url": "https://github.com/databricks/databricks-empty-ide-project.git"
 }
+
+>>> print_requests.py --get //repos //workspace/get-status
+{
+  "method": "POST",
+  "path": "/api/2.0/repos",
+  "body": {
+    "path": "/Repos/me@databricks.com/test-repo",
+    "provider": "gitHub",
+    "url": "https://github.com/databricks/databricks-empty-ide-project.git"
+  }
+}
+{
+  "method": "PATCH",
+  "path": "/api/2.0/repos/[NUMID]",
+  "body": {
+    "branch": "update-by-id"
+  }
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/repos/[NUMID]"
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/workspace/get-status",
+  "q": {
+    "path": "/Repos/me@databricks.com/test-repo"
+  }
+}
+{
+  "method": "PATCH",
+  "path": "/api/2.0/repos/[NUMID]",
+  "body": {
+    "branch": "update-by-path"
+  }
+}
+{
+  "method": "GET",
+  "path": "/api/2.0/repos/[NUMID]"
+}
diff --git a/acceptance/workspace/repos/update/script b/acceptance/workspace/repos/update/script
index ab5db9f64bf..db166f6f415 100644
--- a/acceptance/workspace/repos/update/script
+++ b/acceptance/workspace/repos/update/script
@@ -2,12 +2,14 @@ url=https://github.com/databricks/databricks-empty-ide-project.git
 provider=gitHub
 path=/Repos/me@databricks.com/test-repo
 
-repo_id=$(trace $CLI repos create $url $provider --path $path | jq .id -r)
+repo_id=$(MSYS_NO_PATHCONV=1 trace $CLI repos create $url $provider --path $path | jq .id -r)
 
-trace $CLI repos update $repo_id --branch update-by-id
+MSYS_NO_PATHCONV=1 trace $CLI repos update $repo_id --branch update-by-id
 
-trace $CLI repos get $repo_id -o json
+MSYS_NO_PATHCONV=1 trace $CLI repos get $repo_id -o json
 
-trace $CLI repos update $path --branch update-by-path
+MSYS_NO_PATHCONV=1 trace $CLI repos update $path --branch update-by-path
 
-trace $CLI repos get $repo_id -o json
+MSYS_NO_PATHCONV=1 trace $CLI repos get $repo_id -o json
+
+trace print_requests.py --get //repos //workspace/get-status