feat(#583): Update specgen configuration to Docker Engine API 20.10.17 (#584)

HofmeisterAn · web-flow · commit e43cdd96ef08 · 2022-09-03T09:40:13.000-03:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+# Autodetect text files
+* text=auto
+
+# Definitively text files
+*.cs text
diff --git a/src/Docker.DotNet/Models/ContainerLogsParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerLogsParameters.Generated.cs
@@ -14,6 +14,9 @@ public class ContainerLogsParameters // (main.ContainerLogsParameters)
         [QueryStringParameter("since", false)]
         public string Since { get; set; }
 
+        [QueryStringParameter("until", false)]
+        public string Until { get; set; }
+
         [QueryStringParameter("timestamps", false, typeof(BoolQueryStringConverter))]
         public bool? Timestamps { get; set; }
 
diff --git a/src/Docker.DotNet/Models/ContainerStatsParameters.Generated.cs b/src/Docker.DotNet/Models/ContainerStatsParameters.Generated.cs
@@ -7,5 +7,8 @@ public class ContainerStatsParameters // (main.ContainerStatsParameters)
     {
         [QueryStringParameter("stream", true, typeof(BoolQueryStringConverter))]
         public bool Stream { get; set; } = true;
+
+        [QueryStringParameter("one-shot", false, typeof(BoolQueryStringConverter))]
+        public bool? OneShot { get; set; }
     }
 }
diff --git a/src/Docker.DotNet/Models/ContainerWaitOKBodyError.Generated.cs b/src/Docker.DotNet/Models/ContainerWaitOKBodyError.Generated.cs
@@ -0,0 +1,11 @@
+using System.Runtime.Serialization;
+
+namespace Docker.DotNet.Models
+{
+    [DataContract]
+    public class ContainerWaitOKBodyError // (container.ContainerWaitOKBodyError)
+    {
+        [DataMember(Name = "Message", EmitDefaultValue = false)]
+        public string Message { get; set; }
+    }
+}
diff --git a/src/Docker.DotNet/Models/ContainerWaitResponse.Generated.cs b/src/Docker.DotNet/Models/ContainerWaitResponse.Generated.cs
@@ -5,6 +5,9 @@ namespace Docker.DotNet.Models
     [DataContract]
     public class ContainerWaitResponse // (main.ContainerWaitResponse)
     {
+        [DataMember(Name = "Error", EmitDefaultValue = false)]
+        public ContainerWaitOKBodyError Error { get; set; }
+
         [DataMember(Name = "StatusCode", EmitDefaultValue = false)]
         public long StatusCode { get; set; }
     }
diff --git a/src/Docker.DotNet/Models/CreateContainerParameters.Generated.cs b/src/Docker.DotNet/Models/CreateContainerParameters.Generated.cs
@@ -47,6 +47,9 @@ public CreateContainerParameters(Config Config)
         [QueryStringParameter("name", false)]
         public string Name { get; set; }
 
+        [QueryStringParameter("platform", false)]
+        public string Platform { get; set; }
+
         [DataMember(Name = "Hostname", EmitDefaultValue = false)]
         public string Hostname { get; set; }
 
diff --git a/src/Docker.DotNet/Models/HealthConfig.Generated.cs b/src/Docker.DotNet/Models/HealthConfig.Generated.cs
@@ -1,28 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-using Newtonsoft.Json;
-
-namespace Docker.DotNet.Models
-{
-    [DataContract]
-    public class HealthConfig // (container.HealthConfig)
-    {
-        [DataMember(Name = "Test", EmitDefaultValue = false)]
-        public IList<string> Test { get; set; }
-
-        [DataMember(Name = "Interval", EmitDefaultValue = false)]
-        [JsonConverter(typeof(TimeSpanNanosecondsConverter))]
-        public TimeSpan Interval { get; set; }
-
-        [DataMember(Name = "Timeout", EmitDefaultValue = false)]
-        [JsonConverter(typeof(TimeSpanNanosecondsConverter))]
-        public TimeSpan Timeout { get; set; }
-
-        [DataMember(Name = "StartPeriod", EmitDefaultValue = false)]
-        public long StartPeriod { get; set; }
-
-        [DataMember(Name = "Retries", EmitDefaultValue = false)]
-        public long Retries { get; set; }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+
+namespace Docker.DotNet.Models
+{
+    [DataContract]
+    public class HealthConfig // (container.HealthConfig)
+    {
+        [DataMember(Name = "Test", EmitDefaultValue = false)]
+        public IList<string> Test { get; set; }
+
+        [DataMember(Name = "Interval", EmitDefaultValue = false)]
+        [JsonConverter(typeof(TimeSpanNanosecondsConverter))]
+        public TimeSpan Interval { get; set; }
+
+        [DataMember(Name = "Timeout", EmitDefaultValue = false)]
+        [JsonConverter(typeof(TimeSpanNanosecondsConverter))]
+        public TimeSpan Timeout { get; set; }
+
+        [DataMember(Name = "StartPeriod", EmitDefaultValue = false)]
+        public long StartPeriod { get; set; }
+
+        [DataMember(Name = "Retries", EmitDefaultValue = false)]
+        public long Retries { get; set; }
+    }
+}
diff --git a/src/Docker.DotNet/Models/ImageBuildParameters.Generated.cs b/src/Docker.DotNet/Models/ImageBuildParameters.Generated.cs
@@ -27,6 +27,9 @@ public class ImageBuildParameters // (main.ImageBuildParameters)
         [QueryStringParameter("pullparent", false, typeof(BoolQueryStringConverter))]
         public bool? PullParent { get; set; }
 
+        [QueryStringParameter("pull", false)]
+        public string Pull { get; set; }
+
         [QueryStringParameter("isolation", false)]
         public string Isolation { get; set; }
 
@@ -92,5 +95,11 @@ public class ImageBuildParameters // (main.ImageBuildParameters)
 
         [QueryStringParameter("platform", false)]
         public string Platform { get; set; }
+
+        [QueryStringParameter("outputs", false)]
+        public string Outputs { get; set; }
+
+        [DataMember(Name = "AuthConfigs", EmitDefaultValue = false)]
+        public IDictionary<string, AuthConfig> AuthConfigs { get; set; }
     }
 }
diff --git a/src/Docker.DotNet/Models/ImagePushParameters.Generated.cs b/src/Docker.DotNet/Models/ImagePushParameters.Generated.cs
@@ -5,7 +5,13 @@ namespace Docker.DotNet.Models
     [DataContract]
     public class ImagePushParameters // (main.ImagePushParameters)
     {
+        [QueryStringParameter("fromImage", false)]
+        public string ImageID { get; set; }
+
         [QueryStringParameter("tag", false)]
         public string Tag { get; set; }
+
+        [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)]
+        public AuthConfig RegistryAuth { get; set; }
     }
 }
diff --git a/src/Docker.DotNet/Models/ImagesCreateParameters.Generated.cs b/src/Docker.DotNet/Models/ImagesCreateParameters.Generated.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace Docker.DotNet.Models
@@ -16,5 +17,17 @@ public class ImagesCreateParameters // (main.ImagesCreateParameters)
 
         [QueryStringParameter("tag", false)]
         public string Tag { get; set; }
+
+        [QueryStringParameter("message", false)]
+        public string Message { get; set; }
+
+        [QueryStringParameter("changes", false, typeof(EnumerableQueryStringConverter))]
+        public IList<string> Changes { get; set; }
+
+        [QueryStringParameter("platform", false)]
+        public string Platform { get; set; }
+
+        [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)]
+        public AuthConfig RegistryAuth { get; set; }
     }
 }
diff --git a/src/Docker.DotNet/Models/ImagesListParameters.Generated.cs b/src/Docker.DotNet/Models/ImagesListParameters.Generated.cs
@@ -11,5 +11,8 @@ public class ImagesListParameters // (main.ImagesListParameters)
 
         [QueryStringParameter("filters", false, typeof(MapQueryStringConverter))]
         public IDictionary<string, IDictionary<string, bool>> Filters { get; set; }
+
+        [QueryStringParameter("digests", false, typeof(BoolQueryStringConverter))]
+        public bool? Digests { get; set; }
     }
 }
diff --git a/src/Docker.DotNet/Models/ServiceUpdateParameters.Generated.cs b/src/Docker.DotNet/Models/ServiceUpdateParameters.Generated.cs
@@ -14,6 +14,9 @@ public class ServiceUpdateParameters // (main.ServiceUpdateParameters)
         [QueryStringParameter("registryauthfrom", false)]
         public string RegistryAuthFrom { get; set; }
 
+        [QueryStringParameter("rollback", false)]
+        public string Rollback { get; set; }
+
         [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)]
         public AuthConfig RegistryAuth { get; set; }
     }
diff --git a/tools/specgen/go.mod b/tools/specgen/go.mod
@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/docker v20.10.2+incompatible
+	github.com/docker/docker v20.10.17+incompatible
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0
 	github.com/gogo/protobuf v1.3.1 // indirect
diff --git a/tools/specgen/go.sum b/tools/specgen/go.sum
@@ -10,6 +10,8 @@ github.com/docker/docker v20.10.1+incompatible h1:u0HIBLwOJdemyBdTCkoBX34u3lb5Ky
 github.com/docker/docker v20.10.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.2+incompatible h1:vFgEHPqWBTp4pTjdLwjAA4bSo3gvIGOYwuJTlEjVBCw=
 github.com/docker/docker v20.10.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE=
+github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
diff --git a/tools/specgen/modeldefs.go b/tools/specgen/modeldefs.go
@@ -20,6 +20,7 @@ type ImageBuildParameters struct {
 	Remove         bool                        `rest:"query,rm"`
 	ForceRemove    bool                        `rest:"query,forcerm"`
 	PullParent     bool                        `rest:"query"`
+	Pull           string                      `rest:"query"`
 	Isolation      string                      `rest:"query"`
 	CPUSetCPUs     string                      `rest:"query"`
 	CPUSetMems     string                      `rest:"query"`
@@ -34,7 +35,6 @@ type ImageBuildParameters struct {
 	Dockerfile     string                      `rest:"query"`
 	Ulimits        []*units.Ulimit             `rest:"query"`
 	BuildArgs      map[string]string           `rest:"query"`
-	AuthConfigs    map[string]types.AuthConfig `rest:"headers,X-Registry-Auth"`
 	Labels         map[string]string           `rest:"query"`
 	Squash         bool                        `rest:"query"`
 	CacheFrom      []string                    `rest:"query"`
@@ -43,6 +43,8 @@ type ImageBuildParameters struct {
 	Target         string                      `rest:"query"`
 	SessionID      string                      `rest:"query,session"`
 	Platform       string                      `rest:"query"`
+	Outputs        string                      `rest:"query"`
+	AuthConfigs    map[string]types.AuthConfig `rest:"headers,X-Registry-Config"`
 }
 
 // CommitContainerChangesParameters for POST /commit
@@ -62,8 +64,9 @@ type CommitContainerChangesResponse types.IDResponse
 
 // CreateContainerParameters for POST /containers/create
 type CreateContainerParameters struct {
-	Name              string `rest:"query,name"`
-	*container.Config `rest:"body"`
+	Name              string                    `rest:"query"`
+	Platform          string                    `rest:"query"`
+	*container.Config                           `rest:"body"`
 	HostConfig        *container.HostConfig     `rest:"body"`
 	NetworkingConfig  *network.NetworkingConfig `rest:"body"`
 }
@@ -111,11 +114,12 @@ type ContainerKillParameters struct {
 	Signal string `rest:"query"`
 }
 
-// ContainerLogsParameters for POST /containers/(id)/logs
+// ContainerLogsParameters for GET /containers/(id)/logs
 type ContainerLogsParameters struct {
 	ShowStdout bool   `rest:"query,stdout"`
 	ShowStderr bool   `rest:"query,stderr"`
 	Since      string `rest:"query"`
+	Until      string `rest:"query"`
 	Timestamps bool   `rest:"query"`
 	Follow     bool   `rest:"query"`
 	Tail       string `rest:"query"`
@@ -149,7 +153,8 @@ type ContainerStopParameters struct {
 
 // ContainerStatsParameters for GET /containers/(id)/stats
 type ContainerStatsParameters struct {
-	Stream bool `rest:"query,stream,required,true"`
+	Stream  bool `rest:"query,stream,required,true"`
+	OneShot bool `rest:"query,one-shot"`
 }
 
 // ContainerListProcessesParameters for GET /containers/(id)/top
@@ -164,15 +169,11 @@ type ContainerUpdateParameters struct {
 
 // ContainerUpdateResponse for POST /containers/(id)/update
 type ContainerUpdateResponse struct {
-	// Warnings are any warnings encountered during the updating of the container.
 	Warnings []string `json:"Warnings"`
 }
 
 // ContainerWaitResponse for POST /containers/(id)/wait
-type ContainerWaitResponse struct {
-	// StatusCode is the status code of the wait job
-	StatusCode int `json:"StatusCode"`
-}
+type ContainerWaitResponse container.ContainerWaitOKBody
 
 // ContainerEventsParameters for GET /events
 type ContainerEventsParameters struct {
@@ -197,16 +198,21 @@ type ContainerExecStartParameters types.ExecConfig
 
 // ImagesCreateParameters for POST /images/create
 type ImagesCreateParameters struct {
-	FromImage string `rest:"query,fromImage"`
-	FromSrc   string `rest:"query,fromSrc"`
-	Repo      string `rest:"query"`
-	Tag       string `rest:"query"`
+	FromImage    string           `rest:"query,fromImage"`
+	FromSrc      string           `rest:"query,fromSrc"`
+	Repo         string           `rest:"query"`
+	Tag          string           `rest:"query"`
+	Message      string           `rest:"query"`
+	Changes      []string         `rest:"query"`
+	Platform     string           `rest:"query"`
+	RegistryAuth types.AuthConfig `rest:"headers,X-Registry-Auth"`
 }
 
 // ImagesListParameters for GET /images/json
 type ImagesListParameters struct {
 	All     bool `rest:"query"`
 	Filters Args `rest:"query"`
+	Digests bool `rest:"query"`
 }
 
 // ImageLoadParameters for POST /images/load
@@ -267,7 +273,7 @@ type PluginListParameters struct {
 	Filters Args `rest:"query"`
 }
 
-// PluginGetPrivilegeParameters for POST /plugins/privileges
+// PluginGetPrivilegeParameters for GET /plugins/privileges
 type PluginGetPrivilegeParameters struct {
 	Remote       string           `rest:"query,remote,required"`
 	RegistryAuth types.AuthConfig `rest:"headers,X-Registry-Auth"`
@@ -281,7 +287,7 @@ type PluginInstallParameters struct {
 	Privileges   types.PluginPrivileges `rest:"body,,required"`
 }
 
-// PluginRemoveParameters for DELETE /plugins/(name)/json
+// PluginRemoveParameters for DELETE /plugins/(name)
 type PluginRemoveParameters struct {
 	Force bool `rest:"query"`
 }
@@ -331,7 +337,7 @@ type VolumesPruneParameters struct {
 	Filters Args `rest:"query"`
 }
 
-// VolumeResponse for volume list.
+// VolumeResponse for GET /volumes
 type VolumeResponse types.Volume
 
 // VolumesListResponse for GET /volumes
@@ -379,7 +385,7 @@ type SwarmUpdateConfigParameters struct {
 	Version int64            `rest:"query,version,required"`
 }
 
-// MessageResponse for methods returning json:"message", like for POST /configs/(id)/update
+// MessageResponse for POST /configs/(id)/update
 type MessageResponse struct {
 	Message string `json:"message"`
 }
@@ -390,11 +396,9 @@ type ServiceCreateParameters struct {
 	RegistryAuth types.AuthConfig  `rest:"headers,X-Registry-Auth"`
 }
 
-// ServiceListParameters clone ServiceListOptions for GET /services, mimic ServiceListOptions
+// ServiceListParameters for GET /services
 type ServiceListParameters struct {
 	Filters Args `rest:"query"`
-	// Status indicates whether the server should include the service task
-	// count of running and desired tasks.
 	Status bool `rest:"query"`
 }
 
@@ -403,10 +407,11 @@ type ServiceUpdateParameters struct {
 	Service          swarm.ServiceSpec `rest:"body,service,required"`
 	Version          int64             `rest:"query,version,required"`
 	RegistryAuthFrom string            `rest:"query"`
+	Rollback         string            `rest:"query"`
 	RegistryAuth     types.AuthConfig  `rest:"headers,X-Registry-Auth"`
 }
 
-// ServiceLogsParameters for POST /services/(id)/logs
+// ServiceLogsParameters for GET /services/(id)/logs
 type ServiceLogsParameters struct {
 	ShowStdout bool   `rest:"query,stdout"`
 	ShowStderr bool   `rest:"query,stderr"`

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,8 @@ public class ContainerStatsParameters // (main.ContainerStatsParameters)`
`7`	`7`	`{`
`8`	`8`	`[QueryStringParameter("stream", true, typeof(BoolQueryStringConverter))]`
`9`	`9`	`public bool Stream { get; set; } = true;`
	`10`	`+`
	`11`	`+ [QueryStringParameter("one-shot", false, typeof(BoolQueryStringConverter))]`
	`12`	`+ public bool? OneShot { get; set; }`
`10`	`13`	`}`
`11`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@ namespace Docker.DotNet.Models`
`5`	`5`	`[DataContract]`
`6`	`6`	`public class ContainerWaitResponse // (main.ContainerWaitResponse)`
`7`	`7`	`{`
	`8`	`+ [DataMember(Name = "Error", EmitDefaultValue = false)]`
	`9`	`+ public ContainerWaitOKBodyError Error { get; set; }`
	`10`	`+`
`8`	`11`	`[DataMember(Name = "StatusCode", EmitDefaultValue = false)]`
`9`	`12`	`public long StatusCode { get; set; }`
`10`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,13 @@ namespace Docker.DotNet.Models`
`5`	`5`	`[DataContract]`
`6`	`6`	`public class ImagePushParameters // (main.ImagePushParameters)`
`7`	`7`	`{`
	`8`	`+ [QueryStringParameter("fromImage", false)]`
	`9`	`+ public string ImageID { get; set; }`
	`10`	`+`
`8`	`11`	`[QueryStringParameter("tag", false)]`
`9`	`12`	`public string Tag { get; set; }`
	`13`	`+`
	`14`	`+ [DataMember(Name = "RegistryAuth", EmitDefaultValue = false)]`
	`15`	`+ public AuthConfig RegistryAuth { get; set; }`
`10`	`16`	`}`
`11`	`17`	`}`