diff --git a/crates/cli/src/commands/admin/group.rs b/crates/cli/src/commands/admin/group.rs index 266917df..87fdc767 100644 --- a/crates/cli/src/commands/admin/group.rs +++ b/crates/cli/src/commands/admin/group.rs @@ -221,41 +221,27 @@ async fn execute_add(args: AddArgs, formatter: &Formatter) -> ExitCode { }) .unwrap_or_default(); - if members.is_empty() { - if formatter.is_json() { - let output = GroupOperationOutput { - success: true, - name: args.name.clone(), - message: format!("Group '{}' created successfully", args.name), - }; - formatter.json(&output); + if let Err(e) = client.add_group_members(&args.name, &members).await { + formatter.error(&format!("Failed to create group: {e}")); + return ExitCode::GeneralError; + } + + if formatter.is_json() { + let message = if members.is_empty() { + format!("Group '{}' created successfully", args.name) } else { - let styled_name = formatter.style_name(&args.name); - formatter.success(&format!("Group '{styled_name}' created successfully.")); - } - ExitCode::Success + format!("Group '{}' created successfully with members", args.name) + }; + formatter.json(&GroupOperationOutput { + success: true, + name: args.name, + message, + }); } else { - match client.add_group_members(&args.name, &members).await { - Ok(()) => { - if formatter.is_json() { - let output = GroupOperationOutput { - success: true, - name: args.name.clone(), - message: format!("Group '{}' created successfully with members", args.name), - }; - formatter.json(&output); - } else { - let styled_name = formatter.style_name(&args.name); - formatter.success(&format!("Group '{styled_name}' created successfully.")); - } - ExitCode::Success - } - Err(e) => { - formatter.error(&format!("Failed to create group: {e}")); - ExitCode::GeneralError - } - } + let styled_name = formatter.style_name(&args.name); + formatter.success(&format!("Group '{styled_name}' created successfully.")); } + ExitCode::Success } async fn execute_info(args: InfoArgs, formatter: &Formatter) -> ExitCode { diff --git a/crates/cli/tests/admin_group.rs b/crates/cli/tests/admin_group.rs new file mode 100644 index 00000000..3166366a --- /dev/null +++ b/crates/cli/tests/admin_group.rs @@ -0,0 +1,71 @@ +mod admin_support; + +use std::process::{Command, Output}; + +use admin_support::{ + rc_binary, rc_host_alias, start_admin_response_test_server, start_admin_test_server, +}; +use serde_json::{Value, json}; + +fn add_group(endpoint: &str, options: &[&str]) -> Output { + let config = tempfile::tempdir().expect("create config directory"); + Command::new(rc_binary()) + .args(["admin", "group", "add", "myalias", "team"]) + .args(options) + .env("RC_CONFIG_DIR", config.path()) + .env("RC_HOST_myalias", rc_host_alias(endpoint)) + .env("NO_PROXY", "127.0.0.1") + .env("no_proxy", "127.0.0.1") + .output() + .expect("run group add") +} + +#[test] +fn group_add_sends_initial_members_including_an_empty_list() { + for (options, members, message) in [ + ( + vec!["--json"], + json!([]), + "Group 'team' created successfully", + ), + ( + vec!["--json", "--members", "alice,bob"], + json!(["alice", "bob"]), + "Group 'team' created successfully with members", + ), + ] { + let (endpoint, requests, server) = start_admin_test_server(""); + let output = add_group(&endpoint, &options); + assert!( + output.status.success(), + "{}", + String::from_utf8_lossy(&output.stderr) + ); + + let request = requests.try_recv().expect("group add must send a request"); + assert_eq!(request.method, "PUT"); + assert_eq!(request.target, "/rustfs/admin/v3/update-group-members"); + let body: Value = serde_json::from_slice(&request.body).expect("request JSON"); + assert_eq!(body["group"], "team"); + assert_eq!(body["members"], members); + assert_eq!(body["isRemove"], false); + let result: Value = serde_json::from_slice(&output.stdout).expect("success JSON"); + assert_eq!( + result, + json!({"success": true, "name": "team", "message": message}) + ); + server.join().expect("join test server"); + } +} + +#[test] +fn group_add_without_members_reports_server_rejection() { + let (endpoint, requests, server) = + start_admin_response_test_server("403 Forbidden", "application/xml", String::new()); + let output = add_group(&endpoint, &[]); + assert_eq!(output.status.code(), Some(1)); + assert!(output.stdout.is_empty()); + assert!(String::from_utf8_lossy(&output.stderr).contains("Failed to create group")); + requests.try_recv().expect("server received group add"); + server.join().expect("join test server"); +}