Run all bundle tests twice; once within a subdir

acceptance/acceptance_test.go

@@ -127,8 +127,8 @@ func testAccept(t *testing.T, InprocessMode bool, singleTest string) int {
 		execPath = BuildCLI(t, buildDir, coverDir)
 	}
 
-	t.Setenv("CLI", execPath)
-	repls.SetPath(execPath, "[CLI]")
+	t.Setenv("CLI_BINARY", execPath)
+	repls.SetPath(execPath, "[CLI_BINARY]")
 
 	// Make helper scripts available
 	t.Setenv("PATH", fmt.Sprintf("%s%c%s", filepath.Join(cwd, "bin"), os.PathListSeparator, os.Getenv("PATH")))
@@ -233,6 +233,12 @@ func testAccept(t *testing.T, InprocessMode bool, singleTest string) int {
 			} else {
 				for _, envset := range expanded {
 					envname := strings.Join(envset, "/")
+					// Presence of $ in PATH confuses Python when building Python artifacts
+					//  File "/private/var/folders/5y/9kkdnjw91p11vsqwk0cvmk200000gp/T/TestAcceptbundleartifactswhl_dynamicCLI=$CLI_BINARYUV_PYTHON=3.102963127949/001/.venv/lib/python3.10/site-packages/setuptools/_distutils/util.py", line 204, in subst_vars
+					//    raise ValueError(f"invalid variable {var}")
+					// ValueError: invalid variable 'CLI_BINARYUV_PYTHON'
+					envname = strings.ReplaceAll(envname, "$", "_")
+
 					t.Run(envname, func(t *testing.T) {
 						if !InprocessMode {
 							t.Parallel()

acceptance/bundle/debug/test.toml

@@ -1,3 +1,6 @@
+[EnvMatrix]
+CLI = ["$CLI_BINARY"]
+
 [[Repls]]
 # The keys are unsorted and also vary per OS
 Old = 'Environment variables for Terraform: ([A-Z_ ,]+) '

acceptance/bundle/deploy/experimental-python/test.toml

@@ -1 +1,3 @@
 # need deterministic ids and clean workspace
+[EnvMatrix]
+CLI = ["$CLI_BINARY"]

acceptance/bundle/deployment/bind/test.toml

@@ -0,0 +1,2 @@
+[EnvMatrix]
+CLI = ["$CLI_BINARY"]

acceptance/bundle/generate/git_job/output.txt

@@ -1,2 +1,8 @@
+
+>>> [CLI] bundle generate job --existing-job-id 1234 --config-dir . --key out
+Job is using Git source, skipping downloading files
+Job configuration successfully saved to out.job.yml
+
+>>> [CLI] bundle generate job --existing-job-id 1234 --config-dir . --key out
 Job is using Git source, skipping downloading files
 Job configuration successfully saved to out.job.yml

acceptance/bundle/generate/git_job/script

@@ -1 +1,7 @@
-$CLI bundle generate job --existing-job-id 1234 --config-dir . --key out
+trace $CLI bundle generate job --existing-job-id 1234 --config-dir . --key out
+
+mkdir subdir1
+cd subdir1
+trace $CLI bundle generate job --existing-job-id 1234 --config-dir . --key out
+diff.py out.job.yml $TESTDIR/out.job.yml
+rm out.job.yml

acceptance/bundle/generate/git_job/test.toml

@@ -1,3 +1,6 @@
+[EnvMatrix]
+CLI = ["$CLI_BINARY"]
+
 [[Server]]
 Pattern = "GET /api/2.2/jobs/get"
 Response.Body = '''

acceptance/bundle/python/test.toml

@@ -10,3 +10,4 @@ UV_ARGS = [
   "--with databricks-bundles==0.7.3",
   "--with-requirements requirements-latest.txt --no-cache",
 ]
+CLI = ["$CLI_BINARY"]

acceptance/bundle/templates-machinery/test.toml

@@ -1,3 +1,6 @@
+[EnvMatrix]
+CLI = ["$CLI_BINARY"]
+
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''

acceptance/bundle/templates/test.toml

@@ -1,5 +1,8 @@
 # Local-only: At the moment, there are many differences across different envs w.r.t to catalog use, node type and so on.
 
+[EnvMatrix]
+CLI = ["$CLI_BINARY"]
+
 [[Server]]
 Pattern = "POST /telemetry-ext"
 Response.Body = '''

acceptance/bundle/test.toml

@@ -1,6 +1,7 @@
 [EnvMatrix]
 # The lowest Python version we support. Alternative to "uv run --python 3.10"
 UV_PYTHON = ["3.10"]
+CLI = ["$CLI_BINARY", "cli_subdir"]
 
 [[Repls]]
 Old = '1\d{18}'

acceptance/script.prepare

@@ -60,6 +60,17 @@ withdir() {
     return $exit_code
 }
 
+cli_subdir() {
+    local orig_dir="$(pwd)"
+    mkdir -p subdir1
+    cd subdir1 || return $?
+    $CLI_BINARY "$@"
+    local exit_code=$?
+    cd "$orig_dir" || return $?
+    return $exit_code
+}
+
+
 uuid() {
     python3 -c 'import uuid; print(uuid.uuid4())'
 }

acceptance/test.toml

@@ -1,3 +1,6 @@
 # Default settings that apply to all tests unless overriden by test.toml files in inner directories.
 Local = true
 Cloud = false
+
+[EnvMatrix]
+CLI = ["$CLI_BINARY"]