Allow to pass env. vars on CLI for serve too

Author: psiegl

crates/wasmtime-cli/src/lib.rs

@@ -599,6 +599,7 @@ pub async fn serve_stateless<C, S>(
     host_resources: Arc<HashMap<Box<str>, HashMap<Box<str>, (ResourceType, ResourceType)>>>,
     engine: &Engine,
     timeout: Duration,
+    vars: Vec<(String, String)>,
 ) -> anyhow::Result<()>
 where
     C: Invoke + Clone + 'static,
@@ -614,6 +615,7 @@ where
                 let clt = clt.clone();
                 let cx = cx.clone();
                 let engine = engine.clone();
+                let vars = vars.clone();
                 info!(?name, "serving root function");
                 let invocations = srv
                     .serve_function(
@@ -624,7 +626,7 @@ where
                                 cx.clone(),
                                 "reactor.wasm",
                                 timeout,
-                                std::iter::empty(),
+                                vars.iter().map(|(k, v)| (k.as_str(), v.as_str())),
                             )
                         },
                         pre.clone(),
@@ -675,6 +677,7 @@ where
                             let clt = clt.clone();
                             let engine = engine.clone();
                             let cx = cx.clone();
+                            let vars = vars.clone();
                             info!(?name, "serving instance function");
                             let invocations = srv
                                 .serve_function(
@@ -685,7 +688,7 @@ where
                                             cx.clone(),
                                             "reactor.wasm",
                                             timeout,
-                                            std::iter::empty(),
+                                            vars.iter().map(|(k, v)| (k.as_str(), v.as_str())),
                                         )
                                     },
                                     pre.clone(),
@@ -762,6 +765,7 @@ pub async fn handle_serve<C, S>(
     clt: C,
     cx: C::Context,
     timeout: Duration,
+    vars: Vec<(String, String)>,
     workload: &str,
 ) -> anyhow::Result<()>
 where
@@ -783,20 +787,22 @@ where
             host_resources,
             &engine,
             timeout,
+            vars,
         )
         .await?;
     } else {
+        let store = new_store(
+            &engine,
+            clt,
+            cx,
+            "reactor.wasm",
+            timeout,
+            vars.iter().map(|(k, v)| (k.as_str(), v.as_str())),
+        );
         serve_shared(
             &mut handlers,
             srv,
-            new_store(
-                &engine,
-                clt,
-                cx,
-                "reactor.wasm",
-                timeout,
-                std::iter::empty(),
-            ),
+            store,
             pre,
             guest_resources,
             host_resources,

crates/wasmtime-cli/src/tcp.rs

@@ -58,6 +58,14 @@ pub struct ServeArgs {
     #[arg(long, default_value = DEFAULT_ADDR)]
     export: String,
 
+    /// Pass an environment variable to the program.
+    ///
+    /// `--env NAME=VALUE` sets the environment variable `NAME` to `VALUE`
+    /// for the guest. Host environment variables are already inherited by
+    /// default, so only the `NAME=VALUE` form is accepted.
+    #[arg(long = "env", number_of_values = 1, value_name = "NAME=VALUE", value_parser = parse_env_var)]
+    vars: Vec<(String, String)>,
+
     /// Path or URL to Wasm command component
     workload: String,
 }
@@ -87,6 +95,7 @@ pub async fn handle_serve(
         timeout,
         export,
         import,
+        vars,
         ref workload,
     }: ServeArgs,
 ) -> anyhow::Result<()> {
@@ -115,6 +124,7 @@ pub async fn handle_serve(
         wrpc_transport::tcp::Client::from(import),
         (),
         *timeout,
+        vars,
         workload,
     )
     .await;