Skip to content

Fix prepend_workspace_prefix to use visited value instead of closure root #5513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonfaltum wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −2
Open

Fix prepend_workspace_prefix to use visited value instead of closure root #5513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e216f4d
Fix prepend_workspace_prefix to use visited value instead of closure …
simonfaltum Jun 9, 2026
aeca96c
Remove redundant comments
simonfaltum Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions bundle/config/mutator/prepend_workspace_prefix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (m *prependWorkspacePrefix) Apply(ctx context.Context, b *bundle.Bundle) di
v, err = dyn.MapByPattern(v, pattern, func(p dyn.Path, pv dyn.Value) (dyn.Value, error) {
path, ok := pv.AsString()
if !ok {
return dyn.InvalidValue, fmt.Errorf("expected string, got %s", v.Kind())
return dyn.InvalidValue, fmt.Errorf("expected string, got %s", pv.Kind())
}

// Skip prefixing if the path does not start with /, it might be variable reference or smth else.
Expand All @@ -55,7 +55,8 @@ func (m *prependWorkspacePrefix) Apply(ctx context.Context, b *bundle.Bundle) di
}
}

return dyn.NewValue("/Workspace"+path, v.Locations()), nil
// Use pv's locations, not the root v's, so diagnostics point at the original config line.
return dyn.NewValue("/Workspace"+path, pv.Locations()), nil
})
if err != nil {
return dyn.InvalidValue, err
Expand Down
19 changes: 19 additions & 0 deletions bundle/config/mutator/prepend_workspace_prefix_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import (

"github.com/databricks/cli/bundle"
"github.com/databricks/cli/bundle/config"
"github.com/databricks/cli/bundle/internal/bundletest"
"github.com/databricks/cli/libs/dyn"
"github.com/databricks/databricks-sdk-go/service/iam"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -63,6 +65,23 @@ func TestPrependWorkspacePrefix(t *testing.T) {
}
}

func TestPrependWorkspacePrefixPreservesLocations(t *testing.T) {
b := &bundle.Bundle{
Config: config.Root{
Workspace: config.Workspace{
RootPath: "/Users/test",
},
},
}
locations := []dyn.Location{{File: "databricks.yml", Line: 42, Column: 5}}
bundletest.SetLocation(b, "workspace.root_path", locations)

diags := bundle.Apply(t.Context(), b, PrependWorkspacePrefix())
require.Empty(t, diags)
require.Equal(t, "/Workspace/Users/test", b.Config.Workspace.RootPath)
require.Equal(t, locations, b.Config.GetLocations("workspace.root_path"))
}

func TestPrependWorkspaceForDefaultConfig(t *testing.T) {
b := &bundle.Bundle{
Config: config.Root{
Expand Down
Loading