HashRecursiveMerge: support arrays in recursive merge #1831
Conversation
This file contains 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
I am not 100% this is the right choice, but for our use-case, where we will have top-level global platforms, and per-cookbook potential additional platforms, we need something that allows them to be merged together. test-kitchen#778 Signed-off-by: Nishanth Aravamudan <[email protected]>
nacc
force-pushed
the
naravamudan/support-arrays-in-recursive-merge
branch
from
0961368
to
55c2bdf
Compare
|
I realize that perhaps for safety purposes, we should maybe avoid changing the default behavior since it is used by the within-the-yaml merging (eg between suites, platforms). I think I can do that pretty easily by adding an opt-in parameter to rmerge. |
|
I think the CI failures are the same as #1826 |
Require callers to opt-in, and default to opt-out.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
When HashRecursiveMerge currently encounters a non-Hash, it will simply return the "new" value. This is sub-optimal for cases where we might want to have some top-level defaults (e.g., for platforms) but certain cookbooks may want to define additional ones. The current code will only leverage the additional ones, instead of appending them to the global ones.
At this point, I'm looking for comments and if this seems like an appropriate direction, in which case I will add tests (and think harder about corner cases).
Issues Resolved
#650
#778
Check List