feat(wamr): add wasm-mico-runtime shim implementation

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-22.04"]
-        runtime: ["common", "wasmtime", "wasmedge", "wasmer"]
+        runtime: ["common", "wasmtime", "wasmedge", "wasmer", "wamr"]
         libc: ["musl", "gnu"]
     uses: ./.github/workflows/action-build.yml
     with:
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         os: ["windows-latest"]
-        runtime: ["common", "wasmtime", "wasmedge", "wasmer"]
+        runtime: ["common", "wasmtime", "wasmedge", "wasmer", "wamr"]
     uses: ./.github/workflows/action-build.yml
     with:
       os: ${{ matrix.os }}
@@ -70,7 +70,7 @@ jobs:
       matrix:
         # 20.04 uses cgroupv1, 22.04 uses cgroupv2
         os: ["ubuntu-20.04", "ubuntu-22.04"]
-        runtime:  ["wasmtime", "wasmedge", "wasmer"]
+        runtime:  ["wasmtime", "wasmedge", "wasmer", "wamr"]
     uses: ./.github/workflows/action-test-smoke.yml
     with:
       os: ${{ matrix.os }}
@@ -84,7 +84,7 @@ jobs:
       matrix:
         # 20.04 uses cgroupv1, 22.04 uses cgroupv2
         os: ["ubuntu-20.04", "ubuntu-22.04"]
-        runtime: ["wasmtime", "wasmedge", "wasmer"]
+        runtime: ["wasmtime", "wasmedge", "wasmer", "wamr"]
     uses: ./.github/workflows/action-test-kind.yml
     with:
       os: ${{ matrix.os }}
@@ -97,7 +97,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-22.04"]
-        runtime: ["wasmtime", "wasmedge", "wasmer"]
+        runtime: ["wasmtime", "wasmedge", "wasmer", "wamr"]
     uses: ./.github/workflows/action-test-kind.yml
     with:
       os: ${{ matrix.os }}
@@ -112,7 +112,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-20.04", "ubuntu-22.04"]
-        runtime: ["wasmtime", "wasmedge", "wasmer"]
+        runtime: ["wasmtime", "wasmedge", "wasmer", "wamr"]
     uses: ./.github/workflows/action-test-k3s.yml
     with:
       os: ${{ matrix.os }}

Cargo.toml

@@ -1,12 +1,6 @@
 [workspace]
 members = [
-    "crates/containerd-shim-wasm",
-    "crates/containerd-shim-wasm-test-modules",
-    "crates/wasi-demo-app",
-    "crates/oci-tar-builder",
-    "crates/containerd-shim-wasmedge",
-    "crates/containerd-shim-wasmtime",
-    "crates/containerd-shim-wasmer"
+    "crates/*",
 ]
 resolver = "2"
 

Makefile

@@ -3,7 +3,7 @@ INSTALL ?= install
 CARGO ?= cargo
 LN ?= ln -sf
 TEST_IMG_NAME ?= wasmtest:latest
-RUNTIMES ?= wasmedge wasmtime wasmer
+RUNTIMES ?= wasmedge wasmtime wasmer wamr
 CONTAINERD_NAMESPACE ?= default
 
 # We have a bit of fancy logic here to determine the target 

crates/containerd-shim-wamr/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "containerd-shim-wamr"
+version.workspace = true
+edition.workspace = true
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = { workspace = true }
+containerd-shim = { workspace = true }
+containerd-shim-wasm = { workspace = true }
+log = { workspace = true }
+oci-spec = { workspace = true, features = ["runtime"] }
+ttrpc = { workspace = true }
+sha256 = { workspace = true }
+
+wamr-rust-sdk = { git = "https://github.com/bytecodealliance/wamr-rust-sdk", branch = "main" }
+
+[dev-dependencies]
+containerd-shim-wasm = { workspace = true, features = ["testing"] }
+serial_test = { workspace = true }
+
+[[bin]]
+name = "containerd-shim-wamr-v1"
+path = "src/main.rs"

crates/containerd-shim-wamr/src/instance.rs

@@ -0,0 +1,90 @@
+use anyhow::{Context, Result};
+use containerd_shim_wasm::container::{
+    Engine, Entrypoint, Instance, RuntimeContext, Stdio
+};
+use wamr_rust_sdk::function::Function;
+use wamr_rust_sdk::instance::Instance as WamrInstnace;
+use wamr_rust_sdk::module::Module;
+use wamr_rust_sdk::runtime::Runtime;
+
+pub type WamrInstance = Instance<WamrEngine>;
+
+pub struct WamrEngine {
+    runtime: Runtime,
+}
+
+unsafe impl Send for WamrEngine {}
+unsafe impl Sync for WamrEngine {}
+
+// TODO: wasmr_rust_sdk::runtime::Runtime should implement Clone
+
+impl Default for WamrEngine {
+    fn default() -> Self {
+        let runtime = Runtime::new().unwrap();
+        Self { runtime }
+    }
+}
+
+impl Clone for WamrEngine {
+    fn clone(&self) -> Self {
+        let runtime = Runtime::new().unwrap();
+        Self { runtime }
+    }
+}
+
+impl Engine for WamrEngine {
+    fn name() -> &'static str {
+        "wamr"
+    }
+
+    fn run_wasi(&self, ctx: &impl RuntimeContext, stdio: Stdio) -> Result<i32> {
+        let args = ctx.args();
+        let envs: Vec<_> = std::env::vars().map(|(k, v)| format!("{k}={v}")).collect();
+        let Entrypoint {
+            source,
+            func,
+            arg0: _,
+            name,
+        } = ctx.entrypoint();
+
+        let wasm_bytes = source
+            .as_bytes()
+            .context("Failed to get bytes from source")?;
+
+        log::info!("Create a WamrInstance");
+
+        // TODO: error handling isn't ideal
+
+        let mut module = Module::from_buf(&wasm_bytes).map_err(|e| {
+            anyhow::Error::msg(format!("Failed to create module from bytes: {:?}", e))
+        })?;
+
+        module.set_wasi_arg_pre_open_path(vec![String::from("/")], vec![String::from("/")]);
+        module.set_wasi_arg_env_vars(envs);
+
+        // TODO: no way to set args in wamr?
+        // TODO: no way to register a named module with bytes?
+
+        let instance = WamrInstnace::new(&module, 1024 * 64)
+            .map_err(|e| anyhow::Error::msg(format!("Failed to create instance: {:?}", e)))?;
+
+        // TODO: bug: failed at line above saying: `thread signal env initialized failed`
+
+        log::info!("redirect stdio");
+        stdio.redirect()?;
+
+        log::info!("Running {func:?}");
+        let function = Function::find_export_func(&instance, &func)
+            .map_err(|e| anyhow::Error::msg(format!("Failed to find function: {:?}", e)))?;
+        let status = function
+            .call(&instance, &Vec::new())
+            .map(|_| 0)
+            .or_else(|err| {
+                log::error!("Error: {:?}", err);
+                Err(err)
+            })
+            .map_err(|e| anyhow::Error::msg(format!("Failed to call function: {:?}", e)))?;
+
+        Ok(status)
+    }
+}

crates/containerd-shim-wamr/src/lib.rs

@@ -0,0 +1,3 @@
+pub mod instance;
+
+pub use instance::WamrInstance;

crates/containerd-shim-wamr/src/main.rs

@@ -0,0 +1,6 @@
+use containerd_shim_wamr::WamrInstance;
+use containerd_shim_wasm::sandbox::cli::{revision, shim_main, version};
+
+fn main() {
+    shim_main::<WamrInstance>("wamr", version!(), revision!(), "v1", None);
+}

crates/containerd-shim-wamr/src/test.rs

@@ -0,0 +1 @@
+// TODO: add tests