Skip to content
Open
Changes from all commits
Commits
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
28 changes: 26 additions & 2 deletions crates/openshell-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2728,7 +2728,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).
Expand All @@ -2744,7 +2744,7 @@ enum WorkspaceMemberCommands {
workspace: String,

/// OIDC subject claim identifying the principal.
#[arg(long)]
#[arg(long, allow_hyphen_values = true)]
subject: String,
},

Expand Down Expand Up @@ -5066,6 +5066,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"])
Expand Down
Loading