Merge pull request #947 from wangzhen11aaa/fix_confict

Suppress user and password info output via Config structure.

Author: databend-bot

fusequery/query/src/configs/config.rs

@@ -2,6 +2,9 @@
 //
 // SPDX-License-Identifier: Apache-2.0.
 
+use std::fmt;
+use std::str::FromStr;
+
 use common_exception::ErrorCode;
 use common_exception::Result;
 use lazy_static::lazy_static;
@@ -137,15 +140,81 @@ pub struct Config {
     pub store_api_address: String,
 
     #[structopt(long, env = STORE_API_USERNAME, default_value = "root")]
-    pub store_api_username: String,
+    pub store_api_username: User,
 
     #[structopt(long, env = STORE_API_PASSWORD, default_value = "root")]
-    pub store_api_password: String,
+    pub store_api_password: Password,
 
     #[structopt(long, short = "c", env = CONFIG_FILE, default_value = "")]
     pub config_file: String,
 }
 
+#[derive(Clone, serde::Deserialize, PartialEq, StructOpt, StructOptToml)]
+#[serde(default)]
+pub struct Password {
+    pub store_api_password: String,
+}
+
+impl AsRef<String> for Password {
+    fn as_ref(&self) -> &String {
+        &self.store_api_password
+    }
+}
+
+impl FromStr for Password {
+    type Err = ErrorCode;
+    fn from_str(s: &str) -> common_exception::Result<Self> {
+        Ok(Self {
+            store_api_password: s.to_string(),
+        })
+    }
+}
+
+impl ToString for Password {
+    fn to_string(&self) -> String {
+        self.store_api_password.clone()
+    }
+}
+
+impl fmt::Debug for Password {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "******")
+    }
+}
+
+#[derive(Clone, serde::Deserialize, PartialEq, StructOpt, StructOptToml)]
+#[serde(default)]
+pub struct User {
+    pub store_api_username: String,
+}
+
+impl ToString for User {
+    fn to_string(&self) -> String {
+        self.store_api_username.clone()
+    }
+}
+
+impl fmt::Debug for User {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        write!(f, "******")
+    }
+}
+
+impl AsRef<String> for User {
+    fn as_ref(&self) -> &String {
+        &self.store_api_username
+    }
+}
+
+impl FromStr for User {
+    type Err = ErrorCode;
+    fn from_str(s: &str) -> common_exception::Result<Self> {
+        Ok(Self {
+            store_api_username: s.to_string(),
+        })
+    }
+}
+
 impl Config {
     /// Default configs.
     pub fn default() -> Self {
@@ -163,8 +232,12 @@ impl Config {
             http_api_address: "127.0.0.1:8080".to_string(),
             metric_api_address: "127.0.0.1:7070".to_string(),
             store_api_address: "127.0.0.1:9191".to_string(),
-            store_api_username: "root".to_string(),
-            store_api_password: "root".to_string(),
+            store_api_username: User {
+                store_api_username: "root".to_string(),
+            },
+            store_api_password: Password {
+                store_api_password: "root".to_string(),
+            },
             config_file: "".to_string(),
         }
     }
@@ -231,8 +304,8 @@ impl Config {
         env_helper!(mut_config, http_api_address, String, HTTP_API_ADDRESS);
         env_helper!(mut_config, metric_api_address, String, METRICS_API_ADDRESS);
         env_helper!(mut_config, store_api_address, String, STORE_API_ADDRESS);
-        env_helper!(mut_config, store_api_username, String, STORE_API_USERNAME);
-        env_helper!(mut_config, store_api_password, String, STORE_API_PASSWORD);
+        env_helper!(mut_config, store_api_username, User, STORE_API_USERNAME);
+        env_helper!(mut_config, store_api_password, Password, STORE_API_PASSWORD);
 
         Ok(mut_config)
     }

fusequery/query/src/configs/config_test.rs

@@ -4,6 +4,9 @@
 
 use common_exception::Result;
 
+use crate::configs::config::Password;
+use crate::configs::config::User;
+
 #[test]
 fn test_config() -> Result<()> {
     use pretty_assertions::assert_eq;
@@ -26,8 +29,12 @@ fn test_config() -> Result<()> {
             http_api_address: "127.0.0.1:8080".to_string(),
             metric_api_address: "127.0.0.1:7070".to_string(),
             store_api_address: "127.0.0.1:9191".to_string(),
-            store_api_username: "root".to_string(),
-            store_api_password: "root".to_string(),
+            store_api_username: User {
+                store_api_username: "root".to_string(),
+            },
+            store_api_password: Password {
+                store_api_password: "root".to_string(),
+            },
             config_file: "".to_string(),
         };
         let actual = Config::default();
@@ -95,8 +102,8 @@ fn test_config() -> Result<()> {
         assert_eq!("1.2.3.4:7071", configured.metric_api_address);
 
         assert_eq!("1.2.3.4:1234", configured.store_api_address);
-        assert_eq!("admin", configured.store_api_username);
-        assert_eq!("password!", configured.store_api_password);
+        assert_eq!("admin", configured.store_api_username.to_string());
+        assert_eq!("password!", configured.store_api_password.to_string());
 
         // clean up
         std::env::remove_var("FUSE_QUERY_LOG_LEVEL");

fusequery/query/src/datasources/remote/remote_factory.rs

@@ -53,8 +53,8 @@ impl TryGetStoreClient for ClientProvider {
     async fn try_get_client(&self) -> Result<StoreClient> {
         let client = StoreClient::try_create(
             &self.conf.store_api_address,
-            &self.conf.store_api_username,
-            &self.conf.store_api_password,
+            &self.conf.store_api_username.as_ref(),
+            &self.conf.store_api_password.as_ref(),
         )
         .await
         .map_err(ErrorCode::from)?;