Repository navigation
Conversation
Contributor
There was a problem hiding this comment.
All reported issues were addressed across 3 files
Reply with feedback, questions, or to request a fix.
View guided diff | Re-trigger cubic
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
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.
Fixes #25291
Related: #25271 also changes
rust/model.mustache(oneOf with an enum discriminator), in a different section.With
enumUnknownDefaultCase=truethe rust client adds anUnknownDefaultOpenApivariant to each enum without#[serde(other)]. So only the literal"unknown_default_open_api"/11184809maps to it, and any other value outside the spec still fails to deserialize.Changes:
rust/model.mustache: add#[serde(other)]to the injected unknown variant (the lastenumVarsentry, only whenenumUnknownDefaultCaseis set). This covers schema-level and inline property enums, for both string enums (Deserialize) and integer enums (Deserialize_repr;serde_reprsupports#[serde(other)])."unknown_default_open_api"/11184809.Not covered: the
rust-serverandrust-axumgenerators. They use separate templates.Testing:
RustClientCodegenTest#testEnumUnknownDefaultCaseUsesSerdeOtherwithsrc/test/resources/3_0/rust/enum-unknown-default-case.yaml. The test fails without the template change.UnknownDefaultOpenApi, and known values are unchanged.enumUnknownDefaultCase, so regenerating the samples changed nothing.PR checklist
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*.IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
Regenerated
./bin/configs/rust-reqwest-*.yamland./bin/configs/rust-hyper*.yaml(32 configs): no changes. No generator options were changed, so the docs export is not needed.cc @frol @farcaller @richardwhiuk @paladinzh @jacob-pro @dsteeley
Summary by cubic
Makes
enumUnknownDefaultCasework as documented in the Rust client: unknown enum values now deserialize to theUnknownDefaultOpenApivariant instead of erroring.Previously the variant only matched its serialized literal (
"unknown_default_open_api"/11184809), so any other out-of-spec value failed deserialization. The injected variant now carries#[serde(other)], which applies to schema-level and inline enums for both string and integer types. Serialization behavior and output without the option are unchanged.rustgenerator only;rust-serverandrust-axumuse separate templates.Written for commit 0b11126. Summary will update on new commits.