Merge branch 'main' into feature-gate-e2e-tests-with-deps

Author: kate-goldenring

crates/config/src/lib.rs

@@ -123,7 +123,7 @@ impl Resolver {
 }
 
 /// A config key.
-#[derive(Debug, PartialEq)]
+#[derive(Debug, PartialEq, Eq)]
 pub struct Key<'a>(&'a str);
 
 impl<'a> Key<'a> {

crates/config/src/tree.rs

@@ -193,10 +193,10 @@ impl std::fmt::Debug for Slot {
     }
 }
 
-#[derive(Debug, Deserialize, PartialEq)]
+#[derive(Debug, Deserialize, PartialEq, Eq)]
 pub struct RawSection(pub HashMap<String, RawSlot>);
 
-#[derive(Debug, Default, PartialEq, Deserialize, Serialize)]
+#[derive(Debug, Default, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(default)]
 pub struct RawSlot {
     pub default: Option<String>,

crates/engine/src/io.rs

@@ -1,18 +1,14 @@
-use cap_std::fs::File as CapFile;
 use std::{
     collections::HashSet,
     fmt::Debug,
-    fs::{File, OpenOptions},
     io::{LineWriter, Write},
-    path::PathBuf,
     sync::{Arc, RwLock, RwLockReadGuard},
 };
 
 use wasi_common::{
     pipe::{ReadPipe, WritePipe},
     WasiFile,
 };
-use wasmtime_wasi::sync::file::File as WasmtimeFile;
 
 /// Prepares a WASI pipe which writes to a memory buffer, optionally
 /// copying to the specified output stream.
@@ -65,78 +61,6 @@ pub trait OutputBuffers {
     fn stderr(&self) -> &[u8];
 }
 
-/// Wrapper around File with a convenient PathBuf for cloning
-pub struct PipeFile(pub File, pub PathBuf);
-
-impl PipeFile {
-    /// Constructs an instance from a file, and the PathBuf to that file.
-    pub fn new(file: File, path: PathBuf) -> Self {
-        Self(file, path)
-    }
-}
-
-impl std::fmt::Debug for PipeFile {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("PipeFile")
-            .field("File", &self.0)
-            .field("PathBuf", &self.1)
-            .finish()
-    }
-}
-
-impl Clone for PipeFile {
-    fn clone(&self) -> Self {
-        let f = OpenOptions::new()
-            .read(true)
-            .write(true)
-            .open(&self.1)
-            .unwrap();
-        Self(f, self.1.clone())
-    }
-}
-
-/// CustomIoPipes that can be passed to `ExecutionContextConfiguration`
-/// to direct out and err
-#[derive(Clone, Debug, Default)]
-pub struct CustomLogPipes {
-    /// in pipe (file and pathbuf)
-    pub stdin_pipe: Option<PipeFile>,
-    /// out pipe (file and pathbuf)
-    pub stdout_pipe: Option<PipeFile>,
-    /// err pipe (file and pathbuf)
-    pub stderr_pipe: Option<PipeFile>,
-}
-
-impl CustomLogPipes {
-    /// Constructs an instance from a set of PipeFile objects.
-    pub fn new(
-        stdin_pipe: Option<PipeFile>,
-        stdout_pipe: Option<PipeFile>,
-        stderr_pipe: Option<PipeFile>,
-    ) -> Self {
-        Self {
-            stdin_pipe,
-            stdout_pipe,
-            stderr_pipe,
-        }
-    }
-}
-
-/// Types of ModuleIoRedirects
-#[derive(Clone, Debug)]
-pub enum ModuleIoRedirectsTypes {
-    /// This will signal the executor to use `capture_io_to_memory_default()`
-    Default,
-    /// This will signal the executor to use `capture_io_to_memory_files()`
-    FromFiles(CustomLogPipes),
-}
-
-impl Default for ModuleIoRedirectsTypes {
-    fn default() -> Self {
-        Self::Default
-    }
-}
-
 /// A set of redirected standard I/O streams with which
 /// a Wasm module is to be run.
 pub struct ModuleIoRedirects {
@@ -170,37 +94,6 @@ impl ModuleIoRedirects {
             read_handles: rrh,
         }
     }
-
-    /// Constructs the ModuleIoRedirects, and RedirectReadHandles instances from `File`s directly
-    pub fn new_from_files(
-        stdin_file: Option<File>,
-        stdout_file: Option<File>,
-        stderr_file: Option<File>,
-    ) -> Self {
-        let rrh = RedirectReadHandles::new(true);
-
-        let in_stdpipe: Box<dyn WasiFile> = match stdin_file {
-            Some(inf) => Box::new(WasmtimeFile::from_cap_std(CapFile::from_std(inf))),
-            None => Box::new(ReadPipe::from(vec![])),
-        };
-        let out_stdpipe: Box<dyn WasiFile> = match stdout_file {
-            Some(ouf) => Box::new(WasmtimeFile::from_cap_std(CapFile::from_std(ouf))),
-            None => Box::new(WritePipe::from_shared(rrh.stdout.clone())),
-        };
-        let err_stdpipe: Box<dyn WasiFile> = match stderr_file {
-            Some(erf) => Box::new(WasmtimeFile::from_cap_std(CapFile::from_std(erf))),
-            None => Box::new(WritePipe::from_shared(rrh.stderr.clone())),
-        };
-
-        Self {
-            pipes: RedirectPipes {
-                stdin: in_stdpipe,
-                stdout: out_stdpipe,
-                stderr: err_stdpipe,
-            },
-            read_handles: rrh,
-        }
-    }
 }
 
 /// Pipes from `ModuleIoRedirects`

crates/engine/src/lib.rs

@@ -11,7 +11,7 @@ use std::{collections::HashMap, io::Write, path::PathBuf, sync::Arc};
 
 use anyhow::{bail, Context, Result};
 use host_component::{HostComponent, HostComponents, HostComponentsState};
-use io::{FollowComponents, ModuleIoRedirectsTypes, OutputBuffers, RedirectPipes};
+use io::{FollowComponents, OutputBuffers, RedirectPipes};
 use spin_config::{host_component::ComponentConfig, Resolver};
 use spin_manifest::{CoreComponent, DirectoryMount, ModuleSource};
 use tokio::{
@@ -38,8 +38,6 @@ pub struct ExecutionContextConfiguration {
     pub follow_components: FollowComponents,
     /// Application configuration resolver.
     pub config_resolver: Option<Arc<Resolver>>,
-    /// The type of io redirects for the module (default, or files)
-    pub module_io_redirects: ModuleIoRedirectsTypes,
 }
 
 /// Top-level runtime context data to be passed to a component.

crates/http/src/spin.rs

@@ -6,7 +6,7 @@ use anyhow::Result;
 use async_trait::async_trait;
 use http::Uri;
 use hyper::{Body, Request, Response};
-use spin_engine::io::{ModuleIoRedirects, ModuleIoRedirectsTypes};
+use spin_engine::io::ModuleIoRedirects;
 use std::{net::SocketAddr, str, str::FromStr};
 use tokio::task::spawn_blocking;
 use tracing::log;
@@ -32,17 +32,7 @@ impl HttpExecutor for SpinHttpExecutor {
             component
         );
 
-        let mior = if let ModuleIoRedirectsTypes::FromFiles(clp) =
-            engine.config.module_io_redirects.clone()
-        {
-            ModuleIoRedirects::new_from_files(
-                clp.stdin_pipe.map(|inp| inp.0),
-                clp.stdout_pipe.map(|oup| oup.0),
-                clp.stderr_pipe.map(|erp| erp.0),
-            )
-        } else {
-            ModuleIoRedirects::new(follow)
-        };
+        let mior = ModuleIoRedirects::new(follow);
 
         let (store, instance) =
             engine.prepare_component(component, None, Some(mior.pipes), None, None)?;

crates/loader/src/local/config.rs

@@ -107,7 +107,7 @@ pub struct RawWasmConfig {
 
 /// An entry in the `files` list mapping a source path to an absolute
 /// mount path in the guest.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields, rename_all = "snake_case")]
 pub struct RawDirectoryPlacement {
     /// The source to mount.
@@ -118,7 +118,7 @@ pub struct RawDirectoryPlacement {
 
 /// A specification for a file or set of files to mount in the
 /// Wasm module.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields, rename_all = "snake_case", untagged)]
 pub enum RawFileMount {
     /// Mount a specified directory at a specified location.
@@ -141,7 +141,7 @@ pub enum RawModuleSource {
 /// TODO
 /// The component and its entrypoint should be pulled from Bindle.
 /// This assumes access to the Bindle server.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields, rename_all = "snake_case")]
 pub struct FileComponentBindleSource {
     /// Reference to the bindle (name/version)

crates/manifest/src/lib.rs

@@ -84,7 +84,7 @@ pub struct CoreComponent {
 }
 
 /// The location from which an application was loaded.
-#[derive(Clone, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum ApplicationOrigin {
     /// The application was loaded from the specified file.
     File(PathBuf),
@@ -98,7 +98,7 @@ pub enum ApplicationOrigin {
 }
 
 /// The trigger type.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 #[serde(deny_unknown_fields, rename_all = "camelCase", tag = "type")]
 pub enum ApplicationTrigger {
     /// HTTP trigger type.
@@ -108,7 +108,7 @@ pub enum ApplicationTrigger {
 }
 
 /// HTTP trigger configuration.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct HttpTriggerConfiguration {
     /// Base path for the HTTP application.
     pub base: String,
@@ -132,7 +132,7 @@ impl TryFrom<ApplicationTrigger> for HttpTriggerConfiguration {
 }
 
 /// Redis trigger configuration.
-#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct RedisTriggerConfiguration {
     /// Address of Redis server.
     pub address: String,
@@ -217,7 +217,7 @@ impl Default for HttpConfig {
 /// or the Wagi CGI interface.
 ///
 /// If an executor is not specified, the inferred default is `HttpExecutor::Spin`.
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(deny_unknown_fields, rename_all = "camelCase", tag = "type")]
 pub enum HttpExecutor {
     /// The component implements the Spin HTTP interface.
@@ -233,7 +233,7 @@ impl Default for HttpExecutor {
 }
 
 /// Wagi specific configuration for the http executor.
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(default, deny_unknown_fields, rename_all = "camelCase")]
 pub struct WagiConfig {
     /// The name of the entrypoint.
@@ -275,7 +275,7 @@ pub struct RedisConfig {
 /// The executor for the Redis component.
 ///
 /// If an executor is not specified, the inferred default is `RedisExecutor::Spin`.
-#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[serde(deny_unknown_fields, rename_all = "camelCase", tag = "type")]
 pub enum RedisExecutor {
     /// The component implements the Spin Redis interface.

crates/redis/src/spin.rs

@@ -1,7 +1,7 @@
 use crate::{spin_redis::SpinRedis, ExecutionContext, RedisExecutor, RuntimeContext};
 use anyhow::Result;
 use async_trait::async_trait;
-use spin_engine::io::{ModuleIoRedirects, ModuleIoRedirectsTypes};
+use spin_engine::io::ModuleIoRedirects;
 use tokio::task::spawn_blocking;
 use wasmtime::{Instance, Store};
 
@@ -23,17 +23,7 @@ impl RedisExecutor for SpinRedisExecutor {
             component
         );
 
-        let mior = if let ModuleIoRedirectsTypes::FromFiles(clp) =
-            engine.config.module_io_redirects.clone()
-        {
-            ModuleIoRedirects::new_from_files(
-                clp.stdin_pipe.map(|inp| inp.0),
-                clp.stdout_pipe.map(|oup| oup.0),
-                clp.stderr_pipe.map(|erp| erp.0),
-            )
-        } else {
-            ModuleIoRedirects::new(follow)
-        };
+        let mior = ModuleIoRedirects::new(follow);
 
         let (store, instance) =
             engine.prepare_component(component, None, Some(mior.pipes), None, None)?;

crates/trigger/src/lib.rs

@@ -93,7 +93,6 @@ impl<Executor: TriggerExecutor> TriggerExecutorBuilder<Executor> {
             log_dir: self.log_dir,
             follow_components: self.follow_components,
             config_resolver: app.config_resolver,
-            module_io_redirects: Default::default(),
         };
         let engine = Engine::new(self.wasmtime_config)?;
         let mut ctx_builder = Builder::with_engine(ctx_config, engine)?;