Merge branch 'bug_23834/make_check_connection_an_option_of_the_update_command_pr'

Author: Jenkins CI

relay/sources/rudder-package/src/cli.rs

@@ -45,7 +45,10 @@ pub struct Args {
 #[derive(Debug, Subcommand)]
 pub enum Command {
     /// Update package index and licenses from the repository
-    Update {},
+    Update {
+        #[clap(long, short, help = "Only check for server connectivity")]
+        check: bool,
+    },
     /// Install plugins, locally or from the repository
     Install {
         #[clap(long, short, help = "Force installation of given plugin")]
@@ -119,6 +122,4 @@ pub enum Command {
         )]
         incompatible: bool,
     },
-    /// Test connection to the plugin repository
-    CheckConnection {},
 }

relay/sources/rudder-package/src/lib.rs

@@ -202,9 +202,13 @@ pub fn run() -> Result<()> {
                 )
             }
         }
-        Command::Update {} => {
-            repo.update(&webapp)?;
-            info!("Index and licenses successfully updated")
+        Command::Update { check } => {
+            if check {
+                repo.test_connection()?;
+            } else {
+                repo.update(&webapp)?;
+                info!("Index and licenses successfully updated")
+            }
         }
         Command::Enable {
             package,
@@ -292,7 +296,6 @@ pub fn run() -> Result<()> {
                 info!("Plugins successfully disabled");
             }
         }
-        Command::CheckConnection {} => repo.test_connection()?,
     }
     // Restart if needed
     webapp.apply_changes()?;