bump: version 0.1.0 → 0.2.0

CHANGELOG.md

@@ -5,17 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## v0.2.1 (2025-09-30)
+## [0.0.1] - 2025-09-10
 
-### Feat
+## v0.2.0 (2025-09-29)
-
-- Environment variable interpolation in the Gman configuration file
-
-### Fix
-
-- Corrected tab completions for the provider flag
-
-## v0.2.0 (2025-09-30)
 
 ### Feat
 

Cargo.toml

@@ -1,16 +1,10 @@
 [package]
 name = "gman"
-version = "0.2.1"
+version = "0.2.0"
 edition = "2024"
 authors = ["Alex Clarke <alex.j.tusa@gmail.com>"]
 description = "Universal command line secret management and injection tool"
-keywords = [
+keywords = ["cli", "secrets-manager", "secret-injection", "command-runner", "vault"]
-  "cli",
-  "secrets-manager",
-  "secret-injection",
-  "command-runner",
-  "vault",
-]
 documentation = "https://github.com/Dark-Alex-17/gman"
 repository = "https://github.com/Dark-Alex-17/gman"
 homepage = "https://github.com/Dark-Alex-17/gman"
@@ -79,7 +73,7 @@ pretty_assertions = "1.4.1"
 proptest = "1.5.0"
 assert_cmd = "2.0.16"
 predicates = "3.1.2"
-serial_test = "3.2.0"
+
 
 [[bin]]
 bench = false

README.md

@@ -94,7 +94,6 @@ gman aws sts get-caller-identity
   - [AWS Secrets Manager](#provider-aws_secrets_manager)
   - [GCP Secret Manager](#provider-gcp_secret_manager)
   - [Azure Key Vault](#provider-azure_key_vault)
-  - [Gopass](#provider-gopass)
 - [Run Configurations](#run-configurations) 
   - [Specifying a Default Provider per Run Config](#specifying-a-default-provider-per-run-config)
   - [Environment Variable Secret Injection](#environment-variable-secret-injection)
@@ -242,31 +241,6 @@ providers:
 run_configs: []
 ```
 
-### Environment Variable Interpolation
-The config file supports environment variable interpolation using `${VAR_NAME}` syntax. For example, to use an
-AWS profile from your environment:
-
-```yaml
-providers:
-  - name: aws
-    type: aws_secrets_manager
-    aws_profile: ${AWS_PROFILE}  # Uses the AWS_PROFILE env var
-    aws_region: us-east-1
-```
-
-Or to set a default profile to use when `AWS_PROFILE` is unset:
-
-```yaml
-providers:
-  - name: aws
-    type: aws_secrets_manager
-    aws_profile: ${AWS_PROFILE:-default}  # Uses 'default' if AWS_PROFILE is unset
-    aws_region: us-east-1
-```
-
-**Important Note:** Environment variable interpolation is only supported in string or numeric fields. It is not 
-supported in lists or maps.
-
 ## Providers
 `gman` supports multiple providers for secret storage. The default provider is `local`, which stores secrets in an 
 encrypted file on your filesystem. The CLI and config format are designed to be extensible so new providers can be

src/bin/gman/cli.rs

@@ -280,24 +280,6 @@ pub fn run_config_completer(current: &OsStr) -> Vec<CompletionCandidate> {
     }
 }
 
-pub fn provider_completer(current: &OsStr) -> Vec<CompletionCandidate> {
-    let cur = current.to_string_lossy();
-    match load_config() {
-        Ok(config) => config
-            .providers
-            .iter()
-            .filter(|pc| {
-                pc.name
-                    .as_ref()
-                    .expect("run config has no name")
-                    .starts_with(&*cur)
-            })
-            .map(|pc| CompletionCandidate::new(pc.name.as_ref().expect("provider has no name")))
-            .collect(),
-        Err(_) => vec![],
-    }
-}
-
 pub fn secrets_completer(current: &OsStr) -> Vec<CompletionCandidate> {
     let cur = current.to_string_lossy();
     match load_config() {
@@ -325,11 +307,8 @@ mod tests {
     use crate::cli::generate_files_secret_injections;
     use gman::config::{Config, RunConfig};
     use pretty_assertions::{assert_eq, assert_str_eq};
-    use serial_test::serial;
     use std::collections::HashMap;
-    use std::env as std_env;
     use std::ffi::OsString;
-    use tempfile::tempdir;
 
     #[test]
     fn test_generate_files_secret_injections() {
@@ -430,121 +409,4 @@ mod tests {
             .expect_err("expected failed secret resolution in dry_run");
         assert!(err.to_string().contains("Failed to fetch"));
     }
-
-    #[test]
-    #[serial]
-    fn test_run_config_completer_filters_by_prefix() {
-        let td = tempdir().unwrap();
-        let xdg = td.path().join("xdg");
-        let app_dir = xdg.join("gman");
-        fs::create_dir_all(&app_dir).unwrap();
-        unsafe { std_env::set_var("XDG_CONFIG_HOME", &xdg) };
-
-        let yaml = indoc::indoc! {
-            "---
-            default_provider: local
-            providers:
-              - name: local
-                type: local
-            run_configs:
-              - name: echo
-                secrets: [API_KEY]
-              - name: docker
-                secrets: [DB_PASSWORD]
-              - name: aws
-                secrets: [AWS_ACCESS_KEY_ID]
-            "
-        };
-        fs::write(app_dir.join("config.yml"), yaml).unwrap();
-
-        let out = run_config_completer(OsStr::new("do"));
-        assert_eq!(out.len(), 1);
-        // Compare via debug string to avoid depending on crate internals
-        let rendered = format!("{:?}", &out[0]);
-        assert!(rendered.contains("docker"), "got: {}", rendered);
-
-        unsafe { std_env::remove_var("XDG_CONFIG_HOME") };
-    }
-
-    #[test]
-    #[serial]
-    fn test_provider_completer_lists_matching_providers() {
-        let td = tempdir().unwrap();
-        let xdg = td.path().join("xdg");
-        let app_dir = xdg.join("gman");
-        fs::create_dir_all(&app_dir).unwrap();
-        unsafe { std_env::set_var("XDG_CONFIG_HOME", &xdg) };
-
-        let yaml = indoc::indoc! {
-            "---
-            default_provider: local
-            providers:
-              - name: local
-                type: local
-              - name: prod
-                type: local
-            run_configs:
-              - name: echo
-                secrets: [API_KEY]
-            "
-        };
-        fs::write(app_dir.join("config.yml"), yaml).unwrap();
-
-        // Prefix 'p' should match only 'prod'
-        let out = provider_completer(OsStr::new("p"));
-        assert_eq!(out.len(), 1);
-        let rendered = format!("{:?}", &out[0]);
-        assert!(rendered.contains("prod"), "got: {}", rendered);
-
-        // Empty prefix returns at least both providers
-        let out_all = provider_completer(OsStr::new(""));
-        assert!(out_all.len() >= 2);
-
-        unsafe { std_env::remove_var("XDG_CONFIG_HOME") };
-    }
-
-    #[tokio::test(flavor = "multi_thread")]
-    #[serial]
-    async fn test_secrets_completer_filters_keys_by_prefix() {
-        let td = tempdir().unwrap();
-        let xdg = td.path().join("xdg");
-        let app_dir = xdg.join("gman");
-        fs::create_dir_all(&app_dir).unwrap();
-        unsafe { std_env::set_var("XDG_CONFIG_HOME", &xdg) };
-
-        let yaml = indoc::indoc! {
-            "---
-            default_provider: local
-            providers:
-              - name: local
-                type: local
-            run_configs:
-              - name: echo
-                secrets: [API_KEY]
-            "
-        };
-        fs::write(app_dir.join("config.yml"), yaml).unwrap();
-
-        // Seed a minimal vault with keys (values are irrelevant for listing)
-        let vault_yaml = indoc::indoc! {
-            "---
-            API_KEY: dummy
-            DB_PASSWORD: dummy
-            AWS_ACCESS_KEY_ID: dummy
-            "
-        };
-        fs::write(app_dir.join("vault.yml"), vault_yaml).unwrap();
-
-        let out = secrets_completer(OsStr::new("AWS"));
-        assert_eq!(out.len(), 1);
-        let rendered = format!("{:?}", &out[0]);
-        assert!(rendered.contains("AWS_ACCESS_KEY_ID"), "got: {}", rendered);
-
-        let out2 = secrets_completer(OsStr::new("DB_"));
-        assert_eq!(out2.len(), 1);
-        let rendered2 = format!("{:?}", &out2[0]);
-        assert!(rendered2.contains("DB_PASSWORD"), "got: {}", rendered2);
-
-        unsafe { std_env::remove_var("XDG_CONFIG_HOME") };
-    }
 }

src/bin/gman/main.rs

@@ -1,4 +1,3 @@
-use crate::cli::provider_completer;
 use crate::cli::run_config_completer;
 use crate::cli::secrets_completer;
 use anyhow::{Context, Result};
@@ -52,7 +51,7 @@ struct Cli {
     output: Option<OutputFormat>,
 
     /// Specify the secret provider to use (defaults to 'default_provider' in config (usually 'local'))
-    #[arg(long, global = true, env = "GMAN_PROVIDER", add = ArgValueCompleter::new(provider_completer))]
+    #[arg(long, global = true, env = "GMAN_PROVIDER", value_parser = ["local", "aws_secrets_manager", "azure_key_vault", "gcp_secret_manager", "gopass"])]
     provider: Option<String>,
 
     /// Specify a run profile to use when wrapping a command

src/config.rs

@@ -26,7 +26,6 @@ use crate::providers::{SecretProvider, SupportedProvider};
 use anyhow::{Context, Result};
 use collections::HashSet;
 use log::debug;
-use regex::Regex;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
 use serde_with::skip_serializing_none;
@@ -46,19 +45,14 @@ use validator::{Validate, ValidationError};
 #[validate(schema(function = "flags_or_files"))]
 pub struct RunConfig {
     #[validate(required)]
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub name: Option<String>,
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub provider: Option<String>,
     #[validate(required)]
     pub secrets: Option<Vec<String>>,
     pub files: Option<Vec<PathBuf>>,
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub flag: Option<String>,
     #[validate(range(min = 1))]
-    #[serde(default, deserialize_with = "deserialize_optional_usize_env_var")]
     pub flag_position: Option<usize>,
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub arg_format: Option<String>,
 }
 
@@ -198,7 +192,6 @@ impl ProviderConfig {
 #[validate(schema(function = "default_provider_exists"))]
 #[validate(schema(function = "providers_names_are_unique"))]
 pub struct Config {
-    #[serde(deserialize_with = "deserialize_optional_env_var")]
     pub default_provider: Option<String>,
     #[validate(length(min = 1))]
     #[validate(nested)]
@@ -338,7 +331,7 @@ pub fn load_config() -> Result<Config> {
     Ok(config)
 }
 
-/// Returns the configuration file path that `confy` will use
+/// Returns the configuration file path that `confy` will use for this app.
 pub fn get_config_file_path() -> Result<PathBuf> {
     if let Some(base) = env::var_os("XDG_CONFIG_HOME").map(PathBuf::from) {
         let dir = base.join("gman");
@@ -347,394 +340,8 @@ pub fn get_config_file_path() -> Result<PathBuf> {
         if yml.exists() || yaml.exists() {
             return Ok(if yml.exists() { yml } else { yaml });
         }
+        // Prefer .yml if creating anew
         return Ok(dir.join("config.yml"));
     }
     Ok(confy::get_configuration_file_path("gman", "config")?)
 }
-
-pub fn deserialize_optional_env_var<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let s: Option<String> = Option::deserialize(deserializer)?;
-    match s {
-        Some(value) => {
-            let interpolated = interpolate_env_vars(&value);
-            Ok(Some(interpolated))
-        }
-        None => Ok(None),
-    }
-}
-
-pub fn deserialize_optional_pathbuf_env_var<'de, D>(
-    deserializer: D,
-) -> Result<Option<PathBuf>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let s: Option<String> = Option::deserialize(deserializer)?;
-    match s {
-        Some(value) => {
-            let interpolated = interpolate_env_vars(&value);
-            Ok(Some(interpolated.parse().unwrap()))
-        }
-        None => Ok(None),
-    }
-}
-
-fn deserialize_optional_usize_env_var<'de, D>(deserializer: D) -> Result<Option<usize>, D::Error>
-where
-    D: serde::Deserializer<'de>,
-{
-    let s: Option<String> = Option::deserialize(deserializer)?;
-    match s {
-        Some(value) => {
-            let interpolated = interpolate_env_vars(&value);
-            interpolated
-                .parse::<usize>()
-                .map(Some)
-                .map_err(serde::de::Error::custom)
-        }
-        None => Ok(None),
-    }
-}
-
-pub fn interpolate_env_vars(s: &str) -> String {
-    let result = s.to_string();
-    let scrubbing_regex = Regex::new(r#"[\s{}^()\[\]\\|`'"]+"#).unwrap();
-    let var_regex = Regex::new(r"\$\{(.*?)(:-.+)?}").unwrap();
-
-    var_regex
-        .replace_all(s, |caps: &regex::Captures<'_>| {
-            if let Some(mat) = caps.get(1) {
-                if let Ok(value) = env::var(mat.as_str()) {
-                    return scrubbing_regex.replace_all(&value, "").to_string();
-                } else if let Some(default_value) = caps.get(2) {
-                    return scrubbing_regex
-                        .replace_all(
-                            default_value
-                                .as_str()
-                                .strip_prefix(":-")
-                                .expect("unable to strip ':-' prefix from default value"),
-                            "",
-                        )
-                        .to_string();
-                }
-            }
-
-            scrubbing_regex.replace_all(&result, "").to_string()
-        })
-        .to_string()
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use indoc::indoc;
-    use pretty_assertions::{assert_eq, assert_str_eq};
-    use serde::Deserialize;
-    use serial_test::serial;
-    use std::path::PathBuf;
-
-    #[derive(Default, Deserialize, PartialEq, Eq, Debug)]
-    struct TestConfig {
-        #[serde(default, deserialize_with = "deserialize_optional_env_var")]
-        string_var: Option<String>,
-        #[serde(default, deserialize_with = "deserialize_optional_pathbuf_env_var")]
-        path_var: Option<PathBuf>,
-        #[serde(default, deserialize_with = "deserialize_optional_usize_env_var")]
-        usize_var: Option<usize>,
-    }
-
-    #[test]
-    #[serial]
-    fn test_deserialize_optional_env_var_is_present() {
-        unsafe { env::set_var("TEST_VAR_DESERIALIZE_OPTION", "localhost") };
-        let yaml_data = indoc!(
-            r#"
-							string_var: ${TEST_VAR_DESERIALIZE_OPTION}
-							path_var: /some/path
-							usize_var: 123
-						"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.string_var, Some("localhost".to_string()));
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        assert_eq!(config.usize_var, Some(123));
-        unsafe { env::remove_var("TEST_VAR_DESERIALIZE_OPTION") };
-    }
-
-    #[test]
-    fn test_deserialize_optional_env_var_empty_env_var_uses_default_value_if_provided() {
-        let yaml_data = indoc!(
-            r#"
-							string_var: ${TEST_VAR_DESERIALIZE_OPTION_UNDEFINED:-localhost}
-							path_var: /some/path
-							usize_var: 123
-						"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.string_var, Some("localhost".to_string()));
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        assert_eq!(config.usize_var, Some(123));
-    }
-
-    #[test]
-    #[serial]
-    fn test_deserialize_optional_env_var_does_not_overwrite_non_env_value() {
-        unsafe { env::set_var("TEST_VAR_DESERIALIZE_OPTION_NO_OVERWRITE", "localhost") };
-        let yaml_data = indoc!(
-            r#"
-							string_var: www.example.com
-							path_var: /some/path
-							usize_var: 123
-						"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.string_var, Some("www.example.com".to_string()));
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        assert_eq!(config.usize_var, Some(123));
-        unsafe { env::remove_var("TEST_VAR_DESERIALIZE_OPTION_NO_OVERWRITE") };
-    }
-
-    #[test]
-    fn test_deserialize_optional_env_var_empty() {
-        let yaml_data = indoc!(
-            r#"
-							path_var: /some/path
-							usize_var: 123
-						"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.string_var, None);
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        assert_eq!(config.usize_var, Some(123));
-    }
-
-    #[test]
-    #[serial]
-    fn test_deserialize_optional_pathbuf_env_var_is_present() {
-        unsafe { env::set_var("TEST_VAR_DESERIALIZE_OPTION_PATHBUF", "/some/path") };
-        let yaml_data = indoc!(
-            r#"
-								string_var: hithere
-								path_var: ${TEST_VAR_DESERIALIZE_OPTION_PATHBUF}
-								usize_var: 123
-							"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        assert_eq!(config.string_var, Some("hithere".to_string()));
-        assert_eq!(config.usize_var, Some(123));
-        unsafe { env::remove_var("TEST_VAR_DESERIALIZE_OPTION_PATHBUF") };
-    }
-
-    #[test]
-    fn test_deserialize_optional_pathbuf_env_var_empty_env_var_uses_default_value_if_provided() {
-        let yaml_data = indoc!(
-            r#"
-								string_var: hithere
-								path_var: ${TEST_VAR_DESERIALIZE_OPTION_PATHBUF_UNDEFINED:-/some/path}
-								usize_var: 123
-							"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        assert_eq!(config.string_var, Some("hithere".to_string()));
-        assert_eq!(config.usize_var, Some(123));
-    }
-
-    #[test]
-    #[serial]
-    fn test_deserialize_optional_pathbuf_env_var_does_not_overwrite_non_env_value() {
-        unsafe {
-            env::set_var(
-                "TEST_VAR_DESERIALIZE_OPTION_PATHBUF_NO_OVERWRITE",
-                "/something/else",
-            )
-        };
-        let yaml_data = indoc!(
-            r#"
-								string_var: hithere
-								path_var: /some/path
-								usize_var: 123
-							"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        assert_eq!(config.string_var, Some("hithere".to_string()));
-        assert_eq!(config.usize_var, Some(123));
-        unsafe { env::remove_var("TEST_VAR_DESERIALIZE_OPTION_PATHBUF_NO_OVERWRITE") };
-    }
-
-    #[test]
-    fn test_deserialize_optional_pathbuf_env_var_empty() {
-        let yaml_data = indoc!(
-            r#"
-								string_var: hithere
-								usize_var: 123
-							"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.string_var, Some("hithere".to_string()));
-        assert_eq!(config.path_var, None);
-        assert_eq!(config.usize_var, Some(123));
-    }
-
-    #[test]
-    #[serial]
-    fn test_deserialize_optional_usize_env_var_is_present() {
-        unsafe { env::set_var("TEST_VAR_DESERIALIZE_OPTION_USIZE", "123") };
-        let yaml_data = indoc!(
-            r#"
-							string_var: hithere
-							path_var: /some/path
-							usize_var: ${TEST_VAR_DESERIALIZE_OPTION_USIZE}
-						"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.usize_var, Some(123));
-        assert_eq!(config.string_var, Some("hithere".to_string()));
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        unsafe { env::remove_var("TEST_VAR_DESERIALIZE_OPTION_USIZE") };
-    }
-
-    #[test]
-    fn test_deserialize_optional_usize_env_var_uses_default_value_if_provided() {
-        let yaml_data = indoc!(
-            r#"
-							string_var: hithere
-							path_var: /some/path
-							usize_var: ${TEST_VAR_DESERIALIZE_OPTION_USIZE_UNDEFINED:-123}
-						"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.usize_var, Some(123));
-        assert_eq!(config.string_var, Some("hithere".to_string()));
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-    }
-
-    #[test]
-    #[serial]
-    fn test_deserialize_optional_usize_env_var_does_not_overwrite_non_env_value() {
-        unsafe { env::set_var("TEST_VAR_DESERIALIZE_OPTION_NO_OVERWRITE_USIZE", "456") };
-        let yaml_data = indoc!(
-            r#"
-								string_var: hithere
-								path_var: /some/path
-								usize_var: 123
-						"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.usize_var, Some(123));
-        assert_eq!(config.string_var, Some("hithere".to_string()));
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-        unsafe { env::remove_var("TEST_VAR_DESERIALIZE_OPTION_NO_OVERWRITE_USIZE") };
-    }
-
-    #[test]
-    fn test_deserialize_optional_usize_env_var_invalid_number() {
-        let yaml_data = indoc!(
-            r#"
-								string_var: hithere
-								path_var: /some/path
-								usize_var: "holo"
-						"#
-        );
-        let result: Result<TestConfig, _> = serde_yaml::from_str(yaml_data);
-
-        assert!(result.is_err());
-        let err = result.unwrap_err().to_string();
-        assert!(err.contains("invalid digit found in string"));
-    }
-
-    #[test]
-    fn test_deserialize_optional_usize_env_var_empty() {
-        let yaml_data = indoc!(
-            r#"
-							string_var: hithere
-							path_var: /some/path
-						"#
-        );
-
-        let config: TestConfig = serde_yaml::from_str(yaml_data).unwrap();
-
-        assert_eq!(config.usize_var, None);
-        assert_eq!(config.string_var, Some("hithere".to_string()));
-        assert_eq!(config.path_var, Some(PathBuf::from("/some/path")));
-    }
-
-    #[test]
-    fn test_interpolate_env_vars_defaults_to_original_string_if_not_in_yaml_interpolation_format() {
-        let var = interpolate_env_vars("TEST_VAR_INTERPOLATION_NON_YAML");
-
-        assert_str_eq!(var, "TEST_VAR_INTERPOLATION_NON_YAML");
-    }
-
-    #[test]
-    #[serial]
-    fn test_interpolate_env_vars_scrubs_all_unnecessary_characters() {
-        unsafe {
-            env::set_var(
-                "TEST_VAR_INTERPOLATION_UNNECESSARY_CHARACTERS",
-                r#"""
-						`"'https://dontdo:this@testing.com/query?test=%20query#results'"` {([\|])}
-				"""#,
-            )
-        };
-
-        let var = interpolate_env_vars("${TEST_VAR_INTERPOLATION_UNNECESSARY_CHARACTERS}");
-
-        assert_str_eq!(
-            var,
-            "https://dontdo:this@testing.com/query?test=%20query#results"
-        );
-        unsafe { env::remove_var("TEST_VAR_INTERPOLATION_UNNECESSARY_CHARACTERS") };
-    }
-
-    #[test]
-    #[serial]
-    fn test_interpolate_env_vars_scrubs_all_unnecessary_characters_for_default_values() {
-        let var = interpolate_env_vars(
-            r#"${UNSET:-`"'https://dontdo:this@testing.com/query?test=%20query#results'"` {([\|])}}"#,
-        );
-
-        assert_str_eq!(
-            var,
-            "https://dontdo:this@testing.com/query?test=%20query#results"
-        );
-    }
-
-    #[test]
-    fn test_interpolate_env_vars_scrubs_all_unnecessary_characters_from_non_environment_variable() {
-        let var =
-            interpolate_env_vars("https://dontdo:this@testing.com/query?test=%20query#results");
-
-        assert_str_eq!(
-            var,
-            "https://dontdo:this@testing.com/query?test=%20query#results"
-        );
-    }
-}

src/providers/aws_secrets_manager.rs

@@ -1,4 +1,3 @@
-use crate::config::deserialize_optional_env_var;
 use crate::providers::SecretProvider;
 use anyhow::Context;
 use anyhow::Result;
@@ -33,10 +32,8 @@ use validator::Validate;
 #[serde(deny_unknown_fields)]
 pub struct AwsSecretsManagerProvider {
     #[validate(required)]
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub aws_profile: Option<String>,
     #[validate(required)]
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub aws_region: Option<String>,
 }
 

src/providers/azure_key_vault.rs

@@ -1,4 +1,3 @@
-use crate::config::deserialize_optional_env_var;
 use crate::providers::SecretProvider;
 use anyhow::{Context, Result};
 use azure_identity::DefaultAzureCredential;
@@ -31,7 +30,6 @@ use validator::Validate;
 #[serde(deny_unknown_fields)]
 pub struct AzureKeyVaultProvider {
     #[validate(required)]
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub vault_name: Option<String>,
 }
 

src/providers/gcp_secret_manager.rs

@@ -1,4 +1,3 @@
-use crate::config::deserialize_optional_env_var;
 use crate::providers::SecretProvider;
 use anyhow::{Context, Result, anyhow};
 use gcloud_sdk::google::cloud::secretmanager::v1;
@@ -40,7 +39,6 @@ type SecretsManagerClient = GoogleApi<SecretManagerServiceClient<GoogleAuthMiddl
 #[serde(deny_unknown_fields)]
 pub struct GcpSecretManagerProvider {
     #[validate(required)]
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub gcp_project_id: Option<String>,
 }
 

src/providers/gopass.rs

@@ -1,4 +1,3 @@
-use crate::config::deserialize_optional_env_var;
 use crate::providers::{ENV_PATH, SecretProvider};
 use anyhow::{Context, Result, anyhow};
 use serde::{Deserialize, Serialize};
@@ -29,7 +28,6 @@ use validator::Validate;
 #[derive(Debug, Default, Clone, Validate, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(deny_unknown_fields)]
 pub struct GopassProvider {
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub store: Option<String>,
 }
 

src/providers/local.rs

@@ -1,5 +1,3 @@
-use crate::config::deserialize_optional_env_var;
-use crate::config::deserialize_optional_pathbuf_env_var;
 use anyhow::{Context, anyhow, bail};
 use secrecy::{ExposeSecret, SecretString};
 use std::collections::HashMap;
@@ -52,21 +50,14 @@ use validator::Validate;
 #[derive(Debug, Clone, Validate, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(deny_unknown_fields)]
 pub struct LocalProvider {
-    #[serde(default, deserialize_with = "deserialize_optional_pathbuf_env_var")]
     pub password_file: Option<PathBuf>,
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub git_branch: Option<String>,
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub git_remote_url: Option<String>,
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub git_user_name: Option<String>,
     #[validate(email)]
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub git_user_email: Option<String>,
-    #[serde(default, deserialize_with = "deserialize_optional_pathbuf_env_var")]
     pub git_executable: Option<PathBuf>,
     #[serde(skip)]
-    #[serde(default, deserialize_with = "deserialize_optional_env_var")]
     pub runtime_provider_name: Option<String>,
 }