feat(config): move [[idm.users]] to [[query.users]].

Author: youngsofun

src/query/config/src/inner.rs

@@ -53,8 +53,6 @@ pub struct Config {
     // - Later, catalog information SHOULD be kept in KV Service
     // - currently only supports HIVE (via hive meta store)
     pub catalog: HiveCatalogConfig,
-
-    pub idm: IDMConfig,
 }
 
 impl Config {
@@ -150,6 +148,7 @@ pub struct QueryConfig {
     pub async_insert_max_data_size: u64,
     pub async_insert_busy_timeout: u64,
     pub async_insert_stale_timeout: u64,
+    pub idm: IDMConfig,
 }
 
 impl Default for QueryConfig {
@@ -194,6 +193,7 @@ impl Default for QueryConfig {
             async_insert_max_data_size: 10000,
             async_insert_busy_timeout: 200,
             async_insert_stale_timeout: 0,
+            idm: IDMConfig::default(),
         }
     }
 }

src/query/config/src/outer_v0.rs

@@ -93,9 +93,6 @@ pub struct Config {
     // - currently only supports HIVE (via hive meta store)
     #[clap(flatten)]
     pub catalog: HiveCatalogConfig,
-
-    #[clap(skip)]
-    pub idm: IDMConfig,
 }
 
 impl Default for Config {
@@ -148,7 +145,6 @@ impl From<InnerConfig> for Config {
             meta: inner.meta.into(),
             storage: inner.storage.into(),
             catalog: inner.catalog.into(),
-            idm: inner.idm.into(),
         }
     }
 }
@@ -165,7 +161,6 @@ impl TryInto<InnerConfig> for Config {
             meta: self.meta.try_into()?,
             storage: self.storage.try_into()?,
             catalog: self.catalog.try_into()?,
-            idm: self.idm.try_into()?,
         })
     }
 }
@@ -826,6 +821,10 @@ pub struct QueryConfig {
     /// The maximum timeout in milliseconds since the last insert before inserting collected data.
     #[clap(long, default_value = "0")]
     pub async_insert_stale_timeout: u64,
+
+    #[clap(skip)]
+    #[serde(flatten)]
+    pub idm: IDMConfig,
 }
 
 impl Default for QueryConfig {
@@ -878,6 +877,7 @@ impl TryInto<InnerQueryConfig> for QueryConfig {
             async_insert_max_data_size: self.async_insert_max_data_size,
             async_insert_busy_timeout: self.async_insert_busy_timeout,
             async_insert_stale_timeout: self.async_insert_stale_timeout,
+            idm: self.idm.try_into()?,
         })
     }
 }
@@ -931,6 +931,7 @@ impl From<InnerQueryConfig> for QueryConfig {
             async_insert_max_data_size: inner.async_insert_max_data_size,
             async_insert_busy_timeout: inner.async_insert_busy_timeout,
             async_insert_stale_timeout: inner.async_insert_stale_timeout,
+            idm: inner.idm.into(),
         }
     }
 }

src/query/service/src/global_services.rs

@@ -89,7 +89,7 @@ impl GlobalServices {
         SessionManager::init(config.clone(), global_services.clone())?;
         UserApiProvider::init(
             config.meta.to_meta_grpc_client_conf(),
-            config.idm,
+            config.query.idm,
             global_services.clone(),
         )
         .await?;

src/query/service/tests/it/configs.rs

@@ -71,6 +71,7 @@ jwt_key_file = ""
 async_insert_max_data_size = 10000
 async_insert_busy_timeout = 200
 async_insert_stale_timeout = 0
+users = []
 
 [log]
 level = "INFO"
@@ -142,9 +143,6 @@ root = ""
 [catalog]
 meta_store_address = "127.0.0.1:9083"
 protocol = "binary"
-
-[idm]
-users = []
 "#;
 
     let tom_actual = toml::to_string(&actual.into_outer()).unwrap();
@@ -485,6 +483,7 @@ jwt_key_file = ""
 async_insert_max_data_size = 10000
 async_insert_busy_timeout = 200
 async_insert_stale_timeout = 0
+users = []
 
 [log]
 level = "INFO"
@@ -538,10 +537,7 @@ root = ""
 [catalog]
 meta_store_address = "127.0.0.1:9083"
 protocol = "binary"
-
-[idm]
-users = []
-    "#
+"#
         .as_bytes(),
     )?;
 

src/query/service/tests/it/tests/config.rs

@@ -65,7 +65,7 @@ impl ConfigBuilder {
     pub fn add_user(mut self, user_name: &str, auth_info: AuthInfo) -> ConfigBuilder {
         let mut users = HashMap::new();
         users.insert(user_name.to_string(), auth_info);
-        self.conf.idm = IDMConfig { users };
+        self.conf.query.idm = IDMConfig { users };
         self
     }
 

src/query/service/tests/it/tests/sessions.rs

@@ -112,7 +112,7 @@ impl TestGlobalServices {
         SessionManager::init(config.clone(), global_services.clone())?;
         UserApiProvider::init(
             config.meta.to_meta_grpc_client_conf(),
-            config.idm.clone(),
+            config.query.idm.clone(),
             global_services.clone(),
         )
         .await?;