fix: external history tables config and env conflict (#18341)

* fix: external history tables config and env conflict

* add test

* fix test

* fix: allow history table to load credential by connection

* fix: allow history table to load credential by connection

Author: dqhl76

.github/actions/test_logs/action.yml

@@ -33,6 +33,9 @@ runs:
         bash ./tests/logging/test-logs.sh
 
     - name: Run History Tables Tests
+      env:
+        LOG_HISTORY_STORAGE_S3_ACCESS_KEY_ID: 'minioadmin'
+        LOG_HISTORY_STORAGE_S3_SECRET_ACCESS_KEY: 'minioadmin'
       shell: bash
       run: |
         bash ./tests/logging/test-history-tables.sh

src/query/config/src/config.rs

@@ -2794,12 +2794,17 @@ pub struct HistoryLogConfig {
     #[serde(rename = "tables")]
     pub log_history_tables: Vec<HistoryLogTableConfig>,
 
-    /// Specifies the storage parameters for the history log
+    /// Specifies whether enable external storage
+    /// If set to false (default), the default storage parameters from `[storage]` will be used.
+    #[clap(skip)]
+    #[serde(rename = "storage_on", default)]
+    pub log_history_external_storage_on: bool,
+
+    /// Specifies the external storage parameters for the history log
     /// This is used to configure how the history log data is stored.
-    /// If not specified, the default storage parameters from `[storage]` will be used.
     #[clap(skip)]
     #[serde(rename = "storage")]
-    pub log_history_storage_params: Option<StorageConfig>,
+    pub log_history_storage_params: StorageConfig,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -2849,12 +2854,11 @@ impl TryInto<InnerHistoryConfig> for HistoryLogConfig {
     type Error = ErrorCode;
 
     fn try_into(self) -> Result<InnerHistoryConfig> {
-        let storage_params: Option<InnerStorageConfig> =
-            if self.log_history_storage_params.is_some() {
-                Some(self.log_history_storage_params.unwrap().try_into()?)
-            } else {
-                None
-            };
+        let storage_params: Option<InnerStorageConfig> = if self.log_history_external_storage_on {
+            Some(self.log_history_storage_params.try_into()?)
+        } else {
+            None
+        };
         Ok(InnerHistoryConfig {
             on: self.log_history_on,
             log_only: self.log_history_log_only,
@@ -2887,7 +2891,8 @@ impl From<InnerHistoryConfig> for HistoryLogConfig {
             log_history_level: inner.level,
             log_history_retention_interval: inner.retention_interval,
             log_history_tables: inner.tables.into_iter().map(Into::into).collect(),
-            log_history_storage_params: inner_storage_config.map(Into::into),
+            log_history_external_storage_on: inner_storage_config.is_some(),
+            log_history_storage_params: inner_storage_config.map(Into::into).unwrap_or_default(),
         }
     }
 }