Add YAML merge key (<<) support to the values walk - #312
Open
ThatsMrTalbot wants to merge 1 commit into
Open
Conversation
cert-manager-prow
Bot
added
the
dco-signoff: yes
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
cert-manager-prow
Bot
added
the
size/L
Previously "<<" was walked like a normal alias key, which produced bogus paths (e.g. serviceA.<<.replicaCount) and meant a shared anchor's non-scalar content was only ever documented at the first merge site, due to the existing alias-cycle guard. mappingEntries now resolves "<<" merge keys (including sequences of mappings) and flattens their entries into the parent mapping before walking, following the conventional merge key precedence: explicit keys win over merged ones, and among multiple merge sources the earliest wins on conflict. A recursion guard prevents a self-referential merge from looping forever. The walk's alias/merge-cycle guard previously stopped descending into any non-end node it had already visited once, which also meant that any non-scalar value shared across more than one alias or merge site (not just the merge key's own direct entries) was silently documented only at the first site. This is replaced with proper memoization: the properties found under a shared node's subtree are cached (relative to where it was first reached) and replayed at every later site, while a separate in-progress marker still catches genuine self-reference without recursing forever. Signed-off-by: Adam Talbot <adamtalbot93@googlemail.com>
ThatsMrTalbot
force-pushed
the
add-yaml-merge-key-support
branch
from
August 1, 2026 13:59
34f8978 to
3350ba1
Compare
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.
Previously "<<" was walked like a normal alias key, which produced bogus paths (e.g. serviceA.<<.replicaCount) and meant a shared anchor's non-scalar content was only ever documented at the first merge site, due to the existing alias-cycle guard.
mappingEntries now resolves "<<" merge keys (including sequences of mappings) and flattens their entries into the parent mapping before walking, following the conventional merge key precedence: explicit keys win over merged ones, and among multiple merge sources the earliest wins on conflict. A recursion guard prevents a self-referential merge from looping forever.