Adapt to the latest HTTP API client

Author: michaelklishin

Cargo.lock

@@ -19,8 +19,8 @@ use super::tanzu_cli::tanzu_subcommands;
 use crate::output::TableStyle;
 use clap::{Arg, ArgAction, ArgGroup, Command, value_parser};
 use rabbitmq_http_client::commons::{
-    BindingDestinationType, ExchangeType, PolicyTarget, QueueType, ShovelAcknowledgementMode,
-    SupportedProtocol,
+    BindingDestinationType, ExchangeType, MessageTransferAcknowledgementMode, PolicyTarget,
+    QueueType, SupportedProtocol,
 };
 
 pub fn parser() -> Command {
@@ -1468,7 +1468,7 @@ pub fn shovel_subcommands() -> [Command; 4] {
                 .long("ack-mode")
                 .help("One of: on-confirm, on-publish, no-ack")
                 .default_value("on-confirm")
-                .value_parser(value_parser!(ShovelAcknowledgementMode)),
+                .value_parser(value_parser!(MessageTransferAcknowledgementMode)),
         )
         .arg(
             Arg::new("source_queue")
@@ -1558,7 +1558,7 @@ pub fn shovel_subcommands() -> [Command; 4] {
                 .long("ack-mode")
                 .help("One of: on-confirm, on-publish, no-ack")
                 .default_value("on-confirm")
-                .value_parser(value_parser!(ShovelAcknowledgementMode)),
+                .value_parser(value_parser!(MessageTransferAcknowledgementMode)),
         )
         .arg(Arg::new("source_address").long("source-address"))
         .arg(Arg::new("destination_address").long("destination-address"))

src/cli.rs

@@ -18,8 +18,8 @@ use rabbitmq_http_client::blocking_api::Client;
 use rabbitmq_http_client::blocking_api::Result as ClientResult;
 use rabbitmq_http_client::commons;
 use rabbitmq_http_client::commons::{ExchangeType, SupportedProtocol};
+use rabbitmq_http_client::commons::{MessageTransferAcknowledgementMode, UserLimitTarget};
 use rabbitmq_http_client::commons::{PolicyTarget, VirtualHostLimitTarget};
-use rabbitmq_http_client::commons::{ShovelAcknowledgementMode, UserLimitTarget};
 use rabbitmq_http_client::requests::{
     Amqp10ShovelDestinationParams, Amqp10ShovelParams, Amqp10ShovelSourceParams,
     Amqp091ShovelDestinationParams, Amqp091ShovelParams, Amqp091ShovelSourceParams,
@@ -210,7 +210,7 @@ pub fn declare_amqp10_shovel(
         .unwrap();
 
     let ack_mode = command_args
-        .get_one::<ShovelAcknowledgementMode>("ack_mode")
+        .get_one::<MessageTransferAcknowledgementMode>("ack_mode")
         .cloned()
         .unwrap();
     let reconnect_delay = command_args
@@ -256,7 +256,7 @@ pub fn declare_amqp091_shovel(
         .unwrap();
 
     let ack_mode = command_args
-        .get_one::<ShovelAcknowledgementMode>("ack_mode")
+        .get_one::<MessageTransferAcknowledgementMode>("ack_mode")
         .cloned()
         .unwrap();
     let reconnect_delay = command_args

src/commands.rs

@@ -73,6 +73,8 @@ pub enum CommandRunError {
     ConflictingOptions { message: String },
     #[error("{message}")]
     MissingOptions { message: String },
+    #[error("Missing argument value for property (field) {property}")]
+    MissingArgumentValue { property: String },
     #[error("Unsupported argument value for property (field) {property}")]
     UnsupportedArgumentValue { property: String },
     #[error("This request produces an invalid HTTP header value")]
@@ -93,26 +95,29 @@ impl From<HttpClientError> for CommandRunError {
     fn from(value: HttpClientError) -> Self {
         match value {
             ApiClientError::UnsupportedArgumentValue { property } => {
-                Self::UnsupportedArgumentValue { property }
-            }
+                        Self::UnsupportedArgumentValue { property }
+                    }
             ApiClientError::ClientErrorResponse { status_code, url, body, headers, .. } => {
-                Self::ClientError { status_code, url, body, headers }
-            },
+                        Self::ClientError { status_code, url, body, headers }
+                    },
             ApiClientError::ServerErrorResponse { status_code, url, body, headers, .. } => {
-                Self::ServerError { status_code, url, body, headers }
-            },
+                        Self::ServerError { status_code, url, body, headers }
+                    },
             ApiClientError::HealthCheckFailed { path, details, status_code } => {
-                Self::HealthCheckFailed { health_check_path: path, details, status_code }
-            },
+                        Self::HealthCheckFailed { health_check_path: path, details, status_code }
+                    },
             ApiClientError::NotFound => Self::NotFound,
             ApiClientError::MultipleMatchingBindings => Self::ConflictingOptions {
-                message: "multiple bindings match, cannot determine which binding to delete without explicitly provided binding properties".to_owned()
-            },
+                        message: "multiple bindings match, cannot determine which binding to delete without explicitly provided binding properties".to_owned()
+                    },
             ApiClientError::InvalidHeaderValue { error } => {
-                Self::InvalidHeaderValue { error }
-            },
+                        Self::InvalidHeaderValue { error }
+                    },
             ApiClientError::RequestError { error, .. } => Self::RequestError { error },
             ApiClientError::Other => Self::Other,
+            ApiClientError::MissingProperty { argument } => {
+                Self::MissingArgumentValue { property: argument }
+            },
         }
     }
 }

src/errors.rs

@@ -387,6 +387,7 @@ impl<'a> ResultHandler<'a> {
 // We cannot implement From<T> for two types in other crates, so…
 pub(crate) fn client_error_to_exit_code(error: &HttpClientError) -> ExitCode {
     match error {
+        ClientError::MissingProperty { .. } => ExitCode::DataErr,
         ClientError::UnsupportedArgumentValue { .. } => ExitCode::DataErr,
         ClientError::ClientErrorResponse { .. } => ExitCode::DataErr,
         ClientError::ServerErrorResponse { .. } => ExitCode::Unavailable,

src/output.rs

@@ -252,6 +252,22 @@ pub fn schema_definition_sync_status(status: SchemaDefinitionSyncStatus) -> Tabl
 
 pub fn failure_details(error: &HttpClientError) -> Table {
     match error {
+        HttpClientError::MissingProperty { argument } => {
+            let message = format!("Missing value for property (field) {}", argument);
+            let data = vec![
+                RowOfTwo {
+                    key: "result",
+                    value: "request was not executed",
+                },
+                RowOfTwo {
+                    key: "message",
+                    value: &message,
+                },
+            ];
+
+            let tb = Table::builder(data);
+            tb.build()
+        }
         HttpClientError::UnsupportedArgumentValue { property } => {
             let message = format!(
                 "Unsupported argument value for property (field) {}",