feat: keep_unknown_fields support yml config

examples/src/unknown/thrift_server.rs

@@ -5,12 +5,12 @@ use std::net::SocketAddr;
 pub struct S;
 
 #[volo::async_trait]
-impl volo_gen::volo_gen::echo_unknown::EchoService for S {
+impl volo_gen::thrift_gen::echo_unknown::EchoService for S {
     async fn hello(
         &self,
-        req: volo_gen::volo_gen::echo_unknown::EchoRequest,
-    ) -> Result<volo_gen::volo_gen::echo_unknown::EchoResponse, volo_thrift::AnyhowError> {
-        let resp = volo_gen::volo_gen::echo_unknown::EchoResponse {
+        req: volo_gen::thrift_gen::echo_unknown::EchoRequest,
+    ) -> Result<volo_gen::thrift_gen::echo_unknown::EchoResponse, volo_thrift::AnyhowError> {
+        let resp = volo_gen::thrift_gen::echo_unknown::EchoResponse {
             name: format!("{}", req.name).into(),
             echo_union: req.echo_union,
             _unknown_fields: req._unknown_fields,
@@ -25,7 +25,7 @@ async fn main() {
     let addr: SocketAddr = "[::]:8081".parse().unwrap();
     let addr = volo::net::Address::from(addr);
 
-    volo_gen::volo_gen::echo_unknown::EchoServiceServer::new(S)
+    volo_gen::thrift_gen::echo_unknown::EchoServiceServer::new(S)
         .run(addr)
         .await
         .unwrap();

examples/volo-gen/build.rs

@@ -1,9 +1,3 @@
 fn main() {
     volo_build::ConfigBuilder::default().write().unwrap();
-
-    volo_build::Builder::thrift()
-        .add_service("../thrift_idl/echo_unknown.thrift")
-        .keep_unknown_fields(true)
-        .write()
-        .unwrap();
 }

examples/volo-gen/src/lib.rs

@@ -3,7 +3,6 @@
 mod gen {
     volo::include_service!("thrift_gen.rs");
     volo::include_service!("proto_gen.rs");
-    volo::include_service!("volo_gen.rs");
 }
 
 pub use gen::*;

examples/volo-gen/volo.yml

@@ -23,3 +23,6 @@ entries:
         path: ../thrift_idl/hello.thrift
       - source: local
         path: ../thrift_idl/echo.thrift
+      - source: local
+        path: ../thrift_idl/echo_unknown.thrift
+        keep_unknown_fields: true

volo-build/src/config_builder.rs

@@ -86,6 +86,15 @@ impl InnerBuilder {
             InnerBuilder::Thrift(inner) => InnerBuilder::Thrift(inner.touch(items)),
         }
     }
+
+    pub fn keep_unknown_fields(self, keep: impl IntoIterator<Item = PathBuf>) -> Self {
+        match self {
+            InnerBuilder::Protobuf(inner) => {
+                InnerBuilder::Protobuf(inner.keep_unknown_fields(keep))
+            }
+            InnerBuilder::Thrift(inner) => InnerBuilder::Thrift(inner.keep_unknown_fields(keep)),
+        }
+    }
 }
 
 impl ConfigBuilder {
@@ -123,12 +132,16 @@ impl ConfigBuilder {
                     path,
                     includes,
                     touch,
+                    keep_unknown_fields,
                 } = get_or_download_idl(idl, &*DEFAULT_DIR)?;
 
                 builder = builder
                     .add_service(path.clone())
                     .includes(includes)
-                    .touch([(path, touch)])
+                    .touch([(path.clone(), touch)]);
+                if keep_unknown_fields {
+                    builder = builder.keep_unknown_fields([path])
+                }
             }
 
             builder.write()?;
@@ -166,12 +179,16 @@ impl InitBuilder {
                 path,
                 includes,
                 touch,
+                keep_unknown_fields,
             } = get_or_download_idl(idl, &*DEFAULT_DIR)?;
 
             builder = builder
                 .add_service(path.clone())
                 .includes(includes)
-                .touch([(path, touch)])
+                .touch([(path.clone(), touch)]);
+            if keep_unknown_fields {
+                builder = builder.keep_unknown_fields([path])
+            }
         }
 
         builder.init_service()

volo-build/src/lib.rs

@@ -103,7 +103,10 @@ impl<MkB, Parser> Builder<MkB, Parser> {
         self
     }
 
-    pub fn keep_unknown_fields(mut self, keep_unknown_fields: bool) -> Self {
+    pub fn keep_unknown_fields(
+        mut self,
+        keep_unknown_fields: impl IntoIterator<Item = PathBuf>,
+    ) -> Self {
         self.pilota_builder = self.pilota_builder.keep_unknown_fields(keep_unknown_fields);
         self
     }

volo-build/src/model.rs

@@ -35,6 +35,12 @@ pub struct Idl {
     pub includes: Option<Vec<PathBuf>>,
     #[serde(skip_serializing_if = "Vec::is_empty", default = "Vec::new")]
     pub touch: Vec<String>,
+    #[serde(default = "default_keep_unknown_fields")]
+    pub keep_unknown_fields: bool,
+}
+
+fn default_keep_unknown_fields() -> bool {
+    false
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -74,6 +80,7 @@ impl Idl {
             path: PathBuf::from(""),
             includes: None,
             touch: Vec::default(),
+            keep_unknown_fields: false,
         }
     }
 

volo-build/src/util.rs

@@ -67,6 +67,7 @@ pub struct LocalIdl {
     pub path: PathBuf,
     pub includes: Vec<PathBuf>,
     pub touch: Vec<String>,
+    pub keep_unknown_fields: bool,
 }
 
 pub fn get_or_download_idl(idl: Idl, target_dir: impl AsRef<Path>) -> anyhow::Result<LocalIdl> {
@@ -108,6 +109,7 @@ pub fn get_or_download_idl(idl: Idl, target_dir: impl AsRef<Path>) -> anyhow::Re
         path,
         includes,
         touch: idl.touch,
+        keep_unknown_fields: idl.keep_unknown_fields,
     })
 }
 

volo-cli/src/idl/add.rs

@@ -71,13 +71,15 @@ impl CliCommand for Add {
                         touch: vec![],
                         path: self.idl.clone(),
                         includes: self.includes.clone(),
+                        keep_unknown_fields: false,
                     }
                 } else {
                     Idl {
                         source: Source::Local,
                         touch: vec![],
                         path: self.idl.clone(),
                         includes: self.includes.clone(),
+                        keep_unknown_fields: false,
                     }
                 }
             };