Enable grpc server reflection for all interfaces

eclipse-kuksa · Feb 3, 2025 · 87abf6b · 87abf6b
1 parent bd6290a
commit 87abf6b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/databroker-proto/build.rs b/databroker-proto/build.rs
@@ -42,6 +42,27 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             &["proto"],
         )
         .unwrap();
+    tonic_build::configure()
+        .file_descriptor_set_path(out_dir.join("kuksa.val.v1_descriptor.bin"))
+        .compile(
+            &[
+                "proto/kuksa/val/v1/val.proto",
+                "proto/kuksa/val/v1/types.proto",
+            ],
+            &["proto"],
+        )
+        .unwrap();
+    tonic_build::configure()
+        .file_descriptor_set_path(out_dir.join("sdv.databroker.v1_descriptor.bin"))
+        .compile(
+            &[
+                "proto/sdv/databroker/v1/broker.proto",
+                "proto/sdv/databroker/v1/types.proto",
+                "proto/sdv/databroker/v1/collector.proto",
+            ],
+            &["proto"],
+        )
+        .unwrap();
 
     Ok(())
 }
diff --git a/databroker-proto/src/lib.rs b/databroker-proto/src/lib.rs
@@ -16,6 +16,8 @@
 pub mod sdv {
     pub mod databroker {
         pub mod v1 {
+            pub const FILE_DESCRIPTOR_SET: &[u8] =
+                tonic::include_file_descriptor_set!("sdv.databroker.v1_descriptor");
             tonic::include_proto!("sdv.databroker.v1");
         }
     }
@@ -24,6 +26,8 @@ pub mod sdv {
 pub mod kuksa {
     pub mod val {
         pub mod v1 {
+            pub const FILE_DESCRIPTOR_SET: &[u8] =
+                tonic::include_file_descriptor_set!("kuksa.val.v1_descriptor");
             tonic::include_proto!("kuksa.val.v1");
 
             use datapoint::Value;

diff --git a/databroker/src/grpc/server.rs b/databroker/src/grpc/server.rs
@@ -212,15 +212,15 @@ where
         }
     };
 
+    let mut reflection_builder = tonic_reflection::server::Builder::configure()
+            .register_encoded_file_descriptor_set(kuksa::val::v1::FILE_DESCRIPTOR_SET);
     let mut router = server.add_optional_service(kuksa_val_v1);
 
     if apis.contains(&Api::KuksaValV2) {
-        let service = tonic_reflection::server::Builder::configure()
-            .register_encoded_file_descriptor_set(kuksa::val::v2::FILE_DESCRIPTOR_SET)
-            .build()
-            .unwrap();
+        reflection_builder = reflection_builder
+            .register_encoded_file_descriptor_set(kuksa::val::v2::FILE_DESCRIPTOR_SET);
 
-        router = router.add_service(service).add_optional_service(Some(
+        router = router.add_optional_service(Some(
             kuksa::val::v2::val_server::ValServer::with_interceptor(
                 broker.clone(),
                 authorization.clone(),
@@ -229,6 +229,9 @@ where
     }
 
     if apis.contains(&Api::SdvDatabrokerV1) {
+        reflection_builder = reflection_builder
+            .register_encoded_file_descriptor_set(sdv::databroker::v1::FILE_DESCRIPTOR_SET);
+
         router = router.add_optional_service(Some(
             sdv::databroker::v1::broker_server::BrokerServer::with_interceptor(
                 broker.clone(),
@@ -243,6 +246,9 @@ where
         ));
     }
 
+    let reflection_service = reflection_builder.build().unwrap();
+    router = router.add_service(reflection_service);
+
     router
         .serve_with_incoming_shutdown(incoming, shutdown(broker, signal))
         .await?;