Fix annotation deserializing for the Wasi and Wcgi runners

lib/wasi/src/runners/wasi.rs

@@ -144,15 +144,17 @@ impl crate::runners::Runner for WasiRunner {
             .starts_with(webc::metadata::annotations::WASI_RUNNER_URI))
     }
 
+    #[tracing::instrument(skip(self, command, container))]
     fn run_command(
         &mut self,
         command_name: &str,
         command: &Command,
         container: &WapmContainer,
     ) -> Result<Self::Output, Error> {
-        let wasi = command
-            .get_annotation("wasi")?
-            .unwrap_or_else(|| Wasi::new(command_name));
+        let Annotations { wasi } = command
+            .get_annotation(webc::metadata::annotations::WASI_RUNNER_URI)?
+            .unwrap_or_default();
+        let wasi = wasi.unwrap_or_else(|| Wasi::new(command_name));
         let atom_name = &wasi.atom;
         let atom = container
             .get_atom(atom_name)
@@ -167,3 +169,8 @@ impl crate::runners::Runner for WasiRunner {
         Ok(())
     }
 }
+
+#[derive(Default, Debug, serde::Deserialize)]
+struct Annotations {
+    wasi: Option<Wasi>,
+}

lib/wasi/src/runners/wcgi/handler.rs

@@ -40,6 +40,11 @@ impl Handler {
         tracing::debug!("Creating the WebAssembly instance");
 
         let mut request_specific_env = HashMap::new();
+
+        if self.dialect == CgiDialect::Rfc3875 {
+            // HACK(Michael-F-Bryan): this belongs in the wcgi-host crate
+            request_specific_env.insert("SCRIPT_NAME".to_string(), parts.uri.to_string());
+        }
         self.dialect
             .prepare_environment_variables(parts, &mut request_specific_env);
 
@@ -59,7 +64,10 @@ impl Handler {
 
         let module = self.module.clone();
 
-        tracing::debug!("Calling into the WCGI executable");
+        tracing::debug!(
+            dialect=%self.dialect,
+            "Calling into the WCGI executable",
+        );
 
         let done = self
             .task_manager

lib/wasi/src/runners/wcgi/runner.rs

@@ -41,17 +41,20 @@ impl WcgiRunner {
 
     #[tracing::instrument(skip(self, ctx))]
     fn run(&mut self, command_name: &str, ctx: &RunnerContext<'_>) -> Result<(), Error> {
-        let wasi: Wasi = ctx
+        let key = webc::metadata::annotations::WCGI_RUNNER_URI;
+        let Annotations { wasi, wcgi } = ctx
             .command()
-            .get_annotation("wasi")
-            .context("Unable to retrieve the WASI metadata")?
-            .unwrap_or_else(|| Wasi::new(command_name));
+            .get_annotation(key)
+            .with_context(|| format!("Unable to deserialize the \"{key}\" annotations"))?
+            .unwrap_or_default();
+
+        let wasi = wasi.unwrap_or_else(|| Wasi::new(command_name));
 
         let module = self
             .load_module(&wasi, ctx)
             .context("Couldn't load the module")?;
 
-        let handler = self.create_handler(module, &wasi, ctx)?;
+        let handler = self.create_handler(module, &wasi, &wcgi, ctx)?;
         let task_manager = Arc::clone(&handler.task_manager);
         let callbacks = Arc::clone(&self.config.callbacks);
 
@@ -126,11 +129,10 @@ impl WcgiRunner {
         &self,
         module: Module,
         wasi: &Wasi,
+        wcgi: &Wcgi,
         ctx: &RunnerContext<'_>,
     ) -> Result<Handler, Error> {
-        let Wcgi { dialect, .. } = ctx.command().get_annotation("wcgi")?.unwrap_or_default();
-
-        let dialect = match dialect {
+        let dialect = match &wcgi.dialect {
             Some(d) => d.parse().context("Unable to parse the CGI dialect")?,
             None => CgiDialect::Wcgi,
         };
@@ -343,6 +345,13 @@ impl Default for Config {
     }
 }
 
+#[derive(Debug, Default, serde::Deserialize)]
+struct Annotations {
+    wasi: Option<Wasi>,
+    #[serde(default)]
+    wcgi: Wcgi,
+}
+
 /// Callbacks that are triggered at various points in the lifecycle of a runner
 /// and any WebAssembly instances it may start.
 pub trait Callbacks: Send + Sync + 'static {