Update axum

Cargo.toml

@@ -155,8 +155,8 @@ anymap = "0.12"
 arrayvec = "0.7.2"
 async-stream = "0.3.6"
 async-trait = "0.1.68"
-axum = { version = "0.7", features = ["tracing"] }
-axum-extra = { version = "0.9", features = ["typed-header"] }
+axum = { version = "0.8.4", features = ["tracing"] }
+axum-extra = { version = "0.10", features = ["typed-header"] }
 backtrace = "0.3.66"
 base64 = "0.21.2"
 bigdecimal = "0.4.7"

crates/client-api/src/auth.rs

@@ -385,7 +385,6 @@ pub struct SpacetimeAuthHeader {
     auth: Option<SpacetimeAuth>,
 }
 
-#[async_trait::async_trait]
 impl<S: NodeDelegate + Send + Sync> axum::extract::FromRequestParts<S> for SpacetimeAuthHeader {
     type Rejection = AuthorizationRejection;
     async fn from_request_parts(parts: &mut request::Parts, state: &S) -> Result<Self, Self::Rejection> {
@@ -461,7 +460,6 @@ impl SpacetimeAuthHeader {
 
 pub struct SpacetimeAuthRequired(pub SpacetimeAuth);
 
-#[async_trait::async_trait]
 impl<S: NodeDelegate + Send + Sync> axum::extract::FromRequestParts<S> for SpacetimeAuthRequired {
     type Rejection = AuthorizationRejection;
     async fn from_request_parts(parts: &mut request::Parts, state: &S) -> Result<Self, Self::Rejection> {

crates/client-api/src/routes/database.rs

@@ -616,7 +616,7 @@ pub async fn reset<S: NodeDelegate + ControlStateDelegate + Authorization>(
         host_type,
     }): Query<ResetDatabaseQueryParams>,
     Extension(auth): Extension<SpacetimeAuth>,
-    program_bytes: Option<Bytes>,
+    program_bytes: Bytes,
 ) -> axum::response::Result<axum::Json<PublishResult>> {
     let database_identity = name_or_identity.resolve(&ctx).await?;
     let database = worker_ctx_find_database(&ctx, &database_identity)
@@ -631,7 +631,7 @@ pub async fn reset<S: NodeDelegate + ControlStateDelegate + Authorization>(
         &auth.claims.identity,
         DatabaseResetDef {
             database_identity,
-            program_bytes,
+            program_bytes: Some(program_bytes),
             num_replicas,
             host_type: Some(host_type),
         },
@@ -716,7 +716,7 @@ pub async fn publish<S: NodeDelegate + ControlStateDelegate + Authorization>(
                         host_type,
                     }),
                     Extension(auth),
-                    Some(program_bytes),
+                    program_bytes,
                 )
                 .await;
             }
@@ -1244,7 +1244,7 @@ where
             .route("/names", self.names_put)
             .route("/identity", self.identity_get)
             .route("/subscribe", self.subscribe_get)
-            .route("/call/:reducer", self.call_reducer_procedure_post)
+            .route("/call/{reducer}", self.call_reducer_procedure_post)
             .route("/schema", self.schema_get)
             .route("/logs", self.logs_get)
             .route("/sql", self.sql_post)
@@ -1254,7 +1254,7 @@ where
 
         axum::Router::new()
             .route("/", self.root_post)
-            .nest("/:name_or_identity", db_router)
+            .nest("/{name_or_identity}", db_router)
             .route_layer(axum::middleware::from_fn_with_state(ctx, anon_auth_middleware::<S>))
     }
 }

crates/client-api/src/routes/energy.rs

@@ -131,7 +131,7 @@ where
 {
     use axum::routing::get;
     axum::Router::new().route(
-        "/:identity",
+        "/{identity}",
         get(get_energy_balance::<S>)
             .put(set_energy_balance::<S>)
             .post(add_energy::<S>),

crates/client-api/src/routes/identity.rs

@@ -175,7 +175,7 @@ where
             .route("/", self.create_post)
             .route("/public-key", self.public_key_get)
             .route("/websocket-token", self.websocket_token_post)
-            .route("/:identity/verify", self.verify_get)
-            .route("/:identity/databases", self.databases_get)
+            .route("/{identity}/verify", self.verify_get)
+            .route("/{identity}/databases", self.databases_get)
     }
 }

crates/client-api/src/util.rs

@@ -21,7 +21,6 @@ use crate::{log_and_500, ControlStateReadAccess};
 
 pub struct ByteStringBody(pub ByteString);
 
-#[async_trait::async_trait]
 impl<S: Send + Sync> FromRequest<S> for ByteStringBody {
     type Rejection = axum::response::Response;
 
@@ -165,8 +164,7 @@ impl fmt::Display for NameOrIdentity {
 
 pub struct EmptyBody;
 
-#[async_trait::async_trait]
-impl<S> FromRequest<S> for EmptyBody {
+impl<S: Sync> FromRequest<S> for EmptyBody {
     type Rejection = axum::response::Response;
     async fn from_request(req: Request, _state: &S) -> Result<Self, Self::Rejection> {
         let body = req.into_body();

crates/client-api/src/util/websocket.rs

@@ -78,8 +78,7 @@ pub enum WebSocketUpgradeRejection {
     KeyMissing,
 }
 
-#[async_trait::async_trait]
-impl<S> FromRequestParts<S> for WebSocketUpgrade {
+impl<S: Sync> FromRequestParts<S> for WebSocketUpgrade {
     type Rejection = WebSocketUpgradeRejection;
     async fn from_request_parts(parts: &mut http::request::Parts, _state: &S) -> Result<Self, Self::Rejection> {
         use WebSocketUpgradeRejection::*;