Open
Conversation
Signed-off-by: syedowais312 <syedowais312sf@gmail.com>
Signed-off-by: syedowais312 <syedowais312sf@gmail.com>
Syedowais312
force-pushed
the
fix/yamlmerger-deep-merge
branch
from
630fcdf to
c8371e6
Compare
Syedowais312
commented
Feb 25, 2026
| case yaml.ScalarNode: | ||
| // SA4006 these variables represent pointers and are propagated outside of `recursiveMerge` | ||
| into = from //nolint:staticcheck | ||
| *into = *from |
Author
There was a problem hiding this comment.
Previously, this reassigned the local pointer (into = from), which did not modify the underlying node. Using *into = *from correctly overwrites the target node value.
Syedowais312
commented
Feb 25, 2026
| foundFrom := false | ||
| for _, intoItem := range into.Content { | ||
| if fromItem.Value == intoItem.Value { | ||
| if nodesDeepEqual(fromItem, intoItem) { |
Author
There was a problem hiding this comment.
also replaced shallow .Value comparison with structural deep equality. .Value works for scalar nodes but fails for mappings and nested structures.
@nderjung @craciunoiuc could you please take a look
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR fixes scalar node merge behavior in RecursiveMerge
by replacing pointer reassignment with value overwrite.
It also improves sequence merging by introducing deep
node comparison, enabling proper handling of sequences
of mappings and nested structures.
Changes
Testing
All tests pass with:
go test ./internal/yamlmerger/...