refactor!: remove htsget-lambda library code and replace with axum router

Author: mmalenic

htsget-actix/src/lib.rs

@@ -175,8 +175,16 @@ mod tests {
   struct ActixTestRequest<T>(T);
 
   impl TestRequest for ActixTestRequest<test::TestRequest> {
-    fn insert_header(self, header: TestHeader<impl Into<String>>) -> Self {
-      Self(self.0.insert_header(header.into_tuple()))
+    fn insert_header(
+      self,
+      header: TestHeader<impl Into<http_1::HeaderName>, impl Into<http_1::HeaderValue>>,
+    ) -> Self {
+      let (name, value) = header.into_tuple();
+      Self(
+        self
+          .0
+          .insert_header((name.to_string(), value.to_str().unwrap())),
+      )
     }
 
     fn set_payload(self, payload: impl Into<String>) -> Self {
@@ -187,11 +195,15 @@ mod tests {
       Self(self.0.uri(&uri.into()))
     }
 
-    fn method(self, method: impl Into<String>) -> Self {
+    fn method(self, method: impl Into<http_1::Method>) -> Self {
       Self(
-        self
-          .0
-          .method(method.into().parse().expect("expected valid method")),
+        self.0.method(
+          method
+            .into()
+            .to_string()
+            .parse()
+            .expect("expected valid method"),
+        ),
       )
     }
   }
@@ -224,7 +236,7 @@ mod tests {
       &self.config
     }
 
-    fn get_request(&self) -> ActixTestRequest<test::TestRequest> {
+    fn request(&self) -> ActixTestRequest<test::TestRequest> {
       ActixTestRequest(test::TestRequest::default())
     }
 

htsget-actix/src/main.rs

@@ -8,9 +8,7 @@ use htsget_config::command;
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-  if let Some(path) =
-    Config::parse_args_with_command(command!()).expect("expected valid command parsing")
-  {
+  if let Some(path) = Config::parse_args_with_command(command!())? {
     let config = Config::from_path(&path)?;
 
     config.setup_tracing()?;

htsget-axum/src/server/data.rs

@@ -88,7 +88,7 @@ mod tests {
 
   use async_trait::async_trait;
   use http::header::HeaderName;
-  use http::{HeaderMap, HeaderValue, Method};
+  use http::{HeaderMap, Method};
   use reqwest::{Client, ClientBuilder, RequestBuilder};
   use tempfile::{tempdir, TempDir};
   use tokio::fs::{create_dir, File};
@@ -118,11 +118,11 @@ mod tests {
   }
 
   impl TestRequest for DataTestRequest {
-    fn insert_header(mut self, header: Header<impl Into<String>>) -> Self {
-      self.headers.insert(
-        HeaderName::from_str(&header.name.into()).unwrap(),
-        HeaderValue::from_str(&header.value.into()).unwrap(),
-      );
+    fn insert_header(
+      mut self,
+      header: Header<impl Into<HeaderName>, impl Into<http::HeaderValue>>,
+    ) -> Self {
+      self.headers.insert(header.name.into(), header.value.into());
       self
     }
 
@@ -136,8 +136,8 @@ mod tests {
       self
     }
 
-    fn method(mut self, method: impl Into<String>) -> Self {
-      self.method = method.into().parse().unwrap();
+    fn method(mut self, method: impl Into<Method>) -> Self {
+      self.method = method.into();
       self
     }
   }
@@ -186,7 +186,7 @@ mod tests {
       &self.config
     }
 
-    fn get_request(&self) -> DataTestRequest {
+    fn request(&self) -> DataTestRequest {
       DataTestRequest::default()
     }
 
@@ -294,8 +294,8 @@ mod tests {
 
     let test_server = DataTestServer::default();
     let request = test_server
-      .get_request()
-      .method(Method::GET.to_string())
+      .request()
+      .method(Method::GET)
       .uri(format!("{scheme}://localhost:{port}/data/key1"));
     let response = test_server.test_server(request, "".to_string()).await;
 

htsget-axum/src/server/ticket.rs

@@ -105,7 +105,6 @@ mod tests {
   use std::convert::Infallible;
   use std::path::Path;
   use std::result;
-  use std::str::FromStr;
 
   use super::*;
   use async_trait::async_trait;
@@ -119,7 +118,7 @@ mod tests {
     TestRequest, TestServer,
   };
   use http::header::HeaderName;
-  use http::Request;
+  use http::{Method, Request};
   use tempfile::TempDir;
   use tower::ServiceExt;
 
@@ -130,15 +129,14 @@ mod tests {
   struct AxumTestRequest<T>(T);
 
   impl TestRequest for AxumTestRequest<Request<Body>> {
-    fn insert_header(mut self, header: Header<impl Into<String>>) -> Self {
-      self.0.headers_mut().insert(
-        HeaderName::from_str(&header.name.into()).expect("expected valid header name"),
-        header
-          .value
-          .into()
-          .parse()
-          .expect("expected valid header value"),
-      );
+    fn insert_header(
+      mut self,
+      header: Header<impl Into<HeaderName>, impl Into<http::HeaderValue>>,
+    ) -> Self {
+      self
+        .0
+        .headers_mut()
+        .insert(header.name.into(), header.value.into());
       self
     }
 
@@ -153,8 +151,8 @@ mod tests {
       self
     }
 
-    fn method(mut self, method: impl Into<String>) -> Self {
-      *self.0.method_mut() = method.into().parse().expect("expected valid method");
+    fn method(mut self, method: impl Into<Method>) -> Self {
+      *self.0.method_mut() = method.into();
       self
     }
   }
@@ -187,7 +185,7 @@ mod tests {
       &self.config
     }
 
-    fn get_request(&self) -> AxumTestRequest<Request<Body>> {
+    fn request(&self) -> AxumTestRequest<Request<Body>> {
       AxumTestRequest(Request::default())
     }
 
@@ -306,4 +304,9 @@ mod tests {
   async fn cors_preflight_request() {
     cors::test_cors_preflight_request(&AxumTestServer::default()).await;
   }
+
+  #[tokio::test]
+  async fn get_route_invalid_method() {
+    server::test_errors(&AxumTestServer::default()).await;
+  }
 }