reduce trigger-http p2 and p3 code duplication

dicej · dicej · commit 6cf0535c789e · 2025-09-16T12:22:42.000-06:00
Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
diff --git a/crates/trigger-http/src/wasi.rs b/crates/trigger-http/src/wasi.rs
@@ -17,6 +17,34 @@ use wasmtime_wasi_http::{bindings::Proxy, body::HyperIncomingBody as Body, WasiH
 
 use crate::{headers::prepare_request_headers, server::HttpExecutor, TriggerInstanceBuilder};
 
+pub(super) fn prepare_request(
+    route_match: &RouteMatch<'_, '_>,
+    req: &mut Request<Body>,
+    client_addr: SocketAddr,
+) -> Result<()> {
+    let spin_http::routes::TriggerLookupKey::Component(component_id) = route_match.lookup_key()
+    else {
+        unreachable!()
+    };
+
+    tracing::trace!("Executing request using the Wasi executor for component {component_id}");
+
+    let headers = prepare_request_headers(req, route_match, client_addr)?;
+    req.headers_mut().clear();
+    req.headers_mut()
+        .extend(headers.into_iter().filter_map(|(n, v)| {
+            let Ok(name) = n.parse::<HeaderName>() else {
+                return None;
+            };
+            let Ok(value) = HeaderValue::from_bytes(v.as_bytes()) else {
+                return None;
+            };
+            Some((name, value))
+        }));
+
+    Ok(())
+}
+
 /// An [`HttpExecutor`] that uses the `wasi:http/incoming-handler` interface.
 pub struct WasiHttpExecutor<'a> {
     pub handler_type: &'a HandlerType,
@@ -31,28 +59,10 @@ impl HttpExecutor for WasiHttpExecutor<'_> {
         mut req: Request<Body>,
         client_addr: SocketAddr,
     ) -> Result<Response<Body>> {
-        let spin_http::routes::TriggerLookupKey::Component(component_id) = route_match.lookup_key()
-        else {
-            anyhow::bail!("INCONCEIVABLE");
-        };
-
-        tracing::trace!("Executing request using the Wasi executor for component {component_id}");
+        prepare_request(route_match, &mut req, client_addr)?;
 
         let (instance, mut store) = instance_builder.instantiate(()).await?;
 
-        let headers = prepare_request_headers(&req, route_match, client_addr)?;
-        req.headers_mut().clear();
-        req.headers_mut()
-            .extend(headers.into_iter().filter_map(|(n, v)| {
-                let Ok(name) = n.parse::<HeaderName>() else {
-                    return None;
-                };
-                let Ok(value) = HeaderValue::from_bytes(v.as_bytes()) else {
-                    return None;
-                };
-                Some((name, value))
-            }));
-
         let mut wasi_http = spin_factor_outbound_http::OutboundHttpFactor::get_wasi_http_impl(
             store.data_mut().factors_instance_state_mut(),
         )
diff --git a/crates/trigger-http/src/wasip3.rs b/crates/trigger-http/src/wasip3.rs
@@ -1,7 +1,6 @@
-use crate::{headers, server::HttpExecutor, TriggerInstanceBuilder};
+use crate::{server::HttpExecutor, TriggerInstanceBuilder};
 use anyhow::{Context, Result};
 use futures::{channel::oneshot, FutureExt};
-use http::{HeaderName, HeaderValue};
 use http_body_util::BodyExt;
 use spin_factors::RuntimeFactors;
 use spin_factors_executor::InstanceState;
@@ -29,28 +28,10 @@ impl HttpExecutor for Wasip3HttpExecutor<'_> {
         mut req: http::Request<Body>,
         client_addr: SocketAddr,
     ) -> Result<http::Response<Body>> {
-        let spin_http::routes::TriggerLookupKey::Component(component_id) = route_match.lookup_key()
-        else {
-            anyhow::bail!("INCONCEIVABLE");
-        };
-
-        tracing::trace!("Executing request using the Wasi executor for component {component_id}");
+        super::wasi::prepare_request(route_match, &mut req, client_addr)?;
 
         let (instance, mut store) = instance_builder.instantiate(()).await?;
 
-        let headers = headers::prepare_request_headers(&req, route_match, client_addr)?;
-        req.headers_mut().clear();
-        req.headers_mut()
-            .extend(headers.into_iter().filter_map(|(n, v)| {
-                let Ok(name) = n.parse::<HeaderName>() else {
-                    return None;
-                };
-                let Ok(value) = HeaderValue::from_bytes(v.as_bytes()) else {
-                    return None;
-                };
-                Some((name, value))
-            }));
-
         let getter = (|data| wasi_http::<F>(data).unwrap())
             as fn(&mut InstanceState<F::InstanceState, ()>) -> WasiHttpCtxView<'_>;
 
