x

Author: forsaken628

Cargo.lock

@@ -478,6 +478,8 @@ self_cell = "1.2.0"
 semver = "1.0.14"
 seq-marked = { version = "0.3.1", features = ["seq-marked-serde", "seq-marked-bincode", "seqv-serde"] }
 serde = { version = "1.0.164", features = ["derive", "rc"] }
+serde-bridge = "0.0.3"
+serde-env = { git = "https://github.com/Xuanwo/serde-env", rev = "085d4b1" }
 serde_derive = "1"
 serde_ignored = "0.1.10"
 serde_json = { version = "1.0.85", default-features = false, features = ["preserve_order", "unbounded_depth"] }

Cargo.toml

@@ -26,6 +26,8 @@ databend-common-storage = { workspace = true }
 databend-common-tracing = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true }
+serde-bridge = { workspace = true }
+serde-env = { workspace = true }
 serde_ignored = { workspace = true }
 serde_with = { workspace = true }
 serfig = { workspace = true }

src/query/config/Cargo.toml

@@ -59,10 +59,10 @@ use databend_common_tracing::CONFIG_DEFAULT_LOG_LEVEL;
 use serde::Deserialize;
 use serde::Serialize;
 use serde_with::with_prefix;
-use serfig::collectors::from_env;
 use serfig::collectors::from_file;
 use serfig::collectors::from_self;
 
+use super::env::from_env;
 use super::inner;
 use super::inner::CatalogConfig as InnerCatalogConfig;
 use super::inner::CatalogHiveConfig as InnerCatalogHiveConfig;
@@ -3529,7 +3529,7 @@ pub struct SpillConfig {
     /// Allow space in bytes to spill to local disk.
     pub spill_local_disk_max_bytes: u64,
 
-    // TODO: We need to fix StorageConfig so that it supports environment variables and command line injections.
+    // TODO: We need to fix StorageConfig so that it supports command line injections.
     #[clap(skip)]
     pub storage: Option<StorageConfig>,
 }

src/query/config/src/config.rs

@@ -0,0 +1,75 @@
+// Copyright 2021 Datafuse Labs
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt::Debug;
+use std::marker::PhantomData;
+
+use log::debug;
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+use serde_bridge::IntoValue;
+use serde_bridge::Value;
+use serfig::collectors::IntoCollector;
+use serfig::Collector;
+
+pub fn from_env<V>() -> Environment<V>
+where V: DeserializeOwned + Serialize + Debug {
+    Environment {
+        _v: Default::default(),
+    }
+}
+
+#[derive(Debug)]
+pub struct Environment<V: DeserializeOwned + Serialize + Debug> {
+    _v: PhantomData<V>,
+}
+
+impl<V> Collector<V> for Environment<V>
+where V: DeserializeOwned + Serialize + Debug
+{
+    fn collect(&mut self) -> anyhow::Result<Value> {
+        let v: V = serde_env::from_env()?;
+        debug!("value parsed from env: {:?}", v);
+        Ok(v.into_value()?)
+    }
+}
+
+impl<V> IntoCollector<V> for Environment<V>
+where V: DeserializeOwned + Serialize + Debug + 'static
+{
+    fn into_collector(self) -> Box<dyn Collector<V>> {
+        Box::new(self)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::Config;
+
+    #[test]
+    fn test_env() {
+        // see https://github.com/Xuanwo/serde-env/pull/48
+        let cfg: Config = serde_env::from_iter([
+            ("LOG_TRACING_OTLP_ENDPOINT", "http://127.0.2.1:1111"),
+            ("LOG_TRACING_CAPTURE_LOG_LEVEL", "DebuG"),
+        ])
+        .unwrap();
+
+        assert_eq!(
+            cfg.log.tracing.tracing_otlp.endpoint,
+            "http://127.0.2.1:1111"
+        );
+        assert_eq!(cfg.log.tracing.tracing_capture_log_level, "DebuG");
+    }
+}

src/query/config/src/env.rs

@@ -29,6 +29,7 @@ mod builtin;
 /// - `TryInto<inner::InnerConfig> for config::Config`
 /// - `From<inner::InnerConfig> for config::Config`
 mod config;
+mod env;
 mod global;
 mod inner;
 mod mask;