Move linker loading to trigger crate

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -264,10 +264,7 @@ pub struct EngineBuilder<T> {
 impl<T: Send + Sync + OutboundWasiHttpHandler> EngineBuilder<T> {
     fn new(config: &Config) -> Result<Self> {
         let engine = wasmtime::Engine::new(&config.inner)?;
-
-        let mut linker: Linker<T> = Linker::new(&engine);
-        wasmtime_wasi_http::proxy::add_to_linker(&mut linker)?;
-
+        let linker: Linker<T> = Linker::new(&engine);
         let mut module_linker = ModuleLinker::new(&engine);
         wasmtime_wasi::tokio::add_to_linker(&mut module_linker, |data| match &mut data.wasi {
             Wasi::Preview1(ctx) => ctx,

crates/core/src/lib.rs

@@ -44,10 +44,11 @@ spin-manifest = { path = "../manifest" }
 terminal = { path = "../terminal" }
 tokio = { version = "1.23", features = ["fs"] }
 toml = "0.5.9"
-tracing = { workspace = true }
 url = "2"
-wasmtime = { workspace = true }
 spin-componentize = { workspace = true }
+tracing = { workspace = true }
+wasmtime = { workspace = true }
+wasmtime-wasi-http = { workspace = true }
 
 [dev-dependencies]
 tempfile = "3.8.0"

crates/trigger/Cargo.toml

@@ -111,6 +111,7 @@ impl<Executor: TriggerExecutor> TriggerExecutorBuilder<Executor> {
             let mut builder = Engine::builder(&self.config)?;
 
             if !self.disable_default_host_components {
+                builder.link_import(|l, _| wasmtime_wasi_http::proxy::add_to_linker(l))?;
                 builder.add_host_component(outbound_redis::OutboundRedisComponent)?;
                 builder.add_host_component(outbound_pg::OutboundPg::default())?;
                 builder.add_host_component(outbound_mysql::OutboundMysql::default())?;