From 64e71a05c4d3b7fffe161171c5c31627a51bbeca Mon Sep 17 00:00:00 2001 From: Eric Curtin Date: Sun, 15 Nov 2026 22:28:20 +0000 Subject: [PATCH] fix(cli): accept hyphen-leading --subject values Signed-off-by: Eric Curtin --- crates/openshell-cli/src/main.rs | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/crates/openshell-cli/src/main.rs b/crates/openshell-cli/src/main.rs index bb55bd7fcc..e9cffcf68b 100644 --- a/crates/openshell-cli/src/main.rs +++ b/crates/openshell-cli/src/main.rs @@ -2580,7 +2580,7 @@ enum WorkspaceMemberCommands { workspace: String, /// OIDC subject claim identifying the principal. - #[arg(long)] + #[arg(long, allow_hyphen_values = true)] subject: String, /// Role to assign (user or admin). @@ -2596,7 +2596,7 @@ enum WorkspaceMemberCommands { workspace: String, /// OIDC subject claim identifying the principal. - #[arg(long)] + #[arg(long, allow_hyphen_values = true)] subject: String, }, @@ -4807,6 +4807,30 @@ mod tests { assert!(matches!(cli.command, Some(Commands::Status { .. }))); } + #[test] + fn workspace_member_subject_accepts_leading_hyphen() { + for action in [vec!["add", "--role", "user"], vec!["remove"]] { + let mut argv = vec!["openshell", "workspace", "member"]; + argv.push(action[0]); + argv.extend(["--workspace", "ws", "--subject", "-oAbC"]); + argv.extend(&action[1..]); + let cli = Cli::try_parse_from(argv).expect("hyphen-leading subject should parse"); + + let Some(Commands::Workspace { + command: Some(WorkspaceCommands::Member(member)), + }) = cli.command + else { + panic!("expected workspace member command"); + }; + let subject = match member { + WorkspaceMemberCommands::Add { subject, .. } + | WorkspaceMemberCommands::Remove { subject, .. } => subject, + WorkspaceMemberCommands::List { .. } => panic!("unexpected list"), + }; + assert_eq!(subject, "-oAbC"); + } + } + #[test] fn whoami_accepts_output_json() { let cli = Cli::try_parse_from(["openshell", "whoami", "--output", "json"])