sync with main

Signed-off-by: Aminu Oluwaseun Joshua <[email protected]>

Author: seun-ja

Cargo.lock

@@ -71,7 +71,6 @@ spin-templates = { path = "crates/templates" }
 spin-trigger = { path = "crates/trigger" }
 spin-trigger-http = { path = "crates/trigger-http" }
 spin-trigger-redis = { path = "crates/trigger-redis" }
-spin-variables = { path = "crates/variables" }
 terminal = { path = "crates/terminal" }
 
 [target.'cfg(target_os = "linux")'.dependencies]

Cargo.toml

@@ -21,7 +21,6 @@ spin-locked-app = { path = "../locked-app" }
 spin-manifest = { path = "../manifest" }
 spin-outbound-networking-config = { path = "../outbound-networking-config" }
 spin-serde = { path = "../serde" }
-spin-variables = { path = "../variables" }
 tempfile = { workspace = true }
 terminal = { path = "../terminal" }
 tokio = { workspace = true }

crates/loader/Cargo.toml

@@ -29,6 +29,7 @@ spin-key-value-aws = { path = "../key-value-aws" }
 spin-key-value-azure = { path = "../key-value-azure" }
 spin-key-value-redis = { path = "../key-value-redis" }
 spin-key-value-spin = { path = "../key-value-spin" }
+spin-locked-app = { path = "../locked-app" }
 spin-sqlite = { path = "../sqlite" }
 spin-trigger = { path = "../trigger" }
 spin-variables-azure = { path = "../variables-azure" }

crates/runtime-config/Cargo.toml

@@ -1,18 +1,9 @@
 //! The runtime configuration for the variables factor used in the Spin CLI.
 
-mod azure_key_vault;
-mod env;
-mod statik;
-mod vault;
-
 use std::path::PathBuf;
 
-pub use azure_key_vault::*;
-pub use env::*;
 use spin_common::{env::env_key, ui::quoted_path};
 use spin_locked_app::Variable;
-pub use statik::*;
-pub use vault::*;
 
 use serde::Deserialize;
 use spin_expressions::Provider;

crates/runtime-config/src/variables.rs

@@ -6,9 +6,9 @@ use anyhow::Context as _;
 use spin_factors_executor::FactorsExecutor;
 use spin_runtime_config::ResolvedRuntimeConfig;
 use spin_trigger::cli::{
-    EnvVariableHook, FactorsConfig, InitialKvSetterHook, KeyValueDefaultStoreSummaryHook,
-    MaxInstanceMemoryHook, RuntimeFactorsBuilder, SqlStatementExecutorHook,
-    SqliteDefaultStoreSummaryHook, StdioLoggingExecutorHooks,
+    FactorsConfig, InitialKvSetterHook, KeyValueDefaultStoreSummaryHook, MaxInstanceMemoryHook,
+    RuntimeFactorsBuilder, SqlStatementExecutorHook, SqliteDefaultStoreSummaryHook,
+    StdioLoggingExecutorHooks,
 };
 use spin_variables_static::StaticVariablesProvider;
 
@@ -72,9 +72,6 @@ impl RuntimeFactorsBuilder for FactorsBuilder {
         executor.add_hooks(InitialKvSetterHook::new(args.key_values.clone()));
         executor.add_hooks(SqliteDefaultStoreSummaryHook);
         executor.add_hooks(KeyValueDefaultStoreSummaryHook);
-        executor.add_hooks(VariableSorterExecutorHooks::new(
-            runtime_config.toml.clone(),
-        ));
 
         let max_instance_memory = args
             .max_instance_memory

crates/runtime-factors/src/build.rs

@@ -32,9 +32,7 @@ spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
 spin-factors-executor = { path = "../factors-executor" }
 spin-telemetry = { path = "../telemetry" }
-spin-variables = { path = "../variables" }
 tokio = { workspace = true, features = ["fs", "rt"] }
-toml = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]

crates/trigger/Cargo.toml

@@ -4,7 +4,6 @@ mod max_instance_memory;
 mod sqlite_statements;
 mod stdio;
 mod summary;
-mod variables;
 
 use std::path::PathBuf;
 use std::{future::Future, sync::Arc};
@@ -26,7 +25,6 @@ pub use sqlite_statements::SqlStatementExecutorHook;
 use stdio::FollowComponents;
 pub use stdio::StdioLoggingExecutorHooks;
 pub use summary::{KeyValueDefaultStoreSummaryHook, SqliteDefaultStoreSummaryHook};
-pub use variables::VariableSorterExecutorHooks;
 
 pub const APP_LOG_DIR: &str = "APP_LOG_DIR";
 pub const SPIN_TRUNCATE_LOGS: &str = "SPIN_TRUNCATE_LOGS";

crates/trigger/src/cli.rs

@@ -11,6 +11,7 @@ rust-version.workspace = true
 [dependencies]
 dotenvy = "0.15"
 serde = { workspace = true }
+spin-common = { path = "../common" }
 spin-expressions = { path = "../expressions" }
 spin-factors = { path = "../factors" }
 spin-world = { path = "../world" }