Adapt new 'policies' commands based on core team's feedback

Author: michaelklishin

CHANGELOG.md

@@ -12,6 +12,10 @@
    used by `rabbitmqctl` and the latter reflects the fact that the command can be used to update an existing policy,
    in particular, to override its definition
  * `policies patch` is a new command that updates a policy definition by merging the provided definition with the existing one
+ * `policies delete_definition_keys` is a new command that removes keys from a policy definition
+ * `policies delete_definition_keys_from_all_in` is a new command that removes definition keys from all policies in a virtual host
+ * `policies update_definition` is a new command that updates a policy definition key; for multi-key updates, see `policies patch
+ * `policies update_definitions_of_all_in` is a new command that updates a definition key for all policies in a virtual host
  * `policies declare_override` is a new command that declares a policy that overrides another policy
  * `policies declare_blanket` is a new command that declares a low priority policy that matches all objects not matched
    by any other policies

src/cli.rs

@@ -1663,26 +1663,32 @@ fn operator_policies_subcommands(pre_flight_settings: PreFlightSettings) -> [Com
                 .required(true),
         );
 
-    let delete_definition_key_cmd = Command::new("delete_definition_key")
-        .about("Deletes a definition key from an operator policy, unless it is the only key")
+    let delete_definition_key_cmd = Command::new("delete_definition_keys")
+        .about("Deletes definition keys from an operator policy, unless it is the only key")
         .arg(
             Arg::new("name")
                 .long("name")
                 .help("operator policy name")
                 .required(true),
         )
         .arg(
-            Arg::new("definition_key")
-                .long("definition-key")
-                .help("definition key"),
+            Arg::new("definition_keys")
+                .long("definition-keys")
+                .num_args(1..)
+                .value_delimiter(',')
+                .action(ArgAction::Append)
+                .help("comma-separated definition keys"),
         );
 
-    let delete_definition_key_from_all_in_cmd = Command::new("delete_definition_key_from_all_in")
+    let delete_definition_key_from_all_in_cmd = Command::new("delete_definition_keys_from_all_in")
         .about("Deletes a definition key from all operator policies in a virtual host, unless it is the only key")
         .arg(
-            Arg::new("definition_key")
-                .long("definition-key")
-                .help("definition key")
+            Arg::new("definition_keys")
+                .long("definition-keys")
+                .num_args(1..)
+                .value_delimiter(',')
+                .action(ArgAction::Append)
+                .help("comma-separated definition keys")
         );
 
     let list_in_cmd = Command::new("list_in")
@@ -1872,7 +1878,7 @@ fn policies_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 12]
             .required(true),
     );
 
-    let delete_definition_key_cmd = Command::new("delete_definition_key")
+    let delete_definition_keys_cmd = Command::new("delete_definition_keys")
         .about("Deletes a definition key from a policy, unless it is the only key")
         .arg(
             Arg::new("name")
@@ -1881,17 +1887,24 @@ fn policies_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 12]
                 .required(true),
         )
         .arg(
-            Arg::new("definition_key")
-                .long("definition-key")
-                .help("definition key"),
+            Arg::new("definition_keys")
+                .long("definition-keys")
+                .num_args(1..)
+                .value_delimiter(',')
+                .action(ArgAction::Append)
+                .help("comma-separated definition keys"),
         );
 
-    let delete_definition_key_from_all_in_cmd = Command::new("delete_definition_key_from_all_in")
-        .about("Deletes a definition key from all policies in a virtual host, unless it is the only key")
+    let delete_definition_keys_from_all_in_cmd = Command::new("delete_definition_keys_from_all_in")
+        .about("Deletes definition keys from all policies in a virtual host, unless it is the only policy key")
         .arg(
-            Arg::new("definition_key")
-                .long("definition-key")
-                .help("definition key")
+            Arg::new("definition_keys")
+                .long("definition-keys")
+                .help("comma-separated definition keys")
+                .num_args(1..)
+                .value_delimiter(',')
+                .action(ArgAction::Append)
+                .required(true)
         );
 
     let list_in_cmd = Command::new("list_in")
@@ -1974,8 +1987,8 @@ fn policies_subcommands(pre_flight_settings: PreFlightSettings) -> [Command; 12]
         declare_override_cmd,
         declare_blanket_cmd,
         delete_cmd,
-        delete_definition_key_cmd,
-        delete_definition_key_from_all_in_cmd,
+        delete_definition_keys_cmd,
+        delete_definition_keys_from_all_in_cmd,
         list_cmd,
         list_in_cmd,
         list_matching_cmd,

src/commands.rs

@@ -1286,37 +1286,43 @@ pub fn update_all_operator_policy_definitions_in(
     Ok(())
 }
 
-pub fn delete_policy_definition(
+pub fn delete_policy_definition_keys(
     client: APIClient,
     vhost: &str,
     command_args: &ArgMatches,
 ) -> ClientResult<()> {
     let name = command_args.get_one::<String>("name").cloned().unwrap();
-    let key = command_args
-        .get_one::<String>("definition_key")
-        .cloned()
-        .unwrap();
+    let keys = command_args
+        .get_many::<String>("definition_keys")
+        .unwrap()
+        .into_iter()
+        .map(String::from)
+        .collect::<Vec<_>>();
+    let str_keys: Vec<&str> = keys.iter().map(AsRef::as_ref).collect::<Vec<_>>();
 
     let pol = client.get_policy(vhost, &name)?;
-    let updated_pol = pol.without_keys(vec![&key]);
+    let updated_pol = pol.without_keys(str_keys);
 
     let params = PolicyParams::from(&updated_pol);
     client.declare_policy(&params)
 }
 
-pub fn delete_policy_definition_key_in(
+pub fn delete_policy_definition_keys_in(
     client: APIClient,
     vhost: &str,
     command_args: &ArgMatches,
 ) -> ClientResult<()> {
     let pols = client.list_policies_in(vhost)?;
-    let key = command_args
-        .get_one::<String>("definition_key")
-        .cloned()
-        .unwrap();
+    let keys = command_args
+        .get_many::<String>("definition_keys")
+        .unwrap()
+        .into_iter()
+        .map(String::from)
+        .collect::<Vec<_>>();
+    let str_keys: Vec<&str> = keys.iter().map(AsRef::as_ref).collect::<Vec<_>>();
 
     for pol in pols {
-        let updated_pol = pol.without_keys(vec![&key]);
+        let updated_pol = pol.without_keys(str_keys.clone());
 
         let params = PolicyParams::from(&updated_pol);
         client.declare_policy(&params)?
@@ -1325,37 +1331,43 @@ pub fn delete_policy_definition_key_in(
     Ok(())
 }
 
-pub fn delete_operator_policy_definition(
+pub fn delete_operator_policy_definition_keys(
     client: APIClient,
     vhost: &str,
     command_args: &ArgMatches,
 ) -> ClientResult<()> {
     let name = command_args.get_one::<String>("name").cloned().unwrap();
-    let key = command_args
-        .get_one::<String>("definition_key")
-        .cloned()
-        .unwrap();
+    let keys = command_args
+        .get_many::<String>("definition_keys")
+        .unwrap()
+        .into_iter()
+        .map(String::from)
+        .collect::<Vec<_>>();
+    let str_keys: Vec<&str> = keys.iter().map(AsRef::as_ref).collect::<Vec<_>>();
 
     let pol = client.get_operator_policy(vhost, &name)?;
-    let updated_pol = pol.without_keys(vec![&key]);
+    let updated_pol = pol.without_keys(str_keys);
 
     let params = PolicyParams::from(&updated_pol);
     client.declare_operator_policy(&params)
 }
 
-pub fn delete_operator_policy_definition_key_in(
+pub fn delete_operator_policy_definition_keys_in(
     client: APIClient,
     vhost: &str,
     command_args: &ArgMatches,
 ) -> ClientResult<()> {
     let pols = client.list_operator_policies_in(vhost)?;
-    let key = command_args
-        .get_one::<String>("definition_key")
-        .cloned()
-        .unwrap();
+    let keys = command_args
+        .get_many::<String>("definition_keys")
+        .unwrap()
+        .into_iter()
+        .map(String::from)
+        .collect::<Vec<_>>();
+    let str_keys: Vec<&str> = keys.iter().map(AsRef::as_ref).collect::<Vec<_>>();
 
     for pol in pols {
-        let updated_pol = pol.without_keys(vec![&key]);
+        let updated_pol = pol.without_keys(str_keys.clone());
 
         let params = PolicyParams::from(&updated_pol);
         client.declare_operator_policy(&params)?

src/main.rs

@@ -649,13 +649,13 @@ fn dispatch_common_subcommand(
             let result = commands::delete_operator_policy(client, &vhost, second_level_args);
             res_handler.no_output_on_success(result);
         }
-        ("operator_policies", "delete_definition_key") => {
+        ("operator_policies", "delete_definition_keys") => {
             let result =
-                commands::delete_operator_policy_definition(client, &vhost, second_level_args);
+                commands::delete_operator_policy_definition_keys(client, &vhost, second_level_args);
             res_handler.no_output_on_success(result);
         }
-        ("operator_policies", "delete_definition_key_from_all_in") => {
-            let result = commands::delete_operator_policy_definition_key_in(
+        ("operator_policies", "delete_definition_keys_from_all_in") => {
+            let result = commands::delete_operator_policy_definition_keys_in(
                 client,
                 &vhost,
                 second_level_args,
@@ -745,13 +745,13 @@ fn dispatch_common_subcommand(
             let result = commands::delete_policy(client, &vhost, second_level_args);
             res_handler.no_output_on_success(result);
         }
-        ("policies", "delete_definition_key") => {
-            let result = commands::delete_policy_definition(client, &vhost, second_level_args);
+        ("policies", "delete_definition_keys") => {
+            let result = commands::delete_policy_definition_keys(client, &vhost, second_level_args);
             res_handler.no_output_on_success(result);
         }
-        ("policies", "delete_definition_key_from_all_in") => {
+        ("policies", "delete_definition_keys_from_all_in") => {
             let result =
-                commands::delete_policy_definition_key_in(client, &vhost, second_level_args);
+                commands::delete_policy_definition_keys_in(client, &vhost, second_level_args);
             res_handler.no_output_on_success(result);
         }
         ("policies", "list") => {