Ensure that the settings load properly, and default to a None regex f…

…ield This was broken in 0.1.7 because I didn't run a manual integration test, oops Yay automation
reiseburo · May 11, 2020 · becfefd · becfefd
1 parent 6dc8add
commit becfefd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hotdog"
-version = "0.1.7"
+version = "0.1.8"
 authors = ["R. Tyler Croy <rtyler+hotdog@brokenco.de>"]
 edition = "2018"
 

diff --git a/src/settings.rs b/src/settings.rs
@@ -67,7 +67,7 @@ pub enum Action {
 pub struct Rule {
     pub field: Field,
     pub actions: Vec<Action>,
-    #[serde(with = "serde_regex")]
+    #[serde(with = "serde_regex", default = "default_none")]
     pub regex: Option<regex::Regex>,
     #[serde(default = "empty_str")]
     pub jmespath: String,
@@ -152,10 +152,19 @@ fn kafka_timeout_default() -> Duration {
     Duration::from_secs(30)
 }
 
+fn default_none<T>() -> Option<T> {
+    None
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
 
+    #[test]
+    fn test_load_example_config() {
+        load("hotdog.yml");
+    }
+
     #[test]
     fn test_default_tls() {
         assert_eq!(TlsType::None, TlsType::default());