move rust proto generation into protos (#191)

Author: aaylward

Cargo.lock

@@ -3,10 +3,21 @@ resolver = "2"
 
 members = [
     "rust/helloworld_tonic",
+    "protos/example_service"
 ]
 
 [workspace.package]
 edition = "2021"
 rust-version = "1.79.0"
 readme = "README.md"
 
+
+[workspace.dependencies]
+example_service = { path = "protos/example_service" }
+prost = { version = "0.12.6" }
+prost-types = { version = "0.12.6", default-features = false }
+tonic = { version = "0.11.0", features = ["transport"] }
+tonic-build = "0.11.0"
+tokio = { version = "1.38", default-features = false, features = ["macros", "net", "rt-multi-thread", "signal"] }
+protoc-gen-tonic = "0.4.0"
+protoc-gen-prost = "0.3.1"

Cargo.toml

@@ -44,6 +44,7 @@ crate.from_cargo(
     cargo_lockfile = "//:Cargo.lock",
     manifests = [
         "//:Cargo.toml",
+        "//protos/example_service:Cargo.toml",
         "//rust/helloworld_tonic:Cargo.toml",
     ],
 )

MODULE.bazel

@@ -0,0 +1,22 @@
+[package]
+name = "example_service"
+version = "0.1.0"
+edition.workspace = true
+rust-version.workspace = true
+
+
+[lib]
+name = "proto_bindings"
+path = "lib.rs"
+
+
+[dependencies]
+tonic = { workspace = true }
+prost = { workspace = true }
+prost-types = { workspace = true }
+tonic-build = { workspace = true }
+protoc-gen-prost = { workspace = true }
+protoc-gen-tonic = { workspace = true }
+
+[build-dependencies]
+tonic-build = { workspace = true }

protos/example_service/Cargo.toml

@@ -0,0 +1,4 @@
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    tonic_build::compile_protos("helloworld.proto")?;
+    Ok(())
+}

protos/example_service/build.rs

@@ -0,0 +1,3 @@
+pub mod hello_world {
+    tonic::include_proto!("example_service");
+}

protos/example_service/lib.rs

@@ -1,29 +1,30 @@
 load("@crates//:defs.bzl", "all_crate_deps")
-load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
+
+# load("@rules_rust//cargo:defs.bzl", "cargo_build_script")
 load("@rules_rust//rust:defs.bzl", "rust_binary")
 
-cargo_build_script(
-    name = "build_script",
-    srcs = ["build.rs"],
-    build_script_env = {
-        "PROTO_PATH": "$(execpath //protos/example_service:proto_files)",
-    },
-    data = ["//protos/example_service:proto_files"],
-    deps = ["@crates//:tonic-build"],
-)
+#cargo_build_script(
+#    name = "build_script",
+#    srcs = ["build.rs"],
+#    build_script_env = {
+#        "PROTO_PATH": "$(execpath //protos/example_service:proto_files)",
+#    },
+#    data = ["//protos/example_service:proto_files"],
+#    deps = ["@crates//:tonic-build"],
+#)
 
 rust_binary(
     name = "helloworld_tonic_server",
     srcs = ["src/server.rs"],
     crate_name = "helloworld_tonic",
-    deps = all_crate_deps() + [":build_script"],
-    # deps = all_crate_deps() + ["//protos/example_service:hello_proto_rust"],
+    # deps = all_crate_deps() + [":build_script"],
+    deps = all_crate_deps() + ["//protos/example_service:hello_proto_rust"],
 )
 
 rust_binary(
     name = "helloworld_tonic_client",
     srcs = ["src/client.rs"],
     crate_name = "helloworld_tonic",
-    deps = all_crate_deps() + [":build_script"],
-    # deps = all_crate_deps() + ["//protos/example_service:hello_proto_rust"],
+    # deps = all_crate_deps() + [":build_script"],
+    deps = all_crate_deps() + ["//protos/example_service:hello_proto_rust"],
 )

rust/helloworld_tonic/BUILD.bazel

@@ -3,7 +3,6 @@ name = "helloworld_tonic"
 version = "0.1.0"
 edition.workspace = true
 rust-version.workspace = true
-readme.workspace = true
 
 [[bin]] # Bin to run the HelloWorld gRPC server
 name = "helloworld_server"
@@ -14,15 +13,6 @@ name = "helloworld_client"
 path = "src/client.rs"
 
 [dependencies]
-tonic = "0.11"
-prost = "0.12"
-tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
-
-[dev-dependencies]
-tonic-build = "0.11"
-prost-types = { version = "0.12.6", default-features = false }
-protoc-gen-prost ="0.3.1"
-protoc-gen-tonic ="0.4.0"
-
-[build-dependencies]
-tonic-build = "0.11"
+example_service = { workspace = true }
+tonic = { workspace = true }
+tokio = { workspace = true }

rust/helloworld_tonic/Cargo.toml

@@ -1,9 +1,5 @@
-use hello_world::greeter_client::GreeterClient;
-use hello_world::HelloRequest;
-
-pub mod hello_world {
-    tonic::include_proto!("example_service");
-}
+use hello_proto::example_service::greeter_client::GreeterClient;
+use hello_proto::example_service::HelloRequest;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {

rust/helloworld_tonic/build.rs

@@ -1,11 +1,7 @@
 use tonic::{transport::Server, Request, Response, Status};
 
-use hello_world::greeter_server::{Greeter, GreeterServer};
-use hello_world::{HelloReply, HelloRequest};
-
-pub mod hello_world {
-    tonic::include_proto!("example_service"); // The string specified here must match the proto package name
-}
+use hello_proto::example_service::greeter_server::{Greeter, GreeterServer};
+use hello_proto::example_service::{HelloReply, HelloRequest};
 
 #[derive(Debug, Default)]
 pub struct MyGreeter {}