Revisit federation-related CLI options

Author: michaelklishin

src/cli.rs

@@ -1674,13 +1674,11 @@ fn federation_subcommands() -> [Command; 5] {
             Arg::new("queue_name")
                 .long("queue-name")
                 .help("queue federation: the queue name to use on the upstream. Defaults to the federated queue name")
-                .conflicts_with("exchange")
         )
         .arg(
             Arg::new("consumer_tag")
                 .long("consumer-tag")
                 .help("Custom consumer tag to use for the internal federation consumer")
-                .conflicts_with("exchange")
                 .requires("queue_name")
         )
         .arg(
@@ -1700,14 +1698,18 @@ fn federation_subcommands() -> [Command; 5] {
                 .long("max_hops")
                 .default_value("1")
                 .value_parser(value_parser!(u8))
-                .conflicts_with("queue_name")
+        )
+        .arg(
+            Arg::new("bind_nowait")
+                .long("bind-using-nowait")
+                .default_value("false")
+                .value_parser(value_parser!(bool))
         )
         .arg(
             Arg::new("resource_cleanup_mode")
                 .long("resource-cleanup-mode")
                 .default_value("default")
                 .value_parser(value_parser!(FederationResourceCleanupMode))
-                .conflicts_with("queue_name")
         )
         .arg(
             Arg::new("ttl")
@@ -1864,6 +1866,12 @@ fn federation_subcommands() -> [Command; 5] {
                 .default_value("default")
                 .value_parser(value_parser!(FederationResourceCleanupMode))
         )
+        .arg(
+            Arg::new("bind_nowait")
+                .long("bind-using-nowait")
+                .default_value("false")
+                .value_parser(value_parser!(bool))
+        )
         .arg(
             Arg::new("ttl")
                 .long("ttl")

src/commands.rs

@@ -433,6 +433,10 @@ pub fn declare_federation_upstream(
         .get_one::<FederationResourceCleanupMode>("resource_cleanup_mode")
         .cloned()
         .unwrap_or_default();
+    let bind_using_nowait = command_args
+        .get_one::<bool>("bind_nowait")
+        .cloned()
+        .unwrap_or_default();
     let ttl = command_args.get_one::<u32>("ttl").cloned();
     let message_ttl = command_args.get_one::<u32>("message_ttl").cloned();
     let efp = Some(ExchangeFederationParams {
@@ -453,7 +457,7 @@ pub fn declare_federation_upstream(
         trust_user_id,
         prefetch_count,
         ack_mode,
-        bind_using_nowait: false,
+        bind_using_nowait,
         queue_federation: qfp,
         exchange_federation: efp,
     };
@@ -497,6 +501,10 @@ pub fn declare_federation_upstream_for_exchange_federation(
         .get_one::<FederationResourceCleanupMode>("resource_cleanup_mode")
         .cloned()
         .unwrap_or_default();
+    let bind_using_nowait = command_args
+        .get_one::<bool>("bind_nowait")
+        .cloned()
+        .unwrap_or_default();
     let ttl = command_args.get_one::<u32>("ttl").cloned();
     let message_ttl = command_args.get_one::<u32>("message_ttl").cloned();
     let efp = Some(ExchangeFederationParams {
@@ -517,7 +525,7 @@ pub fn declare_federation_upstream_for_exchange_federation(
         trust_user_id,
         prefetch_count,
         ack_mode,
-        bind_using_nowait: false,
+        bind_using_nowait,
         queue_federation: None,
         exchange_federation: efp,
     };