From 82d6eaa2a8d15985b89ffc18eb364e83a7cdd459 Mon Sep 17 00:00:00 2001 From: Jett Chen Date: Thu, 21 Nov 2024 11:50:26 +0800 Subject: [PATCH] Update: add protobuf defs --- burrow/Cargo.toml | 4 ++-- burrow/build.rs | 5 ++++- burrow/src/auth/server/grpc_defs.rs | 5 +++++ burrow/src/auth/server/mod.rs | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 burrow/src/auth/server/grpc_defs.rs diff --git a/burrow/Cargo.toml b/burrow/Cargo.toml index d5e56c1..4e2b33c 100644 --- a/burrow/Cargo.toml +++ b/burrow/Cargo.toml @@ -59,7 +59,7 @@ reqwest = { version = "0.12", default-features = false, features = [ ] } rusqlite = { version = "0.31.0", features = ["blob"] } dotenv = "0.15.0" -tonic = "0.12.0" +tonic = "0.12.3" prost = "0.13.1" prost-types = "0.13.1" tokio-stream = "0.1" @@ -96,4 +96,4 @@ bundled = ["rusqlite/bundled"] [build-dependencies] -tonic-build = "0.12.0" +tonic-build = "0.12.3" diff --git a/burrow/build.rs b/burrow/build.rs index 8eea5dc..f1dfad0 100644 --- a/burrow/build.rs +++ b/burrow/build.rs @@ -1,4 +1,7 @@ fn main() -> Result<(), Box> { - tonic_build::compile_protos("../proto/burrow.proto")?; + tonic_build::configure().compile_protos( + &["../proto/burrow.proto", "../proto/burrowweb.proto"], + &["../proto", "../proto"], + )?; Ok(()) } diff --git a/burrow/src/auth/server/grpc_defs.rs b/burrow/src/auth/server/grpc_defs.rs new file mode 100644 index 0000000..97a5b30 --- /dev/null +++ b/burrow/src/auth/server/grpc_defs.rs @@ -0,0 +1,5 @@ +pub use burrowwebrpc::*; + +mod burrowwebrpc { + tonic::include_proto!("burrowweb"); +} diff --git a/burrow/src/auth/server/mod.rs b/burrow/src/auth/server/mod.rs index 88b3ff3..4071668 100644 --- a/burrow/src/auth/server/mod.rs +++ b/burrow/src/auth/server/mod.rs @@ -1,4 +1,5 @@ pub mod db; +mod grpc_defs; pub mod providers; use anyhow::Result;