Merge pull request #3 from AmirStha/master

CacheSpec changes
bgamari · Dec 14, 2022 · a0ee5d0 · a0ee5d0
2 parents 2e046a6 + de73bf0
commit a0ee5d0
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 10 deletions.
diff --git a/GitLab/CacheSpec/Type.dhall b/GitLab/CacheSpec/Type.dhall
@@ -7,6 +7,6 @@ let CacheKey = ../CacheKey/Type.dhall
 in  { key : Optional CacheKey
     , paths : List Text
     , untracked : Optional Bool
-    , when : When
+    , when : Optional When
     , policy : Optional CachePolicy
     }
diff --git a/GitLab/CacheSpec/default.dhall b/GitLab/CacheSpec/default.dhall
@@ -5,7 +5,7 @@ let CachePolicy = ../CachePolicy/Type.dhall
 let CacheKey = ../CacheKey/Type.dhall
 
 in    { key = None CacheKey
-      , when = When.OnSuccess
+      , when = None When
       , paths = [] : List Text
       , untracked = None Bool
       , policy = None CachePolicy

diff --git a/GitLab/CacheSpec/toJSON.dhall b/GitLab/CacheSpec/toJSON.dhall
@@ -4,10 +4,14 @@ let Map = Prelude.Map
 
 let JSON = Prelude.JSON
 
+let When = ../When/package.dhall
+
 let CacheSpec = ./Type.dhall
 
 let CacheKey = ../CacheKey/package.dhall
 
+let CachePolicy = ../CachePolicy/package.dhall
+
 let stringsArray
     : List Text → JSON.Type
     = λ(xs : List Text) →
@@ -43,6 +47,20 @@ in  let CacheSpec/toJSON
                                         cs.paths
                                     )
                                 )
+                    , untracked =
+                        Optional/map Bool JSON.Type JSON.bool cs.untracked
+                    , when = 
+                        Optional/map 
+                            When.Type 
+                            JSON.Type
+                            When.toJSON
+                            cs.when
+                    , policy =
+                        Optional/map
+                            CachePolicy.Type
+                            JSON.Type
+                            CachePolicy.toJSON
+                            cs.policy
                     }
 
             in  JSON.object (dropNones Text JSON.Type obj)

diff --git a/GitLab/Job/Type.dhall b/GitLab/Job/Type.dhall
@@ -35,7 +35,7 @@ in  { stage : Optional Text
     , coverage : Optional Text
     , services : Optional (List Service)
     , after_script : Optional Script
-    , cache : Optional CacheSpec
+    , cache : Optional (List CacheSpec)
     , artifacts : Optional ArtifactsSpec
     , resource_group : Optional Text
     , environment : Optional Environment

diff --git a/GitLab/Job/append.dhall b/GitLab/Job/append.dhall
@@ -48,7 +48,7 @@ let append
         , coverage = mergeOptionalRight Text a.coverage b.coverage
         , services = mergeOptionalList Service.Type a.services b.services
         , after_script = mergeOptionalList Text a.after_script b.after_script
-        , cache = mergeOptional CacheSpec.Type CacheSpec.append a.cache b.cache
+        , cache = mergeOptionalList CacheSpec.Type a.cache b.cache
         , artifacts =
             mergeOptional
               ArtifactsSpec.Type

diff --git a/GitLab/Job/default.dhall b/GitLab/Job/default.dhall
@@ -35,7 +35,7 @@ in    { stage = None Text
       , coverage = None Text
       , services = None (List Service)
       , after_script = None Script
-      , cache = None CacheSpec
+      , cache = None (List CacheSpec)
       , artifacts = None ArtifactsSpec
       , resource_group = None Text
       , environment = None Environment

diff --git a/GitLab/Job/toJSON.dhall b/GitLab/Job/toJSON.dhall
@@ -133,11 +133,19 @@ in  let Job/toJSON
                           stringsArrayJSON
                           job.after_script
                     , cache =
-                        Optional/map
-                          CacheSpec.Type
-                          JSON.Type
-                          CacheSpec.toJSON
-                          job.cache
+                        let cacheList = optionalList CacheSpec.Type job.cache
+
+                        in  if    Prelude.List.null CacheSpec.Type cacheList
+                            then  None JSON.Type
+                            else  Some
+                                    ( JSON.array
+                                        ( Prelude.List.map
+                                            CacheSpec.Type
+                                            JSON.Type
+                                            CacheSpec.toJSON
+                                            cacheList
+                                        )
+                                    )
                     , artifacts =
                         Optional/map
                           ArtifactsSpec.Type