Support for Axum v0.5.x (#179)

* Support for Axum x0.5.x

* Upgrade axum v0.5 for example-project

Signed-off-by: Yoshiki Kudo <[email protected]>

Author: 335g

Cargo.toml

@@ -46,7 +46,7 @@ bytes = { version = "^1.0", optional = true }
 futures = { version = "^0.3", optional = true }
 http = { version = "0.2", optional = true }
 hyper = { version = "^0.14", optional = true }
-axum-lib = { version = "^0.4", optional = true , package="axum"}
+axum-lib = { version = "^0.5", optional = true , package="axum"}
 http-body = { version = "^0.4", optional = true }
 poem-lib = { version = "=1.2.34", optional = true, package = "poem" }
 

example-projects/axum-example/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 cloudevents-sdk = { path = "../..", features = ["axum"] }
-axum = "^0.4"
+axum = "^0.5"
 http = "^0.2"
 tokio = { version = "^1", features = ["full"] }
 tracing = "^0.1"

src/binding/axum/extract.rs

@@ -21,22 +21,17 @@ where
     type Rejection = (StatusCode, String);
 
     async fn from_request(req: &mut RequestParts<B>) -> Result<Self, Self::Rejection> {
-        let headers = req.headers().cloned().ok_or(0).map_err(|_| {
-            (
-                StatusCode::BAD_REQUEST,
-                "unexpected empty headers".to_string(),
-            )
-        })?;
-
         let req_body = req
             .take_body()
             .ok_or(0)
             .map_err(|_| (StatusCode::BAD_REQUEST, "unexpected empty body".to_string()))?;
-
         let buf = body::to_bytes(req_body)
             .await
-            .map_err(|e| (StatusCode::BAD_REQUEST, format!("{}", e.into())))?;
-        to_event(&headers, buf.to_vec()).map_err(|e| (StatusCode::BAD_REQUEST, format!("{}", e)))
+            .map_err(|e| (StatusCode::BAD_REQUEST, format!("{}", e.into())))?
+            .to_vec();
+        let headers = req.headers();
+
+        to_event(headers, buf).map_err(|e| (StatusCode::BAD_REQUEST, format!("{}", e)))
     }
 }