feat(values)!: support schema merge on imports#4951
Merged
Conversation
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
✅ Deploy Preview for zarf-docs canceled.
|
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
AustinAbro321
requested changes
Jun 2, 2026
Member
AustinAbro321
left a comment
AustinAbro321
left a comment
There was a problem hiding this comment.
Glad to see this moving along, poked at it and found some bugs / decision points
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Member
AustinAbro321
left a comment
AustinAbro321
left a comment
There was a problem hiding this comment.
looks close, a few more comments
Member
|
Could you also mark this PR with a "!" and note the breaking changes in load in the description |
brandtkeller
changed the title
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
AustinAbro321
approved these changes
Jun 3, 2026
Member
AustinAbro321
left a comment
AustinAbro321
left a comment
There was a problem hiding this comment.
LGTM, we should document the behavior (merge for "properties, "definitions", ...) and overwrite for others, but lets do that in a follow up
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
3 participants
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
Support importing child package values schemas and merging them during package create for local import paths only. Skeleton values support will follow. Given that we do not want to modify the source parent schema as we process imports and it not being a list - I've proposed the current strategy:
Updating the function parameters and adding an intermediary type
DefinedPackageto support a proper handoff between the require packages.I had originally created an exported field
ImportedSchemaswhich is used to track schemas during the import resolution process for access duringAssemblePackage(). I felt like this modified the public API in an inappropriate way.This does take a stance on not allowing the use of
$refsas they create concerns for availability of the referenced files and I figured an explicit error would be better than trying to handle them outside of the schema. This means the schemas used are required to be flat.Related Issue
Fixes #4877
Checklist before merging