chore(deps): update axum requirement from 0.7 to 0.8 (#221)

dependabot[bot] · Threated · web-flow · commit 8768b6c9384f · 2025-01-15T09:30:39.000+01:00
* chore(deps): update axum requirement from 0.7 to 0.8 Updates the requirements on [axum](https://github.com/tokio-rs/axum) to permit the latest version. - [Release notes](https://github.com/tokio-rs/axum/releases) - [Changelog](https://github.com/tokio-rs/axum/blob/main/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/axum/commits) --- updated-dependencies: - dependency-name: axum dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * chore: migrate to native async traits where possible * chore: migrate routes to new axum syntax --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: janskiba <jan.skiba@dkfz-heidelberg.de>
diff --git a/broker/Cargo.toml b/broker/Cargo.toml
@@ -14,7 +14,7 @@ beam-lib = { workspace = true }
 tokio = { version = "1", features = ["full"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-axum = { version = "0.7", features = [ "query" ] }
+axum = { version = "0.8", features = [ "query" ] }
 #axum-macros = "0.3.7"
 dashmap =  "6.0"
 
@@ -30,7 +30,7 @@ futures-core = { version = "0.3", default-features = false }
 once_cell = "1"
 # Socket dependencies
 bytes = { version = "1", optional = true }
-axum-extra = { version = "0.9", features = ["typed-header"] }
+axum-extra = { version = "0.10", features = ["typed-header"] }
 hyper = { version = "1", default-features = false, optional = true}
 hyper-util = { version = "0.1", default-features = false, features = ["tokio"], optional = true}
 
diff --git a/broker/src/crypto.rs b/broker/src/crypto.rs
@@ -1,15 +1,9 @@
 use std::{future::Future, mem::discriminant};
 
-use axum::{
-    async_trait,
-    http::{header, method, uri::Scheme, Method, Request, StatusCode, Uri},
-};
+use axum::http::{header, method, uri::Scheme, Method, Request, StatusCode, Uri};
 use serde::{Deserialize, Serialize};
 use shared::{
-    config,
-    crypto::{parse_crl, CertificateCache, CertificateCacheUpdate, GetCerts},
-    errors::SamplyBeamError,
-    http_client::{self, SamplyHttpClient}, openssl::x509::X509Crl, reqwest::{self, Url},
+    async_trait, config, crypto::{parse_crl, CertificateCache, CertificateCacheUpdate, GetCerts}, errors::SamplyBeamError, http_client::{self, SamplyHttpClient}, openssl::x509::X509Crl, reqwest::{self, Url}
 };
 use std::time::Duration;
 use tokio::time::timeout;
diff --git a/broker/src/serve_health.rs b/broker/src/serve_health.rs
@@ -19,7 +19,7 @@ struct HealthOutput {
 pub(crate) fn router(health: Arc<RwLock<Health>>) -> Router {
     Router::new()
         .route("/v1/health", get(handler))
-        .route("/v1/health/proxies/:proxy_id", get(proxy_health))
+        .route("/v1/health/proxies/{proxy_id}", get(proxy_health))
         .route("/v1/health/proxies", get(get_all_proxies))
         .route("/v1/control", get(get_control_tasks).layer(axum::middleware::from_fn(log_version_mismatch)))
         .with_state(health)
diff --git a/broker/src/serve_pki.rs b/broker/src/serve_pki.rs
@@ -47,12 +47,12 @@ pub(crate) fn router() -> Router {
         .route("/v1/pki/certs", get(get_certificate_list))
         .route("/v1/pki/certs/im-ca", get(get_im_cert))
         .route(
-            "/v1/pki/certs/by_serial/:serial",
+            "/v1/pki/certs/by_serial/{serial}",
             get(get_certificate_by_serial),
         )
 }
 
-#[tracing::instrument(name = "/v1/pki/certs/by_serial/:serial")]
+#[tracing::instrument(name = "/v1/pki/certs/by_serial/{serial}")]
 async fn get_certificate_by_serial(
     ConnectInfo(addr): ConnectInfo<SocketAddr>,
     Path(serial): Path<String>,
diff --git a/broker/src/serve_sockets.rs b/broker/src/serve_sockets.rs
@@ -42,7 +42,7 @@ impl Default for SocketState {
 pub(crate) fn router() -> Router {
     Router::new()
         .route("/v1/sockets", get(get_socket_requests).post(post_socket_request))
-        .route("/v1/sockets/:id", get(connect_socket))
+        .route("/v1/sockets/{id}", get(connect_socket))
         .with_state(SocketState::default())
 }
 
diff --git a/broker/src/serve_tasks.rs b/broker/src/serve_tasks.rs
@@ -40,8 +40,8 @@ pub(crate) fn router() -> Router {
     let state = TasksState::default();
     Router::new()
         .route("/v1/tasks", get(get_tasks).post(post_task))
-        .route("/v1/tasks/:task_id/results", get(get_results_for_task))
-        .route("/v1/tasks/:task_id/results/:app_id", put(put_result))
+        .route("/v1/tasks/{task_id}/results", get(get_results_for_task))
+        .route("/v1/tasks/{task_id}/results/{app_id}", put(put_result))
         .with_state(state)
 }
 
@@ -82,7 +82,7 @@ async fn get_results_for_task(
     }
 }
 
-// GET /v1/tasks/:task_id/results
+// GET /v1/tasks/{task_id}/results
 async fn get_results_for_task_nostream(
     addr: SocketAddr,
     state: TasksState,
@@ -354,7 +354,7 @@ async fn post_task(
     ))
 }
 
-// PUT /v1/tasks/:task_id/results/:app_id
+// PUT /v1/tasks/{task_id}/results/{app_id}
 async fn put_result(
     ConnectInfo(addr): ConnectInfo<SocketAddr>,
     Path((task_id, app_id)): Path<(MsgId, AppOrProxyId)>,
diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml
@@ -12,7 +12,7 @@ shared = { path = "../shared", features = ["config-for-proxy"] }
 beam-lib = { workspace = true }
 
 tokio = { version = "1", features = ["full"] }
-axum = { version = "0.7", features = ["macros"] }
+axum = { version = "0.8", features = ["macros"] }
 bytes = { version = "1" }
 httpdate = "1.0"
 
diff --git a/proxy/src/auth.rs b/proxy/src/auth.rs
@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use axum::{
-    async_trait,
     extract::{FromRequest, FromRequestParts},
     http::{header::{self, HeaderName}, request::Parts, Request, StatusCode},
 };
@@ -14,7 +13,6 @@ use tracing::{debug, Span, debug_span, warn};
 
 pub(crate) struct AuthenticatedApp(pub(crate) AppId);
 
-#[async_trait]
 impl<S: Send + Sync> FromRequestParts<S> for AuthenticatedApp {
     type Rejection = (StatusCode, [(HeaderName, &'static str); 1]);
 
diff --git a/proxy/src/crypto.rs b/proxy/src/crypto.rs
@@ -1,7 +1,7 @@
-use axum::{async_trait, body::Bytes, http::{header, request, Method, Request, StatusCode, Uri}, response::Response, Json};
+use axum::{body::Bytes, http::{header, request, Method, Request, StatusCode, Uri}, response::Response, Json};
 use beam_lib::AppOrProxyId;
 use shared::{
-    config, config_proxy::Config, config_shared::ConfigCrypto, crypto::GetCerts, errors::{CertificateInvalidReason, SamplyBeamError}, http_client::SamplyHttpClient, reqwest, EncryptedMessage, MsgEmpty
+    async_trait, config, config_proxy::Config, config_shared::ConfigCrypto, crypto::GetCerts, errors::{CertificateInvalidReason, SamplyBeamError}, http_client::SamplyHttpClient, reqwest, EncryptedMessage, MsgEmpty
 };
 use tracing::{debug, info, warn, error};
 
diff --git a/proxy/src/serve_sockets.rs b/proxy/src/serve_sockets.rs
@@ -58,7 +58,7 @@ pub(crate) fn router(client: SamplyHttpClient) -> Router {
 
     Router::new()
         .route("/v1/sockets", get(get_tasks))
-        .route("/v1/sockets/:app_or_id", post(create_socket_con).get(connect_socket))
+        .route("/v1/sockets/{app_or_id}", post(create_socket_con).get(connect_socket))
         .with_state(state)
         .layer(Extension(task_secret_map))
 }
diff --git a/proxy/src/serve_tasks.rs b/proxy/src/serve_tasks.rs
@@ -39,8 +39,8 @@ pub(crate) fn router(client: &SamplyHttpClient) -> Router {
     Router::new()
         // We need both path variants so the server won't send us into a redirect loop (/tasks, /tasks/, ...)
         .route("/v1/tasks", get(handler_task).post(handler_task))
-        .route("/v1/tasks/:task_id/results", get(handler_task))
-        .route("/v1/tasks/:task_id/results/:app_id", put(handler_task))
+        .route("/v1/tasks/{task_id}/results", get(handler_task))
+        .route("/v1/tasks/{task_id}/results/{app_id}", put(handler_task))
         .with_state(state)
 }
 
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -17,7 +17,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 
 tokio = { version = "1", features = ["full"] }
-axum = { version = "0.7", features = [] }
+axum = { version = "0.8", features = [] }
 bytes = "1.4"
 
 # HTTP client with proxy support
@@ -52,6 +52,7 @@ regex = "1"
 dashmap =  { version = "6.0", optional = true}
 
 beam-lib = { workspace = true }
+async-trait = "0.1"
 
 [features]
 expire_map = ["dep:dashmap"]
diff --git a/shared/src/config_shared.rs b/shared/src/config_shared.rs
@@ -8,7 +8,6 @@ use crate::{
     },
     SamplyBeamError,
 };
-use axum::async_trait;
 use clap::Parser;
 use jwt_simple::prelude::RS256KeyPair;
 use openssl::{
diff --git a/shared/src/crypto.rs b/shared/src/crypto.rs
@@ -1,4 +1,5 @@
-use axum::{async_trait, body::Body, http::Request, Json};
+use async_trait::async_trait;
+use axum::{body::Body, http::Request, Json};
 
 use itertools::Itertools;
 use once_cell::sync::{Lazy, OnceCell};
diff --git a/shared/src/crypto_jwt.rs b/shared/src/crypto_jwt.rs
@@ -8,7 +8,7 @@ use crate::{
     errors::{CertificateInvalidReason, SamplyBeamError},
     Msg, MsgEmpty, MsgId, MsgSigned,
 };
-use axum::{async_trait, body::HttpBody, extract::{{FromRequest, ConnectInfo, FromRequestParts}, Request}, http::{header, request::Parts, uri::PathAndQuery, HeaderMap, HeaderName, Method, StatusCode, Uri}, BoxError, RequestExt};
+use axum::{body::HttpBody, extract::{{FromRequest, ConnectInfo, FromRequestParts}, Request}, http::{header, request::Parts, uri::PathAndQuery, HeaderMap, HeaderName, Method, StatusCode, Uri}, BoxError, RequestExt};
 use jwt_simple::{
     claims::JWTClaims,
     prelude::{
@@ -30,7 +30,6 @@ const ERR_FROM: (StatusCode, &str) = (
     "\"from\" field in message does not match your certificate.",
 );
 
-#[async_trait]
 impl<S: Send + Sync, T> FromRequest<S> for MsgSigned<T>
 where
     // these trait bounds are copied from `impl FromRequest for axum::Json`
diff --git a/shared/src/http_client.rs b/shared/src/http_client.rs
@@ -1,6 +1,5 @@
 use std::{collections::HashSet, ops::Deref, time::Duration};
 
-use axum::async_trait;
 use axum::http::{Request, Response, Uri};
 use itertools::Itertools;
 use once_cell::sync::OnceCell;
diff --git a/shared/src/lib.rs b/shared/src/lib.rs
@@ -1,6 +1,5 @@
 #![allow(unused_imports)]
 
-use axum::async_trait;
 use beam_lib::{AppId, AppOrProxyId, ProxyId, FailureStrategy, WorkStatus};
 use chacha20poly1305::{
     aead::{Aead, AeadCore, KeyInit, OsRng},
@@ -34,6 +33,7 @@ use crate::{crypto_jwt::JWT_VERIFICATION_OPTIONS, serde_helpers::*};
 // Reexport b64 implementation
 pub use jwt_simple::reexports::ct_codecs;
 pub use reqwest;
+pub use async_trait::async_trait;
 
 pub type MsgId = beam_lib::MsgId;
 pub type MsgType = String;
diff --git a/shared/src/traits.rs b/shared/src/traits.rs
@@ -1,5 +1,4 @@
 use axum::{
-    async_trait,
     extract::{self, FromRequest, FromRequestParts, Path, Query},
     http::{request::Parts, StatusCode},
     BoxError, RequestPartsExt,
@@ -22,7 +21,6 @@ fn test_duration_parsing() {
     assert_eq!(Duration::try_from(parser.parse("1234").unwrap()).unwrap().as_millis(), 1234);
 }
 
-#[async_trait]
 impl<S> FromRequestParts<S> for HowLongToBlock
 where
     S: Send + Sync,

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,12 @@ pub(crate) fn router() -> Router {`
`47`	`47`	`.route("/v1/pki/certs", get(get_certificate_list))`
`48`	`48`	`.route("/v1/pki/certs/im-ca", get(get_im_cert))`
`49`	`49`	`.route(`
`50`		`- "/v1/pki/certs/by_serial/:serial",`
	`50`	`+ "/v1/pki/certs/by_serial/{serial}",`
`51`	`51`	`get(get_certificate_by_serial),`
`52`	`52`	`)`
`53`	`53`	`}`
`54`	`54`
`55`		`-#[tracing::instrument(name = "/v1/pki/certs/by_serial/:serial")]`
	`55`	`+#[tracing::instrument(name = "/v1/pki/certs/by_serial/{serial}")]`
`56`	`56`	`async fn get_certificate_by_serial(`
`57`	`57`	`ConnectInfo(addr): ConnectInfo<SocketAddr>,`
`58`	`58`	`Path(serial): Path<String>,`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ impl Default for SocketState {`
`42`	`42`	`pub(crate) fn router() -> Router {`
`43`	`43`	`Router::new()`
`44`	`44`	`.route("/v1/sockets", get(get_socket_requests).post(post_socket_request))`
`45`		`- .route("/v1/sockets/:id", get(connect_socket))`
	`45`	`+ .route("/v1/sockets/{id}", get(connect_socket))`
`46`	`46`	`.with_state(SocketState::default())`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ pub(crate) fn router() -> Router {`
`40`	`40`	`let state = TasksState::default();`
`41`	`41`	`Router::new()`
`42`	`42`	`.route("/v1/tasks", get(get_tasks).post(post_task))`
`43`		`- .route("/v1/tasks/:task_id/results", get(get_results_for_task))`
`44`		`- .route("/v1/tasks/:task_id/results/:app_id", put(put_result))`
	`43`	`+ .route("/v1/tasks/{task_id}/results", get(get_results_for_task))`
	`44`	`+ .route("/v1/tasks/{task_id}/results/{app_id}", put(put_result))`
`45`	`45`	`.with_state(state)`
`46`	`46`	`}`
`47`	`47`
`@@ -82,7 +82,7 @@ async fn get_results_for_task(`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`85`		`-// GET /v1/tasks/:task_id/results`
	`85`	`+// GET /v1/tasks/{task_id}/results`
`86`	`86`	`async fn get_results_for_task_nostream(`
`87`	`87`	`addr: SocketAddr,`
`88`	`88`	`state: TasksState,`
`@@ -354,7 +354,7 @@ async fn post_task(`
`354`	`354`	`))`
`355`	`355`	`}`
`356`	`356`
`357`		`-// PUT /v1/tasks/:task_id/results/:app_id`
	`357`	`+// PUT /v1/tasks/{task_id}/results/{app_id}`
`358`	`358`	`async fn put_result(`
`359`	`359`	`ConnectInfo(addr): ConnectInfo<SocketAddr>,`
`360`	`360`	`Path((task_id, app_id)): Path<(MsgId, AppOrProxyId)>,`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ pub(crate) fn router(client: SamplyHttpClient) -> Router {`
`58`	`58`
`59`	`59`	`Router::new()`
`60`	`60`	`.route("/v1/sockets", get(get_tasks))`
`61`		`- .route("/v1/sockets/:app_or_id", post(create_socket_con).get(connect_socket))`
	`61`	`+ .route("/v1/sockets/{app_or_id}", post(create_socket_con).get(connect_socket))`
`62`	`62`	`.with_state(state)`
`63`	`63`	`.layer(Extension(task_secret_map))`
`64`	`64`	`}`