Skip to content
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.

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

config/merge: allow obtaining a transcript of merge operations #1127

Merged
merged 8 commits into from
Nov 24, 2020
Merged

config/merge: allow obtaining a transcript of merge operations #1127

merged 8 commits into from
Nov 24, 2020

Conversation

bgilbert
Copy link
Contributor

If FCCT wants to use config merging to implement desugaring, it needs to be able to map fields in the merged config back to the original FCC YAML, which means that it needs a mapping from input to output fields. Add a merge function that also returns a transcript of field mappings.

@bgilbert bgilbert marked this pull request as ready for review November 23, 2020 16:00
We didn't have any test for merging non-IgnoreDuplicates primitive list
items that are present in both lists.
If FCCT wants to use config merging to implement desugaring, it needs
to be able to map fields in the merged config back to the original FCC
YAML, which means that it needs a mapping from input to output fields.
Add a merge function that also returns a transcript of field mappings.
Move all in-tree callers to MergeStructTranscribe(), which doesn't
require using the reflection API, and deprecate MergeStruct().  We can't
remove it because that would require a major version bump.
config/merge/merge_test.go Show resolved Hide resolved
@bgilbert bgilbert merged commit 129ef9c into coreos:master Nov 24, 2020
@bgilbert bgilbert deleted the transcript branch November 24, 2020 07:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants