test: improve vault password file errors by propagating up

This commit is contained in:
2026-06-04 15:32:31 -06:00
parent 8e2a5ce31e
commit fa3f27532e
9 changed files with 243 additions and 29 deletions
+10 -7
View File
@@ -137,13 +137,16 @@ pub(super) fn session_completer(current: &OsStr) -> Vec<CompletionCandidate> {
pub(super) fn secrets_completer(current: &OsStr) -> Vec<CompletionCandidate> {
let cur = current.to_string_lossy();
match load_app_config_for_completion() {
Ok(app_config) => Vault::init(&app_config)
.list_secrets(false)
.unwrap_or_default()
.into_iter()
.filter(|s| s.starts_with(&*cur))
.map(CompletionCandidate::new)
.collect(),
Ok(app_config) => match Vault::init(&app_config) {
Ok(vault) => vault
.list_secrets(false)
.unwrap_or_default()
.into_iter()
.filter(|s| s.starts_with(&*cur))
.map(CompletionCandidate::new)
.collect(),
Err(_) => vec![],
},
Err(_) => vec![],
}
}
+28
View File
@@ -10,6 +10,7 @@ use clap::ValueHint;
use clap::{Parser, crate_authors, crate_description, crate_version};
use clap_complete::ArgValueCompleter;
use is_terminal::IsTerminal;
use std::collections::HashSet;
use std::io::{Read, stdin};
#[derive(Parser, Debug)]
@@ -163,6 +164,18 @@ pub struct Cli {
}
impl Cli {
pub fn skills(&self) -> Vec<String> {
let mut seen = HashSet::new();
let mut out = Vec::with_capacity(self.skill.len());
for name in &self.skill {
if seen.insert(name.clone()) {
out.push(name.clone());
}
}
out
}
pub fn text(&self) -> Result<Option<String>> {
let mut stdin_text = String::new();
if !stdin().is_terminal() {
@@ -323,6 +336,21 @@ mod tests {
);
}
#[test]
fn skills_method_dedupes_preserving_first_occurrence() {
let cli = parse(&[
"--skill", "alpha", "--skill", "beta", "--skill", "alpha", "--skill", "gamma",
"--skill", "beta",
]);
assert_eq!(cli.skills(), vec!["alpha", "beta", "gamma"]);
}
#[test]
fn skills_method_returns_empty_when_no_flags() {
assert!(parse(&[]).skills().is_empty());
}
#[test]
fn parse_file_flag_single() {
let cli = parse(&["-f", "file.txt", "question"]);