Merge pull request #145 from wllenyj/sandbox

shim: add Sandbox API support

crates/shim-protos/Cargo.toml

@@ -28,6 +28,7 @@ tokio = { workspace = true, features = ["full"] }
 [features]
 default = []
 async = ["ttrpc/async", "async-trait"]
+sandbox = []
 
 [[example]]
 name = "shim-proto-server"

crates/shim-protos/build.rs

@@ -32,6 +32,8 @@ fn main() {
             "vendor/github.com/containerd/containerd/protobuf/plugin/fieldpath.proto",
             "vendor/github.com/containerd/containerd/api/types/mount.proto",
             "vendor/github.com/containerd/containerd/api/types/task/task.proto",
+            #[cfg(feature = "sandbox")]
+            "vendor/github.com/containerd/containerd/api/types/platform.proto",
         ],
         false,
     );
@@ -77,6 +79,22 @@ fn main() {
             true,
         );
     }
+
+    #[cfg(feature = "sandbox")]
+    {
+        genmodule(
+            "sandbox",
+            &["vendor/github.com/containerd/containerd/runtime/sandbox/v1/sandbox.proto"],
+            false,
+        );
+
+        #[cfg(feature = "async")]
+        genmodule(
+            "sandbox_async",
+            &["vendor/github.com/containerd/containerd/runtime/sandbox/v1/sandbox.proto"],
+            true,
+        );
+    }
 }
 
 fn genmodule(name: &str, inputs: &[&str], async_all: bool) {

crates/shim-protos/src/lib.rs

@@ -67,6 +67,8 @@ pub use ttrpc;
 
 pub mod cgroups;
 pub mod events;
+#[cfg(feature = "sandbox")]
+mod sandbox;
 pub mod shim;
 pub mod types;
 
@@ -100,3 +102,16 @@ pub mod shim_async {
 pub mod api {
     pub use crate::shim::{empty::*, events::*, mount::*, shim::*, task::*};
 }
+
+#[cfg(feature = "sandbox")]
+pub use sandbox::sandbox as sandbox_api;
+
+#[cfg(feature = "sandbox")]
+pub mod sandbox_sync {
+    pub use crate::sandbox::sandbox_ttrpc::*;
+}
+
+#[cfg(all(feature = "sandbox", feature = "async"))]
+pub mod sandbox_async {
+    pub use crate::sandbox::sandbox_async::*;
+}

crates/shim-protos/src/sandbox.rs

@@ -0,0 +1,36 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+pub mod sandbox {
+    include!(concat!(env!("OUT_DIR"), "/sandbox/sandbox.rs"));
+}
+
+pub mod sandbox_ttrpc {
+    include!(concat!(env!("OUT_DIR"), "/sandbox/sandbox_ttrpc.rs"));
+}
+
+#[cfg(feature = "async")]
+pub mod sandbox_async {
+    include!(concat!(env!("OUT_DIR"), "/sandbox_async/sandbox_ttrpc.rs"));
+}
+
+pub(crate) mod mount {
+    pub use crate::types::mount::*;
+}
+
+pub(crate) mod platform {
+    pub use crate::types::platform::*;
+}

crates/shim-protos/src/types.rs

@@ -33,3 +33,8 @@ pub mod task {
 pub mod fieldpath {
     include!(concat!(env!("OUT_DIR"), "/types/fieldpath.rs"));
 }
+
+#[cfg(feature = "sandbox")]
+pub mod platform {
+    include!(concat!(env!("OUT_DIR"), "/types/platform.rs"));
+}