Add support for untagged enums in CRDs #1028
Merged
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
sbernauer
force-pushed
the
support-untagged-enums
branch
from
7b7516f
to
e922be3
Compare
Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
sbernauer
force-pushed
the
support-untagged-enums
branch
from
e922be3
to
440f60b
Compare
sbernauer
changed the title
nightkr
requested changes
Sep 27, 2022
There was a problem hiding this comment.
This seems to work fine in my testing. My one concern is that this is basically the same logic as the existing one_of flattening (and seems to be ~93% copy/pasted). Could we factor it out to a separate function that we reuse?
After that I'd be happy to merge.
nightkr
added
utils
|
Refactored it out to a separate function, please have a look |
Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
sbernauer
force-pushed
the
support-untagged-enums
branch
from
7b02713
to
e1d5406
Compare
nightkr
reviewed
Sep 27, 2022
Co-authored-by: Teo Klestrup Röijezon <teo@nullable.se> Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Co-authored-by: Teo Klestrup Röijezon <teo@nullable.se> Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Co-authored-by: Teo Klestrup Röijezon <teo@nullable.se> Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Co-authored-by: Teo Klestrup Röijezon <teo@nullable.se> Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
8 tasks
Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
sbernauer
force-pushed
the
support-untagged-enums
branch
from
ce82308
to
9840511
Compare
nightkr
reviewed
Oct 7, 2022
kube-core/src/schema.rs
Outdated
| subschemas: &mut Vec<Schema>, | ||
| common_obj: &mut Option<Box<ObjectValidation>>, | ||
| instance_type: &mut Option<SingleOrVec<InstanceType>>, | ||
| allow_if_equal: bool, |
There was a problem hiding this comment.
I think we can get rid of allow_if_equal now and just assume that across the board?
There was a problem hiding this comment.
That changes the current implementation for oneOf but sounds reasonable. Adopted!
sbernauer
force-pushed
the
support-untagged-enums
branch
from
c7ab486
to
5cc72fc
Compare
Signed-off-by: Sebastian Bernauer <sebastian.bernauer@stackable.de>
sbernauer
force-pushed
the
support-untagged-enums
branch
from
5cc72fc
to
7d6ee75
Compare
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.
Motivation
We want to use untagged enums in our CRDs. This allows us to better validate the users input, without the user realizing that under the hood enums are used.
Solution
Extending the
Visitor for StructuralSchemaRewriterto rewriteanyOfclauses so that they are accepted by the k8s api-server.