Merge pull request #45 from clementd-fretlink/new-clever-vault

Clean up `dhall` type definitions

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/Vault.dhall b/dhall/Vault.dhall
index ba1a30913b9747414740818aa2ebde75939e237d..b2a45cc3aa3f3e729d9b24738c41884acd718e59 100644 (file)
--- a/dhall/Vault.dhall
+++ b/dhall/Vault.dhall
@@ -1 +1 @@
-{ organization : Text, secret : Text, token : Text }
+{ token : Text, secret : Text, sshKey : Text }

diff --git a/dhall/environment/Environment.dhall b/dhall/environment/Environment.dhall
deleted file mode 100644 (file)
index 68514c9..0000000
--- a/dhall/environment/Environment.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{ FORCE_HTTPS : Bool }

diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall
index cf64befea3a5ec7aeaeb270be353883561f91775..413ea5a398675683555df54b83ecd11905800c53 100644 (file)
--- a/dhall/mkConfig.dhall
+++ b/dhall/mkConfig.dhall
@@ -1,44 +1,33 @@
 let Config = ./Config.dhall
 
-in  let Vault = ./Vault.dhall
+let Vault = ./Vault.dhall
 
-    in  let Addon = ./addon/Addon.dhall
+let Addon = ./addon/Addon.dhall
 
-        in  let Environment = ./environment/Environment.dhall
-
-            in  let nonifyEmpty =
-                        λ(opt : Optional Text)
-                      → Optional/fold Text opt Text (λ(x : Text) → x) "None"
-
-                in    λ(vault : Vault)
-                    → λ(app : Text)
-                    → λ(entryPoint : Optional Text)
-                    → λ(metrics : Bool)
-                    → λ(syslogServer : Optional Text)
-                    → λ(domain : Optional Text)
-                    → λ(tasksFile : Optional Text)
-                    → λ(addons : List Addon)
-                    →   { clever_app =
-                            app
-                        , clever_orga =
-                            vault.organization
-                        , clever_secret =
-                            vault.secret
-                        , clever_token =
-                            vault.token
-                        , clever_syslog_server =
-                            nonifyEmpty syslogServer
-                        , clever_domain =
-                            nonifyEmpty domain
-                        , clever_app_tasks_file =
-                            nonifyEmpty tasksFile
-                        , clever_haskell_entry_point =
-                            nonifyEmpty entryPoint
-                        , clever_metrics =
-                            metrics
-                        , clever_addons =
-                            addons
-                        , clever_env =
-                            { FORCE_HTTPS = True }
-                        }
-                      : Config Environment
\ No newline at end of file
+in    λ(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_metrics =
+            True
+        , clever_addons =
+            [] : List Addon
+        , clever_env =
+            {=}
+        }
+      : Config {}

diff --git a/dhall/types.dhall b/dhall/types.dhall
index 5e6a81cc981c4b57a238dd344c23e6aa6d213aee..ab153d2e7096512fc4fbe815c85ee6ac9388d0c1 100644 (file)
--- a/dhall/types.dhall
+++ b/dhall/types.dhall
@@ -1,9 +1 @@
-{ Vault =
-    ./Vault.dhall
-, Addon =
-    ./addon/Addon.dhall
-, Environment =
-    ./environment/Environment.dhall
-, Config =
-    ./Config.dhall
-}
+{ Vault = ./Vault.dhall, Addon = ./addon/Addon.dhall, Config = ./Config.dhall }