Merge pull request #51265 from thaJeztah/client_gofumpt

client: gofumpt

client/image_history_test.go

@@ -46,7 +46,8 @@ func TestImageHistory(t *testing.T) {
 				ID:   "image_id2",
 				Tags: []string{"tag1", "tag2"},
 			},
-		}}
+		},
+	}
 
 	imageHistories, err := client.ImageHistory(context.Background(), "image_id", ImageHistoryWithPlatform(ocispec.Platform{
 		Architecture: "arm64",

client/image_pull.go

@@ -23,10 +23,10 @@ type ImagePullResponse interface {
 // It executes the privileged function if the operation is unauthorized
 // and it tries one more time.
 // Callers can:
-// - use [ImagePullResponse.Wait] to wait for pull to complete
-// - use [ImagePullResponse.JSONMessages] to monitor pull progress as a sequence
-//   of JSONMessages, [ImagePullResponse.Close] does not need to be called in this case.
-// - use the [io.Reader] interface and call [ImagePullResponse.Close] after processing.
+//   - use [ImagePullResponse.Wait] to wait for pull to complete
+//   - use [ImagePullResponse.JSONMessages] to monitor pull progress as a sequence
+//     of JSONMessages, [ImagePullResponse.Close] does not need to be called in this case.
+//   - use the [io.Reader] interface and call [ImagePullResponse.Close] after processing.
 func (cli *Client) ImagePull(ctx context.Context, refStr string, options ImagePullOptions) (ImagePullResponse, error) {
 	// FIXME(vdemeester): there is currently used in a few way in docker/docker
 	// - if not in trusted content, ref is used to pass the whole reference, and tag is empty

client/image_push.go

@@ -27,10 +27,10 @@ type ImagePushResponse interface {
 // It executes the privileged function if the operation is unauthorized
 // and it tries one more time.
 // Callers can
-// - use [ImagePushResponse.Wait] to wait for push to complete
-// - use [ImagePushResponse.JSONMessages] to monitor pull progress as a sequence
-//   of JSONMessages, [ImagePushResponse.Close] does not need to be called in this case.
-// - use the [io.Reader] interface and call [ImagePushResponse.Close] after processing.
+//   - use [ImagePushResponse.Wait] to wait for push to complete
+//   - use [ImagePushResponse.JSONMessages] to monitor pull progress as a sequence
+//     of JSONMessages, [ImagePushResponse.Close] does not need to be called in this case.
+//   - use the [io.Reader] interface and call [ImagePushResponse.Close] after processing.
 func (cli *Client) ImagePush(ctx context.Context, image string, options ImagePushOptions) (ImagePushResponse, error) {
 	ref, err := reference.ParseNormalizedNamed(image)
 	if err != nil {

client/node_remove.go

@@ -5,8 +5,7 @@ import (
 	"net/url"
 )
 
-type NodeRemoveResult struct {
-}
+type NodeRemoveResult struct{}
 
 // NodeRemove removes a Node.
 func (cli *Client) NodeRemove(ctx context.Context, nodeID string, options NodeRemoveOptions) (NodeRemoveResult, error) {

client/node_update.go

@@ -5,8 +5,7 @@ import (
 	"net/url"
 )
 
-type NodeUpdateResult struct {
-}
+type NodeUpdateResult struct{}
 
 // NodeUpdate updates a Node.
 func (cli *Client) NodeUpdate(ctx context.Context, nodeID string, options NodeUpdateOptions) (NodeUpdateResult, error) {

client/pkg/jsonmessage/jsonmessage.go

@@ -195,7 +195,7 @@ type JSONMessagesStream iter.Seq2[JSONMessage, error]
 // each [JSONMessage] to out.
 // see DisplayJSONMessages for details
 func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr, isTerminal bool, auxCallback func(JSONMessage)) error {
-	var dec = json.NewDecoder(in)
+	dec := json.NewDecoder(in)
 	var f JSONMessagesStream = func(yield func(JSONMessage, error) bool) {
 		for {
 			var jm JSONMessage
@@ -229,7 +229,7 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr,
 //     called if a JSONMessage contains an Aux field, in which case
 //     DisplayJSONMessagesStream does not present the JSONMessage.
 func DisplayJSONMessages(messages JSONMessagesStream, out io.Writer, terminalFd uintptr, isTerminal bool, auxCallback func(JSONMessage)) error {
-	var ids = make(map[string]uint)
+	ids := make(map[string]uint)
 
 	for jm, err := range messages {
 		var diff uint

client/swarm_node_inspect_opts.go

@@ -1,5 +1,4 @@
 package client
 
 // NodeInspectOptions holds parameters to inspect nodes with.
-type NodeInspectOptions struct {
-}
+type NodeInspectOptions struct{}

vendor/github.com/moby/moby/client/image_pull.go

@@ -23,10 +23,10 @@ type ImagePullResponse interface {
 // It executes the privileged function if the operation is unauthorized
 // and it tries one more time.
 // Callers can:
-// - use [ImagePullResponse.Wait] to wait for pull to complete
-// - use [ImagePullResponse.JSONMessages] to monitor pull progress as a sequence
-//   of JSONMessages, [ImagePullResponse.Close] does not need to be called in this case.
-// - use the [io.Reader] interface and call [ImagePullResponse.Close] after processing.
+//   - use [ImagePullResponse.Wait] to wait for pull to complete
+//   - use [ImagePullResponse.JSONMessages] to monitor pull progress as a sequence
+//     of JSONMessages, [ImagePullResponse.Close] does not need to be called in this case.
+//   - use the [io.Reader] interface and call [ImagePullResponse.Close] after processing.
 func (cli *Client) ImagePull(ctx context.Context, refStr string, options ImagePullOptions) (ImagePullResponse, error) {
 	// FIXME(vdemeester): there is currently used in a few way in docker/docker
 	// - if not in trusted content, ref is used to pass the whole reference, and tag is empty

vendor/github.com/moby/moby/client/image_push.go

@@ -27,10 +27,10 @@ type ImagePushResponse interface {
 // It executes the privileged function if the operation is unauthorized
 // and it tries one more time.
 // Callers can
-// - use [ImagePushResponse.Wait] to wait for push to complete
-// - use [ImagePushResponse.JSONMessages] to monitor pull progress as a sequence
-//   of JSONMessages, [ImagePushResponse.Close] does not need to be called in this case.
-// - use the [io.Reader] interface and call [ImagePushResponse.Close] after processing.
+//   - use [ImagePushResponse.Wait] to wait for push to complete
+//   - use [ImagePushResponse.JSONMessages] to monitor pull progress as a sequence
+//     of JSONMessages, [ImagePushResponse.Close] does not need to be called in this case.
+//   - use the [io.Reader] interface and call [ImagePushResponse.Close] after processing.
 func (cli *Client) ImagePush(ctx context.Context, image string, options ImagePushOptions) (ImagePushResponse, error) {
 	ref, err := reference.ParseNormalizedNamed(image)
 	if err != nil {

vendor/github.com/moby/moby/client/node_remove.go

@@ -5,8 +5,7 @@ import (
 	"net/url"
 )
 
-type NodeRemoveResult struct {
-}
+type NodeRemoveResult struct{}
 
 // NodeRemove removes a Node.
 func (cli *Client) NodeRemove(ctx context.Context, nodeID string, options NodeRemoveOptions) (NodeRemoveResult, error) {

vendor/github.com/moby/moby/client/node_update.go

@@ -5,8 +5,7 @@ import (
 	"net/url"
 )
 
-type NodeUpdateResult struct {
-}
+type NodeUpdateResult struct{}
 
 // NodeUpdate updates a Node.
 func (cli *Client) NodeUpdate(ctx context.Context, nodeID string, options NodeUpdateOptions) (NodeUpdateResult, error) {

vendor/github.com/moby/moby/client/pkg/jsonmessage/jsonmessage.go

@@ -195,7 +195,7 @@ type JSONMessagesStream iter.Seq2[JSONMessage, error]
 // each [JSONMessage] to out.
 // see DisplayJSONMessages for details
 func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr, isTerminal bool, auxCallback func(JSONMessage)) error {
-	var dec = json.NewDecoder(in)
+	dec := json.NewDecoder(in)
 	var f JSONMessagesStream = func(yield func(JSONMessage, error) bool) {
 		for {
 			var jm JSONMessage
@@ -229,7 +229,7 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr,
 //     called if a JSONMessage contains an Aux field, in which case
 //     DisplayJSONMessagesStream does not present the JSONMessage.
 func DisplayJSONMessages(messages JSONMessagesStream, out io.Writer, terminalFd uintptr, isTerminal bool, auxCallback func(JSONMessage)) error {
-	var ids = make(map[string]uint)
+	ids := make(map[string]uint)
 
 	for jm, err := range messages {
 		var diff uint

vendor/github.com/moby/moby/client/swarm_node_inspect_opts.go

@@ -1,5 +1,4 @@
 package client
 
 // NodeInspectOptions holds parameters to inspect nodes with.
-type NodeInspectOptions struct {
-}
+type NodeInspectOptions struct{}