tonic: use header name constants in more places

hyperium · Sep 9, 2024 · 81dbefa · 81dbefa
1 parent a3fdcaf
commit 81dbefa
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 26 deletions.
diff --git a/tonic-build/src/server.rs b/tonic-build/src/server.rs
@@ -166,7 +166,7 @@ pub(crate) fn generate_internal<T: Service>(
                         _ => Box::pin(async move {
                             let mut response = http::Response::new(empty_body());
                             let headers = response.headers_mut();
-                            headers.insert("grpc-status", (tonic::Code::Unimplemented as i32).into());
+                            headers.insert(tonic::Status::GRPC_STATUS, (tonic::Code::Unimplemented as i32).into());
                             headers.insert(http::header::CONTENT_TYPE, tonic::metadata::GRPC_CONTENT_TYPE);
                             Ok(response)
                         }),

diff --git a/tonic-health/src/generated/grpc_health_v1.rs b/tonic-health/src/generated/grpc_health_v1.rs
@@ -411,7 +411,7 @@ pub mod health_server {
                         let headers = response.headers_mut();
                         headers
                             .insert(
-                                "grpc-status",
+                                tonic::Status::GRPC_STATUS,
                                 (tonic::Code::Unimplemented as i32).into(),
                             );
                         headers

diff --git a/tonic-reflection/src/generated/grpc_reflection_v1.rs b/tonic-reflection/src/generated/grpc_reflection_v1.rs
@@ -413,7 +413,7 @@ pub mod server_reflection_server {
                         let headers = response.headers_mut();
                         headers
                             .insert(
-                                "grpc-status",
+                                tonic::Status::GRPC_STATUS,
                                 (tonic::Code::Unimplemented as i32).into(),
                             );
                         headers

diff --git a/tonic-reflection/src/generated/grpc_reflection_v1alpha.rs b/tonic-reflection/src/generated/grpc_reflection_v1alpha.rs
@@ -413,7 +413,7 @@ pub mod server_reflection_server {
                         let headers = response.headers_mut();
                         headers
                             .insert(
-                                "grpc-status",
+                                tonic::Status::GRPC_STATUS,
                                 (tonic::Code::Unimplemented as i32).into(),
                             );
                         headers

diff --git a/tonic-web/src/call.rs b/tonic-web/src/call.rs
@@ -522,8 +522,11 @@ mod tests {
     #[test]
     fn decode_trailers() {
         let mut headers = HeaderMap::new();
-        headers.insert("grpc-status", 0.into());
-        headers.insert("grpc-message", "this is a message".try_into().unwrap());
+        headers.insert(Status::GRPC_STATUS, 0.into());
+        headers.insert(
+            Status::GRPC_MESSAGE,
+            "this is a message".try_into().unwrap(),
+        );
 
         let trailers = make_trailers_frame(headers.clone());
 
@@ -566,7 +569,7 @@ mod tests {
         let trailers = decode_trailers_frame(Bytes::copy_from_slice(&buf[81..]))
             .unwrap()
             .unwrap();
-        let status = trailers.get("grpc-status").unwrap();
+        let status = trailers.get(Status::GRPC_STATUS).unwrap();
         assert_eq!(status.to_str().unwrap(), "0")
     }
 
@@ -624,8 +627,8 @@ mod tests {
             .unwrap();
 
         let mut expected = HeaderMap::new();
-        expected.insert("grpc-status", "0".parse().unwrap());
-        expected.insert("grpc-message", "".parse().unwrap());
+        expected.insert(Status::GRPC_STATUS, "0".parse().unwrap());
+        expected.insert(Status::GRPC_MESSAGE, "".parse().unwrap());
         expected.insert("a", "1".parse().unwrap());
         expected.insert("b", "2".parse().unwrap());
 

diff --git a/tonic-web/src/lib.rs b/tonic-web/src/lib.rs
@@ -109,14 +109,17 @@ mod service;
 
 use http::header::HeaderName;
 use std::time::Duration;
-use tonic::{body::BoxBody, server::NamedService};
+use tonic::{body::BoxBody, server::NamedService, Status};
 use tower_http::cors::{AllowOrigin, CorsLayer};
 use tower_layer::Layer;
 use tower_service::Service;
 
 const DEFAULT_MAX_AGE: Duration = Duration::from_secs(24 * 60 * 60);
-const DEFAULT_EXPOSED_HEADERS: [&str; 3] =
-    ["grpc-status", "grpc-message", "grpc-status-details-bin"];
+const DEFAULT_EXPOSED_HEADERS: [HeaderName; 3] = [
+    Status::GRPC_STATUS,
+    Status::GRPC_MESSAGE,
+    Status::GRPC_STATUS_DETAILS,
+];
 const DEFAULT_ALLOW_HEADERS: [&str; 4] =
     ["x-grpc-web", "content-type", "x-user-agent", "grpc-timeout"];
 
@@ -136,13 +139,7 @@ where
         .allow_origin(AllowOrigin::mirror_request())
         .allow_credentials(true)
         .max_age(DEFAULT_MAX_AGE)
-        .expose_headers(
-            DEFAULT_EXPOSED_HEADERS
-                .iter()
-                .cloned()
-                .map(HeaderName::from_static)
-                .collect::<Vec<HeaderName>>(),
-        )
+        .expose_headers(DEFAULT_EXPOSED_HEADERS.iter().cloned().collect::<Vec<_>>())
         .allow_headers(
             DEFAULT_ALLOW_HEADERS
                 .iter()

diff --git a/tonic/src/codec/prost.rs b/tonic/src/codec/prost.rs
@@ -267,7 +267,7 @@ mod tests {
             frame
                 .into_trailers()
                 .expect("got trailers")
-                .get("grpc-status")
+                .get(Status::GRPC_STATUS)
                 .expect("grpc-status header"),
             "11"
         );
@@ -302,7 +302,7 @@ mod tests {
             frame
                 .into_trailers()
                 .expect("got trailers")
-                .get("grpc-status")
+                .get(Status::GRPC_STATUS)
                 .expect("grpc-status header"),
             "8"
         );

diff --git a/tonic/src/service/router.rs b/tonic/src/service/router.rs
@@ -2,8 +2,9 @@ use crate::{
     body::{boxed, BoxBody},
     metadata::GRPC_CONTENT_TYPE,
     server::NamedService,
+    Status,
 };
-use http::{HeaderName, HeaderValue, Request, Response};
+use http::{HeaderValue, Request, Response};
 use std::{
     convert::Infallible,
     fmt,
@@ -124,10 +125,7 @@ impl From<axum::Router> for Routes {
 async fn unimplemented() -> impl axum::response::IntoResponse {
     let status = http::StatusCode::OK;
     let headers = [
-        (
-            HeaderName::from_static("grpc-status"),
-            HeaderValue::from_static("12"),
-        ),
+        (Status::GRPC_STATUS, HeaderValue::from_static("12")),
         (http::header::CONTENT_TYPE, GRPC_CONTENT_TYPE),
     ];
     (status, headers)