Workflow for bump rust templates sdk dependency (spinframework#3255)

fibonacci1729 · seun-ja · commit 31bbe50eda36 · 2025-09-10T15:05:00.000+01:00
Signed-off-by: Brian Hardock &lt;brian.hardock@fermyon.com&gt;

revert to warning eprint

Signed-off-by: Aminu Oluwaseun Joshua &lt;seun.aminujoshua@gmail.com&gt;

cleanup unused dependencies

Signed-off-by: Aminu Oluwaseun Joshua &lt;seun.aminujoshua@gmail.com&gt;
diff --git a/.github/workflows/rust-sdk-release.yml b/.github/workflows/rust-sdk-release.yml
@@ -0,0 +1,39 @@
+name: Bump Spin Rust Templates SDK Dependency
+
+on:
+  repository_dispatch:
+    types:
+      - rust-sdk-release
+
+jobs:
+  create-pr:
+    name: Create PR with Spin Rust Templates SDK Dependency Bump
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Bump Rust Templates SDK Dependency
+        shell: bash
+        run: ./scripts/bump-rust-template-sdk.sh ${{ github.event.client_payload.version }}
+
+      - name: Import GPG key
+        uses: crazy-max/ghaction-import-gpg@v6
+        with:
+          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          git_user_signingkey: true
+          git_commit_gpgsign: true
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          commit-message: "chore(rust-templates): bump Spin Rust SDK to ${{ github.event.client_payload.version }}"
+          title: "chore(rust-templates): bump Spin Rust SDK to ${{ github.event.client_payload.version }}"
+          body: Update the Spin Rust Templates SDK dependency to ${{ github.event.client_payload.version }}
+          branch: bump-spin-rust-sdk-${{ github.event.client_payload.version }}
+          base: main
+          delete-branch: true
+          committer: spinframeworkbot <202838904+spinframeworkbot@users.noreply.github.com>
+          author: spinframeworkbot <202838904+spinframeworkbot@users.noreply.github.com>
+          signoff: true
+          token: ${{ secrets.PAT }}
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -66,7 +66,7 @@ spin-oci = { path = "crates/oci" }
 spin-plugins = { path = "crates/plugins" }
 spin-runtime-factors = { path = "crates/runtime-factors" }
 spin-telemetry = { path = "crates/telemetry", features = [
-    "tracing-log-compat",
+  "tracing-log-compat",
 ] }
 spin-templates = { path = "crates/templates" }
 spin-trigger = { path = "crates/trigger" }
@@ -97,10 +97,10 @@ testing-framework = { path = "tests/testing-framework" }
 [build-dependencies]
 cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" }
 vergen = { version = "^8.2.1", default-features = false, features = [
-    "build",
-    "git",
-    "gitcl",
-    "cargo",
+  "build",
+  "git",
+  "gitcl",
+  "cargo",
 ] }
 
 [features]
@@ -113,10 +113,10 @@ llm-cublas = ["llm", "spin-runtime-factors/llm-cublas"]
 
 [workspace]
 members = [
-    "crates/*",
-    "tests/conformance-tests",
-    "tests/runtime-tests",
-    "tests/testing-framework",
+  "crates/*",
+  "tests/conformance-tests",
+  "tests/runtime-tests",
+  "tests/testing-framework",
 ]
 
 [workspace.dependencies]
diff --git a/crates/common/src/env.rs b/crates/common/src/env.rs
diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs
@@ -10,7 +10,6 @@
 
 pub mod arg_parser;
 pub mod data_dir;
-pub mod env;
 pub mod paths;
 pub mod sha256;
 pub mod sloth;
diff --git a/crates/expressions/Cargo.toml b/crates/expressions/Cargo.toml
@@ -8,6 +8,7 @@ edition = { workspace = true }
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 futures = { workspace = true }
+spin-common = { path = "../common" }
 spin-locked-app = { path = "../locked-app" }
 thiserror = { workspace = true }
 
diff --git a/crates/expressions/src/lib.rs b/crates/expressions/src/lib.rs
@@ -3,6 +3,7 @@ mod template;
 
 use std::{borrow::Cow, collections::HashMap, fmt::Debug};
 
+use spin_common::ui::quoted_path;
 use spin_locked_app::Variable;
 
 pub use async_trait;
@@ -90,6 +91,18 @@ impl ProviderResolver {
         Ok(PreparedResolver { variables })
     }
 
+    pub async fn pre_runtime_prepare(&self) -> Result<()> {
+        for name in self.internal.variables.keys() {
+            if self.resolve_variable(name).await.is_err() {
+                eprintln!(
+                    "Default value not found for variable: {}",
+                    quoted_path(name)
+                );
+            }
+        }
+        Ok(())
+    }
+
     async fn resolve_variable(&self, key: &str) -> Result<String> {
         for provider in &self.providers {
             if let Some(value) = provider.get(&Key(key)).await.map_err(Error::Provider)? {
diff --git a/crates/factor-variables/src/lib.rs b/crates/factor-variables/src/lib.rs
@@ -85,6 +85,10 @@ impl AppState {
         let template = Template::new(expr)?;
         self.expression_resolver.resolve_template(&template).await
     }
+
+    pub fn expression_resolver(&self) -> &Arc<ExpressionResolver> {
+        &self.expression_resolver
+    }
 }
 
 pub struct InstanceState {
diff --git a/crates/factors-test/Cargo.toml b/crates/factors-test/Cargo.toml
@@ -6,7 +6,6 @@ edition = { workspace = true }
 
 [dependencies]
 spin-app = { path = "../app" }
-spin-common = { path = "../common" }
 spin-factors = { path = "../factors" }
 spin-loader = { path = "../loader" }
 spin-telemetry = { path = "../telemetry", features = ["testing"] }
diff --git a/crates/factors-test/src/lib.rs b/crates/factors-test/src/lib.rs
@@ -1,5 +1,4 @@
 use spin_app::locked::LockedApp;
-use spin_common::env::env_key;
 use spin_factors::{
     anyhow::{self, Context},
     wasmtime::{component::Linker, Config, Engine},
@@ -101,8 +100,6 @@ impl<T: RuntimeFactors> TestEnvironment<T> {
 pub async fn build_locked_app(manifest: &toml::Table) -> anyhow::Result<LockedApp> {
     let toml_str = toml::to_string(manifest).context("failed serializing manifest")?;
     let dir = tempfile::tempdir().context("failed creating tempdir")?;
-    // `foo` variable is set to require. As we're not providing a default value, env is checked.
-    std::env::set_var(env_key(None, "foo"), "baz");
     let path = dir.path().join("spin.toml");
     std::fs::write(&path, toml_str).context("failed writing manifest")?;
     spin_loader::from_file(&path, FilesMountStrategy::Direct, None).await
diff --git a/crates/runtime-config/Cargo.toml b/crates/runtime-config/Cargo.toml
@@ -29,7 +29,6 @@ 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" }
diff --git a/crates/runtime-config/src/variables.rs b/crates/runtime-config/src/variables.rs
@@ -1,10 +1,5 @@
 //! The runtime configuration for the variables factor used in the Spin CLI.
 
-use std::path::PathBuf;
-
-use spin_common::{env::env_key, ui::quoted_path};
-use spin_locked_app::Variable;
-
 use serde::Deserialize;
 use spin_expressions::Provider;
 use spin_factor_variables::runtime_config::RuntimeConfig;
@@ -36,24 +31,6 @@ pub fn runtime_config_from_toml(table: &impl GetTomlValue) -> anyhow::Result<Run
     Ok(RuntimeConfig { providers })
 }
 
-pub fn variable_provider_config_from_toml(
-    table: &impl GetTomlValue,
-) -> anyhow::Result<Vec<VariableProviderConfiguration>> {
-    if let Some(array) = table
-        .get("variables_provider")
-        .or_else(|| table.get("config_provider"))
-    {
-        array
-            .clone()
-            .try_into::<Vec<VariableProviderConfiguration>>()
-            .map_err(|e| anyhow::anyhow!("Failed to parse variable provider configuration: {}", e))
-    } else {
-        Ok(vec![VariableProviderConfiguration::Env(
-            EnvVariablesConfig::default(),
-        )])
-    }
-}
-
 /// A runtime configuration used in the Spin CLI for one type of variable provider.
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "snake_case", tag = "type")]
@@ -86,34 +63,3 @@ impl VariableProviderConfiguration {
         Ok(provider)
     }
 }
-
-pub trait VariableSourcer {
-    fn variable_env_checker(&self, key: String, val: Variable) -> anyhow::Result<()>;
-
-    fn check(
-        &self,
-        key: String,
-        mut val: Variable,
-        dotenv_path: Option<PathBuf>,
-        prefix: Option<String>,
-    ) -> anyhow::Result<()> {
-        if val.default.is_some() {
-            return Ok(());
-        }
-
-        if let Some(path) = dotenv_path {
-            _ = std::env::set_current_dir(path);
-        }
-
-        match std::env::var(env_key(prefix, &key)) {
-            Ok(v) => {
-                val.default = Some(v);
-                Ok(())
-            }
-            Err(_) => Err(anyhow::anyhow!(
-                "Variable data not provided for {}",
-                quoted_path(key)
-            )),
-        }
-    }
-}
diff --git a/crates/runtime-factors/src/build.rs b/crates/runtime-factors/src/build.rs
@@ -8,7 +8,7 @@ use spin_runtime_config::ResolvedRuntimeConfig;
 use spin_trigger::cli::{
     FactorsConfig, InitialKvSetterHook, KeyValueDefaultStoreSummaryHook, MaxInstanceMemoryHook,
     RuntimeFactorsBuilder, SqlStatementExecutorHook, SqliteDefaultStoreSummaryHook,
-    StdioLoggingExecutorHooks,
+    StdioLoggingExecutorHooks, VariablesPreparationExecutorHooks,
 };
 use spin_variables_static::StaticVariablesProvider;
 
@@ -72,6 +72,7 @@ impl RuntimeFactorsBuilder for FactorsBuilder {
         executor.add_hooks(InitialKvSetterHook::new(args.key_values.clone()));
         executor.add_hooks(SqliteDefaultStoreSummaryHook);
         executor.add_hooks(KeyValueDefaultStoreSummaryHook);
+        executor.add_hooks(VariablesPreparationExecutorHooks);
 
         let max_instance_memory = args
             .max_instance_memory
diff --git a/crates/trigger/Cargo.toml b/crates/trigger/Cargo.toml
@@ -28,6 +28,7 @@ spin-compose = { path = "../compose" }
 spin-core = { path = "../core" }
 spin-factor-key-value = { path = "../factor-key-value" }
 spin-factor-sqlite = { path = "../factor-sqlite" }
+spin-factor-variables = { path = "../factor-variables" }
 spin-factor-wasi = { path = "../factor-wasi" }
 spin-factors = { path = "../factors" }
 spin-factors-executor = { path = "../factors-executor" }
diff --git a/crates/trigger/src/cli.rs b/crates/trigger/src/cli.rs
@@ -4,6 +4,7 @@ mod max_instance_memory;
 mod sqlite_statements;
 mod stdio;
 mod summary;
+mod variable;
 
 use std::path::PathBuf;
 use std::{future::Future, sync::Arc};
@@ -25,6 +26,7 @@ pub use sqlite_statements::SqlStatementExecutorHook;
 use stdio::FollowComponents;
 pub use stdio::StdioLoggingExecutorHooks;
 pub use summary::{KeyValueDefaultStoreSummaryHook, SqliteDefaultStoreSummaryHook};
+pub use variable::VariablesPreparationExecutorHooks;
 
 pub const APP_LOG_DIR: &str = "APP_LOG_DIR";
 pub const SPIN_TRUNCATE_LOGS: &str = "SPIN_TRUNCATE_LOGS";
diff --git a/crates/trigger/src/cli/variable.rs b/crates/trigger/src/cli/variable.rs
@@ -0,0 +1,20 @@
+use spin_factor_variables::VariablesFactor;
+use spin_factors::RuntimeFactors;
+use spin_factors_executor::ExecutorHooks;
+
+pub struct VariablesPreparationExecutorHooks;
+
+#[spin_core::async_trait]
+impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for VariablesPreparationExecutorHooks {
+    async fn configure_app(
+        &self,
+        configured_app: &spin_factors::ConfiguredApp<F>,
+    ) -> anyhow::Result<()> {
+        let variables_factor = configured_app.app_state::<VariablesFactor>()?;
+
+        let expression_resolver = variables_factor.expression_resolver();
+        expression_resolver.pre_runtime_prepare().await?;
+
+        Ok(())
+    }
+}
diff --git a/crates/variables-azure/Cargo.toml b/crates/variables-azure/Cargo.toml
@@ -13,10 +13,8 @@ azure_core = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4ca
 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" }
 serde = { workspace = true }
-spin-common = { path = "../common" }
 spin-expressions = { path = "../expressions" }
 spin-factors = { path = "../factors" }
-spin-locked-app = { path = "../locked-app" }
 spin-world = { path = "../world" }
 tracing = { workspace = true }
 
diff --git a/crates/variables-env/Cargo.toml b/crates/variables-env/Cargo.toml
@@ -11,7 +11,6 @@ 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" }
diff --git a/crates/variables-env/src/lib.rs b/crates/variables-env/src/lib.rs
diff --git a/scripts/bump-rust-template-sdk.sh b/scripts/bump-rust-template-sdk.sh
diff --git a/tests/integration.rs b/tests/integration.rs

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,10 @@ impl AppState {`
`85`	`85`	`let template = Template::new(expr)?;`
`86`	`86`	`self.expression_resolver.resolve_template(&template).await`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ pub fn expression_resolver(&self) -> &Arc<ExpressionResolver> {`
	`90`	`+ &self.expression_resolver`
	`91`	`+ }`
`88`	`92`	`}`
`89`	`93`
`90`	`94`	`pub struct InstanceState {`