Move where user defined paths are defined

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

Author: rylev

Cargo.lock

@@ -26,6 +26,7 @@ spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
 spin-sqlite = { path = "../sqlite" }
+spin-trigger = { path = "../trigger" }
 toml = "0.8"
 
 [lints]

crates/runtime-config/Cargo.toml

@@ -20,6 +20,7 @@ use spin_factors::{
 };
 use spin_key_value_spin::{SpinKeyValueRuntimeConfig, SpinKeyValueStore};
 use spin_sqlite as sqlite;
+use spin_trigger::cli::UserProvidedPath;
 
 /// The default state directory for the trigger.
 pub const DEFAULT_STATE_DIR: &str = ".spin";
@@ -453,13 +454,10 @@ fn sqlite_config_resolver(
     ))
 }
 
-/// A user provided option which be either be provided, default, or explicitly none.
-#[derive(Clone, Debug)]
-pub enum UserProvidedPath {
-    /// Use the explicitly provided directory.
-    Provided(PathBuf),
-    /// Use the default.
-    Default,
-    /// Explicitly unset.
-    Unset,
+impl TryFrom<TomlRuntimeConfigSource<'_, '_>> for spin_trigger::TriggerFactorsRuntimeConfig {
+    type Error = anyhow::Error;
+
+    fn try_from(value: TomlRuntimeConfigSource<'_, '_>) -> Result<Self, Self::Error> {
+        Self::from_source(value)
+    }
 }

crates/runtime-config/src/lib.rs

@@ -39,7 +39,6 @@ spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
 spin-factors-executor = { path = "../factors-executor" }
-spin-runtime-config = { path = "../runtime-config" }
 spin-telemetry = { path = "../telemetry" }
 terminal = { path = "../terminal" }
 tokio = { version = "1.23", features = ["fs", "rt"] }

crates/trigger/Cargo.toml

@@ -14,7 +14,6 @@ use spin_common::url::parse_file_url;
 use spin_core::async_trait;
 use spin_factors::RuntimeFactors;
 use spin_factors_executor::{ComponentLoader, FactorsExecutor};
-use spin_runtime_config::{ResolvedRuntimeConfig, UserProvidedPath};
 use sqlite_statements::SqlStatementExecutorHook;
 use summary::{
     summarize_runtime_config, KeyValueDefaultStoreSummaryHook, SqliteDefaultStoreSummaryHook,
@@ -134,15 +133,15 @@ pub struct CommonTriggerOptions {
     /// Path to the runtime config file.
     pub runtime_config_file: Option<PathBuf>,
     /// Path to the state directory.
-    pub state_dir: Option<String>,
+    pub state_dir: UserProvidedPath,
     /// Path to the local app directory.
     pub local_app_dir: Option<String>,
     /// Whether to allow transient writes to mounted files
     pub allow_transient_write: bool,
     /// Which components should have their logs followed.
     pub follow_components: FollowComponents,
     /// Log directory for component stdout/stderr.
-    pub log_dir: Option<PathBuf>,
+    pub log_dir: UserProvidedPath,
 }
 
 /// An empty implementation of clap::Args to be used as TriggerExecutor::RunConfig
@@ -205,14 +204,26 @@ impl<T: Trigger<B::Factors>, B: RuntimeFactorsBuilder> FactorsTriggerCommand<T,
             config.disable_pooling();
         }
 
+        let state_dir = match &self.state_dir {
+            // Make sure `--state-dir=""` unsets the state dir
+            Some(s) if s.is_empty() => UserProvidedPath::Unset,
+            Some(s) => UserProvidedPath::Provided(PathBuf::from(s)),
+            None => UserProvidedPath::Default,
+        };
+        let log_dir = match &self.log {
+            // Make sure `--log-dir=""` unsets the log dir
+            Some(p) if p.as_os_str().is_empty() => UserProvidedPath::Unset,
+            Some(p) => UserProvidedPath::Provided(p.clone()),
+            None => UserProvidedPath::Default,
+        };
         let common_options = CommonTriggerOptions {
             working_dir: PathBuf::from(working_dir),
             runtime_config_file: self.runtime_config_file.clone(),
-            state_dir: self.state_dir.clone(),
+            state_dir,
             local_app_dir: local_app_dir.clone(),
             allow_transient_write: self.allow_transient_write,
             follow_components,
-            log_dir: self.log,
+            log_dir,
         };
         let run_fut = builder.run(app, common_options, self.builder_args).await?;
 
@@ -431,3 +442,14 @@ pub mod help {
         }
     }
 }
+
+/// A user provided option which be either be provided, default, or explicitly none.
+#[derive(Clone, Debug)]
+pub enum UserProvidedPath {
+    /// Use the explicitly provided directory.
+    Provided(PathBuf),
+    /// Use the default.
+    Default,
+    /// Explicitly unset.
+    Unset,
+}

crates/trigger/src/cli.rs

@@ -14,7 +14,6 @@ use spin_factor_sqlite::SqliteFactor;
 use spin_factor_variables::VariablesFactor;
 use spin_factor_wasi::{spin::SpinFilesMounter, WasiFactor};
 use spin_factors::RuntimeFactors;
-use spin_runtime_config::TomlRuntimeConfigSource;
 
 #[derive(RuntimeFactors)]
 pub struct TriggerFactors {
@@ -82,14 +81,6 @@ fn outbound_networking_factor() -> OutboundNetworkingFactor {
     factor
 }
 
-impl TryFrom<TomlRuntimeConfigSource<'_, '_>> for TriggerFactorsRuntimeConfig {
-    type Error = anyhow::Error;
-
-    fn try_from(value: TomlRuntimeConfigSource<'_, '_>) -> Result<Self, Self::Error> {
-        Self::from_source(value)
-    }
-}
-
 /// Options for building a [`TriggerFactors`].
 #[derive(Default, clap::Args)]
 pub struct TriggerAppOptions {

crates/trigger/src/factors.rs

@@ -17,7 +17,7 @@ use spin_cli::commands::{
     watch::WatchCommand,
 };
 use spin_cli::{build_info::*, subprocess::ExitStatusError};
-use spin_runtime_config::{ResolvedRuntimeConfig, UserProvidedPath};
+use spin_runtime_config::ResolvedRuntimeConfig;
 use spin_trigger::cli::help::HelpArgsOnlyTrigger;
 use spin_trigger::cli::{CommonTriggerOptions, FactorsTriggerCommand, RuntimeFactorsBuilder};
 use spin_trigger::{TriggerAppOptions, TriggerFactors, TriggerFactorsRuntimeConfig};
@@ -187,26 +187,14 @@ impl RuntimeFactorsBuilder for Builder {
     )> {
         let runtime_config_path = common_options.runtime_config_file;
         let local_app_dir = common_options.local_app_dir.map(PathBuf::from);
-        let state_dir = match common_options.state_dir {
-            // Make sure `--state-dir=""` unsets the state dir
-            Some(s) if s.is_empty() => UserProvidedPath::Unset,
-            Some(s) => UserProvidedPath::Provided(PathBuf::from(s)),
-            None => UserProvidedPath::Default,
-        };
-        let log_dir = match &common_options.log_dir {
-            // Make sure `--log-dir=""` unsets the log dir
-            Some(p) if p.as_os_str().is_empty() => UserProvidedPath::Unset,
-            Some(p) => UserProvidedPath::Provided(p.clone()),
-            None => UserProvidedPath::Default,
-        };
         // Hardcode `use_gpu` to true for now
         let use_gpu = true;
         let runtime_config =
             ResolvedRuntimeConfig::<TriggerFactorsRuntimeConfig>::from_optional_file(
                 runtime_config_path.as_deref(),
                 local_app_dir,
-                state_dir,
-                log_dir,
+                common_options.state_dir,
+                common_options.log_dir,
                 use_gpu,
             )?;