fix(rvps): fix feature configuration and migrate to tonic-prost-build

This commit addresses two issues:

1. Starting from version 0.14.0, prost, tonic-prost, and tonic-prost-build
   libraries need to work together to enable protobuf compilation. This change
   migrates from tonic-build to tonic-prost-build in build.rs to ensure
   compatibility with the 0.14.x series.

2. The rvps crate's feature configuration had issues where building with
   default features disabled would fail. To fix this, several dependencies
   (prost, tonic, tonic-prost, config, tokio) are now required dependencies
   instead of optional ones, ensuring the crate can build even when default
   features are disabled.

Changes:
- Replace tonic-build with tonic-prost-build in build.rs
- Make prost, tonic, tonic-prost, config, and tokio required dependencies
- Remove these dependencies from the 'bin' feature since they are now always
  included

Signed-off-by: Xynnn007 <[email protected]>

Author: Xynnn007

rvps/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [features]
 default = [ "bin" ]
 # Used to build rvps binary
-bin = [ "clap", "config", "env_logger", "prost", "shadow-rs", "tokio", "tonic" ]
+bin = [ "clap", "env_logger", "shadow-rs" ]
 
 # Support in-toto provenance (not ready)
 in-toto =[ "path-clean", "sha2" ]
@@ -28,11 +28,11 @@ base64.workspace = true
 cfg-if.workspace = true
 chrono = { workspace = true, features = [ "serde" ] }
 clap = { workspace = true, optional = true }
-config = { workspace = true, optional = true }
+config.workspace = true
 env_logger = { workspace = true, optional = true }
 log.workspace = true
 path-clean = { version = "1.0.1", optional = true }
-prost = { workspace = true, optional = true }
+prost.workspace = true
 roxmltree = "0.21.1"
 serde.workspace = true
 serde_json.workspace = true
@@ -41,12 +41,13 @@ shadow-rs = { workspace = true, optional = true }
 sled = "0.34.7"
 strum.workspace = true
 tempfile.workspace = true
-tokio = { workspace = true, optional = true }
-tonic = { workspace = true, optional = true }
+tokio.workspace = true
+tonic.workspace = true
+tonic-prost.workspace = true
 
 [build-dependencies]
 shadow-rs.workspace = true
-tonic-build.workspace = true
+tonic-prost-build.workspace = true
 
 [dev-dependencies]
 assert-json-diff.workspace = true

rvps/build.rs

@@ -31,7 +31,7 @@ fn real_main() -> Result<(), String> {
     }
 
     #[cfg(feature = "rebuild-grpc-protos")]
-    tonic_build::configure()
+    tonic_prost_build::configure()
         .protoc_arg("--experimental_allow_proto3_optional")
         .out_dir("src/rvps_api")
         .compile_protos(&["../protos/reference.proto"], &["../protos"])

rvps/src/rvps_api/reference.rs

@@ -1,20 +1,20 @@
 // This file is @generated by prost-build.
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ReferenceValueQueryRequest {
     #[prost(string, tag = "1")]
     pub reference_value_id: ::prost::alloc::string::String,
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ReferenceValueQueryResponse {
     #[prost(string, optional, tag = "1")]
     pub reference_value_results: ::core::option::Option<::prost::alloc::string::String>,
 }
-#[derive(Clone, PartialEq, ::prost::Message)]
+#[derive(Clone, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ReferenceValueRegisterRequest {
     #[prost(string, tag = "1")]
     pub message: ::prost::alloc::string::String,
 }
-#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+#[derive(Clone, Copy, PartialEq, Eq, Hash, ::prost::Message)]
 pub struct ReferenceValueRegisterResponse {}
 /// Generated client implementations.
 pub mod reference_value_provider_service_client {
@@ -44,7 +44,7 @@ pub mod reference_value_provider_service_client {
     }
     impl<T> ReferenceValueProviderServiceClient<T>
     where
-        T: tonic::client::GrpcService<tonic::body::BoxBody>,
+        T: tonic::client::GrpcService<tonic::body::Body>,
         T::Error: Into<StdError>,
         T::ResponseBody: Body<Data = Bytes> + std::marker::Send + 'static,
         <T::ResponseBody as Body>::Error: Into<StdError> + std::marker::Send,
@@ -65,12 +65,12 @@ pub mod reference_value_provider_service_client {
             F: tonic::service::Interceptor,
             T::ResponseBody: Default,
             T: tonic::codegen::Service<
-                http::Request<tonic::body::BoxBody>,
+                http::Request<tonic::body::Body>,
                 Response = http::Response<
-                    <T as tonic::client::GrpcService<tonic::body::BoxBody>>::ResponseBody,
+                    <T as tonic::client::GrpcService<tonic::body::Body>>::ResponseBody,
                 >,
             >,
-            <T as tonic::codegen::Service<http::Request<tonic::body::BoxBody>>>::Error:
+            <T as tonic::codegen::Service<http::Request<tonic::body::Body>>>::Error:
                 Into<StdError> + std::marker::Send + std::marker::Sync,
         {
             ReferenceValueProviderServiceClient::new(InterceptedService::new(inner, interceptor))
@@ -114,7 +114,7 @@ pub mod reference_value_provider_service_client {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
             })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/reference.ReferenceValueProviderService/QueryReferenceValue",
             );
@@ -135,7 +135,7 @@ pub mod reference_value_provider_service_client {
             self.inner.ready().await.map_err(|e| {
                 tonic::Status::unknown(format!("Service was not ready: {}", e.into()))
             })?;
-            let codec = tonic::codec::ProstCodec::default();
+            let codec = tonic_prost::ProstCodec::default();
             let path = http::uri::PathAndQuery::from_static(
                 "/reference.ReferenceValueProviderService/RegisterReferenceValue",
             );
@@ -237,7 +237,7 @@ pub mod reference_value_provider_service_server {
         B: Body + std::marker::Send + 'static,
         B::Error: Into<StdError> + std::marker::Send + 'static,
     {
-        type Response = http::Response<tonic::body::BoxBody>;
+        type Response = http::Response<tonic::body::Body>;
         type Error = std::convert::Infallible;
         type Future = BoxFuture<Self::Response, Self::Error>;
         fn poll_ready(
@@ -278,7 +278,7 @@ pub mod reference_value_provider_service_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = QueryReferenceValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -323,7 +323,7 @@ pub mod reference_value_provider_service_server {
                     let inner = self.inner.clone();
                     let fut = async move {
                         let method = RegisterReferenceValueSvc(inner);
-                        let codec = tonic::codec::ProstCodec::default();
+                        let codec = tonic_prost::ProstCodec::default();
                         let mut grpc = tonic::server::Grpc::new(codec)
                             .apply_compression_config(
                                 accept_compression_encodings,
@@ -339,7 +339,7 @@ pub mod reference_value_provider_service_server {
                     Box::pin(fut)
                 }
                 _ => Box::pin(async move {
-                    let mut response = http::Response::new(empty_body());
+                    let mut response = http::Response::new(tonic::body::Body::default());
                     let headers = response.headers_mut();
                     headers.insert(
                         tonic::Status::GRPC_STATUS,