refactor: improve MySQL credential setup and error handling (#12)

* refactor: improve MySQL credential setup and error handling

* ci: fix cargo fmt check

Author: QuakeWang

src/lib.rs

@@ -36,37 +36,27 @@ pub fn run_cli() -> Result<()> {
             .default(true)
             .interact()?
     {
-        let mut success = false;
-        for _ in 0..3 {
-            match cred_mgr.prompt_credentials_with_connection_test() {
-                Ok((user, password)) => {
-                    let mysql_config = cred_mgr.encrypt_credentials(&user, &password)?;
-                    doris_config.mysql = Some(mysql_config);
-                    persist_configuration(&doris_config);
-
-                    match tools::mysql::MySQLTool.query_cluster_info(&doris_config) {
-                        Ok(cluster_info) => {
-                            if let Err(e) = cluster_info.save_to_file() {
-                                ui::print_warning(&format!("Failed to save cluster info: {e}"));
-                            }
-                        }
-                        Err(e) => {
-                            ui::print_warning(&format!("Failed to collect cluster info: {e}"));
+        match cred_mgr.prompt_credentials_with_connection_test() {
+            Ok((user, password)) => {
+                let mysql_config = cred_mgr.encrypt_credentials(&user, &password)?;
+                doris_config.mysql = Some(mysql_config);
+                persist_configuration(&doris_config);
+
+                match tools::mysql::MySQLTool.query_cluster_info(&doris_config) {
+                    Ok(cluster_info) => {
+                        if let Err(e) = cluster_info.save_to_file() {
+                            ui::print_warning(&format!("Failed to save cluster info: {e}"));
                         }
                     }
-
-                    success = true;
-                    break;
-                }
-                Err(e) => {
-                    ui::print_warning(&format!("MySQL credential setup failed: {e}"));
+                    Err(e) => {
+                        ui::print_warning(&format!("Failed to collect cluster info: {e}"));
+                    }
                 }
             }
-        }
-        if !success {
-            ui::print_warning(
-                "MySQL credential setup failed after 3 attempts. You can configure it later in the settings.",
-            );
+            Err(e) => {
+                ui::print_warning(&format!("MySQL credential setup failed: {e}"));
+                ui::print_warning("You can configure it later in the settings.");
+            }
         }
     }
 

src/tools/mysql/client.rs

@@ -52,6 +52,10 @@ impl MySQLTool {
             let stderr = String::from_utf8_lossy(&output.stderr);
             if stderr.contains("Access denied for user") || stderr.contains("ERROR 1045") {
                 return Err(CliError::MySQLAccessDenied(stderr.to_string()));
+            } else {
+                return Err(CliError::ToolExecutionFailed(format!(
+                    "mysql query failed: {stderr}"
+                )));
             }
         }
         Ok(String::from_utf8_lossy(&output.stdout).to_string())
@@ -66,19 +70,23 @@ impl MySQLTool {
         query: &str,
     ) -> Result<std::process::Output> {
         let mut command = Command::new("mysql");
-        command.args([
-            "-h",
-            host,
-            "-P",
-            &port.to_string(),
-            "-u",
-            user,
-            &format!("-p{password}"),
-            "-A",
-            "-e",
-            query,
-        ]);
-        crate::executor::execute_command(&mut command, "mysql")
+        command.arg("-h").arg(host);
+        command.arg("-P").arg(port.to_string());
+        command.arg("-u").arg(user);
+
+        if !password.is_empty() {
+            command.arg(format!("-p{password}"));
+        }
+
+        command.arg("-A");
+        command.arg("-e").arg(query);
+
+        // Prevent mysql from prompting for a password interactively
+        command.stdin(std::process::Stdio::null());
+
+        command
+            .output()
+            .map_err(|e| CliError::ToolExecutionFailed(format!("Failed to execute mysql: {e}")))
     }
 
     /// Gets the connection parameters for MySQL, with a clear priority:

src/tools/mysql/credentials.rs

@@ -39,34 +39,46 @@ impl CredentialManager {
         Ok((user, password))
     }
 
+    /// Prompts for credentials and verifies them, handling passwordless scenarios.
     pub fn prompt_credentials_with_connection_test(&self) -> Result<(String, String)> {
         let max_retries = 3;
-        for attempt in 0..max_retries {
+        for _ in 0..max_retries {
             let (user, password) = self.prompt_for_credentials()?;
-            // Build a temporary DorisConfig for connection test
-            let config = DorisConfig {
-                mysql: Some(MySQLConfig {
-                    user: user.clone(),
-                    password: self.encrypt_password(&password)?,
-                }),
-                ..Default::default()
-            };
-            // Try to run a simple query to test credentials
-            let test_result = MySQLTool::query_sql_with_config(&config, "SELECT 1");
-            match test_result {
-                Ok(_) => return Ok((user, password)),
+
+            match self.test_connection(&user, &password) {
+                Ok(_) => {
+                    if password.is_empty() || self.test_connection(&user, "").is_err() {
+                        return Ok((user, password));
+                    } else {
+                        return Ok((user, "".to_string()));
+                    }
+                }
                 Err(CliError::MySQLAccessDenied(_)) => {
-                    println!("Access denied for user. Please try again.");
+                    crate::ui::print_error(
+                        "Access denied. Please check your password and try again.",
+                    );
+                }
+                Err(e) => {
+                    return Err(e);
                 }
-                Err(e) => return Err(e),
-            }
-            if attempt == max_retries - 1 {
-                return Err(CliError::MySQLAccessDenied(
-                    "Maximum retries reached".to_string(),
-                ));
             }
         }
-        unreachable!()
+
+        Err(CliError::MySQLAccessDenied(
+            "Maximum retries reached".to_string(),
+        ))
+    }
+
+    /// Helper function to test a MySQL connection with specific credentials.
+    fn test_connection(&self, user: &str, password: &str) -> Result<()> {
+        let config = DorisConfig {
+            mysql: Some(MySQLConfig {
+                user: user.to_string(),
+                password: self.encrypt_password(password)?,
+            }),
+            ..Default::default()
+        };
+        MySQLTool::query_sql_with_config(&config, "SELECT 1").map(|_| ())
     }
 
     pub fn encrypt_credentials(&self, user: &str, password: &str) -> Result<MySQLConfig> {