Move client proto generation to oak_utils

Update examples

Update functions

examples/abitest/grpc/Cargo.toml

@@ -10,4 +10,4 @@ prost = "*"
 tonic = { version = "*", features = ["tls"] }
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"

examples/abitest/grpc/build.rs

@@ -14,22 +14,7 @@
 // limitations under the License.
 //
 
-use std::path::Path;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // TODO(#1093): drop this client crate and move all proto generation to common crate.
-    let proto_path = Path::new("../proto");
-    let file_path = proto_path.join("abitest.proto");
-
-    // Tell cargo to rerun this build script if the proto file has changed.
-    // https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed={}", file_path.display());
-
-    // Generate the normal (non-Oak) server and client code for the gRPC service,
-    // along with the Rust types corresponding to the message definitions.
-    tonic_build::configure()
-        .build_client(true)
-        .build_server(false)
-        .compile(&[file_path.as_path()], &[proto_path])?;
+    oak_utils::compile_client_proto("../proto", "abitest.proto")?;
     Ok(())
 }

examples/aggregator/backend/Cargo.toml

@@ -16,4 +16,4 @@ tokio = { version = "*", features = ["fs", "macros", "sync", "stream"] }
 tonic = { version = "*", features = ["tls"] }
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"

examples/aggregator/backend/build.rs

@@ -14,19 +14,7 @@
 // limitations under the License.
 //
 
-use std::path::Path;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let proto_path = Path::new("../../../examples/aggregator/proto");
-    let file_path = proto_path.join("aggregator.proto");
-
-    // Tell cargo to rerun this build script if the proto file has changed.
-    // https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed={}", file_path.display());
-
-    tonic_build::configure()
-        .build_client(false)
-        .build_server(true)
-        .compile(&[file_path.as_path()], &[proto_path])?;
+    oak_utils::compile_server_proto("../../../examples/aggregator/proto", "aggregator.proto")?;
     Ok(())
 }

examples/aggregator/grpc/Cargo.toml

@@ -10,4 +10,4 @@ prost = "*"
 tonic = { version = "*", features = ["tls"] }
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"

examples/aggregator/grpc/build.rs

@@ -14,22 +14,7 @@
 // limitations under the License.
 //
 
-use std::path::Path;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // TODO(#1093): drop this client crate and move all proto generation to common crate.
-    let proto_path = Path::new("../proto");
-    let file_path = proto_path.join("aggregator.proto");
-
-    // Tell cargo to rerun this build script if the proto file has changed.
-    // https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed={}", file_path.display());
-
-    // Generate the normal (non-Oak) server and client code for the gRPC service,
-    // along with the Rust types corresponding to the message definitions.
-    tonic_build::configure()
-        .build_client(true)
-        .build_server(false)
-        .compile(&[file_path.as_path()], &[proto_path])?;
+    oak_utils::compile_client_proto("../proto", "aggregator.proto")?;
     Ok(())
 }

examples/authentication/client/Cargo.toml

@@ -20,4 +20,4 @@ tonic = { version = "*", features = ["tls"] }
 url = "*"
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"

examples/authentication/client/build.rs

@@ -14,19 +14,7 @@
 // limitations under the License.
 //
 
-use std::path::Path;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let proto_path = Path::new("../../../oak/proto");
-    let file_path = proto_path.join("authentication.proto");
-
-    // Tell cargo to rerun this build script if the proto file has changed.
-    // https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed={}", file_path.display());
-
-    tonic_build::configure()
-        .build_client(true)
-        .build_server(false)
-        .compile(&[file_path.as_path()], &[proto_path])?;
+    oak_utils::compile_client_proto("../../../oak/proto", "authentication.proto")?;
     Ok(())
 }

examples/hello_world/grpc/Cargo.toml

@@ -10,4 +10,4 @@ prost = "*"
 tonic = { version = "*", features = ["tls"] }
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"

examples/hello_world/grpc/build.rs

@@ -14,22 +14,7 @@
 // limitations under the License.
 //
 
-use std::path::Path;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // TODO(#1093): drop this client crate and move all proto generation to common crate.
-    let proto_path = Path::new("../proto");
-    let file_path = proto_path.join("hello_world.proto");
-
-    // Tell cargo to rerun this build script if the proto file has changed.
-    // https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed={}", file_path.display());
-
-    // Generate the normal (non-Oak) server and client code for the gRPC service,
-    // along with the Rust types corresponding to the message definitions.
-    tonic_build::configure()
-        .build_client(true)
-        .build_server(false)
-        .compile(&[file_path.as_path()], &[proto_path])?;
+    oak_utils::compile_client_proto("../proto", "hello_world.proto")?;
     Ok(())
 }

examples/private_set_intersection/grpc/Cargo.toml

@@ -10,4 +10,4 @@ prost = "*"
 tonic = { version = "*", features = ["tls"] }
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"

examples/private_set_intersection/grpc/build.rs

@@ -14,22 +14,7 @@
 // limitations under the License.
 //
 
-use std::path::Path;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // TODO(#1093): drop this client crate and move all proto generation to common crate.
-    let proto_path = Path::new("../proto");
-    let file_path = proto_path.join("private_set_intersection.proto");
-
-    // Tell cargo to rerun this build script if the proto file has changed.
-    // https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed={}", file_path.display());
-
-    // Generate the normal (non-Oak) server and client code for the gRPC service,
-    // along with the Rust types corresponding to the message definitions.
-    tonic_build::configure()
-        .build_client(true)
-        .build_server(false)
-        .compile(&[file_path.as_path()], &[proto_path])?;
+    oak_utils::compile_client_proto("../proto", "private_set_intersection.proto")?;
     Ok(())
 }

examples/running_average/grpc/Cargo.toml

@@ -10,4 +10,4 @@ prost = "*"
 tonic = { version = "*", features = ["tls"] }
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"

examples/running_average/grpc/build.rs

@@ -14,22 +14,7 @@
 // limitations under the License.
 //
 
-use std::path::Path;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // TODO(#1093): drop this client crate and move all proto generation to common crate.
-    let proto_path = Path::new("../proto");
-    let file_path = proto_path.join("running_average.proto");
-
-    // Tell cargo to rerun this build script if the proto file has changed.
-    // https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed={}", file_path.display());
-
-    // Generate the normal (non-Oak) server and client code for the gRPC service,
-    // along with the Rust types corresponding to the message definitions.
-    tonic_build::configure()
-        .build_client(true)
-        .build_server(false)
-        .compile(&[file_path.as_path()], &[proto_path])?;
+    oak_utils::compile_client_proto("../proto", "running_average.proto")?;
     Ok(())
 }

examples/translator/grpc/Cargo.toml

@@ -10,4 +10,4 @@ prost = "*"
 tonic = { version = "*", features = ["tls"] }
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"

examples/translator/grpc/build.rs

@@ -14,22 +14,7 @@
 // limitations under the License.
 //
 
-use std::path::Path;
-
 fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // TODO(#1093): drop this client crate and move all proto generation to common crate.
-    let proto_path = Path::new("../proto");
-    let file_path = proto_path.join("translator.proto");
-
-    // Tell cargo to rerun this build script if the proto file has changed.
-    // https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed={}", file_path.display());
-
-    // Generate the normal (non-Oak) server and client code for the gRPC service,
-    // along with the Rust types corresponding to the message definitions.
-    tonic_build::configure()
-        .build_client(true)
-        .build_server(false)
-        .compile(&[file_path.as_path()], &[proto_path])?;
+    oak_utils::compile_client_proto("../proto", "translator.proto")?;
     Ok(())
 }

examples/trusted_information_retrieval/backend/Cargo.toml

@@ -30,4 +30,4 @@ quick-xml = { version = "*", features = ["serialize"] }
 assert_matches = "*"
 
 [build-dependencies]
-tonic-build = "*"
+oak_utils = "*"