Skip to content

Accept inline YAML merge mappings in bundles #7269

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

Merged
lennartkats-db merged 2 commits into from
Nov 2, 2026
Merged

Accept inline YAML merge mappings in bundles #7269

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
161eb81
Fix inline YAML merge mappings in bundle validation
lennartkats-db Oct 30, 2026
2cc1143
Test inline YAML merge without strict validation
lennartkats-db Nov 2, 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
21 changes: 14 additions & 7 deletions acceptance/bundle/validate/yaml_anchors/inline_merge_mapping/output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@

>>> [CLI] bundle validate
Error: failed to load [TEST_TMP_DIR]/databricks.yml: yaml ([TEST_TMP_DIR]/databricks.yml:11:11): map merge requires map or sequence of maps as the value


Found 1 error

Exit code: 1
>>> [CLI] bundle validate -t dev
Name: test-bundle
Target: dev
Workspace:
User: [USERNAME]
Path: /Workspace/Users/[USERNAME]/.bundle/test-bundle/dev

Validation OK!

>>> [CLI] bundle validate -t dev -o json
{
"default": "overridden",
"value": "overridden"
}
3 changes: 2 additions & 1 deletion acceptance/bundle/validate/yaml_anchors/inline_merge_mapping/script
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# An inline mapping as the value of '<<' in target variables.
errcode trace $CLI bundle validate
trace $CLI bundle validate -t dev
trace $CLI bundle validate -t dev -o json | jq .variables.x
1 change: 0 additions & 1 deletion acceptance/bundle/validate/yaml_anchors/inline_merge_mapping/test.toml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion libs/dyn/yamlloader/loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ func (d *loader) loadMapping(node *yaml.Node, loc diag.Location) (dyn.Value, err
switch merge.Kind {
case yaml.SequenceNode:
mnodes = merge.Content
case yaml.AliasNode:
case yaml.MappingNode, yaml.AliasNode:
mnodes = []*yaml.Node{merge}
default:
return dyn.NilValue, merr
Expand Down
9 changes: 9 additions & 0 deletions libs/dyn/yamlloader/yaml_anchor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,12 @@ func TestYAMLAnchor10(t *testing.T) {
assert.Equal(t, 1, self.Get("use1").Get("value").AsAny())
assert.Equal(t, 1, self.Get("use2").Get("value").AsAny())
}

func TestYAMLInlineMapMerge(t *testing.T) {
input := "target:\n <<: {x: inherited, y: merged}\n x: local\n"
value, err := yamlloader.LoadYAML("inline.yml", bytes.NewBufferString(input))
require.NoError(t, err)

assert.Equal(t, "local", value.Get("target").Get("x").AsAny())
assert.Equal(t, "merged", value.Get("target").Get("y").AsAny())
}
Loading