dhall: expose optional fields as optional values

Instead of `nonifying` them

diff --git a/dhall/Config.dhall b/dhall/Config.dhall
index db063b78ac166aae50a9e6e1c01413fefdb2b3ee..c0954034e5992bb675cc0a3bdf608cecb2cbc722 100644 (file)
--- a/dhall/Config.dhall
+++ b/dhall/Config.dhall
@@ -10,17 +10,17 @@ in    λ(Environment : Type)
       , clever_token :
           Text
       , clever_syslog_server :
-          Text
+          Optional Text
       , clever_domain :
-          Text
+          Optional Text
       , clever_app_tasks_file :
-          Text
+          Optional Text
       , clever_haskell_entry_point :
-          Text
+          Optional Text
       , clever_metrics :
           Bool
       , clever_addons :
           List Addon
       , clever_env :
           Environment
-      }
\ No newline at end of file
+      }

diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall
index 37b029a8e2a03744514236475c75be1563b4c47b..ae84b21dae5476974bda99ce7745cc815bca694d 100644 (file)
--- a/dhall/mkConfig.dhall
+++ b/dhall/mkConfig.dhall
@@ -4,10 +4,6 @@ let Vault = ./Vault.dhall
 
 let Addon = ./addon/Addon.dhall
 
-let nonifyEmpty =
-        λ(opt : Optional Text)
-      → Optional/fold Text opt Text (λ(x : Text) → x) "None"
-
 in    λ(vault : Vault)
     → λ(app : Text)
     → λ(organization : Text)
@@ -26,13 +22,13 @@ in    λ(vault : Vault)
         , clever_token =
             vault.token
         , clever_syslog_server =
-            nonifyEmpty syslogServer
+            syslogServer
         , clever_domain =
-            nonifyEmpty domain
+            domain
         , clever_app_tasks_file =
-            nonifyEmpty tasksFile
+            tasksFile
         , clever_haskell_entry_point =
-            nonifyEmpty entryPoint
+            entryPoint
         , clever_metrics =
             metrics
         , clever_addons =