Wrap Rust protoc in Oak utils

This change: - Adds `oak_utils` crate, that runs `protoc`/`protoc_grpc` and checks updated files - Updates `build.rs` files to use `oak_utils` Fixes #510
project-oak · Feb 4, 2020 · dfb8ff7 · dfb8ff7
1 parent 22e29ee
commit dfb8ff7
Show file tree

Hide file tree

Showing 27 changed files with 488 additions and 22 deletions.
diff --git a/docs/programming-oak.md b/docs/programming-oak.md
@@ -112,9 +112,9 @@ next section.
 ### Generated gRPC service code
 
 The Oak SDK includes a `proto_rust_grpc` tool (forked from
-https://github.com/stepancheg/rust-protobuf) which takes a
-[gRPC service definition](https://grpc.io/docs/guides/concepts/) and
-autogenerates Rust code for the corresponding Oak Node that implements that
+https://github.com/stepancheg/rust-protobuf and wrapped in the `oak_utils`)
+which takes a [gRPC service definition](https://grpc.io/docs/guides/concepts/)
+and autogenerates Rust code for the corresponding Oak Node that implements that
 service.
 
 Adding a `build.rs` file to the Node that invokes this tool results in a
@@ -124,10 +124,10 @@ generated file appearing in `src/proto/<service>_grpc.rs`.
 [embedmd]:# (../examples/hello_world/module/rust/build.rs Rust /fn main/ /^}/)
 ```Rust
 fn main() {
-    protoc_rust_grpc::run(protoc_rust_grpc::Args {
+    oak_utils::run_protoc_rust_grpc(protoc_rust_grpc::Args {
         out_dir: "src/proto",
         input: &["../../proto/hello_world.proto"],
-        includes: &["../../proto", "../../third_party"],
+        includes: &["../../proto", "../../../../third_party"],
         rust_protobuf: true, // also generate protobuf messages, not just services
         ..Default::default()
     })

diff --git a/examples/Cargo.lock b/examples/Cargo.lock
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -28,3 +28,4 @@ oak_derive = { path = "../sdk/rust/oak_derive" }
 oak_log = { path = "../sdk/rust/oak_log" }
 oak_runtime = { path = "../oak/server/rust/oak_runtime" }
 oak_tests = { path = "../sdk/rust/oak_tests" }
+oak_utils = { path = "../sdk/rust/oak_utils" }
diff --git a/examples/abitest/module_0/rust/Cargo.toml b/examples/abitest/module_0/rust/Cargo.toml
@@ -23,4 +23,5 @@ serde = { version = "*", features = ["derive"] }
 serde_json = "*"
 
 [build-dependencies]
+oak_utils = "*"
 protoc-rust-grpc = { path = "../../../../third_party/grpc-rust/protoc-rust-grpc" }
diff --git a/examples/abitest/module_0/rust/build.rs b/examples/abitest/module_0/rust/build.rs
@@ -1,8 +1,8 @@
 fn main() {
-    protoc_rust_grpc::run(protoc_rust_grpc::Args {
+    oak_utils::run_protoc_rust_grpc(protoc_rust_grpc::Args {
         out_dir: "src/proto",
         input: &["../../proto/abitest.proto"],
-        includes: &["../../proto", "../../third_party"],
+        includes: &["../../proto", "../../../../third_party"],
         rust_protobuf: true, // also generate protobuf messages, not just services
         ..Default::default()
     })

diff --git a/examples/hello_world/module/rust/Cargo.toml b/examples/hello_world/module/rust/Cargo.toml
@@ -22,4 +22,5 @@ serial_test = "*"
 serial_test_derive = "*"
 
 [build-dependencies]
+oak_utils = "*"
 protoc-rust-grpc = { path = "../../../../third_party/grpc-rust/protoc-rust-grpc" }
diff --git a/examples/hello_world/module/rust/build.rs b/examples/hello_world/module/rust/build.rs
@@ -1,8 +1,8 @@
 fn main() {
-    protoc_rust_grpc::run(protoc_rust_grpc::Args {
+    oak_utils::run_protoc_rust_grpc(protoc_rust_grpc::Args {
         out_dir: "src/proto",
         input: &["../../proto/hello_world.proto"],
-        includes: &["../../proto", "../../third_party"],
+        includes: &["../../proto", "../../../../third_party"],
         rust_protobuf: true, // also generate protobuf messages, not just services
         ..Default::default()
     })

diff --git a/examples/private_set_intersection/module/rust/Cargo.toml b/examples/private_set_intersection/module/rust/Cargo.toml
@@ -14,4 +14,5 @@ oak_derive = "*"
 protobuf = "*"
 
 [build-dependencies]
+oak_utils = "*"
 protoc-rust-grpc = { path = "../../../../third_party/grpc-rust/protoc-rust-grpc" }
diff --git a/examples/private_set_intersection/module/rust/build.rs b/examples/private_set_intersection/module/rust/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    protoc_rust_grpc::run(protoc_rust_grpc::Args {
+    oak_utils::run_protoc_rust_grpc(protoc_rust_grpc::Args {
         out_dir: "src/proto",
         input: &["../../proto/private_set_intersection.proto"],
         includes: &["../../proto"],

diff --git a/examples/running_average/module/rust/Cargo.toml b/examples/running_average/module/rust/Cargo.toml
@@ -14,4 +14,5 @@ oak_derive = "*"
 protobuf = "*"
 
 [build-dependencies]
+oak_utils = "*"
 protoc-rust-grpc = { path = "../../../../third_party/grpc-rust/protoc-rust-grpc" }
diff --git a/examples/running_average/module/rust/build.rs b/examples/running_average/module/rust/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    protoc_rust_grpc::run(protoc_rust_grpc::Args {
+    oak_utils::run_protoc_rust_grpc(protoc_rust_grpc::Args {
         out_dir: "src/proto",
         input: &["../../proto/running_average.proto"],
         includes: &["../../proto"],

diff --git a/examples/rustfmt/module/rust/Cargo.toml b/examples/rustfmt/module/rust/Cargo.toml
@@ -16,4 +16,5 @@ protobuf = "*"
 rustfmt-nightly = "*"
 
 [build-dependencies]
+oak_utils = "*"
 protoc-rust-grpc = { path = "../../../../third_party/grpc-rust/protoc-rust-grpc" }
diff --git a/examples/rustfmt/module/rust/build.rs b/examples/rustfmt/module/rust/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    protoc_rust_grpc::run(protoc_rust_grpc::Args {
+    oak_utils::run_protoc_rust_grpc(protoc_rust_grpc::Args {
         out_dir: "src/proto",
         input: &["../../proto/rustfmt.proto"],
         includes: &["../../proto"],