Support request --timeout in seconds

Author: michaelklishin

Cargo.lock

@@ -17,7 +17,7 @@ reqwest = { version = "0.12", features = [
     "__rustls",
     "rustls-tls-native-roots",
 ] }
-rabbitmq_http_client = { version = "0.60.0", features = [
+rabbitmq_http_client = { version = "0.61.0", features = [
     "blocking",
     "tabled",
 ] }

Cargo.toml

@@ -558,6 +558,16 @@ pub fn parser(pre_flight_settings: PreFlightSettings) -> Command {
                 .help("Local path to a client private key file in the PEM format")
                 .value_parser(value_parser!(PathBuf)),
         )
+        // --timeout
+        .arg(
+            Arg::new("timeout")
+                .long("timeout")
+                .env("RABBITMQADMIN_TIMEOUT")
+                .help("HTTP API request timeout in seconds. Must be greater than 0")
+                .required(false)
+                .default_value("60")
+                .value_parser(value_parser!(u64).range(1..)),
+        )
         // --quiet
         .arg(
             Arg::new("quiet")

src/cli.rs

@@ -19,6 +19,7 @@ use clap::{ArgMatches, crate_name, crate_version};
 use errors::CommandRunError;
 use reqwest::{Identity, tls::Version as TlsVersion};
 use std::path::{Path, PathBuf};
+use std::time::Duration;
 use std::{fs, process};
 use sysexits::ExitCode;
 
@@ -124,11 +125,17 @@ fn configure_http_api_client<'a>(
     // Due to how SharedSettings are computed, these should safe to unwrap()
     let username = merged_settings.username.clone().unwrap();
     let password = merged_settings.password.clone().unwrap();
+
+    // Extract timeout from CLI arguments (default is 60 seconds)
+    let timeout_secs = cli.get_one::<u64>("timeout").copied().unwrap_or(60);
+    let timeout = Duration::from_secs(timeout_secs);
+
     let client = build_rabbitmq_http_api_client(
         httpc,
         endpoint.to_owned(),
         username.clone(),
         password.clone(),
+        timeout,
     );
     Ok(client)
 }
@@ -173,11 +180,13 @@ fn build_rabbitmq_http_api_client(
     endpoint: String,
     username: String,
     password: String,
+    timeout: Duration,
 ) -> APIClient {
     ClientBuilder::new()
         .with_endpoint(endpoint)
         .with_basic_auth_credentials(username, password)
         .with_client(httpc)
+        .with_request_timeout(timeout)
         .build()
 }
 

src/main.rs

@@ -0,0 +1,47 @@
+// Copyright (C) 2023-2025 RabbitMQ Core Team (teamrabbitmq@gmail.com)
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+mod test_helpers;
+use std::error::Error;
+use test_helpers::{run_fails, run_succeeds};
+
+#[test]
+fn timeout_flag_with_valid_value() -> Result<(), Box<dyn Error>> {
+    run_succeeds(["--timeout", "30", "show", "overview"]);
+
+    Ok(())
+}
+
+#[test]
+fn timeout_flag_with_zero_value_should_fail() -> Result<(), Box<dyn Error>> {
+    run_fails(["--timeout", "0", "show", "overview"]);
+
+    Ok(())
+}
+
+#[test]
+fn timeout_flag_with_negative_value_should_fail() -> Result<(), Box<dyn Error>> {
+    run_fails(["--timeout", "-1", "show", "overview"]);
+
+    Ok(())
+}
+
+#[test]
+fn timeout_uses_default_when_not_specified() -> Result<(), Box<dyn Error>> {
+    // Should use the default timeout of 60 seconds but we have no
+    // easy way of testing this. Welp.
+    run_succeeds(["show", "overview"]);
+
+    Ok(())
+}