Skip to content

reduce environment variable provider precedence #2886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2024
Merged

reduce environment variable provider precedence #2886

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions crates/variables/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,22 @@ use spin_factor_variables::runtime_config::RuntimeConfig;
/// Resolves a runtime configuration for the variables factor from a TOML table.
pub fn runtime_config_from_toml(table: &impl GetTomlValue) -> anyhow::Result<RuntimeConfig> {
// Always include the environment variable provider.
let mut providers = vec![Box::<EnvVariablesProvider>::default() as _];
let var_provider = vec![Box::<EnvVariablesProvider>::default() as _];
let value = table
.get("variables_provider")
.or_else(|| table.get("config_provider"));
let Some(array) = value else {
return Ok(RuntimeConfig { providers });
return Ok(RuntimeConfig {
providers: var_provider,
});
};

let provider_configs: Vec<VariableProviderConfiguration> = array.clone().try_into()?;
let new_providers = provider_configs
let mut providers = provider_configs
.into_iter()
.map(VariableProviderConfiguration::into_provider)
.collect::<anyhow::Result<Vec<_>>>()?;
providers.extend(new_providers);
providers.extend(var_provider);
Ok(RuntimeConfig { providers })
}

Expand Down
Loading