Merge branch 'tim/http-axum15' into 'master'

chore(http_endpoints): use axum server See merge request dfinity-lab/public/ic!18776
dfinity · May 7, 2024 · 3471a0a · 3471a0a
2 parents e9f99bc + 89d400d
commit 3471a0a
Show file tree

Hide file tree

Showing 6 changed files with 191 additions and 233 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rs/http_endpoints/public/BUILD.bazel b/rs/http_endpoints/public/BUILD.bazel
@@ -33,6 +33,7 @@ DEPENDENCIES = [
     "//rs/validator",
     "@crate_index//:askama",
     "@crate_index//:axum",
+    "@crate_index//:axum_server_0_6_0",
     "@crate_index//:bytes",
     "@crate_index//:byte-unit",
     "@crate_index//:cfg-if",
@@ -53,9 +54,7 @@ DEPENDENCIES = [
     "@crate_index//:serde",
     "@crate_index//:serde_cbor",
     "@crate_index//:slog",
-    "@crate_index//:strum",
     "@crate_index//:tempfile",
-    "@crate_index//:thiserror",
     "@crate_index//:threadpool",
     "@crate_index//:tokio",
     "@crate_index//:tokio-io-timeout",

diff --git a/rs/http_endpoints/public/Cargo.toml b/rs/http_endpoints/public/Cargo.toml
@@ -10,6 +10,7 @@ documentation.workspace = true
 askama = { workspace = true }
 async-trait = { workspace = true }
 axum = { workspace = true }
+axum-server = { version = "^0.6.0", features = ["tls-rustls"] }
 bytes = { workspace = true }
 byte-unit = "4.0.14"
 cfg-if = "1.0.0"
@@ -50,9 +51,7 @@ rand = "0.8.3"
 serde = { workspace = true }
 serde_cbor = { workspace = true }
 slog = { workspace = true }
-strum = { workspace = true }
 tempfile = "3.1.0"
-thiserror = { workspace = true }
 threadpool = "1.8.1"
 tokio = { workspace = true }
 tokio-io-timeout = "1.2.0"

diff --git a/rs/http_endpoints/public/src/common.rs b/rs/http_endpoints/public/src/common.rs
@@ -140,7 +140,7 @@ fn cbor_content_type(headers: &HeaderMap) -> bool {
         return false;
     };
 
-    content_type.to_lowercase() == "application/cbor"
+    content_type.to_lowercase() == CONTENT_TYPE_CBOR
 }
 
 #[async_trait::async_trait]