Componentize Spin wasm component if needed before precompilation

Signed-off-by: Radu Matei <[email protected]>

containerd-shim-spin/Cargo.toml

@@ -16,6 +16,8 @@ containerd-shim-wasm = { path = "../../../containerd/runwasi/crates/containerd-s
 log = "0.4"
 spin-app = { git = "https://github.com/fermyon/spin", tag = "v2.2.0" }
 spin-core = { git = "https://github.com/fermyon/spin", tag = "v2.2.0" }
+spin-componentize = { git = "https://github.com/fermyon/spin", tag = "v2.2.0" }
+spin-componentize = { git = "https://github.com/fermyon/spin-componentize", rev = "191789170abde10cd55590466c0660dd6c7d472a" }
 spin-trigger = { git = "https://github.com/fermyon/spin", tag = "v2.2.0" }
 spin-trigger-http = { git = "https://github.com/fermyon/spin", tag = "v2.2.0" }
 spin-redis-engine = { git = "https://github.com/fermyon/spin", tag = "v2.2.0" }

containerd-shim-spin/src/engine.rs

@@ -318,7 +318,8 @@ impl Engine for SpinEngine {
         match layer.config.media_type() {
             MediaType::Other(name) => {
                 if name == "application/vnd.wasm.content.layer.v1+wasm" {
-                    Some(self.wasmtime_engine.precompile_module(&layer.layer))
+                    let component = spin_componentize::componentize_if_necessary(&layer.layer)?;
+                    Some(self.wasmtime_engine.precompile_module(&component))
                 } else {
                     None
                 }