ci: Add codegen-related ci testing

Install protoc when executing `make deps` of the ttrpc. Add codegen's
check and build, and example2' build to the ci testing.

Signed-off-by: Xuewei Niu <niuxuewei.nxw@antgroup.com>

Author: justxuewei

.github/workflows/bvt.yml

@@ -16,6 +16,7 @@ jobs:
           make check
           make -C compiler check
           make -C ttrpc-codegen check
+          make -C codegen check
 
   make:
     name: Build
@@ -33,6 +34,7 @@ jobs:
           make -C compiler
           make -C ttrpc-codegen
           make -C example build-examples
+          make -C example2 build-examples
 
   deny:
     runs-on: ubuntu-latest

Cargo.toml

@@ -28,13 +28,13 @@ tokio-vsock = { version = "0.3.1", optional = true }
 
 [build-dependencies]
 protobuf-codegen = "3.1.0"
-prost-build = "0.11"
+prost-build = { version = "0.11", optional = true }
 
 [features]
 default = ["sync"]
 async = ["dep:async-trait", "dep:tokio", "dep:futures", "dep:tokio-vsock"]
 sync = []
-prost = ["dep:prost"]
+prost = ["dep:prost", "dep:prost-build"]
 
 [package.metadata.docs.rs]
 all-features = true

Makefile

@@ -21,15 +21,18 @@ build: debug
 
 .PHONY: test
 test:
-	cargo test --all-features --verbose
+	cargo test --features sync,async --verbose
+	cargo test --features sync,async,prost --verbose
 
 .PHONY: check
 check:
 	cargo fmt --all -- --check
-	cargo clippy --all-targets --all-features -- -D warnings
+	cargo clippy --all-targets --features sync,async -- -D warnings
+	cargo clippy --all-targets --features sync,async,prost -- -D warnings
 
 .PHONY: deps
 deps:
 	rustup update stable
 	rustup default stable
 	rustup component add rustfmt clippy
+	./install_protoc.sh

codegen/Makefile

@@ -0,0 +1,35 @@
+all: debug test
+
+#
+# Build
+#
+
+.PHONY: debug
+debug:
+	cargo build --verbose --all-targets
+
+.PHONY: release
+release:
+	cargo build --release
+
+.PHONY: build
+build: debug
+
+#
+# Tests and linters
+#
+
+.PHONY: test
+test:
+	cargo test --verbose
+
+.PHONY: check
+check:
+	cargo fmt --all -- --check
+	cargo clippy --all-targets --all-features -- -D warnings
+
+.PHONY: deps
+deps:
+	rustup update stable
+	rustup default stable
+	rustup component add rustfmt clippy

example2/Makefile

@@ -4,6 +4,10 @@
 
 .PHONY: build
 build:
+	cargo build
+
+.PHONY: build-examples
+build-examples: build
 	cargo build --example server
 	cargo build --example client
 	cargo build --example async-server

install_protoc.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+PB_REL="https://github.com/protocolbuffers/protobuf/releases"
+VERSION="22.0"
+
+mkdir -p $HOME/protoc
+
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    ARCH="linux-x86_64"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    ARCH="osx-universal_binary"
+fi
+
+curl -LO $PB_REL/download/v$VERSION/protoc-$VERSION-$ARCH.zip
+unzip protoc-$VERSION-$ARCH.zip -d $HOME/protoc
+rm -rf protoc-$VERSION-$ARCH.zip

src/asynchronous/server.rs

@@ -746,9 +746,10 @@ impl HandlerContext {
         };
         #[cfg(feature = "prost")]
         let resp = {
-            let mut resp = Response::default();
-            resp.status = Some(status);
-            resp
+            Response {
+                status: Some(status),
+                ..Default::default()
+            }
         };
         Self::respond(tx, stream_id, resp)
             .await

src/context.rs

@@ -65,11 +65,17 @@ pub fn to_pb(kvs: HashMap<String, Vec<String>>) -> Vec<KeyValue> {
 
     for (k, vl) in kvs {
         for v in vl {
+            #[cfg(not(feature = "prost"))]
             let key = KeyValue {
                 key: k.clone(),
                 value: v.clone(),
                 ..Default::default()
             };
+            #[cfg(feature = "prost")]
+            let key = KeyValue {
+                key: k.clone(),
+                value: v.clone(),
+            };
             meta.push(key);
         }
     }
@@ -91,11 +97,17 @@ mod tests {
             ("key1", "value1-2"),
             ("key2", "value2"),
         ] {
+            #[cfg(not(feature = "prost"))]
             let key = KeyValue {
                 key: i.0.to_string(),
                 value: i.1.to_string(),
                 ..Default::default()
             };
+            #[cfg(feature = "prost")]
+            let key = KeyValue {
+                key: i.0.to_string(),
+                value: i.1.to_string(),
+            };
             src.push(key);
         }
 

src/error.rs

@@ -59,11 +59,11 @@ pub fn get_status(c: Code, msg: impl ToString) -> Status {
 #[cfg(feature = "prost")]
 /// Get ttrpc::Status from ttrpc::Code and a message.
 pub fn get_status(c: Code, msg: impl ToString) -> Status {
-    let mut status = Status::default();
-    status.code = c as i32;
-    status.message = msg.to_string();
-
-    status
+    Status {
+        code: c as i32,
+        message: msg.to_string(),
+        ..Default::default()
+    }
 }
 
 pub fn get_rpc_status(c: Code, msg: impl ToString) -> Error {

src/proto.rs

@@ -434,18 +434,17 @@ mod tests {
 
     #[cfg(feature = "prost")]
     fn new_protobuf_request() -> Request {
-        let mut creq = Request::default();
-        creq.service = "grpc.TestServices".to_string();
-        creq.method = "Test".to_string();
-        creq.timeout_nano = 20 * 1000 * 1000;
         let meta = vec![KeyValue {
             key: "test_key1".to_string(),
             value: "test_value1".to_string(),
-            ..Default::default()
         }];
-        creq.metadata = meta;
-        creq.payload = vec![0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9];
-        creq
+        Request {
+            service: "grpc.TestServices".to_owned(),
+            method: "Test".to_owned(),
+            timeout_nano: 20 * 1000 * 1000,
+            metadata: meta,
+            payload: vec![0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9],
+        }
     }
 
     #[test]