Factor out variable azure/vault providers into separate crates (#3215)

Signed-off-by: Brian Hardock <[email protected]>

Author: fibonacci1729

Cargo.lock

@@ -10,7 +10,9 @@ rust-version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 spin-common = { path = "../common" }
+spin-expressions = { path = "../expressions" }
 spin-factor-key-value = { path = "../factor-key-value" }
 spin-factor-llm = { path = "../factor-llm" }
 spin-factor-outbound-http = { path = "../factor-outbound-http" }
@@ -29,7 +31,10 @@ spin-key-value-redis = { path = "../key-value-redis" }
 spin-key-value-spin = { path = "../key-value-spin" }
 spin-sqlite = { path = "../sqlite" }
 spin-trigger = { path = "../trigger" }
-spin-variables = { path = "../variables" }
+spin-variables-azure = { path = "../variables-azure" }
+spin-variables-env = { path = "../variables-env" }
+spin-variables-static = { path = "../variables-static" }
+spin-variables-vault = { path = "../variables-vault" }
 toml = { workspace = true }
 
 [dev-dependencies]

crates/runtime-config/Cargo.toml

@@ -24,6 +24,8 @@ use spin_sqlite as sqlite;
 use spin_trigger::cli::UserProvidedPath;
 use toml::Value;
 
+pub mod variables;
+
 /// The default state directory for the trigger.
 pub const DEFAULT_STATE_DIR: &str = ".spin";
 
@@ -342,9 +344,7 @@ impl FactorRuntimeConfigSource<VariablesFactor> for TomlRuntimeConfigSource<'_,
     fn get_runtime_config(
         &mut self,
     ) -> anyhow::Result<Option<<VariablesFactor as spin_factors::Factor>::RuntimeConfig>> {
-        Ok(Some(spin_variables::runtime_config_from_toml(
-            &self.toml.table,
-        )?))
+        Ok(Some(variables::runtime_config_from_toml(&self.toml.table)?))
     }
 }
 

crates/runtime-config/src/lib.rs

@@ -1,20 +1,11 @@
-//! The runtime configuration for the variables factor used in the Spin CLI.
-
-mod azure_key_vault;
-mod env;
-mod statik;
-mod vault;
-
-pub use azure_key_vault::*;
-pub use env::*;
-pub use statik::*;
-pub use vault::*;
-
 use serde::Deserialize;
 use spin_expressions::Provider;
-use spin_factors::{anyhow, runtime_config::toml::GetTomlValue};
-
 use spin_factor_variables::runtime_config::RuntimeConfig;
+use spin_factors::runtime_config::toml::GetTomlValue;
+use spin_variables_azure::{AzureKeyVaultProvider, AzureKeyVaultVariablesConfig};
+use spin_variables_env::{EnvVariablesConfig, EnvVariablesProvider};
+use spin_variables_static::StaticVariablesProvider;
+use spin_variables_vault::VaultVariablesProvider;
 
 /// Resolves a runtime configuration for the variables factor from a TOML table.
 pub fn runtime_config_from_toml(table: &impl GetTomlValue) -> anyhow::Result<RuntimeConfig> {
@@ -57,7 +48,7 @@ impl VariableProviderConfiguration {
     pub fn into_provider(self) -> anyhow::Result<Box<dyn Provider>> {
         let provider: Box<dyn Provider> = match self {
             VariableProviderConfiguration::Static(provider) => Box::new(provider),
-            VariableProviderConfiguration::Env(config) => Box::new(env::EnvVariablesProvider::new(
+            VariableProviderConfiguration::Env(config) => Box::new(EnvVariablesProvider::new(
                 config.prefix,
                 |s| std::env::var(s),
                 config.dotenv_path,

crates/variables/src/lib.rs renamed to crates/runtime-config/src/variables.rs

@@ -1,5 +1,5 @@
 [package]
-name = "spin-variables"
+name = "spin-variables-azure"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true
@@ -12,15 +12,11 @@ rust-version.workspace = true
 azure_core = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" }
 azure_identity = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" }
 azure_security_keyvault = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" }
-dotenvy = "0.15"
 serde = { workspace = true }
 spin-expressions = { path = "../expressions" }
-spin-factor-variables = { path = "../factor-variables" }
 spin-factors = { path = "../factors" }
 spin-world = { path = "../world" }
-tokio = { workspace = true, features = ["rt-multi-thread"] }
 tracing = { workspace = true }
-vaultrs = "0.7"
 
 [lints]
 workspace = true

crates/variables/Cargo.toml renamed to crates/variables-azure/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "spin-variables-env"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+dotenvy = "0.15"
+serde = { workspace = true }
+spin-expressions = { path = "../expressions" }
+spin-factors = { path = "../factors" }
+spin-world = { path = "../world" }
+tokio = { workspace = true, features = ["rt-multi-thread"] }
+tracing = { workspace = true }
+
+[lints]
+workspace = true

crates/variables/src/azure_key_vault.rs renamed to crates/variables-azure/src/lib.rs

@@ -0,0 +1,17 @@
+[package]
+name = "spin-variables-static"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+serde = { workspace = true }
+spin-expressions = { path = "../expressions" }
+spin-factors = { path = "../factors" }
+
+[lints]
+workspace = true