Merge branch 'main' of github.com:databricks/cli into go-sdk-bump

Author: tanmay-db

.release_metadata.json

@@ -1,3 +1,3 @@
 {
-    "timestamp": "2026-02-05 13:18:41+0000"
+    "timestamp": "2026-02-12 09:31:35+0000"
 }

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Version changelog
 
+## Release v0.288.0 (2026-02-12)
+
+### Bundles
+
+* Add support for task-level `compute` configuration with hardware accelerators (GPU_1xA10, GPU_8xH100) ([#4457](https://github.com/databricks/cli/pull/4457))
+
+### Dependency updates
+
+* Upgrade Go SDK to 0.104.0 and Terraform provider to 1.105.0 ([#4457](https://github.com/databricks/cli/pull/4457))
+
+
 ## Release v0.287.0 (2026-02-05)
 
 ### CLI

Makefile

@@ -147,6 +147,15 @@ integration:
 integration-short:
 	VERBOSE_TEST=1 $(INTEGRATION) -short
 
+dbr-integration:
+	DBR_ENABLED=true go test -v -timeout 4h -run TestDbrAcceptance$$ ./acceptance
+
+# DBR acceptance tests - run on Databricks Runtime using serverless compute
+# These require deco env run for authentication
+# Set DBR_TEST_VERBOSE=1 for detailed output (e.g., DBR_TEST_VERBOSE=1 make dbr-test)
+dbr-test:
+	deco env run -i -n aws-prod-ucws -- make dbr-integration
+
 generate-validation:
 	go run ./bundle/internal/validation/.
 	gofmt -w -s ./bundle/internal/validation/generated

NEXT_CHANGELOG.md

@@ -1,13 +1,11 @@
 # NEXT CHANGELOG
 
-## Release v0.288.0
-
-### Notable Changes
-
-### CLI
+## Release v0.289.0
 
 ### Bundles
+* Log artifact build output in debug mode ([#4208](https://github.com/databricks/cli/pull/4208))
 
 ### Dependency updates
 
-### API Changes
+### Bundles
+* Fix bundle init not working in Azure Government ([#4286](https://github.com/databricks/cli/pull/4286))

acceptance/acceptance_test.go

@@ -46,7 +46,6 @@ var (
 	SkipLocal       bool
 	UseVersion      string
 	WorkspaceTmpDir bool
-	TerraformDir    string
 	OnlyOutTestToml bool
 )
 
@@ -79,11 +78,6 @@ func init() {
 	// DABs in the workspace runs on the workspace file system. This flags does the same for acceptance tests
 	// to simulate an identical environment.
 	flag.BoolVar(&WorkspaceTmpDir, "workspace-tmp-dir", false, "Run tests on the workspace file system (For DBR testing).")
-
-	// Symlinks from workspace file system to local file mount are not supported on DBR. Terraform implicitly
-	// creates these symlinks when a file_mirror is used for a provider (in .terraformrc). This flag
-	// allows us to download the provider to the workspace file system on DBR enabling DBR integration testing.
-	flag.StringVar(&TerraformDir, "terraform-dir", "", "Directory to download the terraform provider to")
 	flag.BoolVar(&OnlyOutTestToml, "only-out-test-toml", false, "Only regenerate out.test.toml files without running tests")
 }
 
@@ -173,14 +167,11 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 
 	buildDir := getBuildDir(t, cwd, runtime.GOOS, runtime.GOARCH)
 
-	terraformDir := TerraformDir
-	if terraformDir == "" {
-		terraformDir = buildDir
+	// Set up terraform for tests. Skip on DBR - tests with RunsOnDbr only use direct deployment.
+	if !WorkspaceTmpDir {
+		setupTerraform(t, cwd, buildDir, &repls)
 	}
 
-	// Download terraform and provider and create config.
-	RunCommand(t, []string{"python3", filepath.Join(cwd, "install_terraform.py"), "--targetdir", terraformDir}, ".", []string{})
-
 	wheelPath := buildDatabricksBundlesWheel(t, buildDir)
 	if wheelPath != "" {
 		t.Setenv("DATABRICKS_BUNDLES_WHEEL", wheelPath)
@@ -210,7 +201,12 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 		}
 	}
 
-	BuildYamlfmt(t)
+	// Skip building yamlfmt when running on workspace filesystem (DBR).
+	// This fails today on DBR. Can be looked into and fixed as a follow-up
+	// as and when needed.
+	if !WorkspaceTmpDir {
+		BuildYamlfmt(t)
+	}
 
 	t.Setenv("CLI", execPath)
 	repls.SetPath(execPath, "[CLI]")
@@ -255,16 +251,6 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int {
 		t.Setenv("CLI_RELEASES_DIR", releasesDir)
 	}
 
-	terraformrcPath := filepath.Join(terraformDir, ".terraformrc")
-	t.Setenv("TF_CLI_CONFIG_FILE", terraformrcPath)
-	t.Setenv("DATABRICKS_TF_CLI_CONFIG_FILE", terraformrcPath)
-	repls.SetPath(terraformrcPath, "[DATABRICKS_TF_CLI_CONFIG_FILE]")
-
-	terraformExecPath := filepath.Join(terraformDir, "terraform") + exeSuffix
-	t.Setenv("DATABRICKS_TF_EXEC_PATH", terraformExecPath)
-	t.Setenv("TERRAFORM", terraformExecPath)
-	repls.SetPath(terraformExecPath, "[TERRAFORM]")
-
 	// do it last so that full paths match first:
 	repls.SetPath(buildDir, "[BUILD_DIR]")
 
@@ -429,8 +415,8 @@ func getSkipReason(config *internal.TestConfig, configPath string) string {
 		return ""
 	}
 
-	if isTruePtr(config.SkipOnDbr) && WorkspaceTmpDir {
-		return "Disabled via SkipOnDbr setting in " + configPath
+	if WorkspaceTmpDir && !isTruePtr(config.RunsOnDbr) {
+		return "Disabled because RunsOnDbr is not set in " + configPath
 	}
 
 	if isTruePtr(config.Slow) && testing.Short() {
@@ -499,6 +485,13 @@ func runTest(t *testing.T,
 	customEnv []string,
 	envFilters []string,
 ) {
+	// Check env filters early, before creating any resources like directories on the file system.
+	// Creating / deleting too many directories causes this error on the workspace FUSE mount:
+	// unlinkat <workspace_path>: directory not empty. Thus avoiding unnecessary directory creation
+	// is important.
+	testEnv := buildTestEnv(config.Env, customEnv)
+	checkEnvFilters(t, testEnv, envFilters)
+
 	if LogConfig {
 		configBytes, err := json.MarshalIndent(config, "", "  ")
 		require.NoError(t, err)
@@ -530,7 +523,7 @@ func runTest(t *testing.T,
 		// If the test is being run on DBR, auth is already configured
 		// by the dbr_runner notebook by reading a token from the notebook context and
 		// setting DATABRICKS_TOKEN and DATABRICKS_HOST environment variables.
-		_, _, tmpDir = workspaceTmpDir(t.Context(), t)
+		tmpDir = workspaceTmpDir(t.Context(), t)
 
 		// Run DBR tests on the workspace file system to mimic usage from
 		// DABs in the workspace.
@@ -630,38 +623,12 @@ func runTest(t *testing.T,
 	uniqueCacheDir := filepath.Join(t.TempDir(), ".cache")
 	cmd.Env = append(cmd.Env, "DATABRICKS_CACHE_DIR="+uniqueCacheDir)
 
-	for _, key := range utils.SortedKeys(config.Env) {
-		if hasKey(customEnv, key) {
-			// We want EnvMatrix to take precedence.
-			// Skip rather than relying on cmd.Env order, because this might interfere with replacements and substitutions.
-			continue
-		}
-		cmd.Env = addEnvVar(t, cmd.Env, &repls, key, config.Env[key], config.EnvRepl, false)
-	}
-
-	for _, keyvalue := range customEnv {
-		items := strings.SplitN(keyvalue, "=", 2)
-		require.Len(t, items, 2)
-		key := items[0]
-		value := items[1]
+	for _, kv := range testEnv {
+		key, value, _ := strings.Cut(kv, "=")
 		// Only add replacement by default if value is part of EnvMatrix with more than 1 option and length is 4 or more chars
 		// (to avoid matching "yes" and "no" values from template input parameters)
-		cmd.Env = addEnvVar(t, cmd.Env, &repls, key, value, config.EnvRepl, len(config.EnvMatrix[key]) > 1 && len(value) >= 4)
-	}
-
-	for filterInd, filterEnv := range envFilters {
-		filterEnvKey := strings.Split(filterEnv, "=")[0]
-		for ind := range cmd.Env {
-			// Search backwards, because the latest settings is what is actually applicable.
-			envPair := cmd.Env[len(cmd.Env)-1-ind]
-			if strings.Split(envPair, "=")[0] == filterEnvKey {
-				if envPair == filterEnv {
-					break
-				} else {
-					t.Skipf("Skipping because test environment %s does not match ENVFILTER#%d: %s", envPair, filterInd, filterEnv)
-				}
-			}
-		}
+		defaultRepl := hasKey(customEnv, key) && len(config.EnvMatrix[key]) > 1 && len(value) >= 4
+		cmd.Env = addEnvVar(t, cmd.Env, &repls, key, value, config.EnvRepl, defaultRepl)
 	}
 
 	absDir, err := filepath.Abs(dir)
@@ -745,10 +712,44 @@ func runTest(t *testing.T,
 	}
 }
 
+// checkEnvFilters skips the test if any env filter doesn't match testEnv.
+func checkEnvFilters(t *testing.T, testEnv, envFilters []string) {
+	envMap := make(map[string]string, len(testEnv))
+	for _, kv := range testEnv {
+		key, value, _ := strings.Cut(kv, "=")
+		envMap[key] = value
+	}
+	for i, filter := range envFilters {
+		key, expected, _ := strings.Cut(filter, "=")
+		if actual, ok := envMap[key]; ok && actual != expected {
+			t.Skipf("Skipping because test environment %s=%s does not match ENVFILTER#%d: %s", key, actual, i, filter)
+		}
+	}
+}
+
+// buildTestEnv builds the test environment from config.Env and customEnv.
+// customEnv (from EnvMatrix) takes precedence over config.Env.
+func buildTestEnv(configEnv map[string]string, customEnv []string) []string {
+	env := make([]string, 0, len(configEnv)+len(customEnv))
+
+	// Add config.Env first (but skip keys that exist in customEnv)
+	for _, key := range utils.SortedKeys(configEnv) {
+		if hasKey(customEnv, key) {
+			continue
+		}
+		env = append(env, key+"="+configEnv[key])
+	}
+
+	// Add customEnv second (takes precedence)
+	env = append(env, customEnv...)
+
+	return env
+}
+
 func hasKey(env []string, key string) bool {
-	for _, keyvalue := range env {
-		items := strings.SplitN(keyvalue, "=", 2)
-		if len(items) == 2 && items[0] == key {
+	for _, kv := range env {
+		k, _, ok := strings.Cut(kv, "=")
+		if ok && k == key {
 			return true
 		}
 	}
@@ -1383,6 +1384,22 @@ func BuildYamlfmt(t *testing.T) {
 	RunCommand(t, args, "..", []string{})
 }
 
+// setupTerraform installs terraform and configures environment variables for tests.
+func setupTerraform(t *testing.T, cwd, buildDir string, repls *testdiff.ReplacementsContext) {
+	RunCommand(t, []string{"python3", filepath.Join(cwd, "install_terraform.py"), "--targetdir", buildDir}, ".", []string{})
+
+	terraformrcPath := filepath.Join(buildDir, ".terraformrc")
+	terraformExecPath := filepath.Join(buildDir, "terraform") + exeSuffix
+
+	t.Setenv("TF_CLI_CONFIG_FILE", terraformrcPath)
+	t.Setenv("DATABRICKS_TF_CLI_CONFIG_FILE", terraformrcPath)
+	t.Setenv("DATABRICKS_TF_EXEC_PATH", terraformExecPath)
+	t.Setenv("TERRAFORM", terraformExecPath)
+
+	repls.SetPath(terraformrcPath, "[DATABRICKS_TF_CLI_CONFIG_FILE]")
+	repls.SetPath(terraformExecPath, "[TERRAFORM]")
+}
+
 func loadUserReplacements(t *testing.T, repls *testdiff.ReplacementsContext, tmpDir string) {
 	b, err := os.ReadFile(filepath.Join(tmpDir, userReplacementsFilename))
 	if os.IsNotExist(err) {

acceptance/bin/gron.py

@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+import json
+import sys
+from pathlib import Path
+
+sys.path.insert(0, str(Path(__file__).parent))
+from print_requests import read_json_many
+
+
+def gron(obj, path="json"):
+    """Flatten JSON into greppable assignments.
+
+    The path parameter defaults to "json" to match the original gron tool,
+    which treats the input as a JavaScript variable named "json".
+
+    Container declarations are only printed for empty dicts/lists.
+    This differs from https://github.com/tomnomnom/gron which always prints
+    container declarations to allow reconstruction via ungron. We don't need
+    reversibility - we only care about making JSON greppable.
+
+    >>> gron({"name": "Tom", "age": 30})
+    json.name = "Tom";
+    json.age = 30;
+
+    >>> gron({"items": ["apple", "banana"]})
+    json.items[0] = "apple";
+    json.items[1] = "banana";
+
+    >>> gron({"tasks": [{"libraries": [{"whl": "file.whl"}]}]})
+    json.tasks[0].libraries[0].whl = "file.whl";
+
+    >>> gron({"empty": {}, "items": []})
+    json.empty = {};
+    json.items = [];
+    """
+    if isinstance(obj, dict):
+        if not obj:
+            print(f"{path} = {{}};")
+        else:
+            for key in obj:
+                gron(obj[key], f"{path}.{key}")
+    elif isinstance(obj, list):
+        if not obj:
+            print(f"{path} = [];")
+        else:
+            for i, item in enumerate(obj):
+                gron(item, f"{path}[{i}]")
+    else:
+        print(f"{path} = {json.dumps(obj)};")
+
+
+def main():
+    if len(sys.argv) > 1:
+        with open(sys.argv[1]) as f:
+            content = f.read()
+        data = read_json_many(content)
+        if len(data) == 1:
+            data = data[0]
+    else:
+        content = sys.stdin.read()
+        data = read_json_many(content)
+        if len(data) == 1:
+            data = data[0]
+
+    gron(data)
+
+
+if __name__ == "__main__":
+    main()

acceptance/bundle/artifacts/test.toml

@@ -11,7 +11,7 @@ RecordRequests = true
 #   Failed to inspect Python interpreter from active virtual environment at `.venv/bin/python3`
 #   Caused by: Failed to query Python interpreter
 #   Caused by: failed to canonicalize path `/Workspace/abcd/.venv/bin/python3`: Invalid cross-device link (os error 18)
-SkipOnDbr = true
+# Thus we cannot run this test on DBR.
 
 Ignore = [
     '.venv',

acceptance/bundle/artifacts/whl_change_version/output.txt

@@ -64,21 +64,7 @@ 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
-[
-  {
-    "existing_cluster_id": "0717-aaaaa-bbbbbb",
-    "libraries": [
-      {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.2.0-py3-none-any.whl"
-      }
-    ],
-    "python_wheel_task": {
-      "entry_point": "run",
-      "package_name": "my_test_code"
-    },
-    "task_key": "TestTask"
-  }
-]
+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
@@ -110,21 +96,7 @@ 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
-[
-  {
-    "existing_cluster_id": "0717-aaaaa-bbbbbb",
-    "libraries": [
-      {
-        "whl": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/artifacts/.internal/my_test_code-0.1.0-py3-none-any.whl"
-      }
-    ],
-    "python_wheel_task": {
-      "entry_point": "run",
-      "package_name": "my_test_code"
-    },
-    "task_key": "TestTask"
-  }
-]
+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