diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41d3647..17b23a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,18 +51,18 @@ jobs: # cabal test all stack: - name: stack / ghc ${{ matrix.ghc }} + name: stack ${{matrix.resolver}} / ${{ matrix.version }} runs-on: ubuntu-latest strategy: fail-fast: false matrix: resolver: - - lts-18.28 # 8.10.7 - - lts-19.33 # 9.0.2 - - lts-20.26 # 9.2.8 - - lts-21.25 # 9.4.8 - - lts-22.30 # 9.6.6 - nightly-2024-07-26 # 9.8.2 + - lts-22.30 # 9.6.6 + - lts-21.25 # 9.4.8 + - lts-20.26 # 9.2.8 + - lts-19.33 # 9.0.2 + - lts-18.28 # 8.10.7 version: - v1.36 - v1.37 diff --git a/flake.nix b/flake.nix index 39ad5f8..4064696 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,21 @@ versionSuffix = 0; + mkApiYaml = { src, patchPhase ? true }: pkgs.stdenv.mkDerivation { + name = "docker-api-1.39.${toString versionSuffix}.yaml"; + inherit src; + unpackPhase = '' + cp $src api.yaml + ''; + inherit patchPhase; + buildInputs = [pkgs.yq-go]; + dontConfigure = true; + dontBuild = true; + installPhase = '' + cp api.yaml "$out" + ''; + }; + api_1_36 = pkgs.fetchurl { url = "https://docs.docker.com/reference/engine/v1.36.yaml"; hash = "sha256-6kS2MJunowLqAEhdCqi+lXLHsGb9dr2M51fuG+ENX0Q="; @@ -21,9 +36,16 @@ url = "https://docs.docker.com/reference/engine/v1.38.yaml"; hash = "sha256-5eHhNFiO4YXVhl045OldlL8Mry72LybHzuAtJT1dfMc="; }; - api_1_39 = pkgs.fetchurl { - url = "https://docs.docker.com/reference/engine/v1.39.yaml"; - hash = "sha256-Oswl1SJb2MCVpTQ/P9Cj+l1gM8d7E7IXxzffmeavhFM="; + api_1_39 = mkApiYaml { + src = pkgs.fetchurl { + url = "https://docs.docker.com/reference/engine/v1.39.yaml"; + hash = "sha256-Oswl1SJb2MCVpTQ/P9Cj+l1gM8d7E7IXxzffmeavhFM="; + }; + patchPhase = '' + yq e -i '.definitions.ContainerSummary.type = "object"' api.yaml + yq e -i '.definitions.ContainerSummary.properties = .definitions.ContainerSummary.items.properties' api.yaml + yq e -i 'del(.definitions.ContainerSummary.items)' api.yaml + ''; }; api_1_40 = pkgs.fetchurl { url = "https://docs.docker.com/reference/engine/v1.40.yaml"; @@ -84,6 +106,17 @@ packages = { inherit (pkgs) openapi-generator-cli; + inherit + api_1_36 + api_1_37 + api_1_38 + api_1_39 + api_1_40 + api_1_41 + api_1_42 + api_1_43 + api_1_44; + generate1_36 = mkGenerateScript api_1_36 "v1.36"; generate1_37 = mkGenerateScript api_1_37 "v1.37"; generate1_38 = mkGenerateScript api_1_38 "v1.38"; diff --git a/v1.39/.openapi-generator/FILES b/v1.39/.openapi-generator/FILES index 7576ff1..e28d83b 100644 --- a/v1.39/.openapi-generator/FILES +++ b/v1.39/.openapi-generator/FILES @@ -1,5 +1,4 @@ .gitignore -.openapi-generator-ignore .travis.yml README.md Setup.hs diff --git a/v1.39/lib/DockerEngine/API/Container.hs b/v1.39/lib/DockerEngine/API/Container.hs index d1bc192..4b4b712 100644 --- a/v1.39/lib/DockerEngine/API/Container.hs +++ b/v1.39/lib/DockerEngine/API/Container.hs @@ -334,7 +334,7 @@ instance Produces ContainerKill MimeNoContent -- Returns a list of containers. For details on the format, see the [inspect endpoint](#operation/ContainerInspect). Note that it uses a different, smaller representation of a container than inspecting a single container. For example, the list of linked containers is not propagated . -- containerList - :: DockerEngineRequest ContainerList MimeNoContent [ContainerSummaryInner] MimeJSON + :: DockerEngineRequest ContainerList MimeNoContent ContainerSummary MimeJSON containerList = _mkRequest "GET" ["/containers/json"] diff --git a/v1.39/lib/DockerEngine/Model.hs b/v1.39/lib/DockerEngine/Model.hs index 3f065b1..0823d4c 100644 --- a/v1.39/lib/DockerEngine/Model.hs +++ b/v1.39/lib/DockerEngine/Model.hs @@ -1416,30 +1416,30 @@ mkContainerState = , containerStateHealth = Nothing } --- ** ContainerSummaryInner --- | ContainerSummaryInner -data ContainerSummaryInner = ContainerSummaryInner - { containerSummaryInnerId :: !(Maybe Text) -- ^ "Id" - The ID of this container - , containerSummaryInnerNames :: !(Maybe [Text]) -- ^ "Names" - The names that this container has been given - , containerSummaryInnerImage :: !(Maybe Text) -- ^ "Image" - The name of the image used when creating this container - , containerSummaryInnerImageId :: !(Maybe Text) -- ^ "ImageID" - The ID of the image that this container was created from - , containerSummaryInnerCommand :: !(Maybe Text) -- ^ "Command" - Command to run when starting the container - , containerSummaryInnerCreated :: !(Maybe Integer) -- ^ "Created" - When the container was created - , containerSummaryInnerPorts :: !(Maybe [Port]) -- ^ "Ports" - The ports exposed by this container - , containerSummaryInnerSizeRw :: !(Maybe Integer) -- ^ "SizeRw" - The size of files that have been created or changed by this container - , containerSummaryInnerSizeRootFs :: !(Maybe Integer) -- ^ "SizeRootFs" - The total size of all the files in this container - , containerSummaryInnerLabels :: !(Maybe (Map.Map String Text)) -- ^ "Labels" - User-defined key/value metadata. - , containerSummaryInnerState :: !(Maybe Text) -- ^ "State" - The state of this container (e.g. `Exited`) - , containerSummaryInnerStatus :: !(Maybe Text) -- ^ "Status" - Additional human-readable status of this container (e.g. `Exit 0`) - , containerSummaryInnerHostConfig :: !(Maybe ContainerSummaryInnerHostConfig) -- ^ "HostConfig" - , containerSummaryInnerNetworkSettings :: !(Maybe ContainerSummaryInnerNetworkSettings) -- ^ "NetworkSettings" - , containerSummaryInnerMounts :: !(Maybe [MountPoint]) -- ^ "Mounts" - } deriving (P.Show, P.Eq, P.Typeable) - --- | FromJSON ContainerSummaryInner -instance A.FromJSON ContainerSummaryInner where - parseJSON = A.withObject "ContainerSummaryInner" $ \o -> - ContainerSummaryInner +-- ** ContainerSummary +-- | ContainerSummary +data ContainerSummary = ContainerSummary + { containerSummaryId :: !(Maybe Text) -- ^ "Id" - The ID of this container + , containerSummaryNames :: !(Maybe [Text]) -- ^ "Names" - The names that this container has been given + , containerSummaryImage :: !(Maybe Text) -- ^ "Image" - The name of the image used when creating this container + , containerSummaryImageId :: !(Maybe Text) -- ^ "ImageID" - The ID of the image that this container was created from + , containerSummaryCommand :: !(Maybe Text) -- ^ "Command" - Command to run when starting the container + , containerSummaryCreated :: !(Maybe Integer) -- ^ "Created" - When the container was created + , containerSummaryPorts :: !(Maybe [Port]) -- ^ "Ports" - The ports exposed by this container + , containerSummarySizeRw :: !(Maybe Integer) -- ^ "SizeRw" - The size of files that have been created or changed by this container + , containerSummarySizeRootFs :: !(Maybe Integer) -- ^ "SizeRootFs" - The total size of all the files in this container + , containerSummaryLabels :: !(Maybe (Map.Map String Text)) -- ^ "Labels" - User-defined key/value metadata. + , containerSummaryState :: !(Maybe Text) -- ^ "State" - The state of this container (e.g. `Exited`) + , containerSummaryStatus :: !(Maybe Text) -- ^ "Status" - Additional human-readable status of this container (e.g. `Exit 0`) + , containerSummaryHostConfig :: !(Maybe ContainerSummaryHostConfig) -- ^ "HostConfig" + , containerSummaryNetworkSettings :: !(Maybe ContainerSummaryNetworkSettings) -- ^ "NetworkSettings" + , containerSummaryMounts :: !(Maybe [MountPoint]) -- ^ "Mounts" + } deriving (P.Show, P.Eq, P.Typeable) + +-- | FromJSON ContainerSummary +instance A.FromJSON ContainerSummary where + parseJSON = A.withObject "ContainerSummary" $ \o -> + ContainerSummary <$> (o .:? "Id") <*> (o .:? "Names") <*> (o .:? "Image") @@ -1456,105 +1456,105 @@ instance A.FromJSON ContainerSummaryInner where <*> (o .:? "NetworkSettings") <*> (o .:? "Mounts") --- | ToJSON ContainerSummaryInner -instance A.ToJSON ContainerSummaryInner where - toJSON ContainerSummaryInner {..} = - _omitNulls - [ "Id" .= containerSummaryInnerId - , "Names" .= containerSummaryInnerNames - , "Image" .= containerSummaryInnerImage - , "ImageID" .= containerSummaryInnerImageId - , "Command" .= containerSummaryInnerCommand - , "Created" .= containerSummaryInnerCreated - , "Ports" .= containerSummaryInnerPorts - , "SizeRw" .= containerSummaryInnerSizeRw - , "SizeRootFs" .= containerSummaryInnerSizeRootFs - , "Labels" .= containerSummaryInnerLabels - , "State" .= containerSummaryInnerState - , "Status" .= containerSummaryInnerStatus - , "HostConfig" .= containerSummaryInnerHostConfig - , "NetworkSettings" .= containerSummaryInnerNetworkSettings - , "Mounts" .= containerSummaryInnerMounts - ] - - --- | Construct a value of type 'ContainerSummaryInner' (by applying it's required fields, if any) -mkContainerSummaryInner - :: ContainerSummaryInner -mkContainerSummaryInner = - ContainerSummaryInner - { containerSummaryInnerId = Nothing - , containerSummaryInnerNames = Nothing - , containerSummaryInnerImage = Nothing - , containerSummaryInnerImageId = Nothing - , containerSummaryInnerCommand = Nothing - , containerSummaryInnerCreated = Nothing - , containerSummaryInnerPorts = Nothing - , containerSummaryInnerSizeRw = Nothing - , containerSummaryInnerSizeRootFs = Nothing - , containerSummaryInnerLabels = Nothing - , containerSummaryInnerState = Nothing - , containerSummaryInnerStatus = Nothing - , containerSummaryInnerHostConfig = Nothing - , containerSummaryInnerNetworkSettings = Nothing - , containerSummaryInnerMounts = Nothing - } - --- ** ContainerSummaryInnerHostConfig --- | ContainerSummaryInnerHostConfig -data ContainerSummaryInnerHostConfig = ContainerSummaryInnerHostConfig - { containerSummaryInnerHostConfigNetworkMode :: !(Maybe Text) -- ^ "NetworkMode" - } deriving (P.Show, P.Eq, P.Typeable) - --- | FromJSON ContainerSummaryInnerHostConfig -instance A.FromJSON ContainerSummaryInnerHostConfig where - parseJSON = A.withObject "ContainerSummaryInnerHostConfig" $ \o -> - ContainerSummaryInnerHostConfig +-- | ToJSON ContainerSummary +instance A.ToJSON ContainerSummary where + toJSON ContainerSummary {..} = + _omitNulls + [ "Id" .= containerSummaryId + , "Names" .= containerSummaryNames + , "Image" .= containerSummaryImage + , "ImageID" .= containerSummaryImageId + , "Command" .= containerSummaryCommand + , "Created" .= containerSummaryCreated + , "Ports" .= containerSummaryPorts + , "SizeRw" .= containerSummarySizeRw + , "SizeRootFs" .= containerSummarySizeRootFs + , "Labels" .= containerSummaryLabels + , "State" .= containerSummaryState + , "Status" .= containerSummaryStatus + , "HostConfig" .= containerSummaryHostConfig + , "NetworkSettings" .= containerSummaryNetworkSettings + , "Mounts" .= containerSummaryMounts + ] + + +-- | Construct a value of type 'ContainerSummary' (by applying it's required fields, if any) +mkContainerSummary + :: ContainerSummary +mkContainerSummary = + ContainerSummary + { containerSummaryId = Nothing + , containerSummaryNames = Nothing + , containerSummaryImage = Nothing + , containerSummaryImageId = Nothing + , containerSummaryCommand = Nothing + , containerSummaryCreated = Nothing + , containerSummaryPorts = Nothing + , containerSummarySizeRw = Nothing + , containerSummarySizeRootFs = Nothing + , containerSummaryLabels = Nothing + , containerSummaryState = Nothing + , containerSummaryStatus = Nothing + , containerSummaryHostConfig = Nothing + , containerSummaryNetworkSettings = Nothing + , containerSummaryMounts = Nothing + } + +-- ** ContainerSummaryHostConfig +-- | ContainerSummaryHostConfig +data ContainerSummaryHostConfig = ContainerSummaryHostConfig + { containerSummaryHostConfigNetworkMode :: !(Maybe Text) -- ^ "NetworkMode" + } deriving (P.Show, P.Eq, P.Typeable) + +-- | FromJSON ContainerSummaryHostConfig +instance A.FromJSON ContainerSummaryHostConfig where + parseJSON = A.withObject "ContainerSummaryHostConfig" $ \o -> + ContainerSummaryHostConfig <$> (o .:? "NetworkMode") --- | ToJSON ContainerSummaryInnerHostConfig -instance A.ToJSON ContainerSummaryInnerHostConfig where - toJSON ContainerSummaryInnerHostConfig {..} = +-- | ToJSON ContainerSummaryHostConfig +instance A.ToJSON ContainerSummaryHostConfig where + toJSON ContainerSummaryHostConfig {..} = _omitNulls - [ "NetworkMode" .= containerSummaryInnerHostConfigNetworkMode + [ "NetworkMode" .= containerSummaryHostConfigNetworkMode ] --- | Construct a value of type 'ContainerSummaryInnerHostConfig' (by applying it's required fields, if any) -mkContainerSummaryInnerHostConfig - :: ContainerSummaryInnerHostConfig -mkContainerSummaryInnerHostConfig = - ContainerSummaryInnerHostConfig - { containerSummaryInnerHostConfigNetworkMode = Nothing +-- | Construct a value of type 'ContainerSummaryHostConfig' (by applying it's required fields, if any) +mkContainerSummaryHostConfig + :: ContainerSummaryHostConfig +mkContainerSummaryHostConfig = + ContainerSummaryHostConfig + { containerSummaryHostConfigNetworkMode = Nothing } --- ** ContainerSummaryInnerNetworkSettings --- | ContainerSummaryInnerNetworkSettings +-- ** ContainerSummaryNetworkSettings +-- | ContainerSummaryNetworkSettings -- A summary of the container's network settings -data ContainerSummaryInnerNetworkSettings = ContainerSummaryInnerNetworkSettings - { containerSummaryInnerNetworkSettingsNetworks :: !(Maybe (Map.Map String EndpointSettings)) -- ^ "Networks" +data ContainerSummaryNetworkSettings = ContainerSummaryNetworkSettings + { containerSummaryNetworkSettingsNetworks :: !(Maybe (Map.Map String EndpointSettings)) -- ^ "Networks" } deriving (P.Show, P.Eq, P.Typeable) --- | FromJSON ContainerSummaryInnerNetworkSettings -instance A.FromJSON ContainerSummaryInnerNetworkSettings where - parseJSON = A.withObject "ContainerSummaryInnerNetworkSettings" $ \o -> - ContainerSummaryInnerNetworkSettings +-- | FromJSON ContainerSummaryNetworkSettings +instance A.FromJSON ContainerSummaryNetworkSettings where + parseJSON = A.withObject "ContainerSummaryNetworkSettings" $ \o -> + ContainerSummaryNetworkSettings <$> (o .:? "Networks") --- | ToJSON ContainerSummaryInnerNetworkSettings -instance A.ToJSON ContainerSummaryInnerNetworkSettings where - toJSON ContainerSummaryInnerNetworkSettings {..} = +-- | ToJSON ContainerSummaryNetworkSettings +instance A.ToJSON ContainerSummaryNetworkSettings where + toJSON ContainerSummaryNetworkSettings {..} = _omitNulls - [ "Networks" .= containerSummaryInnerNetworkSettingsNetworks + [ "Networks" .= containerSummaryNetworkSettingsNetworks ] --- | Construct a value of type 'ContainerSummaryInnerNetworkSettings' (by applying it's required fields, if any) -mkContainerSummaryInnerNetworkSettings - :: ContainerSummaryInnerNetworkSettings -mkContainerSummaryInnerNetworkSettings = - ContainerSummaryInnerNetworkSettings - { containerSummaryInnerNetworkSettingsNetworks = Nothing +-- | Construct a value of type 'ContainerSummaryNetworkSettings' (by applying it's required fields, if any) +mkContainerSummaryNetworkSettings + :: ContainerSummaryNetworkSettings +mkContainerSummaryNetworkSettings = + ContainerSummaryNetworkSettings + { containerSummaryNetworkSettingsNetworks = Nothing } -- ** ContainerTopResponse @@ -7413,7 +7413,7 @@ mkSystemAuthResponse systemAuthResponseStatus = data SystemDataUsageResponse = SystemDataUsageResponse { systemDataUsageResponseLayersSize :: !(Maybe Integer) -- ^ "LayersSize" , systemDataUsageResponseImages :: !(Maybe [ImageSummary]) -- ^ "Images" - , systemDataUsageResponseContainers :: !(Maybe [Array]) -- ^ "Containers" + , systemDataUsageResponseContainers :: !(Maybe [ContainerSummary]) -- ^ "Containers" , systemDataUsageResponseVolumes :: !(Maybe [Volume]) -- ^ "Volumes" , systemDataUsageResponseBuildCache :: !(Maybe [BuildCache]) -- ^ "BuildCache" } deriving (P.Show, P.Eq, P.Typeable) diff --git a/v1.39/lib/DockerEngine/ModelLens.hs b/v1.39/lib/DockerEngine/ModelLens.hs index ca064dc..8daf387 100644 --- a/v1.39/lib/DockerEngine/ModelLens.hs +++ b/v1.39/lib/DockerEngine/ModelLens.hs @@ -878,100 +878,100 @@ containerStateHealthL f ContainerState{..} = (\containerStateHealth -> Container --- * ContainerSummaryInner +-- * ContainerSummary --- | 'containerSummaryInnerId' Lens -containerSummaryInnerIdL :: Lens_' ContainerSummaryInner (Maybe Text) -containerSummaryInnerIdL f ContainerSummaryInner{..} = (\containerSummaryInnerId -> ContainerSummaryInner { containerSummaryInnerId, ..} ) <$> f containerSummaryInnerId -{-# INLINE containerSummaryInnerIdL #-} +-- | 'containerSummaryId' Lens +containerSummaryIdL :: Lens_' ContainerSummary (Maybe Text) +containerSummaryIdL f ContainerSummary{..} = (\containerSummaryId -> ContainerSummary { containerSummaryId, ..} ) <$> f containerSummaryId +{-# INLINE containerSummaryIdL #-} --- | 'containerSummaryInnerNames' Lens -containerSummaryInnerNamesL :: Lens_' ContainerSummaryInner (Maybe [Text]) -containerSummaryInnerNamesL f ContainerSummaryInner{..} = (\containerSummaryInnerNames -> ContainerSummaryInner { containerSummaryInnerNames, ..} ) <$> f containerSummaryInnerNames -{-# INLINE containerSummaryInnerNamesL #-} +-- | 'containerSummaryNames' Lens +containerSummaryNamesL :: Lens_' ContainerSummary (Maybe [Text]) +containerSummaryNamesL f ContainerSummary{..} = (\containerSummaryNames -> ContainerSummary { containerSummaryNames, ..} ) <$> f containerSummaryNames +{-# INLINE containerSummaryNamesL #-} --- | 'containerSummaryInnerImage' Lens -containerSummaryInnerImageL :: Lens_' ContainerSummaryInner (Maybe Text) -containerSummaryInnerImageL f ContainerSummaryInner{..} = (\containerSummaryInnerImage -> ContainerSummaryInner { containerSummaryInnerImage, ..} ) <$> f containerSummaryInnerImage -{-# INLINE containerSummaryInnerImageL #-} +-- | 'containerSummaryImage' Lens +containerSummaryImageL :: Lens_' ContainerSummary (Maybe Text) +containerSummaryImageL f ContainerSummary{..} = (\containerSummaryImage -> ContainerSummary { containerSummaryImage, ..} ) <$> f containerSummaryImage +{-# INLINE containerSummaryImageL #-} --- | 'containerSummaryInnerImageId' Lens -containerSummaryInnerImageIdL :: Lens_' ContainerSummaryInner (Maybe Text) -containerSummaryInnerImageIdL f ContainerSummaryInner{..} = (\containerSummaryInnerImageId -> ContainerSummaryInner { containerSummaryInnerImageId, ..} ) <$> f containerSummaryInnerImageId -{-# INLINE containerSummaryInnerImageIdL #-} +-- | 'containerSummaryImageId' Lens +containerSummaryImageIdL :: Lens_' ContainerSummary (Maybe Text) +containerSummaryImageIdL f ContainerSummary{..} = (\containerSummaryImageId -> ContainerSummary { containerSummaryImageId, ..} ) <$> f containerSummaryImageId +{-# INLINE containerSummaryImageIdL #-} --- | 'containerSummaryInnerCommand' Lens -containerSummaryInnerCommandL :: Lens_' ContainerSummaryInner (Maybe Text) -containerSummaryInnerCommandL f ContainerSummaryInner{..} = (\containerSummaryInnerCommand -> ContainerSummaryInner { containerSummaryInnerCommand, ..} ) <$> f containerSummaryInnerCommand -{-# INLINE containerSummaryInnerCommandL #-} +-- | 'containerSummaryCommand' Lens +containerSummaryCommandL :: Lens_' ContainerSummary (Maybe Text) +containerSummaryCommandL f ContainerSummary{..} = (\containerSummaryCommand -> ContainerSummary { containerSummaryCommand, ..} ) <$> f containerSummaryCommand +{-# INLINE containerSummaryCommandL #-} --- | 'containerSummaryInnerCreated' Lens -containerSummaryInnerCreatedL :: Lens_' ContainerSummaryInner (Maybe Integer) -containerSummaryInnerCreatedL f ContainerSummaryInner{..} = (\containerSummaryInnerCreated -> ContainerSummaryInner { containerSummaryInnerCreated, ..} ) <$> f containerSummaryInnerCreated -{-# INLINE containerSummaryInnerCreatedL #-} +-- | 'containerSummaryCreated' Lens +containerSummaryCreatedL :: Lens_' ContainerSummary (Maybe Integer) +containerSummaryCreatedL f ContainerSummary{..} = (\containerSummaryCreated -> ContainerSummary { containerSummaryCreated, ..} ) <$> f containerSummaryCreated +{-# INLINE containerSummaryCreatedL #-} --- | 'containerSummaryInnerPorts' Lens -containerSummaryInnerPortsL :: Lens_' ContainerSummaryInner (Maybe [Port]) -containerSummaryInnerPortsL f ContainerSummaryInner{..} = (\containerSummaryInnerPorts -> ContainerSummaryInner { containerSummaryInnerPorts, ..} ) <$> f containerSummaryInnerPorts -{-# INLINE containerSummaryInnerPortsL #-} +-- | 'containerSummaryPorts' Lens +containerSummaryPortsL :: Lens_' ContainerSummary (Maybe [Port]) +containerSummaryPortsL f ContainerSummary{..} = (\containerSummaryPorts -> ContainerSummary { containerSummaryPorts, ..} ) <$> f containerSummaryPorts +{-# INLINE containerSummaryPortsL #-} --- | 'containerSummaryInnerSizeRw' Lens -containerSummaryInnerSizeRwL :: Lens_' ContainerSummaryInner (Maybe Integer) -containerSummaryInnerSizeRwL f ContainerSummaryInner{..} = (\containerSummaryInnerSizeRw -> ContainerSummaryInner { containerSummaryInnerSizeRw, ..} ) <$> f containerSummaryInnerSizeRw -{-# INLINE containerSummaryInnerSizeRwL #-} +-- | 'containerSummarySizeRw' Lens +containerSummarySizeRwL :: Lens_' ContainerSummary (Maybe Integer) +containerSummarySizeRwL f ContainerSummary{..} = (\containerSummarySizeRw -> ContainerSummary { containerSummarySizeRw, ..} ) <$> f containerSummarySizeRw +{-# INLINE containerSummarySizeRwL #-} --- | 'containerSummaryInnerSizeRootFs' Lens -containerSummaryInnerSizeRootFsL :: Lens_' ContainerSummaryInner (Maybe Integer) -containerSummaryInnerSizeRootFsL f ContainerSummaryInner{..} = (\containerSummaryInnerSizeRootFs -> ContainerSummaryInner { containerSummaryInnerSizeRootFs, ..} ) <$> f containerSummaryInnerSizeRootFs -{-# INLINE containerSummaryInnerSizeRootFsL #-} +-- | 'containerSummarySizeRootFs' Lens +containerSummarySizeRootFsL :: Lens_' ContainerSummary (Maybe Integer) +containerSummarySizeRootFsL f ContainerSummary{..} = (\containerSummarySizeRootFs -> ContainerSummary { containerSummarySizeRootFs, ..} ) <$> f containerSummarySizeRootFs +{-# INLINE containerSummarySizeRootFsL #-} --- | 'containerSummaryInnerLabels' Lens -containerSummaryInnerLabelsL :: Lens_' ContainerSummaryInner (Maybe (Map.Map String Text)) -containerSummaryInnerLabelsL f ContainerSummaryInner{..} = (\containerSummaryInnerLabels -> ContainerSummaryInner { containerSummaryInnerLabels, ..} ) <$> f containerSummaryInnerLabels -{-# INLINE containerSummaryInnerLabelsL #-} +-- | 'containerSummaryLabels' Lens +containerSummaryLabelsL :: Lens_' ContainerSummary (Maybe (Map.Map String Text)) +containerSummaryLabelsL f ContainerSummary{..} = (\containerSummaryLabels -> ContainerSummary { containerSummaryLabels, ..} ) <$> f containerSummaryLabels +{-# INLINE containerSummaryLabelsL #-} --- | 'containerSummaryInnerState' Lens -containerSummaryInnerStateL :: Lens_' ContainerSummaryInner (Maybe Text) -containerSummaryInnerStateL f ContainerSummaryInner{..} = (\containerSummaryInnerState -> ContainerSummaryInner { containerSummaryInnerState, ..} ) <$> f containerSummaryInnerState -{-# INLINE containerSummaryInnerStateL #-} +-- | 'containerSummaryState' Lens +containerSummaryStateL :: Lens_' ContainerSummary (Maybe Text) +containerSummaryStateL f ContainerSummary{..} = (\containerSummaryState -> ContainerSummary { containerSummaryState, ..} ) <$> f containerSummaryState +{-# INLINE containerSummaryStateL #-} --- | 'containerSummaryInnerStatus' Lens -containerSummaryInnerStatusL :: Lens_' ContainerSummaryInner (Maybe Text) -containerSummaryInnerStatusL f ContainerSummaryInner{..} = (\containerSummaryInnerStatus -> ContainerSummaryInner { containerSummaryInnerStatus, ..} ) <$> f containerSummaryInnerStatus -{-# INLINE containerSummaryInnerStatusL #-} +-- | 'containerSummaryStatus' Lens +containerSummaryStatusL :: Lens_' ContainerSummary (Maybe Text) +containerSummaryStatusL f ContainerSummary{..} = (\containerSummaryStatus -> ContainerSummary { containerSummaryStatus, ..} ) <$> f containerSummaryStatus +{-# INLINE containerSummaryStatusL #-} --- | 'containerSummaryInnerHostConfig' Lens -containerSummaryInnerHostConfigL :: Lens_' ContainerSummaryInner (Maybe ContainerSummaryInnerHostConfig) -containerSummaryInnerHostConfigL f ContainerSummaryInner{..} = (\containerSummaryInnerHostConfig -> ContainerSummaryInner { containerSummaryInnerHostConfig, ..} ) <$> f containerSummaryInnerHostConfig -{-# INLINE containerSummaryInnerHostConfigL #-} +-- | 'containerSummaryHostConfig' Lens +containerSummaryHostConfigL :: Lens_' ContainerSummary (Maybe ContainerSummaryHostConfig) +containerSummaryHostConfigL f ContainerSummary{..} = (\containerSummaryHostConfig -> ContainerSummary { containerSummaryHostConfig, ..} ) <$> f containerSummaryHostConfig +{-# INLINE containerSummaryHostConfigL #-} --- | 'containerSummaryInnerNetworkSettings' Lens -containerSummaryInnerNetworkSettingsL :: Lens_' ContainerSummaryInner (Maybe ContainerSummaryInnerNetworkSettings) -containerSummaryInnerNetworkSettingsL f ContainerSummaryInner{..} = (\containerSummaryInnerNetworkSettings -> ContainerSummaryInner { containerSummaryInnerNetworkSettings, ..} ) <$> f containerSummaryInnerNetworkSettings -{-# INLINE containerSummaryInnerNetworkSettingsL #-} +-- | 'containerSummaryNetworkSettings' Lens +containerSummaryNetworkSettingsL :: Lens_' ContainerSummary (Maybe ContainerSummaryNetworkSettings) +containerSummaryNetworkSettingsL f ContainerSummary{..} = (\containerSummaryNetworkSettings -> ContainerSummary { containerSummaryNetworkSettings, ..} ) <$> f containerSummaryNetworkSettings +{-# INLINE containerSummaryNetworkSettingsL #-} --- | 'containerSummaryInnerMounts' Lens -containerSummaryInnerMountsL :: Lens_' ContainerSummaryInner (Maybe [MountPoint]) -containerSummaryInnerMountsL f ContainerSummaryInner{..} = (\containerSummaryInnerMounts -> ContainerSummaryInner { containerSummaryInnerMounts, ..} ) <$> f containerSummaryInnerMounts -{-# INLINE containerSummaryInnerMountsL #-} +-- | 'containerSummaryMounts' Lens +containerSummaryMountsL :: Lens_' ContainerSummary (Maybe [MountPoint]) +containerSummaryMountsL f ContainerSummary{..} = (\containerSummaryMounts -> ContainerSummary { containerSummaryMounts, ..} ) <$> f containerSummaryMounts +{-# INLINE containerSummaryMountsL #-} --- * ContainerSummaryInnerHostConfig +-- * ContainerSummaryHostConfig --- | 'containerSummaryInnerHostConfigNetworkMode' Lens -containerSummaryInnerHostConfigNetworkModeL :: Lens_' ContainerSummaryInnerHostConfig (Maybe Text) -containerSummaryInnerHostConfigNetworkModeL f ContainerSummaryInnerHostConfig{..} = (\containerSummaryInnerHostConfigNetworkMode -> ContainerSummaryInnerHostConfig { containerSummaryInnerHostConfigNetworkMode, ..} ) <$> f containerSummaryInnerHostConfigNetworkMode -{-# INLINE containerSummaryInnerHostConfigNetworkModeL #-} +-- | 'containerSummaryHostConfigNetworkMode' Lens +containerSummaryHostConfigNetworkModeL :: Lens_' ContainerSummaryHostConfig (Maybe Text) +containerSummaryHostConfigNetworkModeL f ContainerSummaryHostConfig{..} = (\containerSummaryHostConfigNetworkMode -> ContainerSummaryHostConfig { containerSummaryHostConfigNetworkMode, ..} ) <$> f containerSummaryHostConfigNetworkMode +{-# INLINE containerSummaryHostConfigNetworkModeL #-} --- * ContainerSummaryInnerNetworkSettings +-- * ContainerSummaryNetworkSettings --- | 'containerSummaryInnerNetworkSettingsNetworks' Lens -containerSummaryInnerNetworkSettingsNetworksL :: Lens_' ContainerSummaryInnerNetworkSettings (Maybe (Map.Map String EndpointSettings)) -containerSummaryInnerNetworkSettingsNetworksL f ContainerSummaryInnerNetworkSettings{..} = (\containerSummaryInnerNetworkSettingsNetworks -> ContainerSummaryInnerNetworkSettings { containerSummaryInnerNetworkSettingsNetworks, ..} ) <$> f containerSummaryInnerNetworkSettingsNetworks -{-# INLINE containerSummaryInnerNetworkSettingsNetworksL #-} +-- | 'containerSummaryNetworkSettingsNetworks' Lens +containerSummaryNetworkSettingsNetworksL :: Lens_' ContainerSummaryNetworkSettings (Maybe (Map.Map String EndpointSettings)) +containerSummaryNetworkSettingsNetworksL f ContainerSummaryNetworkSettings{..} = (\containerSummaryNetworkSettingsNetworks -> ContainerSummaryNetworkSettings { containerSummaryNetworkSettingsNetworks, ..} ) <$> f containerSummaryNetworkSettingsNetworks +{-# INLINE containerSummaryNetworkSettingsNetworksL #-} @@ -4793,7 +4793,7 @@ systemDataUsageResponseImagesL f SystemDataUsageResponse{..} = (\systemDataUsage {-# INLINE systemDataUsageResponseImagesL #-} -- | 'systemDataUsageResponseContainers' Lens -systemDataUsageResponseContainersL :: Lens_' SystemDataUsageResponse (Maybe [Array]) +systemDataUsageResponseContainersL :: Lens_' SystemDataUsageResponse (Maybe [ContainerSummary]) systemDataUsageResponseContainersL f SystemDataUsageResponse{..} = (\systemDataUsageResponseContainers -> SystemDataUsageResponse { systemDataUsageResponseContainers, ..} ) <$> f systemDataUsageResponseContainers {-# INLINE systemDataUsageResponseContainersL #-} diff --git a/v1.39/tests/Instances.hs b/v1.39/tests/Instances.hs index ebd89a8..eb573f5 100644 --- a/v1.39/tests/Instances.hs +++ b/v1.39/tests/Instances.hs @@ -393,43 +393,43 @@ genContainerState n = <*> arbitraryReducedMaybe n -- containerStateFinishedAt :: Maybe Text <*> arbitraryReducedMaybe n -- containerStateHealth :: Maybe Health -instance Arbitrary ContainerSummaryInner where - arbitrary = sized genContainerSummaryInner - -genContainerSummaryInner :: Int -> Gen ContainerSummaryInner -genContainerSummaryInner n = - ContainerSummaryInner - <$> arbitraryReducedMaybe n -- containerSummaryInnerId :: Maybe Text - <*> arbitraryReducedMaybe n -- containerSummaryInnerNames :: Maybe [Text] - <*> arbitraryReducedMaybe n -- containerSummaryInnerImage :: Maybe Text - <*> arbitraryReducedMaybe n -- containerSummaryInnerImageId :: Maybe Text - <*> arbitraryReducedMaybe n -- containerSummaryInnerCommand :: Maybe Text - <*> arbitraryReducedMaybe n -- containerSummaryInnerCreated :: Maybe Integer - <*> arbitraryReducedMaybe n -- containerSummaryInnerPorts :: Maybe [Port] - <*> arbitraryReducedMaybe n -- containerSummaryInnerSizeRw :: Maybe Integer - <*> arbitraryReducedMaybe n -- containerSummaryInnerSizeRootFs :: Maybe Integer - <*> arbitraryReducedMaybe n -- containerSummaryInnerLabels :: Maybe (Map.Map String Text) - <*> arbitraryReducedMaybe n -- containerSummaryInnerState :: Maybe Text - <*> arbitraryReducedMaybe n -- containerSummaryInnerStatus :: Maybe Text - <*> arbitraryReducedMaybe n -- containerSummaryInnerHostConfig :: Maybe ContainerSummaryInnerHostConfig - <*> arbitraryReducedMaybe n -- containerSummaryInnerNetworkSettings :: Maybe ContainerSummaryInnerNetworkSettings - <*> arbitraryReducedMaybe n -- containerSummaryInnerMounts :: Maybe [MountPoint] - -instance Arbitrary ContainerSummaryInnerHostConfig where - arbitrary = sized genContainerSummaryInnerHostConfig - -genContainerSummaryInnerHostConfig :: Int -> Gen ContainerSummaryInnerHostConfig -genContainerSummaryInnerHostConfig n = - ContainerSummaryInnerHostConfig - <$> arbitraryReducedMaybe n -- containerSummaryInnerHostConfigNetworkMode :: Maybe Text - -instance Arbitrary ContainerSummaryInnerNetworkSettings where - arbitrary = sized genContainerSummaryInnerNetworkSettings - -genContainerSummaryInnerNetworkSettings :: Int -> Gen ContainerSummaryInnerNetworkSettings -genContainerSummaryInnerNetworkSettings n = - ContainerSummaryInnerNetworkSettings - <$> arbitraryReducedMaybe n -- containerSummaryInnerNetworkSettingsNetworks :: Maybe (Map.Map String EndpointSettings) +instance Arbitrary ContainerSummary where + arbitrary = sized genContainerSummary + +genContainerSummary :: Int -> Gen ContainerSummary +genContainerSummary n = + ContainerSummary + <$> arbitraryReducedMaybe n -- containerSummaryId :: Maybe Text + <*> arbitraryReducedMaybe n -- containerSummaryNames :: Maybe [Text] + <*> arbitraryReducedMaybe n -- containerSummaryImage :: Maybe Text + <*> arbitraryReducedMaybe n -- containerSummaryImageId :: Maybe Text + <*> arbitraryReducedMaybe n -- containerSummaryCommand :: Maybe Text + <*> arbitraryReducedMaybe n -- containerSummaryCreated :: Maybe Integer + <*> arbitraryReducedMaybe n -- containerSummaryPorts :: Maybe [Port] + <*> arbitraryReducedMaybe n -- containerSummarySizeRw :: Maybe Integer + <*> arbitraryReducedMaybe n -- containerSummarySizeRootFs :: Maybe Integer + <*> arbitraryReducedMaybe n -- containerSummaryLabels :: Maybe (Map.Map String Text) + <*> arbitraryReducedMaybe n -- containerSummaryState :: Maybe Text + <*> arbitraryReducedMaybe n -- containerSummaryStatus :: Maybe Text + <*> arbitraryReducedMaybe n -- containerSummaryHostConfig :: Maybe ContainerSummaryHostConfig + <*> arbitraryReducedMaybe n -- containerSummaryNetworkSettings :: Maybe ContainerSummaryNetworkSettings + <*> arbitraryReducedMaybe n -- containerSummaryMounts :: Maybe [MountPoint] + +instance Arbitrary ContainerSummaryHostConfig where + arbitrary = sized genContainerSummaryHostConfig + +genContainerSummaryHostConfig :: Int -> Gen ContainerSummaryHostConfig +genContainerSummaryHostConfig n = + ContainerSummaryHostConfig + <$> arbitraryReducedMaybe n -- containerSummaryHostConfigNetworkMode :: Maybe Text + +instance Arbitrary ContainerSummaryNetworkSettings where + arbitrary = sized genContainerSummaryNetworkSettings + +genContainerSummaryNetworkSettings :: Int -> Gen ContainerSummaryNetworkSettings +genContainerSummaryNetworkSettings n = + ContainerSummaryNetworkSettings + <$> arbitraryReducedMaybe n -- containerSummaryNetworkSettingsNetworks :: Maybe (Map.Map String EndpointSettings) instance Arbitrary ContainerTopResponse where arbitrary = sized genContainerTopResponse @@ -1985,7 +1985,7 @@ genSystemDataUsageResponse n = SystemDataUsageResponse <$> arbitraryReducedMaybe n -- systemDataUsageResponseLayersSize :: Maybe Integer <*> arbitraryReducedMaybe n -- systemDataUsageResponseImages :: Maybe [ImageSummary] - <*> arbitraryReducedMaybe n -- systemDataUsageResponseContainers :: Maybe [Array] + <*> arbitraryReducedMaybe n -- systemDataUsageResponseContainers :: Maybe [ContainerSummary] <*> arbitraryReducedMaybe n -- systemDataUsageResponseVolumes :: Maybe [Volume] <*> arbitraryReducedMaybe n -- systemDataUsageResponseBuildCache :: Maybe [BuildCache] diff --git a/v1.39/tests/Test.hs b/v1.39/tests/Test.hs index 335e8d8..015c793 100644 --- a/v1.39/tests/Test.hs +++ b/v1.39/tests/Test.hs @@ -38,9 +38,9 @@ main = propMimeEq MimeJSON (Proxy :: Proxy ContainerInspectResponse) propMimeEq MimeJSON (Proxy :: Proxy ContainerPruneResponse) propMimeEq MimeJSON (Proxy :: Proxy ContainerState) - propMimeEq MimeJSON (Proxy :: Proxy ContainerSummaryInner) - propMimeEq MimeJSON (Proxy :: Proxy ContainerSummaryInnerHostConfig) - propMimeEq MimeJSON (Proxy :: Proxy ContainerSummaryInnerNetworkSettings) + propMimeEq MimeJSON (Proxy :: Proxy ContainerSummary) + propMimeEq MimeJSON (Proxy :: Proxy ContainerSummaryHostConfig) + propMimeEq MimeJSON (Proxy :: Proxy ContainerSummaryNetworkSettings) propMimeEq MimeJSON (Proxy :: Proxy ContainerTopResponse) propMimeEq MimeJSON (Proxy :: Proxy ContainerUpdateRequest) propMimeEq MimeJSON (Proxy :: Proxy ContainerUpdateResponse)