feat(shuttle-axum): support axum 0.7 through feature flag (#1440)

shuttle-hq · Nov 29, 2023 · 2128794 · 2128794
1 parent 0c03da0
commit 2128794
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/services/shuttle-axum/Cargo.toml b/services/shuttle-axum/Cargo.toml
@@ -9,8 +9,14 @@ keywords = ["shuttle-service", "axum"]
 [workspace]
 
 [dependencies]
-axum = { version = "0.6.10" }
+axum = { version = "0.6.13", optional = true }
+axum-0-7 = { package = "axum", version = "0.7.1", optional = true }
 shuttle-runtime = { path = "../../runtime", version = "0.34.1", default-features = false }
 
 [dev-dependencies]
 tokio = { version = "1.26.0", features = ["macros", "rt-multi-thread"] }
+
+[features]
+default = ["axum"]
+
+axum-0-7 = ["dep:axum-0-7"]
diff --git a/services/shuttle-axum/src/lib.rs b/services/shuttle-axum/src/lib.rs
@@ -19,25 +19,40 @@
 use shuttle_runtime::{CustomError, Error};
 use std::net::SocketAddr;
 
+#[cfg(feature = "axum")]
+use axum::Router;
+#[cfg(feature = "axum-0-7")]
+use axum_0_7::Router;
+
 /// A wrapper type for [axum::Router] so we can implement [shuttle_runtime::Service] for it.
-pub struct AxumService(pub axum::Router);
+pub struct AxumService(pub Router);
 
 #[shuttle_runtime::async_trait]
 impl shuttle_runtime::Service for AxumService {
     /// Takes the router that is returned by the user in their [shuttle_runtime::main] function
     /// and binds to an address passed in by shuttle.
     async fn bind(mut self, addr: SocketAddr) -> Result<(), Error> {
+        #[cfg(feature = "axum")]
         axum::Server::bind(&addr)
             .serve(self.0.into_make_service())
             .await
             .map_err(CustomError::new)?;
+        #[cfg(feature = "axum-0-7")]
+        axum_0_7::serve(
+            shuttle_runtime::tokio::net::TcpListener::bind(addr)
+                .await
+                .map_err(CustomError::new)?,
+            self.0,
+        )
+        .await
+        .map_err(CustomError::new)?;
 
         Ok(())
     }
 }
 
-impl From<axum::Router> for AxumService {
-    fn from(router: axum::Router) -> Self {
+impl From<Router> for AxumService {
+    fn from(router: Router) -> Self {
         Self(router)
     }
 }