Get interfaces.proto working

Finally figured out how to get those well-known protos in! Change-Id: I4fd1d422a8f7a3734eadab84d98bf77eda1df5c5
project-oak · Apr 11, 2024 · 7ee62c2 · 7ee62c2
1 parent a70ce99
commit 7ee62c2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/oak_containers/proto/interfaces.proto b/oak_containers/proto/interfaces.proto
@@ -19,10 +19,7 @@ syntax = "proto3";
 package oak.containers;
 
 import "google/protobuf/empty.proto";
-import "proto/crypto/crypto.proto";
-import "proto/attestation/endorsement.proto";
 import "proto/attestation/evidence.proto";
-import "proto/session/messages.proto";
 
 // As images can be large (hundreds of megabytes), the launcher chunks up the
 // response into smaller pieces to respect proto/gRPC limits. The image needs to

diff --git a/oak_proto_rust/BUILD b/oak_proto_rust/BUILD
@@ -42,6 +42,7 @@ cargo_build_script(
     },
     crate_features = ["bazel"],
     data = [
+        "//oak_containers/proto:interfaces_proto",
         "//proto:digest_proto",
         "//proto/attestation:attachment_proto",
         "//proto/attestation:dice_proto",

diff --git a/oak_proto_rust/build.rs b/oak_proto_rust/build.rs
@@ -16,6 +16,7 @@
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let proto_paths = [
+        "../oak_containers/proto/interfaces.proto",
         "../proto/attestation/attachment.proto",
         "../proto/attestation/dice.proto",
         "../proto/attestation/endorsement.proto",
@@ -30,12 +31,24 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut config = prost_build::Config::new();
     config
         .btree_map(["."]) // Support no-std proto maps
-        .compile_protos(&proto_paths, &[".."])
+        .compile_protos(
+            &proto_paths,
+            &[
+                "..",
+                // We need to include the well-known protos ourselves
+                "../external/com_google_protobuf/src/google/protobuf/_virtual_imports/empty_proto",
+                "../external/com_google_protobuf/src/google/protobuf/_virtual_imports/descriptor_proto",
+            ],
+        )
         .expect("proto compilation failed");
 
     micro_rpc_build::compile(
         &["../proto/oak_functions/testing.proto", "../proto/crypto/crypto.proto"],
-        &[".."],
+        &[
+            "..",
+            // We need to include the well-known protos ourselves
+            "../external/com_google_protobuf/src/google/protobuf/_virtual_imports/descriptor_proto",
+        ],
         Default::default(),
     );
 

diff --git a/proto/oak_functions/testing.proto b/proto/oak_functions/testing.proto
@@ -18,11 +18,17 @@ syntax = "proto3";
 
 package oak.functions.testing;
 
+import "proto/micro_rpc/options.proto";
+
 service TestModule {
   // method_id: 0
-  rpc Lookup(LookupRequest) returns (LookupResponse) {}
+  rpc Lookup(LookupRequest) returns (LookupResponse) {
+    option (.oak.micro_rpc.method_id) = 0;
+  }
   // method_id: 1
-  rpc EchoAndPanic(EchoAndPanicRequest) returns (EchoAndPanicResponse) {}
+  rpc EchoAndPanic(EchoAndPanicRequest) returns (EchoAndPanicResponse) {
+    option (.oak.micro_rpc.method_id) = 1;
+  }
 }
 
 message LookupRequest {