remove hyper dependency on dashboard proxy

Signed-off-by: Bugen Zhao <[email protected]>
risingwavelabs · Apr 4, 2024 · f69fd95 · f69fd95
1 parent 500fdb0
commit f69fd95
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/meta/dashboard/Cargo.toml b/src/meta/dashboard/Cargo.toml
@@ -13,7 +13,6 @@ anyhow = "1"
 axum = { workspace = true }
 axum-embed = "0.1"
 bytes = "1"
-hyper = "1"
 mime_guess = "2"
 reqwest = "0.12.2"
 rust-embed = { version = "8", features = ["interpolate-folder-path", "mime-guess"] }

diff --git a/src/meta/dashboard/src/proxy.rs b/src/meta/dashboard/src/proxy.rs
@@ -16,12 +16,10 @@ use std::collections::HashMap;
 use std::sync::{Arc, Mutex};
 
 use anyhow::anyhow;
-use axum::http::StatusCode;
+use axum::http::{header, HeaderMap, StatusCode, Uri};
 use axum::response::{IntoResponse, Response};
 use axum::Router;
 use bytes::Bytes;
-use hyper::header::CONTENT_TYPE;
-use hyper::{HeaderMap, Uri};
 use thiserror_ext::AsReport as _;
 use url::Url;
 
@@ -37,21 +35,21 @@ impl IntoResponse for CachedResponse {
     fn into_response(self) -> Response {
         let guess = mime_guess::from_path(self.uri.path());
         let mut headers = HeaderMap::new();
-        if let Some(x) = self.headers.get(hyper::header::ETAG) {
-            headers.insert(hyper::header::ETAG, x.clone());
+        if let Some(x) = self.headers.get(header::ETAG) {
+            headers.insert(header::ETAG, x.clone());
         }
-        if let Some(x) = self.headers.get(hyper::header::CACHE_CONTROL) {
-            headers.insert(hyper::header::CACHE_CONTROL, x.clone());
+        if let Some(x) = self.headers.get(header::CACHE_CONTROL) {
+            headers.insert(header::CACHE_CONTROL, x.clone());
         }
-        if let Some(x) = self.headers.get(hyper::header::EXPIRES) {
-            headers.insert(hyper::header::EXPIRES, x.clone());
+        if let Some(x) = self.headers.get(header::EXPIRES) {
+            headers.insert(header::EXPIRES, x.clone());
         }
         if let Some(x) = guess.first() {
             if x.type_() == "image" && x.subtype() == "svg" {
-                headers.insert(CONTENT_TYPE, "image/svg+xml".parse().unwrap());
+                headers.insert(header::CONTENT_TYPE, "image/svg+xml".parse().unwrap());
             } else {
                 headers.insert(
-                    CONTENT_TYPE,
+                    header::CONTENT_TYPE,
                     format!("{}/{}", x.type_(), x.subtype()).parse().unwrap(),
                 );
             }