Merge pull request #1918 from fibonacci1729/variables

Rename config to variables

Author: fibonacci1729

Cargo.lock

@@ -49,10 +49,8 @@ terminal = { path = "crates/terminal" }
 spin-app = { path = "crates/app" }
 spin-build = { path = "crates/build" }
 spin-common = { path = "crates/common" }
-spin-config = { path = "crates/config" }
 spin-doctor = { path = "crates/doctor" }
 spin-http = { path = "crates/http" }
-spin-trigger-http = { path = "crates/trigger-http" }
 spin-loader = { path = "crates/loader" }
 spin-locked-app = { path = "crates/locked-app" }
 spin-manifest = { path = "crates/manifest" }
@@ -61,6 +59,9 @@ spin-plugins = { path = "crates/plugins" }
 spin-redis-engine = { path = "crates/redis" }
 spin-templates = { path = "crates/templates" }
 spin-trigger = { path = "crates/trigger" }
+spin-trigger-http = { path = "crates/trigger-http" }
+spin-variables = { path = "crates/variables" }
+
 tempfile = "3.8.0"
 tokio = { version = "1.23", features = ["full"] }
 toml = "0.6"

Cargo.toml

@@ -9,7 +9,7 @@ use cargo_target_dep::build_target_dep;
 
 const RUST_HTTP_INTEGRATION_TEST: &str = "tests/http/simple-spin-rust";
 const RUST_HTTP_INTEGRATION_ENV_TEST: &str = "tests/http/headers-env-routes-test";
-const RUST_HTTP_VAULT_CONFIG_TEST: &str = "tests/http/vault-config-test";
+const RUST_HTTP_VAULT_VARIABLES_TEST: &str = "tests/http/vault-variables-test";
 const RUST_OUTBOUND_REDIS_INTEGRATION_TEST: &str = "tests/outbound-redis/http-rust-outbound-redis";
 const TIMER_TRIGGER_INTEGRATION_TEST: &str = "examples/spin-timer/app-example";
 const WASI_HTTP_INTEGRATION_TEST: &str = "examples/wasi-http-rust-streaming-outgoing-body";
@@ -88,7 +88,7 @@ error: the `wasm32-wasi` target is not installed
 
     cargo_build(RUST_HTTP_INTEGRATION_TEST);
     cargo_build(RUST_HTTP_INTEGRATION_ENV_TEST);
-    cargo_build(RUST_HTTP_VAULT_CONFIG_TEST);
+    cargo_build(RUST_HTTP_VAULT_VARIABLES_TEST);
     cargo_build(RUST_OUTBOUND_REDIS_INTEGRATION_TEST);
     cargo_build(TIMER_TRIGGER_INTEGRATION_TEST);
     cargo_build(WASI_HTTP_INTEGRATION_TEST);

build.rs

@@ -37,10 +37,10 @@ sanitize-filename = "0.4"
 serde = "1.0.188"
 serde_json = "1.0"
 spin-app = { path = "../app" }
-spin-config = { path = "../config" }
 spin-core = { path = "../core" }
 spin-loader = { path = "../loader" }
 spin-manifest = { path = "../manifest" }
+spin-variables = { path = "../variables" }
 terminal = { path = "../terminal" }
 tokio = { version = "1.23", features = ["fs"] }
 toml = "0.5.9"

crates/redis/tests/rust/Cargo.lock

@@ -139,7 +139,9 @@ impl<Executor: TriggerExecutor> TriggerExecutorBuilder<Executor> {
                 )?;
                 self.loader.add_dynamic_host_component(
                     &mut builder,
-                    spin_config::ConfigHostComponent::new(runtime_config.config_providers()),
+                    spin_variables::VariablesHostComponent::new(
+                        runtime_config.variables_providers(),
+                    ),
                 )?;
             }
 

crates/trigger/Cargo.toml

@@ -1,7 +1,7 @@
-pub mod config_provider;
 pub mod key_value;
 pub mod llm;
 pub mod sqlite;
+pub mod variables_provider;
 
 use std::{
     collections::HashMap,
@@ -15,10 +15,10 @@ use serde::Deserialize;
 use spin_sqlite::Connection;
 
 use self::{
-    config_provider::{ConfigProvider, ConfigProviderOpts},
     key_value::{KeyValueStore, KeyValueStoreOpts},
     llm::LlmComputeOpts,
     sqlite::SqliteDatabaseOpts,
+    variables_provider::{VariablesProvider, VariablesProviderOpts},
 };
 
 pub const DEFAULT_STATE_DIR: &str = ".spin";
@@ -57,12 +57,12 @@ impl RuntimeConfig {
         Ok(())
     }
 
-    /// Return a Vec of configured [`spin_config::Provider`]s.
-    pub fn config_providers(&self) -> Vec<ConfigProvider> {
-        let default_provider = ConfigProviderOpts::default_provider_opts(self).build_provider();
-        let mut providers: Vec<ConfigProvider> = vec![default_provider];
+    /// Return a Vec of configured [`VariablesProvider`]s.
+    pub fn variables_providers(&self) -> Vec<VariablesProvider> {
+        let default_provider = VariablesProviderOpts::default_provider_opts(self).build_provider();
+        let mut providers: Vec<VariablesProvider> = vec![default_provider];
         providers.extend(self.opts_layers().flat_map(|opts| {
-            opts.config_providers
+            opts.variables_providers
                 .iter()
                 .map(|opts| opts.build_provider())
         }));
@@ -198,8 +198,8 @@ pub struct RuntimeConfigOpts {
     #[serde(default)]
     pub llm_compute: Option<LlmComputeOpts>,
 
-    #[serde(rename = "config_provider", default)]
-    pub config_providers: Vec<ConfigProviderOpts>,
+    #[serde(rename = "variables_provider", alias = "config_provider", default)]
+    pub variables_providers: Vec<VariablesProviderOpts>,
 
     #[serde(rename = "key_value_store", default)]
     pub key_value_stores: HashMap<String, KeyValueStoreOpts>,
@@ -307,11 +307,11 @@ mod tests {
     }
 
     #[test]
-    fn config_providers_from_file() -> Result<()> {
+    fn deprecated_config_provider_in_runtime_config_file() -> Result<()> {
         let mut config = RuntimeConfig::new(None);
 
         // One default provider
-        assert_eq!(config.config_providers().len(), 1);
+        assert_eq!(config.variables_providers().len(), 1);
 
         merge_config_toml(
             &mut config,
@@ -323,7 +323,29 @@ mod tests {
                 mount = "root"
             },
         );
-        assert_eq!(config.config_providers().len(), 2);
+        assert_eq!(config.variables_providers().len(), 2);
+
+        Ok(())
+    }
+
+    #[test]
+    fn variables_providers_from_file() -> Result<()> {
+        let mut config = RuntimeConfig::new(None);
+
+        // One default provider
+        assert_eq!(config.variables_providers().len(), 1);
+
+        merge_config_toml(
+            &mut config,
+            toml! {
+                [[variables_provider]]
+                type = "vault"
+                url = "http://vault"
+                token = "secret"
+                mount = "root"
+            },
+        );
+        assert_eq!(config.variables_providers().len(), 2);
 
         Ok(())
     }