Make Job.dependencies Optional (List Text) to allow explicit empty ar…

…rays
bgamari · Jul 27, 2022 · 9ebca9b · 9ebca9b
1 parent 4647c07
commit 9ebca9b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/GitLab/Job/Type.dhall b/GitLab/Job/Type.dhall
@@ -24,7 +24,7 @@ in  { stage : Optional Text
     , image : Optional Image
     , variables : Prelude.Map.Type Text Text
     , rules : Optional (List Rule)
-    , dependencies : List Text
+    , dependencies : Optional (List Text)
     , needs : List Text
     , allow_failure : Bool
     , tags : Optional (List Text)

diff --git a/GitLab/Job/append.dhall b/GitLab/Job/append.dhall
@@ -37,7 +37,7 @@ let append
         , image = mergeOptional Image.Type Image.append a.image b.image
         , variables = a.variables # b.variables
         , rules = mergeOptionalList Rule.Type a.rules b.rules
-        , dependencies = a.dependencies # b.dependencies
+        , dependencies = mergeOptionalList Text a.dependencies b.dependencies
         , needs = a.needs # b.needs
         , allow_failure = b.allow_failure
         , tags = mergeOptionalList Text a.tags b.tags

diff --git a/GitLab/Job/default.dhall b/GitLab/Job/default.dhall
@@ -24,7 +24,7 @@ in    { stage = None Text
       , image = None Image
       , variables = Prelude.Map.empty Text Text
       , rules = None (List Rule)
-      , dependencies = [] : List Text
+      , dependencies = None (List Text)
       , needs = [] : List Text
       , allow_failure = False
       , tags = None (List Text)

diff --git a/GitLab/Job/toJSON.dhall b/GitLab/Job/toJSON.dhall
@@ -70,9 +70,12 @@ in  let Job/toJSON
                                         )
                                     )
                     , dependencies =
-                        if    Prelude.List.null Text job.dependencies
+                        if    Prelude.Optional.null (List Text) job.dependencies
                         then  None JSON.Type
-                        else  Some (stringsArrayJSON job.dependencies)
+                        else  let dependenciesList =
+                                    optionalList Text job.dependencies
+
+                              in  Some (stringsArrayJSON dependenciesList)
                     , needs =
                         if    Prelude.List.null Text job.needs
                         then  None JSON.Type