New command group: connections

It reuses the commands we already have
under 'list' and 'close', and groups them together.

Author: michaelklishin

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+ * `connections` is a new command group for operations on connections
  * `policies set` and `policies update` are two new aliases for `policies declare`. The former follows the naming
    used by `rabbitmqctl` and the latter reflects the fact that the command can be used to update an existing policy,
    in particular, to override its definition

src/cli.rs

@@ -56,6 +56,11 @@ pub fn parser(pre_flight_settings: PreFlightSettings) -> Command {
         .infer_subcommands(pre_flight_settings.infer_subcommands)
         .infer_long_args(pre_flight_settings.infer_long_options)
         .subcommands(close_subcommands(pre_flight_settings.clone()));
+    let connections_group = Command::new("connections")
+        .about("Operations on connections")
+        .infer_subcommands(pre_flight_settings.infer_subcommands)
+        .infer_long_args(pre_flight_settings.infer_long_options)
+        .subcommands(connections_subcommands(pre_flight_settings.clone()));
     let declare_group = Command::new("declare")
         .about("Creates or declares objects")
         .infer_subcommands(pre_flight_settings.infer_subcommands)
@@ -283,6 +288,7 @@ pub fn parser(pre_flight_settings: PreFlightSettings) -> Command {
     let command_groups = [
         bindings_group,
         close_group,
+        connections_group,
         declare_group,
         definitions_group,
         delete_group,
@@ -574,7 +580,7 @@ fn list_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 19] {
                 .short('u')
                 .long("username")
                 .required(true)
-                .help("Name of the user whose connections to list"),
+                .help("Name of the user whose connections should be listed"),
         )
         .long_about("Lists client connections that authenticated with a specific username")
         .after_help(color_print::cformat!(
@@ -1842,6 +1848,53 @@ fn close_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 2] {
         .map(|cmd| cmd.infer_long_args(pre_flight_settings.infer_long_options))
 }
 
+fn connections_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 4] {
+    let close_connection = Command::new("close")
+        .about("Closes a client connection")
+        .arg(
+            Arg::new("name")
+                .long("name")
+                .help("connection name (identifying string)")
+                .required(true),
+        );
+    let close_user_connections = Command::new("close_of_user")
+        .about("Closes all connections that are authenticated with a specific username")
+        .arg(
+            Arg::new("username")
+                .short('u')
+                .long("username")
+                .help("Name of the user whose connections should be closed")
+                .required(true),
+        );
+    let list_cmd = Command::new("list")
+        .long_about("Lists client connections")
+        .after_help(color_print::cformat!(
+            "<bold>Doc guide</bold>: {}",
+            CONNECTION_GUIDE_URL
+        ));
+    let list_user_connections_cmd = Command::new("list_of_user")
+        .arg(
+            Arg::new("username")
+                .short('u')
+                .long("username")
+                .required(true)
+                .help("Name of the user whose connections should be listed"),
+        )
+        .long_about("Lists client connections that are authenticated with a specific username")
+        .after_help(color_print::cformat!(
+            "<bold>Doc guide</bold>: {}",
+            CONNECTION_GUIDE_URL
+        ));
+
+    [
+        close_connection,
+        close_user_connections,
+        list_cmd,
+        list_user_connections_cmd,
+    ]
+    .map(|cmd| cmd.infer_long_args(pre_flight_settings.infer_long_options))
+}
+
 fn definitions_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 4] {
     let export_cmd = Command::new("export")
         .about("Export cluster-wide definitions")
@@ -2365,7 +2418,7 @@ pub fn users_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 6]
                 .short('u')
                 .long("username")
                 .required(true)
-                .help("Name of the user whose connections to list"),
+                .help("Name of the user whose connections should be listed"),
         )
         .long_about("Lists client connections that authenticated with a specific username")
         .after_help(color_print::cformat!(

src/main.rs

@@ -299,6 +299,22 @@ fn dispatch_common_subcommand(
             let result = commands::close_user_connections(client, second_level_args);
             res_handler.no_output_on_success(result);
         }
+        ("connections", "close") => {
+            let result = commands::close_connection(client, second_level_args);
+            res_handler.no_output_on_success(result);
+        }
+        ("connections", "close_of_user") => {
+            let result = commands::close_user_connections(client, second_level_args);
+            res_handler.no_output_on_success(result);
+        }
+        ("connections", "list") => {
+            let result = commands::list_connections(client);
+            res_handler.tabular_result(result)
+        }
+        ("connections", "list_of_user") => {
+            let result = commands::list_user_connections(client, second_level_args);
+            res_handler.tabular_result(result)
+        }
         ("declare", "binding") => {
             let result = commands::declare_binding(client, &vhost, second_level_args);
             res_handler.no_output_on_success(result);

tests/connections_tests.rs

@@ -16,7 +16,14 @@ mod test_helpers;
 use crate::test_helpers::*;
 
 #[test]
-fn test_list_connections() -> Result<(), Box<dyn std::error::Error>> {
+fn test_list_connections1() -> Result<(), Box<dyn std::error::Error>> {
+    run_succeeds(["connections", "list"]);
+
+    Ok(())
+}
+
+#[test]
+fn test_list_connections2() -> Result<(), Box<dyn std::error::Error>> {
     run_succeeds(["list", "connections"]);
 
     Ok(())
@@ -30,7 +37,21 @@ fn test_list_connections_table_styles() -> Result<(), Box<dyn std::error::Error>
 }
 
 #[test]
-fn test_list_user_connections() -> Result<(), Box<dyn std::error::Error>> {
+fn test_list_user_connections1() -> Result<(), Box<dyn std::error::Error>> {
+    run_succeeds([
+        "--table-style",
+        "markdown",
+        "connections",
+        "list_of_user",
+        "--username",
+        "monitoring",
+    ]);
+
+    Ok(())
+}
+
+#[test]
+fn test_list_user_connections2() -> Result<(), Box<dyn std::error::Error>> {
     run_succeeds([
         "--table-style",
         "markdown",