Migrate to dhall 1.26.1 and merge types and termsv2.0-test-clementdpolykinds

1 files changed, 37 insertions, 25 deletions

diff --git a/dhall/Config.dhall b/dhall/Config.dhall
index 5b7eab2..1b9388e 100644
--- a/dhall/Config.dhall
+++ b/dhall/Config.dhall
@@ -1,26 +1,38 @@
-let Addon = ./addon/Addon.dhall
+let Addon = (./Addon.dhall).Type
 
-in    λ(Environment : Type)
-    → { clever_app :
-          Text
-      , clever_orga :
-          Text
-      , clever_secret :
-          Text
-      , clever_token :
-          Text
-      , clever_syslog_server :
-          Optional Text
-      , clever_domain :
-          Optional Text
-      , clever_app_tasks_file :
-          Optional Text
-      , clever_haskell_entry_point :
-          Optional Text
-      , clever_disable_metrics :
-          Bool
-      , clever_addons :
-          List Addon
-      , clever_env :
-          Environment
-      }
+let Vault = ./Vault.dhall
+
+let Config =
+        λ(Environment : Type)
+      → { clever_app : Text
+        , clever_orga : Text
+        , clever_secret : Text
+        , clever_token : Text
+        , clever_syslog_server : Optional Text
+        , clever_domain : Optional Text
+        , clever_app_tasks_file : Optional Text
+        , clever_haskell_entry_point : Optional Text
+        , clever_disable_metrics : Bool
+        , clever_addons : List Addon
+        , clever_env : Environment
+        }
+
+let mkConfig =
+        λ(vault : Vault)
+      → λ(app : Text)
+      → λ(organization : Text)
+      →   { clever_app = app
+          , clever_orga = organization
+          , clever_secret = vault.secret
+          , clever_token = vault.token
+          , clever_syslog_server = None Text
+          , clever_domain = None Text
+          , clever_app_tasks_file = None Text
+          , clever_haskell_entry_point = None Text
+          , clever_disable_metrics = False
+          , clever_addons = [] : List Addon
+          , clever_env = {=}
+          }
+        : Config {}
+
+in  { Type = Config, mkConfig = mkConfig }