refactor(activity-fly-http)!: Allow specifying null values for env vars

Author: tomasol

fly/activity-fly-http/fly-http-machine-config.json.sh

@@ -26,7 +26,7 @@ cat <<EOF
             "protocol": "tcp"
         }
     ],
-    "env": [ ["key", "val"], ["other", "otherval"] ],
+    "env": [ ["key", "val"], ["other", null] ],
     "files": [
         {"guest-path":"/etc/info.txt", "raw-value":"$(echo -n "hello" | base64)"}
     ],

fly/activity-fly-http/src/machine.rs

@@ -19,16 +19,16 @@ pub(crate) mod env_serde {
 
     pub fn deserialize<'de, D>(
         deserializer: D,
-    ) -> Result<Option<Vec<(String, String)>>, D::Error>
+    ) -> Result<Option<Vec<(String, Option<String>)>>, D::Error>
     where
         D: Deserializer<'de>,
     {
-        let map: Option<BTreeMap<String, String>> = Option::deserialize(deserializer)?;
+        let map: Option<BTreeMap<String, Option<String>>> = Option::deserialize(deserializer)?;
         Ok(map.map(|m| m.into_iter().collect()))
     }
 
     pub fn serialize<S>(
-        value: &Option<Vec<(String, String)>>,
+        value: &Option<Vec<(String, Option<String>)>>,
         serializer: S,
     ) -> Result<S::Ok, S::Error>
     where
@@ -37,8 +37,10 @@ pub(crate) mod env_serde {
         match value {
             None => serializer.serialize_none(),
             Some(pairs) => {
-                let map: BTreeMap<&str, &str> =
-                    pairs.iter().map(|(k, v)| (k.as_str(), v.as_str())).collect();
+                let map: BTreeMap<&str, Option<&str>> = pairs
+                    .iter()
+                    .map(|(k, v)| (k.as_str(), v.as_deref()))
+                    .collect();
                 map.serialize(serializer)
             }
         }
@@ -472,7 +474,7 @@ mod tests {
         "env": {
             "OBELISK__API__LISTENING_ADDR": "",
             "OBELISK__EXTERNAL__LISTENING_ADDR": "",
-            "OBELISK__WEBUI__LISTENING_ADDR": ""
+            "OBELISK__WEBUI__LISTENING_ADDR": null
         },
         "init": {
             "entrypoint": [

fly/activity-fly-http/src/snapshots/activity_fly_http__machine__tests__machine_deserialization.snap

@@ -42,15 +42,19 @@ Machine {
             [
                 (
                     "OBELISK__API__LISTENING_ADDR",
-                    "",
+                    Some(
+                        "",
+                    ),
                 ),
                 (
                     "OBELISK__EXTERNAL__LISTENING_ADDR",
-                    "",
+                    Some(
+                        "",
+                    ),
                 ),
                 (
                     "OBELISK__WEBUI__LISTENING_ADDR",
-                    "",
+                    None,
                 ),
             ],
         ),

fly/activity-fly-http/wit/obelisk-flyio_activity-fly-http@1.0.0-beta/fly.wit

@@ -117,7 +117,7 @@ interface machines {
         /// Destroy the VM after first exec
         auto-destroy: option<bool>,
         init: option<init-config>,
-        env: option<list<tuple<string, string>>>,
+        env: option<list<tuple<string, option<string>>>>,
         restart: option<machine-restart>,
         stop-config: option<stop-config>,
         mounts: option<list<mount>>,