Skip to content

Commit e43cdd9

Browse files
HofmeisterAnHofmeisterAn
authored
feat(#583): Update specgen configuration to Docker Engine API 20.10.17 (#584)
1 parent 6fd2c5b commit e43cdd9

15 files changed

+120
-51
lines changed

‎.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Autodetect text files
2+
* text=auto
3+
4+
# Definitively text files
5+
*.cs text

‎src/Docker.DotNet/Models/ContainerLogsParameters.Generated.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ public class ContainerLogsParameters // (main.ContainerLogsParameters)
1414
[QueryStringParameter("since", false)]
1515
public string Since { get; set; }
1616

17+
[QueryStringParameter("until", false)]
18+
public string Until { get; set; }
19+
1720
[QueryStringParameter("timestamps", false, typeof(BoolQueryStringConverter))]
1821
public bool? Timestamps { get; set; }
1922

‎src/Docker.DotNet/Models/ContainerStatsParameters.Generated.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ public class ContainerStatsParameters // (main.ContainerStatsParameters)
77
{
88
[QueryStringParameter("stream", true, typeof(BoolQueryStringConverter))]
99
public bool Stream { get; set; } = true;
10+
11+
[QueryStringParameter("one-shot", false, typeof(BoolQueryStringConverter))]
12+
public bool? OneShot { get; set; }
1013
}
1114
}

‎src/Docker.DotNet/Models/ContainerWaitOKBodyError.Generated.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System.Runtime.Serialization;
2+
3+
namespace Docker.DotNet.Models
4+
{
5+
[DataContract]
6+
public class ContainerWaitOKBodyError // (container.ContainerWaitOKBodyError)
7+
{
8+
[DataMember(Name = "Message", EmitDefaultValue = false)]
9+
public string Message { get; set; }
10+
}
11+
}

‎src/Docker.DotNet/Models/ContainerWaitResponse.Generated.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ namespace Docker.DotNet.Models
55
[DataContract]
66
public class ContainerWaitResponse // (main.ContainerWaitResponse)
77
{
8+
[DataMember(Name = "Error", EmitDefaultValue = false)]
9+
public ContainerWaitOKBodyError Error { get; set; }
10+
811
[DataMember(Name = "StatusCode", EmitDefaultValue = false)]
912
public long StatusCode { get; set; }
1013
}

‎src/Docker.DotNet/Models/CreateContainerParameters.Generated.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ public CreateContainerParameters(Config Config)
4747
[QueryStringParameter("name", false)]
4848
public string Name { get; set; }
4949

50+
[QueryStringParameter("platform", false)]
51+
public string Platform { get; set; }
52+
5053
[DataMember(Name = "Hostname", EmitDefaultValue = false)]
5154
public string Hostname { get; set; }
5255

‎src/Docker.DotNet/Models/HealthConfig.Generated.cs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Runtime.Serialization;
4-
using Newtonsoft.Json;
5-
6-
namespace Docker.DotNet.Models
7-
{
8-
[DataContract]
9-
public class HealthConfig // (container.HealthConfig)
10-
{
11-
[DataMember(Name = "Test", EmitDefaultValue = false)]
12-
public IList<string> Test { get; set; }
13-
14-
[DataMember(Name = "Interval", EmitDefaultValue = false)]
15-
[JsonConverter(typeof(TimeSpanNanosecondsConverter))]
16-
public TimeSpan Interval { get; set; }
17-
18-
[DataMember(Name = "Timeout", EmitDefaultValue = false)]
19-
[JsonConverter(typeof(TimeSpanNanosecondsConverter))]
20-
public TimeSpan Timeout { get; set; }
21-
22-
[DataMember(Name = "StartPeriod", EmitDefaultValue = false)]
23-
public long StartPeriod { get; set; }
24-
25-
[DataMember(Name = "Retries", EmitDefaultValue = false)]
26-
public long Retries { get; set; }
27-
}
28-
}
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Runtime.Serialization;
4+
using Newtonsoft.Json;
5+
6+
namespace Docker.DotNet.Models
7+
{
8+
[DataContract]
9+
public class HealthConfig // (container.HealthConfig)
10+
{
11+
[DataMember(Name = "Test", EmitDefaultValue = false)]
12+
public IList<string> Test { get; set; }
13+
14+
[DataMember(Name = "Interval", EmitDefaultValue = false)]
15+
[JsonConverter(typeof(TimeSpanNanosecondsConverter))]
16+
public TimeSpan Interval { get; set; }
17+
18+
[DataMember(Name = "Timeout", EmitDefaultValue = false)]
19+
[JsonConverter(typeof(TimeSpanNanosecondsConverter))]
20+
public TimeSpan Timeout { get; set; }
21+
22+
[DataMember(Name = "StartPeriod", EmitDefaultValue = false)]
23+
public long StartPeriod { get; set; }
24+
25+
[DataMember(Name = "Retries", EmitDefaultValue = false)]
26+
public long Retries { get; set; }
27+
}
28+
}

‎src/Docker.DotNet/Models/ImageBuildParameters.Generated.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ public class ImageBuildParameters // (main.ImageBuildParameters)
2727
[QueryStringParameter("pullparent", false, typeof(BoolQueryStringConverter))]
2828
public bool? PullParent { get; set; }
2929

30+
[QueryStringParameter("pull", false)]
31+
public string Pull { get; set; }
32+
3033
[QueryStringParameter("isolation", false)]
3134
public string Isolation { get; set; }
3235

@@ -92,5 +95,11 @@ public class ImageBuildParameters // (main.ImageBuildParameters)
9295

9396
[QueryStringParameter("platform", false)]
9497
public string Platform { get; set; }
98+
99+
[QueryStringParameter("outputs", false)]
100+
public string Outputs { get; set; }
101+
102+
[DataMember(Name = "AuthConfigs", EmitDefaultValue = false)]
103+
public IDictionary<string, AuthConfig> AuthConfigs { get; set; }
95104
}
96105
}

‎src/Docker.DotNet/Models/ImagePushParameters.Generated.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ namespace Docker.DotNet.Models
55
[DataContract]
66
public class ImagePushParameters // (main.ImagePushParameters)
77
{
8+
[QueryStringParameter("fromImage", false)]
9+
public string ImageID { get; set; }
10+
811
[QueryStringParameter("tag", false)]
912
public string Tag { get; set; }
13+
14+
[DataMember(Name = "RegistryAuth", EmitDefaultValue = false)]
15+
public AuthConfig RegistryAuth { get; set; }
1016
}
1117
}

‎src/Docker.DotNet/Models/ImagesCreateParameters.Generated.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Collections.Generic;
12
using System.Runtime.Serialization;
23

34
namespace Docker.DotNet.Models
@@ -16,5 +17,17 @@ public class ImagesCreateParameters // (main.ImagesCreateParameters)
1617

1718
[QueryStringParameter("tag", false)]
1819
public string Tag { get; set; }
20+
21+
[QueryStringParameter("message", false)]
22+
public string Message { get; set; }
23+
24+
[QueryStringParameter("changes", false, typeof(EnumerableQueryStringConverter))]
25+
public IList<string> Changes { get; set; }
26+
27+
[QueryStringParameter("platform", false)]
28+
public string Platform { get; set; }
29+
30+
[DataMember(Name = "RegistryAuth", EmitDefaultValue = false)]
31+
public AuthConfig RegistryAuth { get; set; }
1932
}
2033
}

‎src/Docker.DotNet/Models/ImagesListParameters.Generated.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@ public class ImagesListParameters // (main.ImagesListParameters)
1111

1212
[QueryStringParameter("filters", false, typeof(MapQueryStringConverter))]
1313
public IDictionary<string, IDictionary<string, bool>> Filters { get; set; }
14+
15+
[QueryStringParameter("digests", false, typeof(BoolQueryStringConverter))]
16+
public bool? Digests { get; set; }
1417
}
1518
}

‎src/Docker.DotNet/Models/ServiceUpdateParameters.Generated.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ public class ServiceUpdateParameters // (main.ServiceUpdateParameters)
1414
[QueryStringParameter("registryauthfrom", false)]
1515
public string RegistryAuthFrom { get; set; }
1616

17+
[QueryStringParameter("rollback", false)]
18+
public string Rollback { get; set; }
19+
1720
[DataMember(Name = "RegistryAuth", EmitDefaultValue = false)]
1821
public AuthConfig RegistryAuth { get; set; }
1922
}

‎tools/specgen/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.15
44

55
require (
66
github.com/davecgh/go-spew v1.1.1 // indirect
7-
github.com/docker/docker v20.10.2+incompatible
7+
github.com/docker/docker v20.10.17+incompatible
88
github.com/docker/go-connections v0.4.0 // indirect
99
github.com/docker/go-units v0.4.0
1010
github.com/gogo/protobuf v1.3.1 // indirect

‎tools/specgen/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ github.com/docker/docker v20.10.1+incompatible h1:u0HIBLwOJdemyBdTCkoBX34u3lb5Ky
1010
github.com/docker/docker v20.10.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
1111
github.com/docker/docker v20.10.2+incompatible h1:vFgEHPqWBTp4pTjdLwjAA4bSo3gvIGOYwuJTlEjVBCw=
1212
github.com/docker/docker v20.10.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
13+
github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE=
14+
github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
1315
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
1416
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
1517
github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=

‎tools/specgen/modeldefs.go

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ type ImageBuildParameters struct {
2020
Remove bool `rest:"query,rm"`
2121
ForceRemove bool `rest:"query,forcerm"`
2222
PullParent bool `rest:"query"`
23+
Pull string `rest:"query"`
2324
Isolation string `rest:"query"`
2425
CPUSetCPUs string `rest:"query"`
2526
CPUSetMems string `rest:"query"`
@@ -34,7 +35,6 @@ type ImageBuildParameters struct {
3435
Dockerfile string `rest:"query"`
3536
Ulimits []*units.Ulimit `rest:"query"`
3637
BuildArgs map[string]string `rest:"query"`
37-
AuthConfigs map[string]types.AuthConfig `rest:"headers,X-Registry-Auth"`
3838
Labels map[string]string `rest:"query"`
3939
Squash bool `rest:"query"`
4040
CacheFrom []string `rest:"query"`
@@ -43,6 +43,8 @@ type ImageBuildParameters struct {
4343
Target string `rest:"query"`
4444
SessionID string `rest:"query,session"`
4545
Platform string `rest:"query"`
46+
Outputs string `rest:"query"`
47+
AuthConfigs map[string]types.AuthConfig `rest:"headers,X-Registry-Config"`
4648
}
4749

4850
// CommitContainerChangesParameters for POST /commit
@@ -62,8 +64,9 @@ type CommitContainerChangesResponse types.IDResponse
6264

6365
// CreateContainerParameters for POST /containers/create
6466
type CreateContainerParameters struct {
65-
Name string `rest:"query,name"`
66-
*container.Config `rest:"body"`
67+
Name string `rest:"query"`
68+
Platform string `rest:"query"`
69+
*container.Config `rest:"body"`
6770
HostConfig *container.HostConfig `rest:"body"`
6871
NetworkingConfig *network.NetworkingConfig `rest:"body"`
6972
}
@@ -111,11 +114,12 @@ type ContainerKillParameters struct {
111114
Signal string `rest:"query"`
112115
}
113116

114-
// ContainerLogsParameters for POST /containers/(id)/logs
117+
// ContainerLogsParameters for GET /containers/(id)/logs
115118
type ContainerLogsParameters struct {
116119
ShowStdout bool `rest:"query,stdout"`
117120
ShowStderr bool `rest:"query,stderr"`
118121
Since string `rest:"query"`
122+
Until string `rest:"query"`
119123
Timestamps bool `rest:"query"`
120124
Follow bool `rest:"query"`
121125
Tail string `rest:"query"`
@@ -149,7 +153,8 @@ type ContainerStopParameters struct {
149153

150154
// ContainerStatsParameters for GET /containers/(id)/stats
151155
type ContainerStatsParameters struct {
152-
Stream bool `rest:"query,stream,required,true"`
156+
Stream bool `rest:"query,stream,required,true"`
157+
OneShot bool `rest:"query,one-shot"`
153158
}
154159

155160
// ContainerListProcessesParameters for GET /containers/(id)/top
@@ -164,15 +169,11 @@ type ContainerUpdateParameters struct {
164169

165170
// ContainerUpdateResponse for POST /containers/(id)/update
166171
type ContainerUpdateResponse struct {
167-
// Warnings are any warnings encountered during the updating of the container.
168172
Warnings []string `json:"Warnings"`
169173
}
170174

171175
// ContainerWaitResponse for POST /containers/(id)/wait
172-
type ContainerWaitResponse struct {
173-
// StatusCode is the status code of the wait job
174-
StatusCode int `json:"StatusCode"`
175-
}
176+
type ContainerWaitResponse container.ContainerWaitOKBody
176177

177178
// ContainerEventsParameters for GET /events
178179
type ContainerEventsParameters struct {
@@ -197,16 +198,21 @@ type ContainerExecStartParameters types.ExecConfig
197198

198199
// ImagesCreateParameters for POST /images/create
199200
type ImagesCreateParameters struct {
200-
FromImage string `rest:"query,fromImage"`
201-
FromSrc string `rest:"query,fromSrc"`
202-
Repo string `rest:"query"`
203-
Tag string `rest:"query"`
201+
FromImage string `rest:"query,fromImage"`
202+
FromSrc string `rest:"query,fromSrc"`
203+
Repo string `rest:"query"`
204+
Tag string `rest:"query"`
205+
Message string `rest:"query"`
206+
Changes []string `rest:"query"`
207+
Platform string `rest:"query"`
208+
RegistryAuth types.AuthConfig `rest:"headers,X-Registry-Auth"`
204209
}
205210

206211
// ImagesListParameters for GET /images/json
207212
type ImagesListParameters struct {
208213
All bool `rest:"query"`
209214
Filters Args `rest:"query"`
215+
Digests bool `rest:"query"`
210216
}
211217

212218
// ImageLoadParameters for POST /images/load
@@ -267,7 +273,7 @@ type PluginListParameters struct {
267273
Filters Args `rest:"query"`
268274
}
269275

270-
// PluginGetPrivilegeParameters for POST /plugins/privileges
276+
// PluginGetPrivilegeParameters for GET /plugins/privileges
271277
type PluginGetPrivilegeParameters struct {
272278
Remote string `rest:"query,remote,required"`
273279
RegistryAuth types.AuthConfig `rest:"headers,X-Registry-Auth"`
@@ -281,7 +287,7 @@ type PluginInstallParameters struct {
281287
Privileges types.PluginPrivileges `rest:"body,,required"`
282288
}
283289

284-
// PluginRemoveParameters for DELETE /plugins/(name)/json
290+
// PluginRemoveParameters for DELETE /plugins/(name)
285291
type PluginRemoveParameters struct {
286292
Force bool `rest:"query"`
287293
}
@@ -331,7 +337,7 @@ type VolumesPruneParameters struct {
331337
Filters Args `rest:"query"`
332338
}
333339

334-
// VolumeResponse for volume list.
340+
// VolumeResponse for GET /volumes
335341
type VolumeResponse types.Volume
336342

337343
// VolumesListResponse for GET /volumes
@@ -379,7 +385,7 @@ type SwarmUpdateConfigParameters struct {
379385
Version int64 `rest:"query,version,required"`
380386
}
381387

382-
// MessageResponse for methods returning json:"message", like for POST /configs/(id)/update
388+
// MessageResponse for POST /configs/(id)/update
383389
type MessageResponse struct {
384390
Message string `json:"message"`
385391
}
@@ -390,11 +396,9 @@ type ServiceCreateParameters struct {
390396
RegistryAuth types.AuthConfig `rest:"headers,X-Registry-Auth"`
391397
}
392398

393-
// ServiceListParameters clone ServiceListOptions for GET /services, mimic ServiceListOptions
399+
// ServiceListParameters for GET /services
394400
type ServiceListParameters struct {
395401
Filters Args `rest:"query"`
396-
// Status indicates whether the server should include the service task
397-
// count of running and desired tasks.
398402
Status bool `rest:"query"`
399403
}
400404

@@ -403,10 +407,11 @@ type ServiceUpdateParameters struct {
403407
Service swarm.ServiceSpec `rest:"body,service,required"`
404408
Version int64 `rest:"query,version,required"`
405409
RegistryAuthFrom string `rest:"query"`
410+
Rollback string `rest:"query"`
406411
RegistryAuth types.AuthConfig `rest:"headers,X-Registry-Auth"`
407412
}
408413

409-
// ServiceLogsParameters for POST /services/(id)/logs
414+
// ServiceLogsParameters for GET /services/(id)/logs
410415
type ServiceLogsParameters struct {
411416
ShowStdout bool `rest:"query,stdout"`
412417
ShowStderr bool `rest:"query,stderr"`

0 commit comments

Comments
 (0)