-
-
Notifications
You must be signed in to change notification settings - Fork 6.2k
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
[rust-reqwest]: allow rust configuration struct to be deserialized #18688
base: master
Are you sure you want to change the base?
[rust-reqwest]: allow rust configuration struct to be deserialized #18688
Conversation
…e easily constructed from a file or other source
0c61589
to
cc2d36f
Compare
…e easily constructed from a file or other source
09875bf
to
b5feb1b
Compare
#[derive(Debug, Clone, Deserialize)] | ||
pub struct DeserializedConfiguration { | ||
pub base_path: String, | ||
pub user_agent: Option<String>, | ||
pub basic_auth: Option<BasicAuth>, | ||
pub oauth_access_token: Option<String>, | ||
pub bearer_access_token: Option<String>, | ||
pub api_key: Option<ApiKey>, | ||
// TODO: take an oauth2 token source, similar to the go one | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This allows users to read configuration from a file, which I imagine is a common use case.
Some of the structs used in config don't implement Deserialize
- thinking of Secret
for example. Also some of the properties of the Configuration
struct cannot be decorated with #[serde(skip)]
either as they don't implement Default
.
So I guess this struct is the best we can do with those constraints.
@@ -89,3 +101,18 @@ impl Default for Configuration { | |||
} | |||
} | |||
} | |||
|
|||
impl From<DeserializedConfiguration> for Configuration { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make a Configuration
from a DeserializedConfiguration
thanks for the PR |
@maxnachlinger when you've time. can you please PM me via Slack to further discuss your Rust-related PRs? Thanks. https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g |
Allow rust configuration struct to be deserialized, so it may be easily constructed from a file or other source.
Fixes: #18687
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.
master
(upcoming 7.1.0 minor release - breaking changes with fallbacks),8.0.x
(breaking changes without fallbacks)