aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorClement Delafargue <clement.delafargue@fretlink.com>2019-07-01 16:32:58 +0200
committerClement Delafargue <clement.delafargue@fretlink.com>2019-07-01 16:32:58 +0200
commit175b14951e46b4d980839fd719b8b7a64968c073 (patch)
tree91ca4cd3fa3ed00eeb5c19ed5c2ebb865ef3a2b4
parenta8c060229d00306720778c05fe5f53319a8de762 (diff)
downloadansible-clever-175b14951e46b4d980839fd719b8b7a64968c073.tar.gz
ansible-clever-175b14951e46b4d980839fd719b8b7a64968c073.tar.zst
ansible-clever-175b14951e46b4d980839fd719b8b7a64968c073.zip
dhall: expose optional fields as optional values
Instead of `nonifying` them
-rw-r--r--dhall/Config.dhall10
-rw-r--r--dhall/mkConfig.dhall12
2 files changed, 9 insertions, 13 deletions
diff --git a/dhall/Config.dhall b/dhall/Config.dhall
index db063b7..c095403 100644
--- a/dhall/Config.dhall
+++ b/dhall/Config.dhall
@@ -10,17 +10,17 @@ in λ(Environment : Type)
10 , clever_token : 10 , clever_token :
11 Text 11 Text
12 , clever_syslog_server : 12 , clever_syslog_server :
13 Text 13 Optional Text
14 , clever_domain : 14 , clever_domain :
15 Text 15 Optional Text
16 , clever_app_tasks_file : 16 , clever_app_tasks_file :
17 Text 17 Optional Text
18 , clever_haskell_entry_point : 18 , clever_haskell_entry_point :
19 Text 19 Optional Text
20 , clever_metrics : 20 , clever_metrics :
21 Bool 21 Bool
22 , clever_addons : 22 , clever_addons :
23 List Addon 23 List Addon
24 , clever_env : 24 , clever_env :
25 Environment 25 Environment
26 } \ No newline at end of file 26 }
diff --git a/dhall/mkConfig.dhall b/dhall/mkConfig.dhall
index 37b029a..ae84b21 100644
--- a/dhall/mkConfig.dhall
+++ b/dhall/mkConfig.dhall
@@ -4,10 +4,6 @@ let Vault = ./Vault.dhall
4 4
5let Addon = ./addon/Addon.dhall 5let Addon = ./addon/Addon.dhall
6 6
7let nonifyEmpty =
8 λ(opt : Optional Text)
9 → Optional/fold Text opt Text (λ(x : Text) → x) "None"
10
11in λ(vault : Vault) 7in λ(vault : Vault)
12 → λ(app : Text) 8 → λ(app : Text)
13 → λ(organization : Text) 9 → λ(organization : Text)
@@ -26,13 +22,13 @@ in λ(vault : Vault)
26 , clever_token = 22 , clever_token =
27 vault.token 23 vault.token
28 , clever_syslog_server = 24 , clever_syslog_server =
29 nonifyEmpty syslogServer 25 syslogServer
30 , clever_domain = 26 , clever_domain =
31 nonifyEmpty domain 27 domain
32 , clever_app_tasks_file = 28 , clever_app_tasks_file =
33 nonifyEmpty tasksFile 29 tasksFile
34 , clever_haskell_entry_point = 30 , clever_haskell_entry_point =
35 nonifyEmpty entryPoint 31 entryPoint
36 , clever_metrics = 32 , clever_metrics =
37 metrics 33 metrics
38 , clever_addons = 34 , clever_addons =