Skip to content

Commit

Permalink
fix: fix(yamlmerger): Update RecursiveMerge to support ScalarNode kind
Browse files Browse the repository at this point in the history
Signed-off-by: MdSahil-oss <[email protected]>
  • Loading branch information
MdSahil-oss committed Jan 24, 2024
1 parent af74468 commit 6cb224d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion internal/yamlmerger/yamlmerger.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func RecursiveMerge(from, into *yaml.Node) error {
}
case yaml.ScalarNode:
// SA4006 these variables represent pointers and are propagated outside of `recursiveMerge`
into = from //nolint:staticcheck
into.Value = from.Value //nolint:staticcheck
case yaml.SequenceNode:
for _, fromItem := range from.Content {
foundFrom := false
Expand Down

0 comments on commit 6cb224d

Please sign in to comment.