OCI and wac version

Signed-off-by: itowlson <ivan.towlson@fermyon.com>

Author: itowlson

Cargo.lock

@@ -375,20 +375,20 @@ impl Client {
             .context("unable to write locked app for precomposition")?;
 
         for mut c in locked.components {
-            let extras = c.metadata.get("trigger-extras").and_then(|e| e.as_object());
+            let trigger_deps = &c.trigger_dependencies;
 
-            let composed = if extras.is_none_or(|e| e.is_empty()) {
+            let composed = if trigger_deps.is_empty() {
                 spin_compose::compose(&ComponentSourceLoaderFs, &c, async |a| Ok(a)).await?
             } else {
-                // There are complications: we need to hand off to the trigger
+                // There are trigger deps (e.g. middleware): we need to hand off to the trigger
                 // to do the composition.
                 precompose_using_trigger(&c, &locked_url, working_dir).await?
             };
 
             let layer = ImageLayer::new(composed, WASM_LAYER_MEDIA_TYPE.to_string(), None);
             c.source.content = self.content_ref_for_layer(&layer);
             c.dependencies.clear();
-            c.metadata.remove("trigger-extras");
+            c.trigger_dependencies.clear();
             layers.push(layer);
 
             c.files = self

crates/oci/src/client.rs

@@ -41,7 +41,7 @@ terminal = { path = "../terminal" }
 tokio = { workspace = true, features = ["full"] }
 tokio-rustls = { workspace = true }
 tracing = { workspace = true }
-wac-graph = "0.9"
+wac-graph = { workspace = true }
 wasmtime = { workspace = true }
 wasmtime-wasi = { workspace = true }
 wasmtime-wasi-http = { workspace = true }

crates/trigger-http/Cargo.toml

@@ -315,7 +315,7 @@ impl<F: RuntimeFactors> Trigger<F> for HttpTrigger {
     }
 
     fn trigger_dependencies_composer() -> impl spin_factors_executor::TriggerDependenciesComposer {
-        middleware::HttpMiddlewareComplicator
+        middleware::HttpMiddlewareComposer
     }
 
     fn supported_host_requirements() -> Vec<&'static str> {

crates/trigger-http/src/lib.rs

@@ -8,10 +8,10 @@ use spin_factors_executor::{
 };
 
 #[derive(Default)]
-pub(crate) struct HttpMiddlewareComplicator;
+pub(crate) struct HttpMiddlewareComposer;
 
 #[spin_core::async_trait]
-impl TriggerDependenciesComposer for HttpMiddlewareComplicator {
+impl TriggerDependenciesComposer for HttpMiddlewareComposer {
     async fn compose_trigger_dependencies(
         &self,
         trigger_dependencies: &HashMap<String, Vec<TriggerDependency>>,
@@ -118,8 +118,5 @@ async fn compose_middlewares(
     // Export the outermost handler as the composed component's export.
     graph.export(outermost_export, MW_HANDLER_INTERFACE)?;
 
-    // eprintln!("encoding {graph:?}");
-    let r = graph.encode(Default::default())?;
-    // eprintln!("encoded");
-    Ok(r)
+    Ok(graph.encode(Default::default())?)
 }