Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: Support axum 0.8.1 and move to axum-extra 0.10 #20622

Closed
wants to merge 3 commits into from
Closed

feat: Support axum 0.8.1 and move to axum-extra 0.10 #20622

wants to merge 3 commits into from

Conversation

AlexandreCassagne
Copy link

@AlexandreCassagne AlexandreCassagne commented Feb 9, 2025 •
edited
Loading

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples: 
    ./mvnw clean package || exit
./bin/generate-samples.sh ./bin/configs/*.yaml || exit
./bin/utils/export_docs_generators.sh || exit
    (For Windows users, please run the script in Git BASH)
    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.
  • File the PR against the correct branch: master (upcoming 7.x.0 minor release - breaking changes with fallbacks), 8.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

@AlexandreCassagne
Copy link
Author

Allows users to upgrade to axum 0.8.1 which has breaking changes. not all use cases were tested but my personal setup worked against this template.

@AlexandreCassagne
Copy link
Author

@farcaller @Metaswitch hello! first contribution here, I'll regenerate the samples. Do you have any concerns aside from that?

wing328
wing328 reviewed Feb 9, 2025
View reviewed changes
modules/openapi-generator/src/main/resources/rust-axum/server-route.mustache Outdated
@@ -2,7 +2,7 @@
pub fn new<I, A{{#havingAuthMethods}}, C{{/havingAuthMethods}}>(api_impl: I) -> Router
where
I: AsRef<A> + Clone + Send + Sync + 'static,
A: {{#apiInfo}}{{#apis}}{{#operations}}apis::{{classFilename}}::{{classnamePascalCase}}{{#havingAuthMethod}}<Claims = C>{{/havingAuthMethod}} + {{/operations}}{{/apis}}{{/apiInfo}}{{#authMethods}}{{#isApiKey}}{{#isKeyInCookie}}apis::CookieAuthentication<Claims = C> + {{/isKeyInCookie}}{{#isKeyInHeader}}apis::ApiKeyAuthHeader<Claims = C> + {{/isKeyInHeader}}{{/isApiKey}}{{/authMethods}}'static,
A: {{#apiInfo}}{{#apis}}{{#operations}}apis::{{classFilename}}::{{classnamePascalCase}}{{#havingAuthMethod}}<Claims = C>{{/havingAuthMethod}} + Sync + {{/operations}}{{/apis}}{{/apiInfo}}{{#authMethods}}{{#isApiKey}}{{#isKeyInCookie}}apis::CookieAuthentication<Claims = C> + {{/isKeyInCookie}}{{#isKeyInHeader}}apis::ApiKeyAuthHeader<Claims = C> + {{/isKeyInHeader}}{{/isApiKey}}{{/authMethods}}'static,
Copy link
Member

@wing328 wing328 Feb 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the PR

is Sync required for the latest version of axum ?

cc @linxGnu

Copy link
Author

@AlexandreCassagne AlexandreCassagne Feb 9, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, strange. I added it after getting compilation errors yesterday. Now I am unsure. I'll check later today.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the sync. Regenerating samples now

@wing328 wing328 added this to the 7.12.0 milestone Feb 9, 2025
@wing328
Copy link
Member

wing328 commented Feb 10, 2025

https://github.com/OpenAPITools/openapi-generator/actions/runs/13232837630/job/36932720924?pr=20622https://github.com/OpenAPITools/openapi-generator/actions/runs/13232837630/job/36932720924?pr=20622

i've updated the samples but builds got errors

can you please take a look when you've time?

cc @linxGnu

@wing328
Copy link
Member

wing328 commented Feb 10, 2025

to regenerate the samples, please run ./bin/generate-samples.sh ./bin/configs/manual/rust-axum-*

@wing328
Copy link
Member

wing328 commented Feb 10, 2025

closed via #20548

please pull the latest master to give it a try

@wing328 wing328 closed this Feb 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wing328 wing328 wing328 left review comments

@farcaller farcaller farcaller approved these changes

Assignees
No one assigned
Labels
Enhancement: General Server: Rust
Projects
None yet
Milestone
7.12.0
Development

Successfully merging this pull request may close these issues.
3 participants
@AlexandreCassagne @wing328 @farcaller