acceptance/bundle/validate/include_locations/databricks.yml

@@ -2,7 +2,7 @@ bundle:
   name: include_locations
 
 include:
-  - resources/*.yml
+  - job.yml
   - override.yml
 
 targets:

acceptance/bundle/validate/include_locations/output.dev.json

@@ -1,8 +1,8 @@
 {
   "files": [
     "databricks.yml",
-    "override.yml",
-    "resources/job.yml"
+    "job.yml",
+    "override.yml"
   ],
   "locations": {
     "bundle": [
@@ -42,36 +42,36 @@
     ],
     "resources": [
       [
-        2,
+        1,
         2,
         3
       ],
       [
-        1,
+        2,
         4,
         7
       ]
     ],
     "resources.jobs": [
       [
-        2,
+        1,
         3,
         5
       ],
       [
-        1,
+        2,
         5,
         9
       ]
     ],
     "resources.jobs.my_job": [
       [
-        2,
+        1,
         4,
         7
       ],
       [
-        1,
+        2,
         6,
         11
       ]
@@ -83,7 +83,7 @@
         3
       ],
       [
-        1,
+        2,
         2,
         3
       ]

acceptance/bundle/validate/include_locations/output.prod.json

@@ -1,8 +1,8 @@
 {
   "files": [
     "databricks.yml",
-    "override.yml",
-    "resources/job.yml"
+    "job.yml",
+    "override.yml"
   ],
   "locations": {
     "bundle": [
@@ -42,36 +42,36 @@
     ],
     "resources": [
       [
-        2,
+        1,
         2,
         3
       ],
       [
-        1,
+        2,
         14,
         7
       ]
     ],
     "resources.jobs": [
       [
-        2,
+        1,
         3,
         5
       ],
       [
-        1,
+        2,
         15,
         9
       ]
     ],
     "resources.jobs.my_job": [
       [
-        2,
+        1,
         4,
         7
       ],
       [
-        1,
+        2,
         16,
         11
       ]
@@ -83,7 +83,7 @@
         3
       ],
       [
-        1,
+        2,
         2,
         3
       ]

libs/dyn/dynloc/locations.go

@@ -1,13 +1,9 @@
 package dynloc
 
 import (
-	"fmt"
 	"path/filepath"
-	"slices"
-	"sort"
 
 	"github.com/databricks/cli/libs/dyn"
-	"golang.org/x/exp/maps"
 )
 
 const (
@@ -41,84 +37,28 @@ type Locations struct {
 	basePath string
 }
 
-func (l *Locations) gatherLocations(v dyn.Value) (map[string][]dyn.Location, error) {
-	locs := map[string][]dyn.Location{}
-	_, err := dyn.Walk(v, func(p dyn.Path, v dyn.Value) (dyn.Value, error) {
-		// Skip the root value.
-		if len(p) == 0 {
-			return v, nil
-		}
-
-		// Skip if the path depth exceeds the maximum depth.
-		if l.maxDepth > 0 && len(p) > l.maxDepth {
-			return v, dyn.ErrSkip
-		}
-
-		locs[p.String()] = v.Locations()
-		return v, nil
-	})
-	return locs, err
-}
-
-func (l *Locations) normalizeFilePath(file string) (string, error) {
+func (l *Locations) addLocation(p dyn.Path, file string, line, col int) error {
 	var err error
 
 	// Compute the relative path. The base path may be empty.
 	file, err = filepath.Rel(l.basePath, file)
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	// Convert the path separator to forward slashes.
 	// This makes it possible to compare output across platforms.
-	return filepath.ToSlash(file), nil
-}
+	file = filepath.ToSlash(file)
 
-func (l *Locations) registerFileNames(locs []dyn.Location) error {
-	cache := map[string]string{}
-	for _, loc := range locs {
-		// Never process the same file path twice.
-		if _, ok := cache[loc.File]; ok {
-			continue
-		}
-
-		// Normalize the file path.
-		out, err := l.normalizeFilePath(loc.File)
-		if err != nil {
-			return err
-		}
-
-		// Cache the normalized path.
-		cache[loc.File] = out
-	}
-
-	l.Files = maps.Values(cache)
-	sort.Strings(l.Files)
-
-	// Build the file-to-index map.
-	for i, file := range l.Files {
-		l.fileToIndex[file] = i
-	}
-
-	// Add entries for the original file path.
-	// Doing this means we can perform the lookup with the verbatim file path.
-	for k, v := range cache {
-		l.fileToIndex[k] = l.fileToIndex[v]
-	}
-
-	return nil
-}
-
-func (l *Locations) addLocation(path, file string, line, col int) error {
-	// Expect the file to be present in the lookup map.
+	// If the file is not yet in the list, add it.
 	if _, ok := l.fileToIndex[file]; !ok {
-		// This indicates a logic problem below, but we rather not panic.
-		return fmt.Errorf("dynloc: unknown file %q", file)
+		l.fileToIndex[file] = len(l.Files)
+		l.Files = append(l.Files, file)
 	}
 
 	// Add the location to the map.
-	l.Locations[path] = append(
-		l.Locations[path],
+	l.Locations[p.String()] = append(
+		l.Locations[p.String()],
 		[]int{l.fileToIndex[file], line, col},
 	)
 
@@ -159,27 +99,26 @@ func Build(v dyn.Value, opts ...Option) (Locations, error) {
 	}
 
 	// Traverse the value and collect locations.
-	pathToLocations, err := l.gatherLocations(v)
-	if err != nil {
-		return l, err
-	}
+	_, err := dyn.Walk(v, func(p dyn.Path, v dyn.Value) (dyn.Value, error) {
+		// Skip the root value.
+		if len(p) == 0 {
+			return v, nil
+		}
 
-	// Normalize file paths and add locations.
-	// This step adds files to the [Files] array in alphabetical order.
-	err = l.registerFileNames(slices.Concat(maps.Values(pathToLocations)...))
-	if err != nil {
-		return l, err
-	}
+		// Skip if the path depth exceeds the maximum depth.
+		if l.maxDepth > 0 && len(p) > l.maxDepth {
+			return v, dyn.ErrSkip
+		}
 
-	// Add locations to the map.
-	for path, locs := range pathToLocations {
-		for _, loc := range locs {
-			err = l.addLocation(path, loc.File, loc.Line, loc.Column)
+		for _, loc := range v.Locations() {
+			err := l.addLocation(p, loc.File, loc.Line, loc.Column)
 			if err != nil {
-				return l, err
+				return dyn.InvalidValue, err
 			}
 		}
-	}
+
+		return v, nil
+	})
 
 	return l, err
 }

libs/dyn/dynloc/locations_test.go

@@ -7,9 +7,9 @@ import (
 	"testing"
 
 	"github.com/databricks/cli/libs/dyn"
-	assert "github.com/databricks/cli/libs/dyn/dynassert"
 	"github.com/databricks/cli/libs/dyn/merge"
 	"github.com/databricks/cli/libs/dyn/yamlloader"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )