[chore]: sharing .proto files across workspace

MyceliaNetwork · Sep 26, 2023 · b84f79e · b84f79e
1 parent ab7ad7a
commit b84f79e
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 47 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,7 @@
 members = [
   # Tooling
   "xtask",
+  "protos",
   "cli",
   "development_server",
   "wasmtime_components",

diff --git a/cli/build.rs b/cli/build.rs
@@ -1,18 +1,13 @@
-// FIXME: this is a copy of /development_server/build.rs
-//
-// > it prob makes sense to eventualy get this into its own package.
-// > But, for now feel free to just repeat the boilerplate in the CLI.
-
 use std::{env, path::PathBuf};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     // See https://github.com/hyperium/tonic/blob/master/examples/build.rs
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     tonic_build::configure()
         .file_descriptor_set_path(out_dir.join("development_descriptor.bin"))
-        .compile(&["proto/development.proto"], &["proto"])
+        .compile(&["../protos/proto/development.proto"], &["../protos/proto"])
         .unwrap();
 
-    tonic_build::compile_protos("proto/development.proto")?;
+    tonic_build::compile_protos("../protos/proto/development.proto")?;
     Ok(())
 }
diff --git a/cli/proto/development.proto b/cli/proto/development.proto
diff --git a/development_server/build.rs b/development_server/build.rs
@@ -5,9 +5,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
     tonic_build::configure()
         .file_descriptor_set_path(out_dir.join("development_descriptor.bin"))
-        .compile(&["proto/development.proto"], &["proto"])
+        .compile(&["../protos/proto/development.proto"], &["../protos/proto"])
         .unwrap();
 
-    tonic_build::compile_protos("proto/development.proto")?;
+    tonic_build::compile_protos("../protos/proto/development.proto")?;
     Ok(())
 }
diff --git a/development_server/proto/development.http b/development_server/proto/development.http
diff --git a/protos/Cargo.toml b/protos/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "proto"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+tonic-build = "0.10.0"
+
+[dependencies]
+tonic-build = "0.10.0"
diff --git a/protos/build.rs b/protos/build.rs
@@ -0,0 +1,13 @@
+use std::{env, path::PathBuf};
+
+fn main() -> Result<(), Box<dyn std::error::Error>> {
+    // See https://github.com/hyperium/tonic/blob/master/examples/build.rs
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+    tonic_build::configure()
+        .file_descriptor_set_path(out_dir.join("development_descriptor.bin"))
+        .compile(&["../protos/proto/development.proto"], &["../protos/proto"])
+        .unwrap();
+
+    tonic_build::compile_protos("proto/development.proto")?;
+    Ok(())
+}
diff --git a/development_server/proto/development.proto → protos/proto/development.proto b/development_server/proto/development.proto → protos/proto/development.proto
@@ -1,15 +1,14 @@
 syntax = "proto3";
 package development;
 
-service Development {
+service Development{
   rpc Echo(EchoRequest) returns (EchoReply) {};
   rpc DeployComponent(DeployRequest) returns (DeployReply) {};
   rpc StopServer(Empty) returns (Empty);
 }
 
-message Empty {
+message Empty {}
 
-}
 
 message DeployRequest {
   string component_path = 1;

diff --git a/protos/src/lib.rs b/protos/src/lib.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("intended for building common .proto files");
+}