Add some tests for CRD generation for enums #1
Conversation
sbernauer
force-pushed
the
test/add-enum-tests
branch
from
6480fee to
295c431
Compare
kube-core/src/schema.rs
Outdated
|
|
||
| assert_json_eq!( | ||
| schemars_schema, | ||
| json_schema!( |
There was a problem hiding this comment.
I'd prefer to go back to assigning so the assert isn't so nested and easier to read from start to end.
There was a problem hiding this comment.
And keeping the commentary, eg:
// Initial check that the text schema above is correct for NormalEnumThere was a problem hiding this comment.
Works for me. Naming things is hard, this way we avoid that 😂
Feel free to revert to the previous way
There was a problem hiding this comment.
Naming things is hard
I agree, though by naming it appropriately, we convey share more information to the reader (which IMO parts of this module currently lacks, which is why it has been difficult to fix).
There was a problem hiding this comment.
I made some adjustments here: 285ab64
I did move it back to owning and returning an owned Schema - but we can discuss that. I don't mind changing it back if you really want.
There was a problem hiding this comment.
I went back to the simpler checks at the start of the function, since the big pattern match is a little too much cognitive load (although very pretty), and uses unstable features.
Note: As described on the function, it is overly documented to express intent where it can be a little unclear. Ideally where would be some clearer official Kubernetes documentation on the differences between regular OpenAPI 3 schemas, and what Kubernetes accepts.
… there are no oneOfs at the top level of the schema
Note: At this point, there is some strange interaction with the new hoisting functions and the existing code whereby "properties" disappear.
| // #[cfg(test)] | ||
| // mod test { |
There was a problem hiding this comment.
We'll bring these back in once we make more progress (more as regression safe guards)
| // if anyOf with 2 entries, and one is nullable with enum that is [null], | ||
| // then hoist nullable, description, type, enum from the other entry. | ||
| // set anyOf to None | ||
| fn hoist_any_of_option_enum(incoming: SchemaObject) -> SchemaObject { |
There was a problem hiding this comment.
Properly document this one
| } else if let Schema::Object(SchemaObject { | ||
| object: None, | ||
| instance_type: variant_type, | ||
| metadata, | ||
| .. | ||
| }) = variant | ||
| { | ||
| if *variant_type == Some(SingleOrVec::Single(Box::new(InstanceType::Object))) { | ||
| *variant_type = None; | ||
| *metadata = None; | ||
| } |
There was a problem hiding this comment.
We probably want to replace these existing hoisting functions. At least they are not working with the new code.
2 participants
WIP!