acc: remove BundleConfig feature (#4182)

## Changes
- Remove BundleConfig setting
(#2809) which allows
post-processing of databricks.yml
- Add bundle.name section to all config that need it explicitly.

## Why
It is not used outside of original 'name' use case and I don't think
that use case alone warrants the complexity.

This makes test runner simpler and understanding the test output
simpler. In particular line numbers in the output become correct. There
is also log noise that is removed.

Dynamically generated configs are useful sometimes, but that can be done
by a script, no need to support it on test runner level. Test runner can
provide input to configuration via EnvMatrix.

Author: denik

acceptance/acceptance_test.go

@@ -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{

acceptance/bundle/apps/app_yaml/databricks.yml

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

acceptance/bundle/artifacts/artifact_upload_for_volumes/databricks.yml

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

acceptance/bundle/artifacts/artifact_upload_for_workspace/databricks.yml

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

acceptance/bundle/artifacts/artifact_upload_with_no_library_reference/databricks.yml

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

acceptance/bundle/artifacts/artifacts_dynamic_version/databricks.yml

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

acceptance/bundle/artifacts/build_and_files/databricks.yml

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

acceptance/bundle/artifacts/build_and_files_whl/databricks.yml

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

acceptance/bundle/artifacts/glob_exact_whl/databricks.yml

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

acceptance/bundle/artifacts/globs_in_files_in_include/databricks.yml

@@ -1,2 +1,5 @@
+bundle:
+  name: test-bundle
+
 include:
   - resources/artifacts.yml