From 7b4cc6d8d6f2a4e327111d78b0ef1973faf892c1 Mon Sep 17 00:00:00 2001 From: Clement Delafargue Date: Mon, 1 Jul 2019 16:35:23 +0200 Subject: dhall: remove optional arguments from mkConfig It was just constructing a record without adding any information. Now it constructs a record from its mandatory parts. The caller can then override fields as they please. --- dhall/mkConfig.dhall | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall index ae84b21..413ea5a 100644 --- a/dhall/mkConfig.dhall +++ b/dhall/mkConfig.dhall @@ -7,12 +7,6 @@ let Addon = ./addon/Addon.dhall in λ(vault : Vault) → λ(app : Text) → λ(organization : Text) - → λ(entryPoint : Optional Text) - → λ(metrics : Bool) - → λ(syslogServer : Optional Text) - → λ(domain : Optional Text) - → λ(tasksFile : Optional Text) - → λ(addons : List Addon) → { clever_app = app , clever_orga = @@ -22,17 +16,17 @@ in λ(vault : Vault) , clever_token = vault.token , clever_syslog_server = - syslogServer + None Text , clever_domain = - domain + None Text , clever_app_tasks_file = - tasksFile + None Text , clever_haskell_entry_point = - entryPoint + None Text , clever_metrics = - metrics + True , clever_addons = - addons + [] : List Addon , clever_env = {=} } -- cgit v1.2.3