feat: add touch_all yml config

cloudwego · Nov 27, 2023 · 3cf33fb · 3cf33fb
1 parent 72e2487
commit 3cf33fb
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 82 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/volo-gen/volo.yml b/examples/volo-gen/volo.yml
@@ -2,6 +2,7 @@ entries:
   proto:
     protocol: protobuf
     filename: proto_gen.rs
+    touch_all: false
     idls:
       - source: local
         path: ../proto/hello.proto
@@ -18,6 +19,7 @@ entries:
   thrift:
     protocol: thrift
     filename: thrift_gen.rs
+    touch_all: false
     idls:
       - source: local
         path: ../thrift_idl/hello.thrift

diff --git a/volo-build/Cargo.toml b/volo-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volo-build"
-version = "0.8.4"
+version = "0.8.5"
 edition.workspace = true
 homepage.workspace = true
 repository.workspace = true

diff --git a/volo-build/src/config_builder.rs b/volo-build/src/config_builder.rs
@@ -87,6 +87,15 @@ impl InnerBuilder {
         }
     }
 
+    pub fn ignore_unused(self, ignore_unused: bool) -> Self {
+        match self {
+            InnerBuilder::Protobuf(inner) => {
+                InnerBuilder::Protobuf(inner.ignore_unused(ignore_unused))
+            }
+            InnerBuilder::Thrift(inner) => InnerBuilder::Thrift(inner.ignore_unused(ignore_unused)),
+        }
+    }
+
     pub fn keep_unknown_fields(self, keep: impl IntoIterator<Item = PathBuf>) -> Self {
         match self {
             InnerBuilder::Protobuf(inner) => {
@@ -144,7 +153,7 @@ impl ConfigBuilder {
                 }
             }
 
-            builder.write()?;
+            builder.ignore_unused(!entry.touch_all).write()?;
 
             Ok(())
         })?;

diff --git a/volo-build/src/model.rs b/volo-build/src/model.rs
@@ -19,6 +19,8 @@ pub struct Entry {
     pub filename: PathBuf,
 
     pub idls: Vec<Idl>,
+    #[serde(default)]
+    pub touch_all: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq)]

diff --git a/volo-cli/Cargo.toml b/volo-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "volo-cli"
-version = "0.8.2"
+version = "0.8.3"
 edition.workspace = true
 homepage.workspace = true
 repository.workspace = true

diff --git a/volo-cli/src/idl/add.rs b/volo-cli/src/idl/add.rs
@@ -149,6 +149,7 @@ impl CliCommand for Add {
                         protocol: new_idl.protocol(),
                         filename: PathBuf::from(&self.filename),
                         idls: vec![new_idl],
+                        touch_all: false,
                     },
                 );
             }

diff --git a/volo-cli/src/init.rs b/volo-cli/src/init.rs
@@ -204,6 +204,7 @@ impl CliCommand for Init {
                 protocol: idl.protocol(),
                 filename: PathBuf::from(DEFAULT_FILENAME),
                 idls: vec![idl.clone()],
+                touch_all: false,
             };
             if self.is_grpc_project() {
                 self.copy_grpc_template(entry.clone())?;