New command group: bindings, closes #64

Author: michaelklishin

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+ * `bindings` is a new command group for operations on bindings
  * `exchanges` is a new command group for operations on exchanges
  * `global_parameters` is a new command group for operations on [global runtime parameters](https://www.rabbitmq.com/docs/parameters)
  * `nodes` is a new command group for operations on nodes

src/cli.rs

@@ -45,6 +45,12 @@ pub fn parser(pre_flight_settings: PreFlightSettings) -> Command {
         GITHUB_REPOSITORY_URL
     );
 
+    let bindings_group = Command::new("bindings")
+        .about("Operations on bindings")
+        .infer_subcommands(pre_flight_settings.infer_subcommands)
+        .infer_long_args(pre_flight_settings.infer_long_options)
+        .subcommand_value_name("binding")
+        .subcommands(binding_subcommands(pre_flight_settings.clone()));
     let close_group = Command::new("close")
         .about("Closes connections")
         .infer_subcommands(pre_flight_settings.infer_subcommands)
@@ -275,6 +281,7 @@ pub fn parser(pre_flight_settings: PreFlightSettings) -> Command {
         .subcommands(vhosts_subcommands(pre_flight_settings.clone()));
 
     let command_groups = [
+        bindings_group,
         close_group,
         declare_group,
         definitions_group,
@@ -1248,6 +1255,82 @@ fn purge_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 1] {
     [queue_cmd].map(|cmd| cmd.infer_long_args(pre_flight_settings.infer_long_options))
 }
 
+fn binding_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 3] {
+    let declare_cmd = Command::new("declare")
+        .about("Creates a binding between a source exchange and a destination (a queue or an exchange)")
+        .arg(
+            Arg::new("source")
+                .long("source")
+                .help("source exchange")
+                .required(true),
+        )
+        .arg(
+            Arg::new("destination_type")
+                .long("destination-type")
+                .help("destination type: exchange or queue")
+                .required(true)
+                .value_parser(value_parser!(BindingDestinationType)),
+        )
+        .arg(
+            Arg::new("destination")
+                .long("destination")
+                .help("destination exchange/queue name")
+                .required(true),
+        )
+        .arg(
+            Arg::new("routing_key")
+                .long("routing-key")
+                .help("routing key")
+                .required(true),
+        )
+        .arg(
+            Arg::new("arguments")
+                .long("arguments")
+                .help("additional arguments")
+                .required(false)
+                .default_value("{}")
+                .value_parser(value_parser!(String)),
+        );
+    let delete_cmd = Command::new("delete")
+        .about("Deletes a binding")
+        .arg(
+            Arg::new("source")
+                .long("source")
+                .help("source exchange")
+                .required(true),
+        )
+        .arg(
+            Arg::new("destination_type")
+                .long("destination-type")
+                .help("destination type: exchange or queue")
+                .required(true),
+        )
+        .arg(
+            Arg::new("destination")
+                .long("destination")
+                .help("destination exchange/queue name")
+                .required(true),
+        )
+        .arg(
+            Arg::new("routing_key")
+                .long("routing-key")
+                .help("routing key")
+                .required(true),
+        )
+        .arg(
+            Arg::new("arguments")
+                .long("arguments")
+                .help("additional arguments")
+                .required(false)
+                .default_value("{}")
+                .value_parser(value_parser!(String)),
+        );
+    let list_cmd = Command::new("list").long_about("Lists bindings");
+
+    [declare_cmd, delete_cmd, list_cmd]
+        .map(|cmd| cmd.infer_long_args(pre_flight_settings.infer_long_options))
+}
+
 fn queues_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 5] {
     let declare_cmd = Command::new("declare")
         .about("Declares a queue or a stream")

src/main.rs

@@ -279,6 +279,18 @@ fn dispatch_common_subcommand(
     res_handler: &mut ResultHandler,
 ) -> ExitCode {
     match &pair {
+        ("bindings", "declare") => {
+            let result = commands::declare_binding(client, &vhost, second_level_args);
+            res_handler.no_output_on_success(result);
+        }
+        ("bindings", "delete") => {
+            let result = commands::delete_binding(client, &vhost, second_level_args);
+            res_handler.no_output_on_success(result);
+        }
+        ("bindings", "list") => {
+            let result = commands::list_bindings(client);
+            res_handler.tabular_result(result)
+        }
         ("close", "connection") => {
             let result = commands::close_connection(client, second_level_args);
             res_handler.no_output_on_success(result);

tests/bindings_tests.rs

@@ -18,8 +18,8 @@ use crate::test_helpers::*;
 
 #[test]
 fn test_list_bindings() -> Result<(), Box<dyn std::error::Error>> {
-    let vh1 = "bindings_vhost_1";
-    let vh2 = "bindings_vhost_2";
+    let vh1 = "test_list_bindings_1";
+    let vh2 = "test_list_bindings_2";
     let q1 = "new_queue_1";
     let q2 = "new_queue_2";
 
@@ -100,3 +100,102 @@ fn test_list_bindings() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
+
+#[test]
+fn test_bindings_list() -> Result<(), Box<dyn std::error::Error>> {
+    let vh1 = "test_bindings_list_1";
+    let vh2 = "test_bindings_list_2";
+    let q1 = "new_queue_1";
+    let q2 = "new_queue_2";
+
+    delete_vhost(vh1).expect("failed to delete a virtual host");
+    delete_vhost(vh2).expect("failed to delete a virtual host");
+
+    // declare vhost 1
+    run_succeeds(["vhosts", "declare", "--name", vh1]);
+
+    // declare vhost 2
+    run_succeeds(["vhosts", "declare", "--name", vh2]);
+
+    // declare a new queue in vhost 1
+    run_succeeds([
+        "-V", vh1, "queues", "declare", "--name", q1, "--type", "classic",
+    ]);
+
+    // declare a new queue in vhost 2
+    run_succeeds([
+        "-V", vh2, "queues", "declare", "--name", q2, "--type", "quorum",
+    ]);
+
+    // bind the queue -> a pre-existing exchange
+    run_succeeds([
+        "-V",
+        vh1,
+        "bindings",
+        "declare",
+        "--source",
+        "amq.direct",
+        "--destination-type",
+        "queue",
+        "--destination",
+        q1,
+        "--routing-key",
+        "routing_key_queue",
+    ]);
+
+    // declare an exchange -> exchange binding
+    run_succeeds([
+        "-V",
+        vh1,
+        "bindings",
+        "declare",
+        "--source",
+        "amq.direct",
+        "--destination-type",
+        "exchange",
+        "--destination",
+        "amq.topic",
+        "--routing-key",
+        "routing_key_exchange",
+    ]);
+
+    await_queue_metric_emission();
+
+    // list bindings in vhost 1
+    run_succeeds(["-V", vh1, "list", "bindings"]).stdout(
+        predicate::str::contains("new_queue_1")
+            .and(predicate::str::contains("routing_key_queue"))
+            .and(predicate::str::contains("routing_key_exchange")),
+    );
+
+    // delete a binding
+    // declare an exchange -> exchange binding
+    run_succeeds([
+        "-V",
+        vh1,
+        "bindings",
+        "declare",
+        "--source",
+        "amq.direct",
+        "--destination-type",
+        "queue",
+        "--destination",
+        q1,
+        "--routing-key",
+        "routing_key_queue",
+    ]);
+
+    // ensure that the deleted binding is no longer listed
+    run_succeeds(["-V", vh1, "list", "bindings"]).stdout(
+        predicate::str::contains("new_queue_1")
+            .not()
+            .and(predicate::str::contains("routing_key_queue"))
+            .not()
+            .and(predicate::str::contains("routing_key_exchange")),
+    );
+
+    delete_vhost(vh1).expect("failed to delete a virtual host");
+    delete_vhost(vh2).expect("failed to delete a virtual host");
+
+    Ok(())
+}

tests/exchanges_tests.rs

@@ -276,7 +276,7 @@ fn test_exchanges_bind_and_unbind() -> Result<(), Box<dyn std::error::Error>> {
     await_queue_metric_emission();
 
     // list bindings in vhost 1
-    run_succeeds(["-V", "bindings_vhost_1", "list", "bindings"]).stdout(
+    run_succeeds(["-V", vh2, "list", "bindings"]).stdout(
         predicate::str::contains("new_queue_1")
             .and(predicate::str::contains("routing_key_queue"))
             .and(predicate::str::contains("routing_key_exchange")),
@@ -298,7 +298,7 @@ fn test_exchanges_bind_and_unbind() -> Result<(), Box<dyn std::error::Error>> {
         "routing_key_queue",
     ]);
 
-    run_succeeds(["-V", "bindings_vhost_1", "list", "bindings"]).stdout(
+    run_succeeds(["-V", vh1, "list", "bindings"]).stdout(
         predicate::str::contains("new_queue_1")
             .not()
             .and(predicate::str::contains("routing_key_queue"))