@@ -11,11 +11,7 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14− , NetworkID
15− , fromNetworkID
16− , toNetworkID
1714 , Timeout(..)
18− , StatusCode(..)
1915 , Signal(..)
2016 , ContainerDetails(..)
2117 , DockerClientOpts(..)
@@ -26,30 +22,23 @@ module Docker.Client.Types (
2622 , ContainerPortInfo(..)
2723 , Container(..)
2824 , ContainerState(..)
29− , State(..)
25+ , Status(..)
3026 , Digest
31− , Label(..)
27+ , Labels(..)
3228 , Tag
3329 , Image(..)
34− , Entrypoint(..)
3530 , dropImagePrefix
3631 , CreateOpts(..)
37− , BuildOpts(..)
38− , defaultBuildOpts
3932 , defaultCreateOpts
4033 , DetachKeys(..)
4134 , StartOpts(..)
4235 , defaultStartOpts
43− , ContainerDeleteOpts(..)
44− , defaultContainerDeleteOpts
45− , ImageDeleteOpts(..)
46− , defaultImageDeleteOpts
36+ , DeleteOpts(..)
37+ , defaultDeleteOpts
4738 , Timestamp
4839 , TailLogOpt(..)
4940 , LogOpts(..)
5041 , defaultLogOpts
51− , CreateNetworkOpts(..)
52− , defaultCreateNetworkOpts
5342 , VolumePermission(..)
5443 , Bind(..)
5544 , Volume(..)
@@ -58,12 +47,12 @@ module Docker.Client.Types (
5847 , VolumeFrom(..)
5948 , Link(..)
6049 , LogDriverType(..)
61− , LogDriverOption(..)
50+ , LogDriverOptions(..)
6251 , LogDriverConfig(..)
6352 , NetworkMode(..)
6453 , PortType(..)
6554-- , NetworkInterface(..)
66− , Network(..)
55+ , Networks(..)
6756 , NetworkSettings(..)
6857 , NetworkOptions(..)
6958 , Mount(..)
@@ -75,8 +64,6 @@ module Docker.Client.Types (
7564 , UTSMode(..)
7665 , HostConfig(..)
7766 , defaultHostConfig
78− , NetworkingConfig(..)
79− , EndpointConfig(..)
8067 , Ulimit(..)
8168 , ContainerResources(..)
8269 , defaultContainerResources
@@ -86,18 +73,15 @@ module Docker.Client.Types (
8673 , EnvVar(..)
8774 , ContainerConfig(..)
8875 , defaultContainerConfig
89− , ExposedPort(..)
76+ , ExposedPorts(..)
9077 , DeviceWeight(..)
9178 , DeviceRate(..)
9279 , addPortBinding
93− , addExposedPort
9480 , addBind
9581 , setCmd
9682 , addLink
9783 , addVolume
9884 , addVolumeFrom
99− , MemoryConstraint(..)
100− , MemoryConstraintSize(..)
10185 ) where
10286
10387import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -107,12 +91,11 @@ import qualified Data.Aeson as JSON
10791import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
10892import Data.Char (isAlphaNum, toUpper)
10993import qualified Data.HashMap.Strict as HM
94+import qualified Data.Map as M
11095import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
11296import Data.Text (Text)
11397import qualified Data.Text as T
11498import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
11699import GHC.Generics (Generic)
117100import Prelude hiding (all, tail)
118101import Text.Read (readMaybe)
@@ -125,20 +108,14 @@ data Endpoint =
125108 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126109 | StartContainerEndpoint StartOpts ContainerID
127110 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129111 | KillContainerEndpoint Signal ContainerID
130112 | RestartContainerEndpoint Timeout ContainerID
131113 | PauseContainerEndpoint ContainerID
132114 | UnpauseContainerEndpoint ContainerID
133115 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134116 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
117+ | DeleteContainerEndpoint DeleteOpts ContainerID
136118 | InspectContainerEndpoint ContainerID
137− | BuildImageEndpoint BuildOpts FilePath
138− | CreateImageEndpoint T.Text Tag (Maybe T.Text) -- ^ Either pull an image from docker hub or imports an image from a tarball (or URL)
139− | DeleteImageEndpoint ImageDeleteOpts ImageID
140− | CreateNetworkEndpoint CreateNetworkOpts
141− | RemoveNetworkEndpoint NetworkID
142119 deriving (Eq, Show)
143120
144121-- | We should newtype this
@@ -185,20 +162,6 @@ toImageID t =
185162-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186163data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
187164
188−data StatusCode = StatusCode Int
189−
190−instance ToJSON StatusCode where
191− toJSON (StatusCode c) = object ["StatusCode" .= c]
192−
193−instance FromJSON StatusCode where
194− parseJSON (JSON.Object o) = do
195− c <- o .: "StatusCode"
196− if c >= 0 && c <= 255 then
197− return (StatusCode c)
198− else
199− fail "Unknown exit code"
200− parseJSON _ = fail "Unknown exit code"
201−
202165-- TODO: Add more Signals or use an existing lib
203166-- | Signal used for sending to the process running in the container.
204167-- The default signal is SIGTERM.
@@ -213,16 +176,16 @@ data Signal = SIGHUP
213176
214177instance FromJSON Signal where
215178 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
179+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
180+ parseJSON (JSON.String "SIGINT") = return SIGINT
218181 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219182 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220183 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
184+ parseJSON _ = fail "Unknown Signal"
222185
223186instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
187+ toJSON SIGHUP = "SIGHUP"
188+ toJSON SIGINT = "SIGINT"
226189 toJSON SIGQUIT = "SIGQUIT"
227190 toJSON SIGSTOP = "SIGSTOP"
228191 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +213,7 @@ data ContainerDetails = ContainerDetails {
250213 , processLabel :: Text
251214 , resolveConfPath :: FilePath
252215 , restartCount :: Int
253− , containerDetailsState :: ContainerState
216+ , state :: ContainerState
254217 , mounts :: [Mount]
255218 }
256219 deriving (Eq, Show, Generic)
@@ -258,11 +221,11 @@ data ContainerDetails = ContainerDetails {
258221-- | Data type used for parsing the mount information from a container
259222-- list.
260223data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
224+ mountName :: Text
262225 , mountSource :: FilePath
263226 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
227+ , mountDriver :: Text
228+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266229 , mountRW :: Bool
267230 , mountPropogation :: Text
268231 }
@@ -270,14 +233,14 @@ data Mount = Mount {
270233
271234instance FromJSON Mount where
272235 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
236+ name <- o .: "Name"
274237 src <- o .: "Source"
275238 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
277− -- mode <- o .: "Mode"
239+ driver <- o .: "Driver"
240+ mode <- o .: "Mode"
278241 rw <- o .: "RW"
279242 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
243+ return $ Mount name src dest driver mode rw prop
281244 parseJSON _ = fail "Mount is not an object"
282245
283246-- | Data type used for parsing the container state from a list of
@@ -293,7 +256,7 @@ data ContainerState = ContainerState {
293256 , restarting :: Bool
294257 , running :: Bool
295258 , startedAt :: UTCTime
296− , state :: State
259+ , status :: Status
297260 }
298261 deriving (Eq, Show, Generic)
299262
@@ -456,17 +419,20 @@ instance FromJSON NetworkOptions where
456419 parseJSON _ = fail "NetworkOptions is not an object"
457420
458421-- TODO: Not sure what this is used for anymore.
459−data Network = Network NetworkMode NetworkOptions
422+newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
460423 deriving (Eq, Show)
461424
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
463− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
425+instance FromJSON Networks where
426+ parseJSON (JSON.Object o) = do
427+ Networks <$> HM.foldlWithKey' f (return M.empty) o
428+
464429 where
465430 f accM k' v' = do
466431 acc <- accM
467432 k <- parseJSON $ JSON.String k'
468433 v <- parseJSON v'
469− return $ (Network k v):acc
434+ return $ M.insert k v acc
435+
470436 parseJSON _ = fail "Networks is not an object"
471437
472438-- | Data type reprsenting the various network settings a container can have.
@@ -488,7 +454,7 @@ data NetworkSettings = NetworkSettings {
488454 , networkSettingsIpPrefixLen :: Int
489455 , networkSettingsIpv6Gateway :: Text
490456 , networkSettingsMacAddress :: Text
491− , networkSettingsNetworks :: [Network]
457+ , networkSettingsNetworks :: Networks
492458 }
493459 deriving (Eq, Show)
494460
@@ -523,23 +489,21 @@ data Container = Container
523489 , containerImageId :: ImageID
524490 , containerCommand :: Text
525491 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
492+ , containerStatus :: Status
528493 , containerPorts :: [ContainerPortInfo]
529− , containerLabels :: [Label]
530− , containerNetworks :: [Network]
494+ , containerLabels :: Labels
495+ , containerNetworks :: Networks
531496 , containerMounts :: [Mount]
532497 } deriving (Show, Eq)
533498
534499instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
536− Container <$> parseJSON o
500+ parseJSON (JSON.Object v) =
501+ Container <$> (v .: "Id")
537502 <*> (v .: "Names")
538503 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
540− <*> (v .: "Command") -- Doesn't exist anymore
504+ <*> (v .: "ImageID")
505+ <*> (v .: "Command")
541506 <*> (v .: "Created")
542− <*> (v .: "State")
543507 <*> (v .: "Status")
544508 <*> (v .: "Ports")
545509 <*> (v .: "Labels")
@@ -549,45 +513,34 @@ instance FromJSON Container where
549513 parseNetworks (JSON.Object v) =
550514 (v .: "Networks") >>= parseJSON
551515 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
516+
552517 parseJSON _ = fail "Container: Not a JSON object."
553518
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
519+-- | Represents the status of the container life cycle.
520+data Status = Created | Restarting | Running | Paused | Exited | Dead
556521 deriving (Eq, Show, Generic)
557522
558−instance FromJSON State where
559− parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
523+instance FromJSON Status where
524+ parseJSON (JSON.String "running") = return Running
525+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561526 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
527+ parseJSON (JSON.String "paused") = return Paused
528+ parseJSON (JSON.String "exited") = return Exited
529+ parseJSON (JSON.String "dead") = return Dead
530+ parseJSON _ = fail "Unknown Status"
566531
567532-- | Alias for representing a RepoDigest. We could newtype this and add
568533-- some validation.
569534type Digest = Text
570535
571536-- | Container and Image Labels.
572−data Label = Label Name Value deriving (Eq, Show)
537+newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
573538
539+instance FromJSON Labels where
540+ parseJSON val = Labels <$> parseJSON val
574541
575−-- If there are multiple lables with the same Name in the list
576−-- then the last one wins.
577−instance {-# OVERLAPPING #-} ToJSON [Label] where
578− toJSON [] = emptyJsonObject
579− toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580− where key (Label k _) = T.unpack k
581− val (Label _ v) = v
582−
583−instance {-# OVERLAPPING #-} FromJSON [Label] where
584− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
585− where f accM k v = do
586− acc <- accM
587− value <- parseJSON v
588− return $ (Label k value):acc
589− parseJSON JSON.Null = return []
590− parseJSON _ = fail "Failed to parse Labels. Not an object."
542+instance ToJSON Labels where
543+ toJSON (Labels kvs) = object [k .= v | (k,v) <- (M.toList kvs)]
591544
592545-- | Alias for Tags.
593546type Tag = Text
@@ -598,10 +551,10 @@ data Image = DockerImage {
598551 , imageCreated :: Integer
599552 , imageParentId :: Maybe ImageID
600553 , imageRepoTags :: [Tag]
601− , imageRepoDigests :: [Digest]
554+ , imageRepoDigests :: Maybe [Digest]
602555 , imageSize :: Integer
603556 , imageVirtualSize :: Integer
604− , imageLabels :: [Label]
557+ , imageLabels :: Maybe Labels
605558 } deriving (Show, Eq, Generic)
606559
607560-- | Helper function used for dropping the "image" prefix when serializing
@@ -609,60 +562,23 @@ data Image = DockerImage {
609562dropImagePrefix :: [a] -> [a]
610563dropImagePrefix = drop 5
611564
612−
613565instance FromJSON Image where
614− parseJSON (JSON.Object o) = do
615− imageId <- o .: "Id"
616− imageCreated <- o .: "Created"
617− imageParentId <- o .:? "ParentId"
618− imageRepoTags <- o .:? "RepoTags" .!= []
619− imageRepoDigests <- o .:? "RepoDigests" .!= []
620− imageSize <- o .: "Size"
621− imageVirtualSize <- o .: "VirtualSize"
622− imageLabels <- o .:? "Labels" .!= []
623− return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624− parseJSON _ = fail "Failed to parse DockerImage."
625−
626−-- | Alias for Aliases.
627−type Alias = Text
628−
629−-- | EndpointsConfig is container configuration for a specific network
630−newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
631−
632−instance ToJSON EndpointConfig where
633− toJSON (EndpointConfig aliases) = JSON.object
634− [ "Aliases" .= aliases
635− ]
636−
637−-- | Alias for endpoint name
638−type EndpointName = Text
639−
640−-- | Data type for the NetworkingConfig section of the container settings
641−newtype NetworkingConfig = NetworkingConfig
642− { endpointsConfig :: HM.HashMap EndpointName EndpointConfig
643− } deriving (Eq, Show)
644−
645−instance ToJSON NetworkingConfig where
646− toJSON (NetworkingConfig endpointsConfig) = JSON.object
647− [ "EndpointsConfig" .= endpointsConfig
648− ]
566+ parseJSON = genericParseJSON defaultOptions {
567+ fieldLabelModifier = dropImagePrefix}
649568
650569-- | Options used for creating a Container.
651570data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
571+ containerConfig :: ContainerConfig
572+ , hostConfig :: HostConfig
655573 } deriving (Eq, Show)
656574
657575instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
576+ toJSON (CreateOpts cc hc) = do
659577 let ccJSON = toJSON cc
660578 let hcJSON = toJSON hc
661579 case ccJSON of
662580 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
664− let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
665− JSON.Object o2
581+ JSON.Object $ HM.insert "HostConfig" hcJSON o
666582 _ -> error "ContainerConfig is not an object." -- This should never happen.
667583
668584-- | Container configuration used for creating a container with sensible
@@ -676,7 +592,7 @@ defaultContainerConfig imageName = ContainerConfig {
676592 , attachStdout=False
677593 , image=imageName
678594 , attachStderr=False
679− , exposedPorts=[]
595+ , exposedPorts=Nothing -- ExposedPorts M.empty
680596 , tty=False
681597 , openStdin=False
682598 , stdinOnce=False
@@ -684,10 +600,10 @@ defaultContainerConfig imageName = ContainerConfig {
684600 , cmd=[]
685601 , volumes=[]
686602 , workingDir=Nothing
687− , entrypoint=Entrypoint []
603+ , entrypoint=Nothing
688604 , networkDisabled=Nothing
689605 , macAddress=Nothing
690− , labels=[]
606+ , labels=Nothing
691607 , stopSignal=SIGTERM
692608 }
693609
@@ -696,8 +612,8 @@ defaultHostConfig :: HostConfig
696612defaultHostConfig = HostConfig {
697613 binds=[]
698614 , containerIDFile=Nothing
699− , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
615+ , logConfig=LogDriverConfig JsonFile Nothing
616+ , networkMode=Bridge
701617 , portBindings=[]
702618 , restartPolicy=RestartOff
703619 , volumeDriver=Nothing
@@ -737,18 +653,14 @@ defaultContainerResources = ContainerResources {
737653 , memory=Nothing
738654 , memoryReservation=Nothing
739655 , memorySwap=Nothing
740− , oomKillDisable=Just False
656+ , oomKillDisable=False
741657 , ulimits=[]
742658 }
743659
744660-- | Default create options when creating a container. You only need to
745661-- specify an image name and the rest is all sensible defaults.
746662defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
751− }
663+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
752664
753665-- | Override the key sequence for detaching a container.
754666-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +674,16 @@ defaultStartOpts :: StartOpts
762674defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763675
764676-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
677+data DeleteOpts = DeleteOpts {
766678 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767679 , force :: Bool -- ^ If the container is still running force deletion anyway.
768680 } deriving (Eq, Show)
769681
770−-- TODO: Add support for container build constraints
771−-- | Options for when building images from a Dockerfile
772−data BuildOpts = BuildOpts {
773− buildImageName :: Text -- ^ Image name in the form of name:tag; ie. myimage:latest.:w
774− , buildDockerfileName :: Text -- ^ Name of dockerfile (default: Dockerfile)
775− , buildQuiet :: Bool
776− , buildNoCache :: Bool -- ^ Do not use cache when building the image.
777− , buildRemoveItermediate :: Bool -- ^ Remove intermediate containers after a successful build (default true).
778− , buildForceRemoveIntermediate :: Bool -- ^ Always remove intermediate containers.
779− , buildPullParent :: Bool -- ^ Always attempt to pull a newer version of the *parent* image (ie. FROM debian:jessie).
780− } deriving (Eq, Show)
781−
782−defaultBuildOpts :: Text -> BuildOpts
783−defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
784− , buildDockerfileName = "Dockerfile"
785− , buildQuiet = False
786− , buildNoCache = False
787− , buildRemoveItermediate = True
788− , buildForceRemoveIntermediate = False
789− , buildPullParent = False
790− }
791−
792682-- | Default options for deleting a container. Most of the time we DON'T
793683-- want to delete the container's volumes or force delete it if it's
794684-- running.
795−defaultContainerDeleteOpts :: ContainerDeleteOpts
796−defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
797−
798−-- | Image delete opts
799−data ImageDeleteOpts = ImageDeleteOpts deriving (Eq, Show)
800−
801−-- | Sane image deletion defaults
802−defaultImageDeleteOpts :: ImageDeleteOpts
803−defaultImageDeleteOpts = ImageDeleteOpts
685+defaultDeleteOpts :: DeleteOpts
686+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
804687
805688-- | Timestamp alias.
806689type Timestamp = Integer
@@ -828,50 +711,18 @@ defaultLogOpts = LogOpts { stdout = True
828711 , tail = All
829712 }
830713
831−-- | Options for creating a network
832−data CreateNetworkOpts = CreateNetworkOpts
833− { createNetworkName :: Text -- ^ The network's name
834− , createNetworkCheckDuplicate :: Bool -- ^ Check for networks with duplicate names.
835− , createNetworkDriver :: Text -- ^ Name of the network driver plugin to use.
836− , createNetworkInternal :: Bool -- ^ Restrict external access to the network.
837− , createNetworkEnableIPv6 :: Bool -- ^ Enable IPv6 on the network.
838− } deriving (Eq, Show)
839−
840−-- | Sensible defalut for create network options
841−defaultCreateNetworkOpts :: Text -> CreateNetworkOpts
842−defaultCreateNetworkOpts name =
843− CreateNetworkOpts
844− { createNetworkName = name
845− , createNetworkCheckDuplicate = False
846− , createNetworkDriver = "bridge"
847− , createNetworkInternal = True
848− , createNetworkEnableIPv6 = False
849− }
850−
851−instance ToJSON CreateNetworkOpts where
852− toJSON opts =
853− object
854− [ "Name" .= createNetworkName opts
855− , "CheckDuplicate" .= createNetworkCheckDuplicate opts
856− , "Driver" .= createNetworkDriver opts
857− , "Internal" .= createNetworkInternal opts
858− , "EnableIPv6" .= createNetworkEnableIPv6 opts
859− ]
860−
861714-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862715-- | Set permissions on volumes that you mount in the container.
863716data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
864717
865718instance ToJSON VolumePermission where
866719 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
720+ toJSON ReadOnly = "ro"
868721
869722instance FromJSON VolumePermission where
870723 parseJSON "rw" = return ReadWrite
871724 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
725+ parseJSON _ = fail "Failed to parse VolumePermission"
875726
876727-- | Used for marking a directory in the container as "exposed" hence
877728-- taking it outside of the COW filesystem and making it mountable
@@ -886,15 +737,15 @@ instance FromJSON VolumePermission where
886737-- @
887738newtype Volume = Volume FilePath deriving (Eq, Show)
888739
889−instance {-# OVERLAPPING #-} ToJSON [Volume] where
890− toJSON [] = emptyJsonObject
891− toJSON (v:vs) = toJsonKey (v:vs) getKey
892− where getKey (Volume v) = v
740+instance ToJSON [Volume] where
741+ toJSON [] = JSON.Object HM.empty
742+ toJSON (v:vs) = JSON.Object $ foldl f HM.empty (v:vs)
743+ where f acc (Volume k) = HM.insert (T.pack k) (JSON.Object HM.empty) acc
893744
894−instance {-# OVERLAPPING #-} FromJSON [Volume] where
745+instance FromJSON [Volume] where
895746 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896− parseJSON (JSON.Null) = return []
897− parseJSON _ = fail "Volume is not an object"
747+ parseJSON (JSON.Null) = return []
748+ parseJSON _ = fail "Volume is not an object"
898749
899750
900751data Bind = Bind { hostSrc :: Text
@@ -904,10 +755,10 @@ data Bind = Bind { hostSrc :: Text
904755
905756instance FromJSON Bind where
906757 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
758+ [src, dest] -> return $ Bind src dest Nothing
908759 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909760 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
761+ _ -> fail "Could not parse Bind"
911762 parseJSON _ = fail "Bind is not a string"
912763
913764data Device = Device {
@@ -930,15 +781,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
930781
931782instance FromJSON VolumeFrom where
932783 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
784+ [vol] -> return $ VolumeFrom vol Nothing
934785 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935786 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
787+ _ -> fail "Could not parse VolumeFrom"
937788 parseJSON _ = fail "VolumeFrom is not a string"
938789
939790instance ToJSON VolumeFrom where
940791 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
792+ Nothing -> toJSON $ n <> ":" <> "rw"
942793 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
943794
944795instance ToJSON Bind where
@@ -950,63 +801,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
950801
951802instance FromJSON Link where
952803 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
804+ [f] -> return $ Link f Nothing
954805 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
806+ _ -> fail "Could not parse Link"
956807 parseJSON _ = fail "Link is not a string"
957808
958809instance ToJSON Link where
959810 toJSON (Link n1 n2) = toJSON $ case n2 of
960811 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
812+ Just n -> T.concat[n1, ":", n] -- used specified name in container
962813
963814-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964815data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
965816
966817instance FromJSON LogDriverType where
967818 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
819+ parseJSON (JSON.String "syslog") = return Syslog
820+ parseJSON (JSON.String "journald") = return Journald
821+ parseJSON (JSON.String "gelf") = return Gelf
822+ parseJSON (JSON.String "fluentd") = return Fluentd
823+ parseJSON (JSON.String "awslogs") = return AwsLogs
824+ parseJSON (JSON.String "splunk") = return Splunk
825+ parseJSON (JSON.String "etwlogs") = return Etwlogs
826+ parseJSON (JSON.String "none") = return LoggingDisabled
827+ parseJSON _ = fail "Unknown LogDriverType"
977828
978829instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
830+ toJSON JsonFile = JSON.String "json-file"
831+ toJSON Syslog = JSON.String "syslog"
832+ toJSON Journald = JSON.String "journald"
833+ toJSON Gelf = JSON.String "gelf"
834+ toJSON Fluentd = JSON.String "fluentd"
835+ toJSON AwsLogs = JSON.String "awslogs"
836+ toJSON Splunk = JSON.String "splunk"
837+ toJSON Etwlogs = JSON.String "etwlogs"
987838 toJSON LoggingDisabled = JSON.String "none"
988839
989−data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
840+newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
990841
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
992− toJSON [] = emptyJsonObject
993− toJSON (o:os) = toJsonKeyVal (o:os) key val
994− where key (LogDriverOption n _) = T.unpack n
995− val (LogDriverOption _ v) = v
842+instance FromJSON LogDriverOptions where
843+ parseJSON (JSON.Object o) = do
844+ LogDriverOptions <$> HM.foldlWithKey' f (return M.empty) o
996845
997−instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
998− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999− where f accM k v = do
846+ where
847+ f accM k (JSON.String v) = do
1000848 acc <- accM
1001− value <- parseJSON v
1002− return $ (LogDriverOption k value):acc
1003− parseJSON JSON.Null = return []
1004− parseJSON _ = fail "Failed to parse LogDriverOptions"
849+ return $ M.insert k v acc
850+ f _ _ _ = fail "Value of LogDriverOptions is not a string"
1005851
1006−data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
852+ parseJSON JSON.Null = return $ LogDriverOptions M.empty
853+ parseJSON _ = fail "LogDriverOptions is not an object"
854+
855+instance ToJSON LogDriverOptions where
856+ toJSON (LogDriverOptions mp) = toJSON mp
857+
858+data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1007859
1008860instance ToJSON LogDriverConfig where
1009− toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
1010861 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1011862
1012863instance FromJSON LogDriverConfig where
@@ -1017,41 +868,19 @@ instance FromJSON LogDriverConfig where
1017868 parseJSON _ = fail "LogDriverConfig is not an object"
1018869
1019870-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
871+data NetworkMode = Bridge | Host | NetworkDisabled
1021872 deriving (Eq, Show, Ord)
1022873
1023874instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
875+ parseJSON (JSON.String "bridge") = return Bridge
876+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
877+ parseJSON (JSON.String "none") = return NetworkDisabled
878+ parseJSON _ = fail "Unknown NetworkMode"
1029879
1030880instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
881+ toJSON Bridge = JSON.String "bridge"
882+ toJSON Host = JSON.String "host"
1033883 toJSON NetworkDisabled = JSON.String "none"
1034− toJSON (NetworkNamed n) = JSON.String n
1035−
1036−newtype NetworkID = NetworkID Text
1037− deriving (Eq, Show)
1038−
1039−-- | Used for extracting the id of the container from the newtype
1040−fromNetworkID :: NetworkID -> Text
1041−fromNetworkID (NetworkID t) = t
1042−
1043−-- | Used for parsing a Text value into a NetworkID.
1044−toNetworkID :: Text -> Maybe NetworkID
1045−toNetworkID t = Just $ NetworkID t
1046−
1047−instance FromJSON NetworkID where
1048− parseJSON (JSON.Object o) = do
1049− nid <- o .: "Id"
1050− return $ NetworkID nid
1051− parseJSON _ = fail "NetworkID is not an object."
1052−
1053−instance ToJSON NetworkID where
1054− toJSON (NetworkID nid) = object ["Id" .= nid]
1055884
1056885data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057886
@@ -1067,7 +896,7 @@ instance FromJSON PortType where
1067896 parseJSON val = case val of
1068897 "tcp" -> return TCP
1069898 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
899+ _ -> fail "PortType: Invalid port type."
1071900
1072901-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1073902--
@@ -1140,15 +969,7 @@ addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
1140969 where hc = hostConfig c
1141970 pbs = portBindings $ hostConfig c
1142971
1143−-- | Helper function for adding a "ExposedPort" to and existing
1144−-- CreateOpts record.
1145−addExposedPort :: ExposedPort -> CreateOpts -> CreateOpts
1146−addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1147− where cc = containerConfig c
1148− oldeps = exposedPorts cc
1149−
1150−
1151−instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
972+instance FromJSON [PortBinding] where
1152973 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1153974 where
1154975 f accM k v = case T.split (== '/') k of
@@ -1158,15 +979,16 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1158979 acc <- accM
1159980 hps <- parseJSON v
1160981 return $ (PortBinding port portType hps):acc
1161− _ -> fail "Could not parse PortBindings"
1162− parseJSON (JSON.Null) = return []
982+ _ ->
983+ fail "Could not parse PortBindings"
1163984 parseJSON _ = fail "PortBindings is not an object"
1164985
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1166− toJSON [] = emptyJsonObject
1167− toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1168− where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1169− val p = hostPorts p
986+instance ToJSON [PortBinding] where
987+ toJSON [] = JSON.Object HM.empty
988+ toJSON (p:ps) = JSON.Object $ foldl f HM.empty (p:ps)
989+ where mKey p = portAndType2Text (containerPort p) (portType p)
990+ mVal p = toJSON $ hostPorts p
991+ f acc p = HM.insert (mKey p) (mVal p) acc
1170992
1171993data HostPort = HostPort {
1172994 hostIp :: Text
@@ -1197,7 +1019,7 @@ instance FromJSON RestartPolicy where
11971019 "on-failure" -> do
11981020 retry <- o .: "MaximumRetryCount"
11991021 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1022+ "off" -> return RestartOff
12011023 _ -> fail "Could not parse RestartPolicy"
12021024 parseJSON _ = fail "RestartPolicy is not an object"
12031025
@@ -1205,7 +1027,7 @@ instance ToJSON RestartPolicy where
12051027 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
12061028 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
12071029 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1030+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
12091031
12101032data Isolation = Default | Process | Hyperv deriving (Eq, Show)
12111033
@@ -1378,22 +1200,6 @@ instance ToJSON DeviceRate where
13781200 , "Rate" .= r
13791201 ]
13801202
1381−data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1382−
1383−data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1384−
1385−instance ToJSON MemoryConstraint where
1386− toJSON (MemoryConstraint x B) = toJSON x
1387− toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1388− toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
1389−
1390−instance FromJSON MemoryConstraint where
1391− parseJSON (JSON.Number x) = case (floatingOrInteger x) of
1392− Left (_ :: Double) -> fail "Failed to parse MemoryConstraint"
1393− Right i -> return $ MemoryConstraint i B
1394− -- The docker daemon will always return the number as bytes (integer), regardless of how we set them (using MB or GB)
1395− parseJSON _ = fail "Failed to parse MemoryConstraint"
1396−
13971203data ContainerResources = ContainerResources {
13981204 cpuShares :: Maybe Integer
13991205 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1215,12 @@ data ContainerResources = ContainerResources {
14091215 , cpusetMems :: Maybe Text
14101216 , devices :: [Device]
14111217 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1413− , memory :: Maybe MemoryConstraint
1414− , memoryReservation :: Maybe MemoryConstraint
1415− , memorySwap :: Maybe MemoryConstraint
1218+ , kernelMemory :: Maybe Integer
1219+ , memory :: Maybe Integer
1220+ , memoryReservation :: Maybe Integer
1221+ , memorySwap :: Maybe Integer
14161222 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1223+ , oomKillDisable :: Bool
14181224 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
14191225 , ulimits :: [Ulimit]
14201226 -- TODO: Missing from 1.24
@@ -1452,59 +1258,45 @@ instance FromJSON EnvVar where
14521258 parseJSON _ = fail "EnvVar is not a string"
14531259
14541260instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1261+ toJSON (EnvVar n v) = object [n .= v]
14561262
1457−-- | ExposedPort represents a port (and it's type)
1263+-- | ExposedPorts represent a enumeraton of all the ports (and their type)
14581264-- that a container should expose to other containers or the host system.
1459−-- `NOTE`: This does not automatically expose the port onto the host
1460−-- system but rather it just tags it. It's best to be used with
1265+-- `NOTE`: This does not automatically expose the ports onto the host
1266+-- system but rather it just tags them. It's best to be used with
14611267-- the PublishAllPorts flag. It is also useful for
14621268-- the daemon to know which Environment variables to
14631269-- inject into a container linking to our container.
14641270-- Example linking a Postgres container named db would inject the following
14651271-- environment variables automatically if we set the corresponding
14661272--
1467−-- ExposedPort:
1273+-- ExposedPorts:
14681274--
14691275-- @
14701276-- DB_PORT_5432_TCP_PORT="5432"
14711277-- DB_PORT_5432_TCP_PROTO="tcp"
14721278-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
14731279-- @
1474−data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1280+newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1281+-- JP: Should this be ExposedPorts [(Port, PortType)]?
1282+
1283+instance FromJSON ExposedPorts where
1284+ parseJSON (JSON.Object o) = do
1285+ ExposedPorts <$> HM.foldlWithKey' f (return M.empty) o
14751286
1476−instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1477− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
14781287 where
14791288 f accM k _ = case T.split (== '/') k of
14801289 [port', portType'] -> do
14811290 port <- parseIntegerText port'
14821291 portType <- parseJSON $ JSON.String portType'
14831292 acc <- accM
1484− return $ (ExposedPort port portType):acc
1485− _ -> fail "Could not parse ExposedPorts"
1486− parseJSON (JSON.Null) = return []
1487− parseJSON _ = fail "ExposedPorts is not an object"
1488−
1489−instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1490− toJSON [] = emptyJsonObject
1491− toJSON (p:ps) = toJsonKey (p:ps) key
1492− where key (ExposedPort p t) = show p <> slash <> show t
1493− slash = T.unpack "/"
1494−
1495−data Entrypoint = Entrypoint [T.Text] deriving (Eq, Show, Generic)
1496−
1497−instance ToJSON Entrypoint where
1498− toJSON (Entrypoint (e:es)) = toJSON (e:es)
1499− toJSON (Entrypoint []) = JSON.Null
1293+ return $ M.insert port portType acc
1294+ _ ->
1295+ fail "Could not parse ExposedPorts"
1296+ parseJSON _ = fail "ExposedPorts is not an object."
15001297
1501−instance FromJSON Entrypoint where
1502− parseJSON (JSON.String e) = return $ Entrypoint [e]
1503− parseJSON (JSON.Array ar) = do
1504− arr <- mapM parseJSON (V.toList ar)
1505− return $ Entrypoint arr
1506− parseJSON JSON.Null = return $ Entrypoint []
1507− parseJSON _ = fail "Failed to parse Entrypoint"
1298+instance ToJSON ExposedPorts where
1299+ toJSON (ExposedPorts kvs) = object [((T.pack $ show p) <> "/" <> (T.pack $ show t)) .= JSON.Object HM.empty | (p,t) <- (M.toList kvs)]
15081300
15091301
15101302data ContainerConfig = ContainerConfig {
@@ -1514,7 +1306,7 @@ data ContainerConfig = ContainerConfig {
15141306 , attachStdin :: Bool
15151307 , attachStdout :: Bool
15161308 , attachStderr :: Bool
1517− , exposedPorts :: [ExposedPort]
1309+ , exposedPorts :: Maybe ExposedPorts -- Note: Should we expand the JSON instance and take away the Maybe?
15181310 -- , publishService :: Text -- Don't see this in 1.24
15191311 , tty :: Bool
15201312 , openStdin :: Bool
@@ -1525,68 +1317,25 @@ data ContainerConfig = ContainerConfig {
15251317 , image :: Text
15261318 , volumes :: [Volume]
15271319 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1320+ , entrypoint :: Maybe Text -- Can be null?
15291321 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
15301322 , macAddress :: Maybe Text
15311323 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1532− , labels :: [Label]
1324+ , labels :: Maybe Labels
15331325 , stopSignal :: Signal
15341326 } deriving (Eq, Show, Generic)
15351327
1536−
15371328instance ToJSON ContainerConfig where
15381329 toJSON = genericToJSON defaultOptions {
15391330 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
15401331
15411332instance FromJSON ContainerConfig where
1542− parseJSON (JSON.Object o) = do
1543− hostname <- o .:? "Hostname"
1544− domainname <- o .:? "Domainname"
1545− user <- o .:? "User"
1546− attachStdin <- o .: "AttachStdin"
1547− attachStdout <- o .: "AttachStdout"
1548− attachStderr <- o .: "AttachStderr"
1549− exposedPorts <- o .:? "ExposedPorts" .!= []
1550− tty <- o .: "Tty"
1551− openStdin <- o .: "OpenStdin"
1552− stdinOnce <- o .: "StdinOnce"
1553− env <- o .: "Env"
1554− cmd <- o .: "Cmd"
1555− image <- o .: "Image"
1556− volumes <- o .: "Volumes"
1557− workingDir <- o .:? "WorkingDir"
1558− entrypoint <- o .: "Entrypoint"
1559− networkDisabled <- o .:? "networkDisabled"
1560− macAddress <- o .:? "MacAddress"
1561− labels <- o .:? "Labels" .!= []
1562− stopSignal <- o .: "StopSignal"
1563− return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1564− macAddress labels stopSignal
1565− parseJSON _ = fail "NetworkSettings is not an object."
1333+ parseJSON = genericParseJSON defaultOptions {
1334+ fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
15661335
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701336parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721337parseIntegerText t = case readMaybe $ T.unpack t of
15731338 Nothing ->
15741339 fail "Could not parse Integer"
15751340 Just i ->
15761341 return i
1577−
1578−-- | Helper function for converting a data type [a] to a json dictionary
1579−-- like so {"something": {}, "something2": {}}
1580−toJsonKey :: Foldable t => t a -> (a -> String) -> JSON.Value
1581−toJsonKey vs getKey = JSON.Object $ foldl f HM.empty vs
1582− where f acc x = HM.insert (T.pack $ getKey x) (JSON.Object HM.empty) acc
1583−
1584−-- | Helper function for converting a data type [a] to a json dictionary
1585−-- like so {"something": "val1", "something2": "val2"}
1586−toJsonKeyVal :: (Foldable t, JSON.ToJSON r) => t a -> (a -> String) -> (a -> r) -> JSON.Value
1587−toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1588− where f acc x = HM.insert (T.pack $ getKey x) (toJSON $ getVal x) acc
1589−
1590−-- | Helper function that return an empty dictionary "{}"
1591−emptyJsonObject :: JSON.Value
1592−emptyJsonObject = JSON.Object HM.empty