Add conditional dependency support for build dependency type

Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>

2 files changed, 124 insertions, 7 deletions

diff --git a/src/package/dependency/build.rs b/src/package/dependency/build.rs
index 42c0763..4d51335 100644
--- a/src/package/dependency/build.rs
+++ b/src/package/dependency/build.rs
@@ -23,14 +23,17 @@ use crate::package::dependency::condition::Condition;
 #[serde(untagged)]
 pub enum BuildDependency {
     Simple(String),
-    Conditional(String, Condition),
+    Conditional {
+        name: String,
+        condition: Condition,
+    },
 }
 
 impl AsRef<str> for BuildDependency {
     fn as_ref(&self) -> &str {
         match self {
             BuildDependency::Simple(name) => name,
-            BuildDependency::Conditional(name, _) => name,
+            BuildDependency::Conditional { name, .. } => name,
         }
     }
 }
@@ -39,7 +42,7 @@ impl StringEqual for BuildDependency {
     fn str_equal(&self, s: &str) -> bool {
         match self {
             BuildDependency::Simple(name) => name == s,
-            BuildDependency::Conditional(name, _) => name == s,
+            BuildDependency::Conditional { name, .. } => name == s,
         }
     }
 }
@@ -53,8 +56,9 @@ impl ParseDependency for BuildDependency {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::package::dependency::condition::OneOrMore;
 
-    #[derive(serde::Deserialize)]
+    #[derive(serde::Serialize, serde::Deserialize)]
     #[allow(unused)]
     pub struct TestSetting {
         setting: BuildDependency,
@@ -68,5 +72,104 @@ mod tests {
             other => panic!("Unexpected deserialization to other variant: {:?}", other),
         }
     }
+
+    #[test]
+    fn test_parse_conditional_dependency() {
+        let s: TestSetting = toml::from_str(r#"setting = { name = "foo", condition = { in_image = "bar"} }"#).expect("Parsing TestSetting failed");
+        match s.setting {
+            BuildDependency::Conditional { name, condition } => {
+                assert_eq!(name, "foo", "Expected 'foo', got {}", name);
+                assert_eq!(*condition.has_env(), None);
+                assert_eq!(*condition.env_eq(), None);
+                assert_eq!(condition.in_image().as_ref(), Some(&OneOrMore::<String>::One(String::from("bar"))));
+            },
+            other => panic!("Unexpected deserialization to other variant: {:?}", other),
+        }
+    }
+
+    #[test]
+    fn test_parse_conditional_dependency_pretty() {
+        let pretty = r#"
+            [setting]
+            name = "foo"
+            [setting.condition]
+            in_image = "bar"
+        "#;
+
+        let s: TestSetting = toml::from_str(pretty).expect("Parsing TestSetting failed");
+
+        match s.setting {
+            BuildDependency::Conditional { name, condition } => {
+                assert_eq!(name, "foo", "Expected 'foo', got {}", name);
+                assert_eq!(*condition.has_env(), None);
+                assert_eq!(*condition.env_eq(), None);
+                assert_eq!(condition.in_image().as_ref(), Some(&OneOrMore::<String>::One(String::from("bar"))));
+            },
+            other => panic!("Unexpected deserialization to other variant: {:?}", other),
+        }
+    }
+
+
+    #[derive(serde::Serialize, serde::Deserialize)]
+    #[allow(unused)]
+    pub struct TestSettings {
+        settings: Vec<BuildDependency>,
+    }
+
+    #[test]
+    fn test_parse_conditional_dependencies() {
+        let s: TestSettings = toml::from_str(r#"settings = [{ name = "foo", condition = { in_image = "bar"} }]"#).expect("Parsing TestSetting failed");
+        match s.settings.get(0).expect("Has not one dependency") {
+            BuildDependency::Conditional { name, condition } => {
+                assert_eq!(name, "foo", "Expected 'foo', got {}", name);
+                assert_eq!(*condition.has_env(), None);
+                assert_eq!(*condition.env_eq(), None);
+                assert_eq!(condition.in_image().as_ref(), Some(&OneOrMore::<String>::One(String::from("bar"))));
+            },
+            other => panic!("Unexpected deserialization to other variant: {:?}", other),
+        }
+    }
+
+    #[test]
+    fn test_parse_conditional_dependencies_pretty() {
+        let pretty = r#"
+            [[settings]]
+            name = "foo"
+            condition = { in_image = "bar" }
+        "#;
+
+        let s: TestSettings = toml::from_str(pretty).expect("Parsing TestSetting failed");
+
+        match s.settings.get(0).expect("Has not one dependency") {
+            BuildDependency::Conditional { name, condition } => {
+                assert_eq!(name, "foo", "Expected 'foo', got {}", name);
+                assert_eq!(*condition.has_env(), None);
+                assert_eq!(*condition.env_eq(), None);
+                assert_eq!(condition.in_image().as_ref(), Some(&OneOrMore::<String>::One(String::from("bar"))));
+            },
+            other => panic!("Unexpected deserialization to other variant: {:?}", other),
+        }
+    }
+
+    #[test]
+    fn test_parse_conditional_dependencies_pretty_2() {
+        let pretty = r#"
+            [[settings]]
+            name = "foo"
+            condition.in_image = "bar"
+        "#;
+
+        let s: TestSettings = toml::from_str(pretty).expect("Parsing TestSetting failed");
+
+        match s.settings.get(0).expect("Has not one dependency") {
+            BuildDependency::Conditional { name, condition } => {
+                assert_eq!(name, "foo", "Expected 'foo', got {}", name);
+                assert_eq!(*condition.has_env(), None);
+                assert_eq!(*condition.env_eq(), None);
+                assert_eq!(condition.in_image().as_ref(), Some(&OneOrMore::<String>::One(String::from("bar"))));
+            },
+            other => panic!("Unexpected deserialization to other variant: {:?}", other),
+        }
+    }
 }
 
diff --git a/src/package/dependency/condition.rs b/src/package/dependency/condition.rs
index 2f46dfe..a3eeaaf 100644
--- a/src/package/dependency/condition.rs
+++ b/src/package/dependency/condition.rs
@@ -29,15 +29,15 @@ use crate::util::EnvironmentVariableName;
 pub struct Condition {
     #[serde(rename = "has_env", skip_serializing_if = "Option::is_none")]
     #[getset(get = "pub")]
-    has_env: Option<OneOrMore<EnvironmentVariableName>>,
+    pub(super) has_env: Option<OneOrMore<EnvironmentVariableName>>,
 
     #[serde(rename = "env_eq", skip_serializing_if = "Option::is_none")]
     #[getset(get = "pub")]
-    env_eq: Option<HashMap<EnvironmentVariableName, String>>,
+    pub(super) env_eq: Option<HashMap<EnvironmentVariableName, String>>,
 
     #[serde(rename = "in_image", skip_serializing_if = "Option::is_none")]
     #[getset(get = "pub")]
-    in_image: Option<OneOrMore<String>>,
+    pub(super) in_image: Option<OneOrMore<String>>,
 }
 
 /// Manual implementation of PartialOrd for Condition
@@ -121,6 +121,20 @@ impl<T: Sized> Into<Vec<T>> for OneOrMore<T> {
 }
 
 #[cfg(test)]
+impl From<Vec<String>> for OneOrMore<String> {
+    fn from(v: Vec<String>) -> Self {
+        OneOrMore::More(v)
+    }
+}
+
+#[cfg(test)]
+impl From<String> for OneOrMore<String> {
+    fn from(s: String) -> Self {
+        OneOrMore::One(s)
+    }
+}
+
+#[cfg(test)]
 mod tests {
     use super::*;