strip_cmq_policies => strip_cmq_keys_from_policies

Author: michaelklishin

Cargo.lock

@@ -1198,10 +1198,10 @@ A comma-separated list of names of the definition transformations to apply.
 
 Supported transformations:
 
- * strip_cmq_policies
+ * strip_cmq_keys_from_policies
  * drop_empty_policies
 
-Example use: --transformations strip_cmq_policies,drop_empty_policies
+Example use: --transformations strip_cmq_keys_from_policies,drop_empty_policies
                 "#,
                 )
                 .num_args(1..)
@@ -1259,7 +1259,7 @@ Example use: --transformations strip_cmq_policies,drop_empty_policies
 }
 
 fn export_subcommands() -> [Command; 1] {
-    [Command::new("definitions")
+    let definitions = Command::new("definitions")
         .about("prefer 'definitions export'")
         .after_long_help(color_print::cformat!(
             "<bold>Doc guide</bold>: {}",
@@ -1271,7 +1271,28 @@ fn export_subcommands() -> [Command; 1] {
                 .help("output path")
                 .required(false)
                 .default_value("-"),
-        )]
+        ).arg(
+        Arg::new("transformations")
+            .long("transformations")
+            .short('t')
+            .long_help(
+                r#"
+A comma-separated list of names of the definition transformations to apply.
+
+Supported transformations:
+
+ * strip_cmq_keys_from_policies
+ * drop_empty_policies
+
+Example use: --transformations strip_cmq_keys_from_policies,drop_empty_policies
+                "#,
+            )
+            .num_args(1..)
+            .value_delimiter(',')
+            .action(ArgAction::Append)
+            .required(false),
+    );
+    [definitions]
 }
 
 fn import_subcommands() -> [Command; 1] {

src/cli.rs

@@ -21,8 +21,8 @@ use rabbitmq_http_client::commons::{ExchangeType, SupportedProtocol};
 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,
+    Amqp10ShovelDestinationParams, Amqp10ShovelParams, Amqp10ShovelSourceParams,
     EnforcedLimitParams,
 };
 use std::fs;
@@ -920,6 +920,7 @@ pub fn export_cluster_wide_definitions(
             .into_iter()
             .map(String::from)
             .collect::<Vec<_>>();
+
         export_and_transform_cluster_wide_definitions(client, command_args, transformations)
     }
 }

src/commands.rs

@@ -45,3 +45,35 @@ fn test_export_vhost_definitions() -> Result<(), Box<dyn std::error::Error>> {
 
     Ok(())
 }
+
+#[test]
+fn test_export_cluster_wide_definitions_with_transformations_case1() -> Result<(), Box<dyn std::error::Error>> {
+    let vh = "test_export_cluster_definitions.transformations.1";
+    delete_vhost(vh).expect("failed to delete a virtual host");
+    run_succeeds(["declare", "vhost", "--name", vh]);
+
+    let p1 = "test_export_cluster_definitions.1";
+    run_succeeds([
+        "--vhost", vh,
+        "declare", "policy",
+        "--name", p1,
+        "--pattern", "^matching\\..+", "--apply-to", "classic_queues", "--priority", "10",
+        "--definition", "{\"max-length\": 10}"]);
+
+    let q = "qq.test_export_cluster_definitions.1";
+    run_succeeds([
+        "-V", vh, "declare", "queue", "--name", q, "--type", "quorum",
+    ]);
+
+    run_succeeds(["--vhost", vh, "definitions", "export"])
+        .stdout(predicate::str::contains(p1));
+    // These two cannot be tested on 4.x: empty definitions will be rejected
+    // by validation and CMQ keys are no longer recognized as known/valid.
+    // But at least we can test the code path this way.
+    run_succeeds(["--vhost", vh, "definitions", "export", "--transformations", "strip_cmq_keys_from_policies,drop_empty_policies"])
+        .stdout(predicate::str::contains(p1));
+
+    delete_vhost(vh).expect("failed to delete a virtual host");
+
+    Ok(())
+}