Full support for secret injection into configuration files

src/providers/git_sync.rs

@@ -89,7 +89,7 @@ fn resolve_git_username(git: &Path, name: Option<&String>) -> Result<String> {
         return Ok(name.to_string());
     }
 
-    run_git_config_capture(&git, &["config", "user.name"])
+    run_git_config_capture(git, &["config", "user.name"])
         .with_context(|| "unable to determine git username")
 }
 
@@ -99,7 +99,7 @@ fn resolve_git_email(git: &Path, email: Option<&String>) -> Result<String> {
         return Ok(email.to_string());
     }
 
-    run_git_config_capture(&git, &["config", "user.email"])
+    run_git_config_capture(git, &["config", "user.email"])
         .with_context(|| "unable to determine git user email")
 }
 
@@ -210,17 +210,15 @@ fn set_origin(git: &Path, repo: &Path, url: &str) -> Result<()> {
 
     if has_origin {
         run_git(git, repo, &["remote", "set-url", "origin", url])?;
-    } else {
-        if Confirm::with_theme(&ColorfulTheme::default())
-			.with_prompt(format!("Have you already created the remote origin '{url}' on the Git host so we can push to it?"))
-			.default(false)
-			.interact()?
-		{
-			run_git(git, repo, &["remote", "add", "origin", url])?;
-		} else {
-			return Err(anyhow!("Remote origin does not yet exist. Please create remote origin before synchronizing, then try again"));
-		}
-    }
+    } else if Confirm::with_theme(&ColorfulTheme::default())
+    			.with_prompt(format!("Have you already created the remote origin '{url}' on the Git host so we can push to it?"))
+    			.default(false)
+    			.interact()?
+    		{
+    			run_git(git, repo, &["remote", "add", "origin", url])?;
+    		} else {
+    			return Err(anyhow!("Remote origin does not yet exist. Please create remote origin before synchronizing, then try again"));
+    		}
     Ok(())
 }
 

src/providers/local.rs

@@ -54,7 +54,7 @@ impl SecretProvider for LocalProvider {
             .get(key)
             .with_context(|| format!("key '{key}' not found in the vault"))?;
 
-        let password = get_password(&config)?;
+        let password = get_password(config)?;
         let plaintext = decrypt_string(&password, envelope)?;
         drop(password);
 
@@ -70,7 +70,7 @@ impl SecretProvider for LocalProvider {
             bail!("key '{key}' already exists");
         }
 
-        let password = get_password(&config)?;
+        let password = get_password(config)?;
         let envelope = encrypt_string(&password, value)?;
         drop(password);
 
@@ -82,7 +82,7 @@ impl SecretProvider for LocalProvider {
     fn update_secret(&self, config: &Config, key: &str, value: &str) -> Result<()> {
         let mut vault: HashMap<String, String> = confy::load("gman", "vault").unwrap_or_default();
 
-        let password = get_password(&config)?;
+        let password = get_password(config)?;
         let envelope = encrypt_string(&password, value)?;
         drop(password);
 
@@ -317,7 +317,7 @@ fn decrypt_string(password: &SecretString, envelope: &str) -> Result<String> {
 fn get_password(config: &Config) -> Result<SecretString> {
     if let Some(password_file) = &config.password_file {
         let password = SecretString::new(
-            fs::read_to_string(&password_file)
+            fs::read_to_string(password_file)
                 .with_context(|| format!("failed to read password file {:?}", password_file))?
                 .trim()
                 .to_string()