fix: additional testing

Author: conblem

Cargo.lock

@@ -40,6 +40,7 @@ ppp = "1.2"
 
 [dev-dependencies]
 serde_test = "1.0"
+tracing-test = "0.1"
 
 [features]
 default = ["postgres"]

Cargo.toml

@@ -1,7 +1,6 @@
 use anyhow::Result;
 use serde::Deserialize;
-use std::fs::File;
-use std::io::Read;
+use std::fs::read_to_string;
 use tracing::{debug, info, info_span};
 
 pub use listener::{Listener, ProxyProtocol};
@@ -54,17 +53,32 @@ pub fn load_config(config_path: Option<String>) -> Result<Config> {
     let span = info_span!("load_config", config_path);
     let _enter = span.enter();
 
-    let mut file = File::open(config_path)?;
-    debug!(?file, "Opened file");
+    let file = read_to_string(config_path)?;
+    debug!(file_length = file.len(), "Read file");
 
-    let mut bytes = vec![];
-    file.read_to_end(&mut bytes)?;
-    debug!(file_length = bytes.len(), "Read file");
-
-    let config = toml::de::from_slice::<Config>(&bytes)?;
+    let config = toml::de::from_slice::<Config>(file.as_ref())?;
     // redact db information
     let config_str = format!("{:?}", config).replace(&config.general.db, "******");
     info!(config = %config_str, "Deserialized config");
 
     Ok(config)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::load_config;
+    use std::path::Path;
+    use tracing_test::traced_test;
+
+    #[test]
+    #[traced_test]
+    fn load_config_test() {
+        let path = Path::new(file!()).with_file_name("test_config.toml");
+        let path = path.to_string_lossy().into_owned();
+        let config = load_config(Some(path)).unwrap();
+
+        // check if logs contain redacted db information
+        let config = format!("{:?}", config).replace("postgres://root@localhost/acme", "******");
+        assert!(logs_contain(&config));
+    }
+}

src/config/mod.rs

@@ -149,28 +149,62 @@ mod tests {
         #[serde(deserialize_with = "deserialize")] PreconfiguredRecords,
     );
 
+    fn a_record_tokens() -> [Token; 8] {
+        [
+            Token::BorrowedStr("acme.example.com"),
+            Token::Map { len: Some(1) },
+            Token::BorrowedStr("A"),
+            Token::Seq { len: Some(2) },
+            Token::U32(100),
+            Token::BorrowedStr("1.1.1.1"),
+            Token::SeqEnd,
+            Token::MapEnd,
+        ]
+    }
+
+    fn cname_record_tokens() -> [Token; 8] {
+        [
+            Token::BorrowedStr("acme.example.com"),
+            Token::Map { len: Some(1) },
+            Token::BorrowedStr("CNAME"),
+            Token::Seq { len: Some(2) },
+            Token::U32(1000),
+            Token::BorrowedStr("google.com"),
+            Token::SeqEnd,
+            Token::MapEnd,
+        ]
+    }
+
+    fn txt_record_tokens() -> [Token; 8] {
+        [
+            Token::BorrowedStr("acme.example.com"),
+            Token::Map { len: Some(1) },
+            Token::BorrowedStr("TXT"),
+            Token::Seq { len: Some(2) },
+            Token::U32(200),
+            Token::BorrowedStr("Hallo Welt"),
+            Token::SeqEnd,
+            Token::MapEnd,
+        ]
+    }
+
     #[test]
     fn deserialize_test() {
         let records = Default::default();
         let records = PreconfiguredRecordsWrapper(records);
 
-        assert_de_tokens(
-            &records,
-            &[
-                Token::NewtypeStruct {
-                    name: "PreconfiguredRecordsWrapper",
-                },
-                Token::Map { len: Some(1) },
-                Token::BorrowedStr("acme.example.com"),
-                Token::Map { len: Some(1) },
-                Token::BorrowedStr("A"),
-                Token::Seq { len: Some(2) },
-                Token::U32(100),
-                Token::BorrowedStr("1.1.1.1"),
-                Token::SeqEnd,
-                Token::MapEnd,
-                Token::MapEnd,
-            ],
-        )
+        // header
+        let mut records_token = vec![
+            Token::NewtypeStruct {
+                name: "PreconfiguredRecordsWrapper",
+            },
+            Token::Map { len: Some(1) },
+        ];
+        records_token.extend_from_slice(&a_record_tokens());
+        records_token.extend_from_slice(&cname_record_tokens());
+        records_token.extend_from_slice(&txt_record_tokens());
+        records_token.push(Token::MapEnd);
+
+        assert_de_tokens(&records, &records_token)
     }
 }

src/config/records.rs

@@ -0,0 +1,11 @@
+[general]
+dns = "0.0.0.0:53"
+db = "postgres://root@localhost/acme"
+acme = "https://acme.example.com/directory"
+name = "acme.example.com"
+
+[records."acme.example.com"]
+A = [100, "1.1.1.1", "2.2.2.2"]
+
+[api]
+https = "0.0.0.0:443"