feat: add map[string]yaml var type

Author: DavSanchez

agent-control/src/agent_type/trivial_value.rs

@@ -11,15 +11,17 @@ use serde::{Deserialize, Serialize};
 #[serde(untagged)]
 pub enum TrivialValue {
     String(String),
+    Bool(bool),
+    Number(serde_yaml::Number),
     #[serde(skip)]
     File(FilePathWithContent),
     #[serde(skip)]
     Yaml(serde_yaml::Value),
-    Bool(bool),
-    Number(serde_yaml::Number),
     #[serde(skip)]
     MapStringString(Map<String, String>),
     #[serde(skip)]
+    MapStringYaml(Map<String, serde_yaml::Value>),
+    #[serde(skip)]
     MapStringFile(Map<String, FilePathWithContent>),
 }
 
@@ -63,10 +65,17 @@ impl Display for TrivialValue {
             TrivialValue::MapStringString(n) => {
                 let flatten: Vec<String> = n
                     .iter()
-                    .map(|(key, value)| format!("{key}={value}"))
+                    // FIXME is this what we really want? key=value?
+                    .map(|(key, value)| format!("{key}={value}")) 
                     .collect();
                 write!(f, "{}", flatten.join(" "))
             }
+            TrivialValue::MapStringYaml(n) => write!(
+                f,
+                "{}",
+                serde_yaml::to_string(n)
+                    .expect("A value of type HashMap<String, serde_yaml::Value> should always be serializable")
+            ),
             TrivialValue::MapStringFile(n) => {
                 let flatten: Vec<String> = n
                     .iter()

agent-control/src/agent_type/variable/variable_type.rs

@@ -32,6 +32,8 @@ pub enum VariableTypeDefinition {
     MapStringString(FieldsDefinition<HashMap<String, String>>),
     #[serde(rename = "map[string]file")]
     MapStringFile(FieldsWithPathDefinition<HashMap<String, FilePathWithContent>>),
+    #[serde(rename = "map[string]yaml")]
+    MapStringYaml(FieldsDefinition<HashMap<String, serde_yaml::Value>>),
     #[serde(rename = "yaml")]
     Yaml(YamlFieldsDefinition),
 }
@@ -45,6 +47,7 @@ pub enum VariableType {
     File(FieldsWithPath<FilePathWithContent>),
     MapStringString(Fields<HashMap<String, String>>),
     MapStringFile(FieldsWithPath<HashMap<String, FilePathWithContent>>),
+    MapStringYaml(Fields<HashMap<String, serde_yaml::Value>>),
     Yaml(Fields<serde_yaml::Value>),
 }
 
@@ -62,6 +65,9 @@ impl VariableTypeDefinition {
             VariableTypeDefinition::MapStringFile(v) => {
                 VariableType::MapStringFile(v.with_config(constraints))
             }
+            VariableTypeDefinition::MapStringYaml(v) => {
+                VariableType::MapStringYaml(v.with_config(constraints))
+            }
             VariableTypeDefinition::Yaml(v) => VariableType::Yaml(v.with_config(constraints)),
         }
     }
@@ -120,6 +126,7 @@ impl VariableType {
             VariableType::File(f) => f.inner.required,
             VariableType::MapStringString(f) => f.required,
             VariableType::MapStringFile(f) => f.inner.required,
+            VariableType::MapStringYaml(f) => f.required,
             VariableType::Yaml(f) => f.required,
         }
     }
@@ -146,6 +153,7 @@ impl VariableType {
                     .for_each(|fp| fp.with_path(f.file_path.clone()));
                 f.inner.set_final_value(files)
             }
+            VariableType::MapStringYaml(f) => f.set_final_value(serde_yaml::from_value(value)?),
             VariableType::Yaml(f) => f.set_final_value(value),
         }?;
         Ok(())
@@ -194,6 +202,12 @@ impl VariableType {
                 .or(f.inner.default.as_ref())
                 .cloned()
                 .map(TrivialValue::MapStringFile),
+            VariableType::MapStringYaml(f) => f
+                .final_value
+                .as_ref()
+                .or(f.default.as_ref())
+                .cloned()
+                .map(TrivialValue::MapStringYaml),
             VariableType::Yaml(f) => f
                 .final_value
                 .as_ref()