Fix finding component target function

containerd · Oct 16, 2024 · d3d8957 · d3d8957
1 parent 9590ecc
commit d3d8957
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/crates/containerd-shim-wasmtime/src/instance.rs b/crates/containerd-shim-wasmtime/src/instance.rs
@@ -37,15 +37,18 @@ impl<'a> ComponentTarget<'a> {
         I: IntoIterator<Item = (&'b str, ComponentItem)> + 'b,
     {
         // This is heuristic but seems to work
-        let has_http_handler = exports
+        exports
             .into_iter()
-            .any(|(name, _)| name.starts_with("wasi:http/incoming-handler"));
-
-        match (func, has_http_handler) {
-            ("_start", false) => Self::Command,
-            ("_start", true) => Self::HttpProxy,
-            _ => Self::Core(func),
-        }
+            .find_map(|(name, _)| {
+                if name.starts_with("wasi:http/incoming-handler") {
+                    Some(Self::HttpProxy)
+                } else if name.starts_with("wasi:cli/run") {
+                    Some(Self::Command)
+                } else {
+                    None
+                }
+            })
+            .unwrap_or(Self::Core(func))
     }
 }