Merge pull request #241 from kate-goldenring/configuring-state-dir-with-runtime-config

fix: enable configuring state_dir with runtime configuration

Author: Mossaka

containerd-shim-spin/src/constants.rs

@@ -21,5 +21,3 @@ pub(crate) const SPIN_TRIGGER_WORKING_DIR: &str = "/";
 /// Defines the subset of application components that should be executable by the shim
 /// If empty or DNE, all components will be supported
 pub(crate) const SPIN_COMPONENTS_TO_RETAIN_ENV: &str = "SPIN_COMPONENTS_TO_RETAIN";
-/// The default state directory for the triggers.
-pub(crate) const SPIN_DEFAULT_STATE_DIR: &str = ".spin";

containerd-shim-spin/src/trigger.rs

@@ -1,9 +1,4 @@
-use std::{
-    collections::HashSet,
-    future::Future,
-    path::{Path, PathBuf},
-    pin::Pin,
-};
+use std::{collections::HashSet, future::Future, path::Path, pin::Pin};
 
 use log::info;
 use spin_app::{locked::LockedApp, App};
@@ -19,7 +14,7 @@ use trigger_command::CommandTrigger;
 use trigger_mqtt::MqttTrigger;
 use trigger_sqs::SqsTrigger;
 
-use crate::constants::{RUNTIME_CONFIG_PATH, SPIN_DEFAULT_STATE_DIR, SPIN_TRIGGER_WORKING_DIR};
+use crate::constants::{RUNTIME_CONFIG_PATH, SPIN_TRIGGER_WORKING_DIR};
 
 pub(crate) const HTTP_TRIGGER_TYPE: &str = <HttpTrigger as Trigger<TriggerFactors>>::TYPE;
 pub(crate) const REDIS_TRIGGER_TYPE: &str = <RedisTrigger as Trigger<TriggerFactors>>::TYPE;
@@ -54,11 +49,12 @@ fn factors_config() -> FactorsConfig {
         .then(|| RUNTIME_CONFIG_PATH.into());
     // Configure the application state directory path. This is used in the default
     // locations for logs, key value stores, etc.
-    let state_dir = PathBuf::from(SPIN_TRIGGER_WORKING_DIR).join(SPIN_DEFAULT_STATE_DIR);
     FactorsConfig {
         working_dir: SPIN_TRIGGER_WORKING_DIR.into(),
         runtime_config_file,
-        state_dir: UserProvidedPath::Provided(state_dir),
+        // This is the default base for the state_dir (.spin) unless it is
+        // explicitly configured via the runtime config.
+        local_app_dir: Some(SPIN_TRIGGER_WORKING_DIR.to_string()),
         // Explicitly do not set log dir in order to force logs to be displayed to stdout.
         // Otherwise, would default to the state directory.
         log_dir: UserProvidedPath::Unset,