Implement progress reporting for more 'shovels' commands

Author: michaelklishin

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## v2.14.0 (in development)
 
-No changes yet.
+### Enhancements
 
+* Several commands now have minimalistic progress indicators: `federation disable_tls_peer_verification_for_all_upstreams`, `federation enable_tls_peer_verification_for_all_upstreams`, `shovels disable_tls_peer_verification_for_all_source_uris`, `shovels disable_tls_peer_verification_for_all_destination_uris`, `shovels enable_tls_peer_verification_for_all_source_uris`, and `shovels enable_tls_peer_verification_for_all_destination_uris`
 
 ## v2.13.0 (Sep 26, 2025)
 

src/commands.rs

@@ -744,7 +744,7 @@ pub fn disable_tls_peer_verification_for_all_federation_upstreams(
         prog_rep.report_success(upstream_name);
     }
 
-    prog_rep.finish_operation(total, total);
+    prog_rep.finish_operation(total);
 
     Ok(())
 }
@@ -825,7 +825,7 @@ pub fn enable_tls_peer_verification_for_all_federation_upstreams(
         prog_rep.report_success(upstream_name);
     }
 
-    prog_rep.finish_operation(total, total);
+    prog_rep.finish_operation(total);
     Ok(())
 }
 
@@ -849,7 +849,7 @@ pub fn disable_tls_peer_verification_for_all_source_uris(
         let owned_params = match OwnedShovelParams::try_from(param.clone()) {
             Ok(params) => params,
             Err(_) => {
-                prog_rep.report_skip(param_name, "invalid shovel parameters");
+                prog_rep.report_skip(param_name, "shovel parameters fail validation");
                 continue;
             }
         };
@@ -871,51 +871,62 @@ pub fn disable_tls_peer_verification_for_all_source_uris(
         prog_rep.report_success(param_name);
     }
 
-    prog_rep.finish_operation(total, total);
+    prog_rep.finish_operation(total);
 
     Ok(())
 }
 
 pub fn disable_tls_peer_verification_for_all_destination_uris(
     client: APIClient,
-    _prog_rep: &mut dyn ProgressReporter,
+    prog_rep: &mut dyn ProgressReporter,
 ) -> Result<(), CommandRunError> {
     let all_params = client.list_runtime_parameters()?;
     let shovel_params: Vec<_> = all_params
         .into_iter()
         .filter(|p| p.component == "shovel")
         .collect();
 
-    for param in shovel_params {
+    let total = shovel_params.len();
+    prog_rep.start_operation(total, "Updating shovel destination URIs");
+
+    for (index, param) in shovel_params.into_iter().enumerate() {
+        let param_name = &param.name;
+        prog_rep.report_progress(index + 1, total, param_name);
+
         let owned_params = match OwnedShovelParams::try_from(param.clone()) {
             Ok(params) => params,
-            Err(_) => continue,
+            Err(_) => {
+                prog_rep.report_skip(param_name, "shovel parameters fail validation");
+                continue;
+            }
         };
 
         let original_destination_uri = &owned_params.destination_uri;
 
         if original_destination_uri.is_empty() {
+            prog_rep.report_skip(param_name, "empty destination URI");
             continue;
         }
 
         let updated_destination_uri = disable_tls_peer_verification(original_destination_uri)?;
 
-        if original_destination_uri != &updated_destination_uri {
-            let mut updated_params = owned_params;
-            updated_params.destination_uri = updated_destination_uri;
+        let mut updated_params = owned_params;
+        updated_params.destination_uri = updated_destination_uri;
 
-            let param = RuntimeParameterDefinition::from(&updated_params);
-            client.upsert_runtime_parameter(&param)?;
-        }
+        let param = RuntimeParameterDefinition::from(&updated_params);
+        client.upsert_runtime_parameter(&param)?;
+        prog_rep.report_success(param_name);
     }
 
+    prog_rep.finish_operation(total);
+
     Ok(())
 }
 
 pub fn enable_tls_peer_verification_for_all_source_uris(
     client: APIClient,
     args: &ArgMatches,
-    _prog_rep: &mut dyn ProgressReporter,
+    prog_rep: &mut dyn ProgressReporter,
 ) -> Result<(), CommandRunError> {
     let ca_cert_path = args
         .get_one::<String>("node_local_ca_certificate_bundle_path")
@@ -939,14 +950,24 @@ pub fn enable_tls_peer_verification_for_all_source_uris(
         .filter(|p| p.component == "shovel")
         .collect();
 
-    for param in shovel_params {
+    let total = shovel_params.len();
+    prog_rep.start_operation(total, "Updating shovel source URIs");
+
+    for (index, param) in shovel_params.into_iter().enumerate() {
+        let param_name = &param.name;
+        prog_rep.report_progress(index + 1, total, param_name);
+
         let owned_params = match OwnedShovelParams::try_from(param.clone()) {
             Ok(params) => params,
-            Err(_) => continue,
+            Err(_) => {
+                prog_rep.report_skip(param_name, "shovel parameters fail validation");
+                continue;
+            }
         };
 
         let original_source_uri = &owned_params.source_uri;
         if original_source_uri.is_empty() {
+            prog_rep.report_skip(param_name, "empty source URI");
             continue;
         }
 
@@ -957,22 +978,23 @@ pub fn enable_tls_peer_verification_for_all_source_uris(
             client_key_path,
         )?;
 
-        if original_source_uri != &updated_source_uri {
-            let mut updated_params = owned_params;
-            updated_params.source_uri = updated_source_uri;
+        let mut updated_params = owned_params;
+        updated_params.source_uri = updated_source_uri;
 
-            let param = RuntimeParameterDefinition::from(&updated_params);
-            client.upsert_runtime_parameter(&param)?;
-        }
+        let param = RuntimeParameterDefinition::from(&updated_params);
+        client.upsert_runtime_parameter(&param)?;
+        prog_rep.report_success(param_name);
     }
 
+    prog_rep.finish_operation(total);
+
     Ok(())
 }
 
 pub fn enable_tls_peer_verification_for_all_destination_uris(
     client: APIClient,
     args: &ArgMatches,
-    _prog_rep: &mut dyn ProgressReporter,
+    prog_rep: &mut dyn ProgressReporter,
 ) -> Result<(), CommandRunError> {
     let ca_cert_path = args
         .get_one::<String>("node_local_ca_certificate_bundle_path")
@@ -996,14 +1018,24 @@ pub fn enable_tls_peer_verification_for_all_destination_uris(
         .filter(|p| p.component == "shovel")
         .collect();
 
-    for param in shovel_params {
+    let total = shovel_params.len();
+    prog_rep.start_operation(total, "Updating shovel destination URIs");
+
+    for (index, param) in shovel_params.into_iter().enumerate() {
+        let param_name = &param.name;
+        prog_rep.report_progress(index + 1, total, param_name);
+
         let owned_params = match OwnedShovelParams::try_from(param.clone()) {
             Ok(params) => params,
-            Err(_) => continue,
+            Err(_) => {
+                prog_rep.report_skip(param_name, "shovel parameters fail validation");
+                continue;
+            }
         };
 
         let original_destination_uri = &owned_params.destination_uri;
         if original_destination_uri.is_empty() {
+            prog_rep.report_skip(param_name, "empty destination URI");
             continue;
         }
 
@@ -1014,15 +1046,16 @@ pub fn enable_tls_peer_verification_for_all_destination_uris(
             client_key_path,
         )?;
 
-        if original_destination_uri != &updated_destination_uri {
-            let mut updated_params = owned_params;
-            updated_params.destination_uri = updated_destination_uri;
+        let mut updated_params = owned_params;
+        updated_params.destination_uri = updated_destination_uri;
 
-            let param = RuntimeParameterDefinition::from(&updated_params);
-            client.upsert_runtime_parameter(&param)?;
-        }
+        let param = RuntimeParameterDefinition::from(&updated_params);
+        client.upsert_runtime_parameter(&param)?;
+        prog_rep.report_success(param_name);
     }
 
+    prog_rep.finish_operation(total);
+
     Ok(())
 }
 

src/output.rs

@@ -461,7 +461,7 @@ pub trait ProgressReporter {
     fn report_progress(&mut self, current: usize, total: usize, item_name: &str);
     fn report_success(&mut self, item_name: &str);
     fn report_skip(&mut self, item_name: &str, reason: &str);
-    fn finish_operation(&mut self, succeeded: usize, total: usize);
+    fn finish_operation(&mut self, total: usize);
 }
 
 #[allow(dead_code)]
@@ -502,23 +502,15 @@ impl ProgressReporter for InteractiveProgressReporter {
     }
 
     fn report_success(&mut self, _item_name: &str) {
-        print!(" ✅");
+        // No-op: progress bar already shows the advancement
     }
 
     fn report_skip(&mut self, _item_name: &str, _reason: &str) {
         // No-op: progress bar already shows the advancement
     }
 
-    fn finish_operation(&mut self, succeeded: usize, total: usize) {
-        let skipped = total - succeeded;
-        if skipped > 0 {
-            println!(
-                "\n✓ Completed: {} updated, {} already configured",
-                succeeded, skipped
-            );
-        } else {
-            println!("\n✓ Completed: {} items updated", succeeded);
-        }
+    fn finish_operation(&mut self, total: usize) {
+        println!("\n✅ Completed: {} items processed", total);
     }
 }
 
@@ -556,16 +548,8 @@ impl ProgressReporter for NonInteractiveProgressReporter {
         // Dot already printed in report_progress
     }
 
-    fn finish_operation(&mut self, succeeded: usize, total: usize) {
-        let skipped = total - succeeded;
-        if skipped > 0 {
-            println!(
-                "\nCompleted: {} updated, {} already configured",
-                succeeded, skipped
-            );
-        } else {
-            println!("\nCompleted: {} items updated", succeeded);
-        }
+    fn finish_operation(&mut self, total: usize) {
+        println!("\nCompleted: {} items processed", total);
     }
 }
 
@@ -596,15 +580,7 @@ impl ProgressReporter for QuietProgressReporter {
         // Silent
     }
 
-    fn finish_operation(&mut self, succeeded: usize, total: usize) {
-        let skipped = total - succeeded;
-        if skipped > 0 {
-            println!(
-                "Completed: {} updated, {} already configured",
-                succeeded, skipped
-            );
-        } else {
-            println!("Completed: {} items updated", succeeded);
-        }
+    fn finish_operation(&mut self, total: usize) {
+        println!("Completed: {} items processed", total);
     }
 }

tests/interactivity_mode_tests.rs

@@ -29,7 +29,7 @@ fn test_interactivity_mode_non_interactive() {
 
 #[test]
 fn test_interactivity_mode_from_env_interactive() {
-    // Clear the environment variable to test default case
+    // Clear the environment variable to test the default case
     unsafe {
         std::env::remove_var("RABBITMQADMIN_NON_INTERACTIVE_MODE");
     }