databricks · denik · Dec 30, 2025 · Dec 30, 2025 · Dec 30, 2025 · Dec 30, 2025
@@ -14,7 +14,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"reflect"
 	"regexp"
 	"runtime"
 	"slices"
@@ -26,7 +25,6 @@ import (
 	"unicode/utf8"
 
 	"github.com/google/uuid"
-	"gopkg.in/yaml.v3"
 
 	"github.com/databricks/cli/acceptance/internal"
 	"github.com/databricks/cli/internal/testutil"
@@ -548,18 +546,6 @@ func runTest(t *testing.T,
 	// Add materialized config to outputs for comparison
 	outputs[internal.MaterializedConfigFile] = true
 
-	bundleConfigTarget := "databricks.yml"
-	if config.BundleConfigTarget != nil {
-		bundleConfigTarget = *config.BundleConfigTarget
-	}
-
-	if bundleConfigTarget != "" {
-		configCreated := applyBundleConfig(t, tmpDir, config.BundleConfig, bundleConfigTarget)
-		if configCreated {
-			inputs[bundleConfigTarget] = true
-		}
-	}
-
 	timeout := config.Timeout
 
 	if runtime.GOOS == "windows" {
@@ -1378,77 +1364,6 @@ func prepareWheelBuildDirectory(t *testing.T, dir string) string {
 	return latestWheel
 }
 
-// Applies BundleConfig setting to file named bundleConfigTarget and updates it in place if there were any changes.
-// Returns true if new file was created.
-func applyBundleConfig(t *testing.T, tmpDir string, bundleConfig map[string]any, bundleConfigTarget string) bool {
-	validConfig := make(map[string]map[string]any, len(bundleConfig))
-
-	for _, configName := range utils.SortedKeys(bundleConfig) {
-		configValue := bundleConfig[configName]
-		// Setting BundleConfig.<name> to empty string disables it.
-		// This is useful when parent directory defines some config that child test wants to cancel.
-		if configValue == "" {
-			continue
-		}
-		cfg, ok := configValue.(map[string]any)
-		if !ok {
-			t.Fatalf("Unexpected type for BundleConfig.%s: %#v", configName, configValue)
-		}
-		validConfig[configName] = cfg
-	}
-
-	if len(validConfig) == 0 {
-		return false
-	}
-
-	configPath := filepath.Join(tmpDir, bundleConfigTarget)
-	configData, configExists := tryReading(t, configPath)
-
-	newConfigData := configData
-	var applied []string
-
-	for _, configName := range utils.SortedKeys(validConfig) {
-		configValue := validConfig[configName]
-		updated, err := internal.MergeBundleConfig(newConfigData, configValue)
-		if err != nil {
-			t.Fatalf("Failed to merge BundleConfig.%s: %s\nvvalue: %#v\ntext:\n%s", configName, err, configValue, newConfigData)
-		}
-		if isSameYAMLContent(newConfigData, updated) {
-			t.Logf("No effective updates from BundleConfig.%s", configName)
-		} else {
-			newConfigData = updated
-			applied = append(applied, configName)
-		}
-	}
-
-	if newConfigData != configData {
-		t.Logf("Writing updated bundle config to %s. BundleConfig sections: %s", bundleConfigTarget, strings.Join(applied, ", "))
-		testutil.WriteFile(t, configPath, newConfigData)
-		return !configExists
-	}
-
-	return false
-}
-
-// Returns true if both strings are deep-equal after unmarshalling
-func isSameYAMLContent(str1, str2 string) bool {
-	var obj1, obj2 any
-
-	if str1 == str2 {
-		return true
-	}
-
-	if err := yaml.Unmarshal([]byte(str1), &obj1); err != nil {
-		return false
-	}
-
-	if err := yaml.Unmarshal([]byte(str2), &obj2); err != nil {
-		return false
-	}
-
-	return reflect.DeepEqual(obj1, obj2)
-}
-
 func BuildYamlfmt(t *testing.T) {
 	// Using make here instead of "go build" directly cause it's faster when it's already built
 	args := []string{

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   apps:
     myapp:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 workspace:
   artifact_path: /Volumes/foo/bar/artifacts
 

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 workspace:
   artifact_path: /foo/bar/artifacts
 

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 workspace:
   artifact_path: /Workspace/foo/bar/artifacts
 

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 presets:
   artifacts_dynamic_version: true
 

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   custom:
     build: touch built.txt

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   artifact_with_custom_dist:
     type: whl

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   my_prebuilt_whl:
     type: whl

@@ -1,2 +1,5 @@
+bundle:
+  name: test-bundle
+
 include:
   - resources/artifacts.yml
@@ -1,2 +1,5 @@
+bundle:
+  name: test-bundle
+
 include:
   - src/job1/databricks_job/resources/*.yaml
@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   my_artifact:
     executable: bash

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   my_artifact:
     executable: sh

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 variables:
   cluster:
     default:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 workspace:
   artifact_path: /foo/bar/artifacts
 

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     test_job:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     test_job:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   my_test_code:
     type: whl

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   my_test_code:
     type: whl

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     test_job:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 workspace:
   artifact_path: /foo/bar
 

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     test_job:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   my_test_code:
     type: whl

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 experimental:
   skip_artifact_cleanup: true
 

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     test_job:

@@ -1 +0,0 @@
-BundleConfig.default_name = ""

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 artifacts:
   my_test_code:
     type: whl

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     foo:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     foo:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     foo:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 sync: {paths: []} # dont need to copy files
 
 experimental:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   jobs:
     my_job:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 sync: {paths: []} # dont need to copy files
 
 resources:

@@ -1,8 +1,6 @@
 Cloud = true
 Local = false
 
-BundleConfigTarget = "databricks.yml"
-
 # On aws the host URL includes the workspace ID as well. Thus skipping it to keep the test simple.
 CloudEnvs.aws = false
 

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle-$UNIQUE_NAME
+
 resources:
   clusters:
     cluster1:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle-$UNIQUE_NAME
+
 resources:
   dashboards:
     dashboard1:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle-$UNIQUE_NAME
+
 resources:
   dashboards:
     dashboard1:

@@ -1,3 +1,6 @@
+bundle:
+  name: test-bundle
+
 resources:
   database_instances:
     database_instance1:

@@ -5,11 +5,11 @@ Successfully bound database_instance with an id '[UUID]'
 Run 'bundle deploy' to deploy changes to your workspace
 
 >>> [CLI] bundle summary
-Name: test-bundle-$UNIQUE_NAME
+Name: test-bundle
 Target: default
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle-$UNIQUE_NAME/default
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
 Resources:
   Database instances:
     database_instance1:
@@ -20,11 +20,11 @@ Resources:
 Updating deployment state...
 
 >>> [CLI] bundle summary
-Name: test-bundle-$UNIQUE_NAME
+Name: test-bundle
 Target: default
 Workspace:
   User: [USERNAME]
-  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle-$UNIQUE_NAME/default
+  Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
 Resources:
   Database instances:
     database_instance1: