Skip to content

Commit 18f08df

Browse files
alpha0010flavioheleno
alpha0010
authored and
flavioheleno
committed
Fix: regenerate from docker 1.45 api spec
1 parent fdf3d17 commit 18f08df

File tree

346 files changed

+21669
-44395
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

346 files changed

+21669
-44395
lines changed

‎.jane-openapi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ return [
44
'date-prefer-interface' => true,
55
'directory' => __DIR__ . '/src',
66
'namespace' => 'Docker\\API',
7-
'openapi-file' => __DIR__ . '/spec/v1.43.json',
7+
'openapi-file' => __DIR__ . '/spec/v1.45.json',
88
'reference' => true,
99
'strict' => false,
1010
'date-input-format' => 'Y-m-d\TH:i:s.uuP',

‎patches/NetworkSettingsNormalizer.patch‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
diff --git a/src/Normalizer/NetworkSettingsNormalizer.php b/src/Normalizer/NetworkSettingsNormalizer.php
2-
index 0c73d7f..a3c893a 100644
2+
index 22cfce8..392058c 100644
33
--- a/src/Normalizer/NetworkSettingsNormalizer.php
44
+++ b/src/Normalizer/NetworkSettingsNormalizer.php
5-
@@ -78,6 +78,10 @@ if (!class_exists(Kernel::class) || (Kernel::MAJOR_VERSION >= 7 || Kernel::MAJOR
6-
if (\array_key_exists('Ports', $data) && null !== $data['Ports']) {
7-
$values = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
8-
foreach ($data['Ports'] as $key => $value) {
9-
+ if ($value === null) {
10-
+ $values[$key] = null;
11-
+ continue;
12-
+ }
13-
$values_1 = [];
14-
foreach ($value as $value_1) {
15-
$values_1[] = $this->denormalizer->denormalize($value_1, 'Docker\\API\\Model\\PortBinding', 'json', $context);
16-
@@ -203,6 +207,10 @@ if (!class_exists(Kernel::class) || (Kernel::MAJOR_VERSION >= 7 || Kernel::MAJOR
17-
if ($object->isInitialized('ports') && null !== $object->getPorts()) {
18-
$values = [];
19-
foreach ($object->getPorts() as $key => $value) {
20-
+ if ($value === null) {
21-
+ $values[$key] = null;
22-
+ continue;
23-
+ }
24-
$values_1 = [];
25-
foreach ($value as $value_1) {
26-
$values_1[] = $this->normalizer->normalize($value_1, 'json', $context);
5+
@@ -78,6 +78,10 @@ class NetworkSettingsNormalizer implements DenormalizerInterface, NormalizerInte
6+
if (\array_key_exists('Ports', $data) && $data['Ports'] !== null) {
7+
$values = new \ArrayObject([], \ArrayObject::ARRAY_AS_PROPS);
8+
foreach ($data['Ports'] as $key => $value) {
9+
+ if (null === $value) {
10+
+ $values[$key] = null;
11+
+ continue;
12+
+ }
13+
$values_1 = [];
14+
foreach ($value as $value_1) {
15+
$values_1[] = $this->denormalizer->denormalize($value_1, \Docker\API\Model\PortBinding::class, 'json', $context);
16+
@@ -214,6 +218,10 @@ class NetworkSettingsNormalizer implements DenormalizerInterface, NormalizerInte
17+
if ($data->isInitialized('ports') && null !== $data->getPorts()) {
18+
$values = [];
19+
foreach ($data->getPorts() as $key => $value) {
20+
+ if (null === $value) {
21+
+ $values[$key] = null;
22+
+ continue;
23+
+ }
24+
$values_1 = [];
25+
foreach ($value as $value_1) {
26+
$values_1[] = $this->normalizer->normalize($value_1, 'json', $context);

‎src/Client.php‎

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Client extends Runtime\Client\Client
4949
* @throws Exception\ContainerListBadRequestException
5050
* @throws Exception\ContainerListInternalServerErrorException
5151
*
52-
* @return \Docker\API\Model\ContainerSummary[]|\Psr\Http\Message\ResponseInterface|null
52+
* @return Model\ContainerSummary[]|\Psr\Http\Message\ResponseInterface|null
5353
*/
5454
public function containerList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
5555
{
@@ -184,7 +184,7 @@ public function containerLogs(string $id, array $queryParameters = [], string $f
184184
* @throws Exception\ContainerChangesNotFoundException
185185
* @throws Exception\ContainerChangesInternalServerErrorException
186186
*
187-
* @return \Docker\API\Model\FilesystemChange[]|\Psr\Http\Message\ResponseInterface|null
187+
* @return Model\FilesystemChange[]|\Psr\Http\Message\ResponseInterface|null
188188
*/
189189
public function containerChanges(string $id, string $fetch = self::FETCH_OBJECT)
190190
{
@@ -768,6 +768,7 @@ public function containerPrune(array $queryParameters = [], string $fetch = self
768768
* - `label=key` or `label="key=value"` of an image label
769769
* - `reference`=(`<image-name>[:<tag>]`)
770770
* - `since`=(`<image-name>[:<tag>]`, `<image id>` or `<image@digest>`)
771+
* - `until=<timestamp>`
771772
* @var bool $shared-size Compute and show shared size as a `SharedSize` field on each image
772773
* @var bool $digests Show digest information as a `RepoDigests` field on each image.
773774
* }
@@ -776,7 +777,7 @@ public function containerPrune(array $queryParameters = [], string $fetch = self
776777
*
777778
* @throws Exception\ImageListInternalServerErrorException
778779
*
779-
* @return \Docker\API\Model\ImageSummary[]|\Psr\Http\Message\ResponseInterface|null
780+
* @return Model\ImageSummary[]|\Psr\Http\Message\ResponseInterface|null
780781
*/
781782
public function imageList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
782783
{
@@ -826,7 +827,12 @@ public function imageList(array $queryParameters = [], string $fetch = self::FET
826827
* @var string $platform Platform in the format os[/arch[/variant]]
827828
* @var string $target Target build stage
828829
* @var string $outputs BuildKit output configuration
829-
* }
830+
* @var string $version Version of the builder backend to use.
831+
*
832+
* - `1` is the first generation classic (deprecated) builder in the Docker daemon (default)
833+
* - `2` is [BuildKit](https://github.com/moby/buildkit)
834+
*
835+
* }
830836
*
831837
* @param array $headerParameters {
832838
*
@@ -897,7 +903,7 @@ public function buildPrune(array $queryParameters = [], string $fetch = self::FE
897903
}
898904

899905
/**
900-
* Create an image by either pulling it from a registry or importing it.
906+
* Pull or import an image.
901907
*
902908
* @param array $queryParameters {
903909
*
@@ -976,7 +982,7 @@ public function imageInspect(string $name, string $fetch = self::FETCH_OBJECT)
976982
* @throws Exception\ImageHistoryNotFoundException
977983
* @throws Exception\ImageHistoryInternalServerErrorException
978984
*
979-
* @return \Docker\API\Model\ImagesNameHistoryGetResponse200Item[]|\Psr\Http\Message\ResponseInterface|null
985+
* @return Model\ImagesNameHistoryGetResponse200Item[]|\Psr\Http\Message\ResponseInterface|null
980986
*/
981987
public function imageHistory(string $name, string $fetch = self::FETCH_OBJECT)
982988
{
@@ -1065,7 +1071,7 @@ public function imageTag(string $name, array $queryParameters = [], string $fetc
10651071
* @throws Exception\ImageDeleteConflictException
10661072
* @throws Exception\ImageDeleteInternalServerErrorException
10671073
*
1068-
* @return \Docker\API\Model\ImageDeleteResponseItem[]|\Psr\Http\Message\ResponseInterface|null
1074+
* @return Model\ImageDeleteResponseItem[]|\Psr\Http\Message\ResponseInterface|null
10691075
*/
10701076
public function imageDelete(string $name, array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
10711077
{
@@ -1081,7 +1087,6 @@ public function imageDelete(string $name, array $queryParameters = [], string $f
10811087
* @var int $limit Maximum number of results to return
10821088
* @var string $filters A JSON encoded value of the filters (a `map[string][]string`) to process on the images list. Available filters:
10831089
*
1084-
* - `is-automated=(true|false)`
10851090
* - `is-official=(true|false)`
10861091
* - `stars=<number>` Matches images that has at least 'number' stars.
10871092
*
@@ -1091,7 +1096,7 @@ public function imageDelete(string $name, array $queryParameters = [], string $f
10911096
*
10921097
* @throws Exception\ImageSearchInternalServerErrorException
10931098
*
1094-
* @return \Docker\API\Model\ImagesSearchGetResponse200Item[]|\Psr\Http\Message\ResponseInterface|null
1099+
* @return Model\ImagesSearchGetResponse200Item[]|\Psr\Http\Message\ResponseInterface|null
10951100
*/
10961101
public function imageSearch(array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
10971102
{
@@ -1596,7 +1601,7 @@ public function volumePrune(array $queryParameters = [], string $fetch = self::F
15961601
*
15971602
* @throws Exception\NetworkListInternalServerErrorException
15981603
*
1599-
* @return \Docker\API\Model\Network[]|\Psr\Http\Message\ResponseInterface|null
1604+
* @return Model\Network[]|\Psr\Http\Message\ResponseInterface|null
16001605
*/
16011606
public function networkList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
16021607
{
@@ -1642,6 +1647,7 @@ public function networkInspect(string $id, array $queryParameters = [], string $
16421647
/**
16431648
* @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
16441649
*
1650+
* @throws Exception\NetworkCreateBadRequestException
16451651
* @throws Exception\NetworkCreateForbiddenException
16461652
* @throws Exception\NetworkCreateNotFoundException
16471653
* @throws Exception\NetworkCreateInternalServerErrorException
@@ -1654,10 +1660,13 @@ public function networkCreate(?Model\NetworksCreatePostBody $requestBody = null,
16541660
}
16551661

16561662
/**
1663+
* The network must be either a local-scoped network or a swarm-scoped network with the `attachable` option set. A network cannot be re-attached to a running container.
1664+
*
16571665
* @param string $id Network ID or name
16581666
* @param string $fetch Fetch mode to use (can be OBJECT or RESPONSE)
16591667
* @param array $accept Accept content header application/json|text/plain
16601668
*
1669+
* @throws Exception\NetworkConnectBadRequestException
16611670
* @throws Exception\NetworkConnectForbiddenException
16621671
* @throws Exception\NetworkConnectNotFoundException
16631672
* @throws Exception\NetworkConnectInternalServerErrorException
@@ -1726,7 +1735,7 @@ public function networkPrune(array $queryParameters = [], string $fetch = self::
17261735
*
17271736
* @throws Exception\PluginListInternalServerErrorException
17281737
*
1729-
* @return \Docker\API\Model\Plugin[]|\Psr\Http\Message\ResponseInterface|null
1738+
* @return Model\Plugin[]|\Psr\Http\Message\ResponseInterface|null
17301739
*/
17311740
public function pluginList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
17321741
{
@@ -1746,7 +1755,7 @@ public function pluginList(array $queryParameters = [], string $fetch = self::FE
17461755
*
17471756
* @throws Exception\GetPluginPrivilegesInternalServerErrorException
17481757
*
1749-
* @return \Docker\API\Model\PluginPrivilege[]|\Psr\Http\Message\ResponseInterface|null
1758+
* @return Model\PluginPrivilege[]|\Psr\Http\Message\ResponseInterface|null
17501759
*/
17511760
public function getPluginPrivileges(array $queryParameters = [], string $fetch = self::FETCH_OBJECT, array $accept = [])
17521761
{
@@ -1757,8 +1766,8 @@ public function getPluginPrivileges(array $queryParameters = [], string $fetch =
17571766
* Pulls and installs a plugin. After the plugin is installed, it can be
17581767
* enabled using the [`POST /plugins/{name}/enable` endpoint](#operation/PostPluginsEnable).
17591768
*
1760-
* @param \Docker\API\Model\PluginPrivilege[]|null $requestBody
1761-
* @param array $queryParameters {
1769+
* @param Model\PluginPrivilege[]|null $requestBody
1770+
* @param array $queryParameters {
17621771
*
17631772
* @var string $remote Remote reference for plugin to install.
17641773
*
@@ -1873,10 +1882,10 @@ public function pluginDisable(string $name, array $queryParameters = [], string
18731882
}
18741883

18751884
/**
1876-
* @param string $name The name of the plugin. The `:latest` tag is optional, and is the
1877-
* default if omitted.
1878-
* @param \Docker\API\Model\PluginPrivilege[]|null $requestBody
1879-
* @param array $queryParameters {
1885+
* @param string $name The name of the plugin. The `:latest` tag is optional, and is the
1886+
* default if omitted.
1887+
* @param Model\PluginPrivilege[]|null $requestBody
1888+
* @param array $queryParameters {
18801889
*
18811890
* @var string $remote Remote reference to upgrade to.
18821891
*
@@ -1984,7 +1993,7 @@ public function pluginSet(string $name, ?array $requestBody = null, string $fetc
19841993
* @throws Exception\NodeListInternalServerErrorException
19851994
* @throws Exception\NodeListServiceUnavailableException
19861995
*
1987-
* @return \Docker\API\Model\Node[]|\Psr\Http\Message\ResponseInterface|null
1996+
* @return Model\Node[]|\Psr\Http\Message\ResponseInterface|null
19881997
*/
19891998
public function nodeList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT, array $accept = [])
19901999
{
@@ -2191,7 +2200,7 @@ public function swarmUnlock(?Model\SwarmUnlockPostBody $requestBody = null, stri
21912200
* @throws Exception\ServiceListInternalServerErrorException
21922201
* @throws Exception\ServiceListServiceUnavailableException
21932202
*
2194-
* @return \Docker\API\Model\Service[]|\Psr\Http\Message\ResponseInterface|null
2203+
* @return Model\Service[]|\Psr\Http\Message\ResponseInterface|null
21952204
*/
21962205
public function serviceList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT, array $accept = [])
21972206
{
@@ -2217,7 +2226,7 @@ public function serviceList(array $queryParameters = [], string $fetch = self::F
22172226
* @throws Exception\ServiceCreateInternalServerErrorException
22182227
* @throws Exception\ServiceCreateServiceUnavailableException
22192228
*
2220-
* @return Model\ServicesCreatePostResponse201|\Psr\Http\Message\ResponseInterface|null
2229+
* @return Model\ServiceCreateResponse|\Psr\Http\Message\ResponseInterface|null
22212230
*/
22222231
public function serviceCreate(?Model\ServicesCreatePostBody $requestBody = null, array $headerParameters = [], string $fetch = self::FETCH_OBJECT)
22232232
{
@@ -2357,7 +2366,7 @@ public function serviceLogs(string $id, array $queryParameters = [], string $fet
23572366
* @throws Exception\TaskListInternalServerErrorException
23582367
* @throws Exception\TaskListServiceUnavailableException
23592368
*
2360-
* @return \Docker\API\Model\Task[]|\Psr\Http\Message\ResponseInterface|null
2369+
* @return Model\Task[]|\Psr\Http\Message\ResponseInterface|null
23612370
*/
23622371
public function taskList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
23632372
{
@@ -2432,7 +2441,7 @@ public function taskLogs(string $id, array $queryParameters = [], string $fetch
24322441
* @throws Exception\SecretListInternalServerErrorException
24332442
* @throws Exception\SecretListServiceUnavailableException
24342443
*
2435-
* @return \Docker\API\Model\Secret[]|\Psr\Http\Message\ResponseInterface|null
2444+
* @return Model\Secret[]|\Psr\Http\Message\ResponseInterface|null
24362445
*/
24372446
public function secretList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
24382447
{
@@ -2527,7 +2536,7 @@ public function secretUpdate(string $id, ?Model\SecretSpec $requestBody = null,
25272536
* @throws Exception\ConfigListInternalServerErrorException
25282537
* @throws Exception\ConfigListServiceUnavailableException
25292538
*
2530-
* @return \Docker\API\Model\Config[]|\Psr\Http\Message\ResponseInterface|null
2539+
* @return Model\Config[]|\Psr\Http\Message\ResponseInterface|null
25312540
*/
25322541
public function configList(array $queryParameters = [], string $fetch = self::FETCH_OBJECT)
25332542
{
@@ -2633,7 +2642,7 @@ public static function create($httpClient = null, array $additionalPlugins = [],
26332642
if (null === $httpClient) {
26342643
$httpClient = \Http\Discovery\Psr18ClientDiscovery::find();
26352644
$plugins = [];
2636-
$uri = \Http\Discovery\Psr17FactoryDiscovery::findUriFactory()->createUri('/v1.43');
2645+
$uri = \Http\Discovery\Psr17FactoryDiscovery::findUriFactory()->createUri('/v1.45');
26372646
$plugins[] = new \Http\Client\Common\Plugin\AddPathPlugin($uri);
26382647
if (\count($additionalPlugins) > 0) {
26392648
$plugins = array_merge($plugins, $additionalPlugins);

‎src/Endpoint/BuildPrune.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ protected function transformResponseBody(\Psr\Http\Message\ResponseInterface $re
7777
$status = $response->getStatusCode();
7878
$body = (string) $response->getBody();
7979
if ((null === $contentType) === false && (200 === $status && false !== mb_strpos($contentType, 'application/json'))) {
80-
return $serializer->deserialize($body, 'Docker\\API\\Model\\BuildPrunePostResponse200', 'json');
80+
return $serializer->deserialize($body, 'Docker\API\Model\BuildPrunePostResponse200', 'json');
8181
}
8282
if ((null === $contentType) === false && (500 === $status && false !== mb_strpos($contentType, 'application/json'))) {
83-
throw new \Docker\API\Exception\BuildPruneInternalServerErrorException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);
83+
throw new \Docker\API\Exception\BuildPruneInternalServerErrorException($serializer->deserialize($body, 'Docker\API\Model\ErrorResponse', 'json'), $response);
8484
}
8585
}
8686

‎src/Endpoint/ConfigCreate.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ protected function transformResponseBody(\Psr\Http\Message\ResponseInterface $re
4949
$status = $response->getStatusCode();
5050
$body = (string) $response->getBody();
5151
if ((null === $contentType) === false && (201 === $status && false !== mb_strpos($contentType, 'application/json'))) {
52-
return $serializer->deserialize($body, 'Docker\\API\\Model\\IdResponse', 'json');
52+
return $serializer->deserialize($body, 'Docker\API\Model\IdResponse', 'json');
5353
}
5454
if ((null === $contentType) === false && (409 === $status && false !== mb_strpos($contentType, 'application/json'))) {
55-
throw new \Docker\API\Exception\ConfigCreateConflictException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);
55+
throw new \Docker\API\Exception\ConfigCreateConflictException($serializer->deserialize($body, 'Docker\API\Model\ErrorResponse', 'json'), $response);
5656
}
5757
if ((null === $contentType) === false && (500 === $status && false !== mb_strpos($contentType, 'application/json'))) {
58-
throw new \Docker\API\Exception\ConfigCreateInternalServerErrorException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);
58+
throw new \Docker\API\Exception\ConfigCreateInternalServerErrorException($serializer->deserialize($body, 'Docker\API\Model\ErrorResponse', 'json'), $response);
5959
}
6060
if ((null === $contentType) === false && (503 === $status && false !== mb_strpos($contentType, 'application/json'))) {
61-
throw new \Docker\API\Exception\ConfigCreateServiceUnavailableException($serializer->deserialize($body, 'Docker\\API\\Model\\ErrorResponse', 'json'), $response);
61+
throw new \Docker\API\Exception\ConfigCreateServiceUnavailableException($serializer->deserialize($body, 'Docker\API\Model\ErrorResponse', 'json'), $response);
6262
}
6363
}
6464

0 commit comments

Comments
 (0)