From 1c34ff94bcbeb6bcd5099acf5be9ec3ccb9bede3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 12 Aug 2025 23:39:45 +0200 Subject: [PATCH] client: consistently use defer for ensureReaderClosed ensureReaderClosed was designed to be usable regardless if a response was nil (error) or non-nil (success). Some code-paths were optimized to avoid using a defer (which used to have an overhead), but the overhead of defer is neglectable in current versions of Go, and some of these optimizations made the logic more complicated (and err-prone). This patch switches to use a defer for all places. Signed-off-by: Sebastiaan van Stijn --- client/build_cancel.go | 2 +- client/checkpoint_create.go | 2 +- client/checkpoint_delete.go | 2 +- client/config_update.go | 2 +- client/container_exec.go | 8 ++++---- client/container_kill.go | 2 +- client/container_pause.go | 2 +- client/container_rename.go | 2 +- client/container_resize.go | 2 +- client/container_restart.go | 2 +- client/container_start.go | 2 +- client/container_stop.go | 2 +- client/container_unpause.go | 2 +- client/image_tag.go | 2 +- client/network_connect.go | 2 +- client/network_disconnect.go | 2 +- client/node_update.go | 2 +- client/plugin_create.go | 2 +- client/plugin_disable.go | 2 +- client/plugin_enable.go | 2 +- client/plugin_set.go | 2 +- client/secret_update.go | 2 +- client/swarm_join.go | 2 +- client/swarm_leave.go | 2 +- client/swarm_unlock.go | 2 +- client/swarm_update.go | 2 +- client/volume_update.go | 2 +- vendor/github.com/moby/moby/client/build_cancel.go | 2 +- vendor/github.com/moby/moby/client/checkpoint_create.go | 2 +- vendor/github.com/moby/moby/client/checkpoint_delete.go | 2 +- vendor/github.com/moby/moby/client/config_update.go | 2 +- vendor/github.com/moby/moby/client/container_exec.go | 8 ++++---- vendor/github.com/moby/moby/client/container_kill.go | 2 +- vendor/github.com/moby/moby/client/container_pause.go | 2 +- vendor/github.com/moby/moby/client/container_rename.go | 2 +- vendor/github.com/moby/moby/client/container_resize.go | 2 +- vendor/github.com/moby/moby/client/container_restart.go | 2 +- vendor/github.com/moby/moby/client/container_start.go | 2 +- vendor/github.com/moby/moby/client/container_stop.go | 2 +- vendor/github.com/moby/moby/client/container_unpause.go | 2 +- vendor/github.com/moby/moby/client/image_tag.go | 2 +- vendor/github.com/moby/moby/client/network_connect.go | 2 +- vendor/github.com/moby/moby/client/network_disconnect.go | 2 +- vendor/github.com/moby/moby/client/node_update.go | 2 +- vendor/github.com/moby/moby/client/plugin_create.go | 2 +- vendor/github.com/moby/moby/client/plugin_disable.go | 2 +- vendor/github.com/moby/moby/client/plugin_enable.go | 2 +- vendor/github.com/moby/moby/client/plugin_set.go | 2 +- vendor/github.com/moby/moby/client/secret_update.go | 2 +- vendor/github.com/moby/moby/client/swarm_join.go | 2 +- vendor/github.com/moby/moby/client/swarm_leave.go | 2 +- vendor/github.com/moby/moby/client/swarm_unlock.go | 2 +- vendor/github.com/moby/moby/client/swarm_update.go | 2 +- vendor/github.com/moby/moby/client/volume_update.go | 2 +- 54 files changed, 60 insertions(+), 60 deletions(-) diff --git a/client/build_cancel.go b/client/build_cancel.go index a1b83c0030..f39b876161 100644 --- a/client/build_cancel.go +++ b/client/build_cancel.go @@ -12,6 +12,6 @@ func (cli *Client) BuildCancel(ctx context.Context, id string) error { query.Set("id", id) resp, err := cli.post(ctx, "/build/cancel", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/checkpoint_create.go b/client/checkpoint_create.go index 0dd07d2374..ef325a82dd 100644 --- a/client/checkpoint_create.go +++ b/client/checkpoint_create.go @@ -14,6 +14,6 @@ func (cli *Client) CheckpointCreate(ctx context.Context, containerID string, opt } resp, err := cli.post(ctx, "/containers/"+containerID+"/checkpoints", nil, options, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/checkpoint_delete.go b/client/checkpoint_delete.go index 15d6075c5a..87f3f88218 100644 --- a/client/checkpoint_delete.go +++ b/client/checkpoint_delete.go @@ -20,6 +20,6 @@ func (cli *Client) CheckpointDelete(ctx context.Context, containerID string, opt } resp, err := cli.delete(ctx, "/containers/"+containerID+"/checkpoints/"+options.CheckpointID, query, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/config_update.go b/client/config_update.go index a55f01beff..9303747947 100644 --- a/client/config_update.go +++ b/client/config_update.go @@ -19,6 +19,6 @@ func (cli *Client) ConfigUpdate(ctx context.Context, id string, version swarm.Ve query := url.Values{} query.Set("version", version.String()) resp, err := cli.post(ctx, "/configs/"+id+"/update", query, config, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/container_exec.go b/client/container_exec.go index 2b42e2f5d1..8739c2967b 100644 --- a/client/container_exec.go +++ b/client/container_exec.go @@ -58,7 +58,7 @@ func (cli *Client) ContainerExecStart(ctx context.Context, execID string, config config.ConsoleSize = nil } resp, err := cli.post(ctx, "/exec/"+execID+"/start", nil, config, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } @@ -91,13 +91,13 @@ func (cli *Client) ContainerExecAttach(ctx context.Context, execID string, confi // ContainerExecInspect returns information about a specific exec process on the docker host. func (cli *Client) ContainerExecInspect(ctx context.Context, execID string) (container.ExecInspect, error) { - var response container.ExecInspect resp, err := cli.get(ctx, "/exec/"+execID+"/json", nil, nil) + defer ensureReaderClosed(resp) if err != nil { - return response, err + return container.ExecInspect{}, err } + var response container.ExecInspect err = json.NewDecoder(resp.Body).Decode(&response) - ensureReaderClosed(resp) return response, err } diff --git a/client/container_kill.go b/client/container_kill.go index 251ae479a3..d198337fd9 100644 --- a/client/container_kill.go +++ b/client/container_kill.go @@ -18,6 +18,6 @@ func (cli *Client) ContainerKill(ctx context.Context, containerID, signal string } resp, err := cli.post(ctx, "/containers/"+containerID+"/kill", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/container_pause.go b/client/container_pause.go index 59b3e2d865..c3488b9723 100644 --- a/client/container_pause.go +++ b/client/container_pause.go @@ -10,6 +10,6 @@ func (cli *Client) ContainerPause(ctx context.Context, containerID string) error } resp, err := cli.post(ctx, "/containers/"+containerID+"/pause", nil, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/container_rename.go b/client/container_rename.go index 4c030228cd..9eba310d5a 100644 --- a/client/container_rename.go +++ b/client/container_rename.go @@ -15,6 +15,6 @@ func (cli *Client) ContainerRename(ctx context.Context, containerID, newContaine query := url.Values{} query.Set("name", newContainerName) resp, err := cli.post(ctx, "/containers/"+containerID+"/rename", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/container_resize.go b/client/container_resize.go index 7b52a97d46..44449df27a 100644 --- a/client/container_resize.go +++ b/client/container_resize.go @@ -33,6 +33,6 @@ func (cli *Client) resize(ctx context.Context, basePath string, height, width ui query.Set("w", strconv.FormatUint(uint64(width), 10)) resp, err := cli.post(ctx, basePath+"/resize", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/container_restart.go b/client/container_restart.go index 34d03dcb1f..ba4a76a85b 100644 --- a/client/container_restart.go +++ b/client/container_restart.go @@ -36,6 +36,6 @@ func (cli *Client) ContainerRestart(ctx context.Context, containerID string, opt } } resp, err := cli.post(ctx, "/containers/"+containerID+"/restart", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/container_start.go b/client/container_start.go index e6c35223ee..37ef68cb47 100644 --- a/client/container_start.go +++ b/client/container_start.go @@ -23,6 +23,6 @@ func (cli *Client) ContainerStart(ctx context.Context, containerID string, optio } resp, err := cli.post(ctx, "/containers/"+containerID+"/start", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/container_stop.go b/client/container_stop.go index 8ea2e6bd35..361464eea4 100644 --- a/client/container_stop.go +++ b/client/container_stop.go @@ -40,6 +40,6 @@ func (cli *Client) ContainerStop(ctx context.Context, containerID string, option } } resp, err := cli.post(ctx, "/containers/"+containerID+"/stop", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/container_unpause.go b/client/container_unpause.go index 5910115b7a..edaf236c1f 100644 --- a/client/container_unpause.go +++ b/client/container_unpause.go @@ -10,6 +10,6 @@ func (cli *Client) ContainerUnpause(ctx context.Context, containerID string) err } resp, err := cli.post(ctx, "/containers/"+containerID+"/unpause", nil, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/image_tag.go b/client/image_tag.go index 2d9fc2a80a..a07f230b8b 100644 --- a/client/image_tag.go +++ b/client/image_tag.go @@ -33,6 +33,6 @@ func (cli *Client) ImageTag(ctx context.Context, source, target string) error { } resp, err := cli.post(ctx, "/images/"+source+"/tag", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/network_connect.go b/client/network_connect.go index 0f76056f1a..74a856e833 100644 --- a/client/network_connect.go +++ b/client/network_connect.go @@ -23,6 +23,6 @@ func (cli *Client) NetworkConnect(ctx context.Context, networkID, containerID st EndpointConfig: config, } resp, err := cli.post(ctx, "/networks/"+networkID+"/connect", nil, nc, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/network_disconnect.go b/client/network_disconnect.go index 09063fcc32..5f52c84d48 100644 --- a/client/network_disconnect.go +++ b/client/network_disconnect.go @@ -23,6 +23,6 @@ func (cli *Client) NetworkDisconnect(ctx context.Context, networkID, containerID Force: force, } resp, err := cli.post(ctx, "/networks/"+networkID+"/disconnect", nil, nd, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/node_update.go b/client/node_update.go index 0265d4fc01..6dfa11b3a6 100644 --- a/client/node_update.go +++ b/client/node_update.go @@ -17,6 +17,6 @@ func (cli *Client) NodeUpdate(ctx context.Context, nodeID string, version swarm. query := url.Values{} query.Set("version", version.String()) resp, err := cli.post(ctx, "/nodes/"+nodeID+"/update", query, node, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/plugin_create.go b/client/plugin_create.go index b1216c1224..c143db7061 100644 --- a/client/plugin_create.go +++ b/client/plugin_create.go @@ -21,6 +21,6 @@ func (cli *Client) PluginCreate(ctx context.Context, createContext io.Reader, cr query.Set("name", createOptions.RepoName) resp, err := cli.postRaw(ctx, "/plugins/create", query, createContext, headers) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/plugin_disable.go b/client/plugin_disable.go index 3f728ab304..b368dc6e58 100644 --- a/client/plugin_disable.go +++ b/client/plugin_disable.go @@ -21,6 +21,6 @@ func (cli *Client) PluginDisable(ctx context.Context, name string, options Plugi query.Set("force", "1") } resp, err := cli.post(ctx, "/plugins/"+name+"/disable", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/plugin_enable.go b/client/plugin_enable.go index 5d534c456d..c79361a473 100644 --- a/client/plugin_enable.go +++ b/client/plugin_enable.go @@ -21,6 +21,6 @@ func (cli *Client) PluginEnable(ctx context.Context, name string, options Plugin query.Set("timeout", strconv.Itoa(options.Timeout)) resp, err := cli.post(ctx, "/plugins/"+name+"/enable", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/plugin_set.go b/client/plugin_set.go index f0e4a0c305..f606311602 100644 --- a/client/plugin_set.go +++ b/client/plugin_set.go @@ -12,6 +12,6 @@ func (cli *Client) PluginSet(ctx context.Context, name string, args []string) er } resp, err := cli.post(ctx, "/plugins/"+name+"/set", nil, args, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/secret_update.go b/client/secret_update.go index d7cb995361..ebc2007d5b 100644 --- a/client/secret_update.go +++ b/client/secret_update.go @@ -19,6 +19,6 @@ func (cli *Client) SecretUpdate(ctx context.Context, id string, version swarm.Ve query := url.Values{} query.Set("version", version.String()) resp, err := cli.post(ctx, "/secrets/"+id+"/update", query, secret, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/swarm_join.go b/client/swarm_join.go index b144593015..7a9fa076d6 100644 --- a/client/swarm_join.go +++ b/client/swarm_join.go @@ -9,6 +9,6 @@ import ( // SwarmJoin joins the swarm. func (cli *Client) SwarmJoin(ctx context.Context, req swarm.JoinRequest) error { resp, err := cli.post(ctx, "/swarm/join", nil, req, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/swarm_leave.go b/client/swarm_leave.go index 709e5adb35..fb0fe3b5d5 100644 --- a/client/swarm_leave.go +++ b/client/swarm_leave.go @@ -12,6 +12,6 @@ func (cli *Client) SwarmLeave(ctx context.Context, force bool) error { query.Set("force", "1") } resp, err := cli.post(ctx, "/swarm/leave", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/swarm_unlock.go b/client/swarm_unlock.go index 3d8d68b67a..5eb3d59399 100644 --- a/client/swarm_unlock.go +++ b/client/swarm_unlock.go @@ -9,6 +9,6 @@ import ( // SwarmUnlock unlocks locked swarm. func (cli *Client) SwarmUnlock(ctx context.Context, req swarm.UnlockRequest) error { resp, err := cli.post(ctx, "/swarm/unlock", nil, req, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/swarm_update.go b/client/swarm_update.go index 948d07b7a8..fc95ac6c3a 100644 --- a/client/swarm_update.go +++ b/client/swarm_update.go @@ -16,6 +16,6 @@ func (cli *Client) SwarmUpdate(ctx context.Context, version swarm.Version, swarm query.Set("rotateManagerToken", strconv.FormatBool(flags.RotateManagerToken)) query.Set("rotateManagerUnlockKey", strconv.FormatBool(flags.RotateManagerUnlockKey)) resp, err := cli.post(ctx, "/swarm/update", query, swarm, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/client/volume_update.go b/client/volume_update.go index 50a16e2c0f..7094c9937e 100644 --- a/client/volume_update.go +++ b/client/volume_update.go @@ -23,6 +23,6 @@ func (cli *Client) VolumeUpdate(ctx context.Context, volumeID string, version sw query.Set("version", version.String()) resp, err := cli.put(ctx, "/volumes/"+volumeID, query, options, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/build_cancel.go b/vendor/github.com/moby/moby/client/build_cancel.go index a1b83c0030..f39b876161 100644 --- a/vendor/github.com/moby/moby/client/build_cancel.go +++ b/vendor/github.com/moby/moby/client/build_cancel.go @@ -12,6 +12,6 @@ func (cli *Client) BuildCancel(ctx context.Context, id string) error { query.Set("id", id) resp, err := cli.post(ctx, "/build/cancel", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/checkpoint_create.go b/vendor/github.com/moby/moby/client/checkpoint_create.go index 0dd07d2374..ef325a82dd 100644 --- a/vendor/github.com/moby/moby/client/checkpoint_create.go +++ b/vendor/github.com/moby/moby/client/checkpoint_create.go @@ -14,6 +14,6 @@ func (cli *Client) CheckpointCreate(ctx context.Context, containerID string, opt } resp, err := cli.post(ctx, "/containers/"+containerID+"/checkpoints", nil, options, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/checkpoint_delete.go b/vendor/github.com/moby/moby/client/checkpoint_delete.go index 15d6075c5a..87f3f88218 100644 --- a/vendor/github.com/moby/moby/client/checkpoint_delete.go +++ b/vendor/github.com/moby/moby/client/checkpoint_delete.go @@ -20,6 +20,6 @@ func (cli *Client) CheckpointDelete(ctx context.Context, containerID string, opt } resp, err := cli.delete(ctx, "/containers/"+containerID+"/checkpoints/"+options.CheckpointID, query, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/config_update.go b/vendor/github.com/moby/moby/client/config_update.go index a55f01beff..9303747947 100644 --- a/vendor/github.com/moby/moby/client/config_update.go +++ b/vendor/github.com/moby/moby/client/config_update.go @@ -19,6 +19,6 @@ func (cli *Client) ConfigUpdate(ctx context.Context, id string, version swarm.Ve query := url.Values{} query.Set("version", version.String()) resp, err := cli.post(ctx, "/configs/"+id+"/update", query, config, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/container_exec.go b/vendor/github.com/moby/moby/client/container_exec.go index 2b42e2f5d1..8739c2967b 100644 --- a/vendor/github.com/moby/moby/client/container_exec.go +++ b/vendor/github.com/moby/moby/client/container_exec.go @@ -58,7 +58,7 @@ func (cli *Client) ContainerExecStart(ctx context.Context, execID string, config config.ConsoleSize = nil } resp, err := cli.post(ctx, "/exec/"+execID+"/start", nil, config, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } @@ -91,13 +91,13 @@ func (cli *Client) ContainerExecAttach(ctx context.Context, execID string, confi // ContainerExecInspect returns information about a specific exec process on the docker host. func (cli *Client) ContainerExecInspect(ctx context.Context, execID string) (container.ExecInspect, error) { - var response container.ExecInspect resp, err := cli.get(ctx, "/exec/"+execID+"/json", nil, nil) + defer ensureReaderClosed(resp) if err != nil { - return response, err + return container.ExecInspect{}, err } + var response container.ExecInspect err = json.NewDecoder(resp.Body).Decode(&response) - ensureReaderClosed(resp) return response, err } diff --git a/vendor/github.com/moby/moby/client/container_kill.go b/vendor/github.com/moby/moby/client/container_kill.go index 251ae479a3..d198337fd9 100644 --- a/vendor/github.com/moby/moby/client/container_kill.go +++ b/vendor/github.com/moby/moby/client/container_kill.go @@ -18,6 +18,6 @@ func (cli *Client) ContainerKill(ctx context.Context, containerID, signal string } resp, err := cli.post(ctx, "/containers/"+containerID+"/kill", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/container_pause.go b/vendor/github.com/moby/moby/client/container_pause.go index 59b3e2d865..c3488b9723 100644 --- a/vendor/github.com/moby/moby/client/container_pause.go +++ b/vendor/github.com/moby/moby/client/container_pause.go @@ -10,6 +10,6 @@ func (cli *Client) ContainerPause(ctx context.Context, containerID string) error } resp, err := cli.post(ctx, "/containers/"+containerID+"/pause", nil, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/container_rename.go b/vendor/github.com/moby/moby/client/container_rename.go index 4c030228cd..9eba310d5a 100644 --- a/vendor/github.com/moby/moby/client/container_rename.go +++ b/vendor/github.com/moby/moby/client/container_rename.go @@ -15,6 +15,6 @@ func (cli *Client) ContainerRename(ctx context.Context, containerID, newContaine query := url.Values{} query.Set("name", newContainerName) resp, err := cli.post(ctx, "/containers/"+containerID+"/rename", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/container_resize.go b/vendor/github.com/moby/moby/client/container_resize.go index 7b52a97d46..44449df27a 100644 --- a/vendor/github.com/moby/moby/client/container_resize.go +++ b/vendor/github.com/moby/moby/client/container_resize.go @@ -33,6 +33,6 @@ func (cli *Client) resize(ctx context.Context, basePath string, height, width ui query.Set("w", strconv.FormatUint(uint64(width), 10)) resp, err := cli.post(ctx, basePath+"/resize", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/container_restart.go b/vendor/github.com/moby/moby/client/container_restart.go index 34d03dcb1f..ba4a76a85b 100644 --- a/vendor/github.com/moby/moby/client/container_restart.go +++ b/vendor/github.com/moby/moby/client/container_restart.go @@ -36,6 +36,6 @@ func (cli *Client) ContainerRestart(ctx context.Context, containerID string, opt } } resp, err := cli.post(ctx, "/containers/"+containerID+"/restart", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/container_start.go b/vendor/github.com/moby/moby/client/container_start.go index e6c35223ee..37ef68cb47 100644 --- a/vendor/github.com/moby/moby/client/container_start.go +++ b/vendor/github.com/moby/moby/client/container_start.go @@ -23,6 +23,6 @@ func (cli *Client) ContainerStart(ctx context.Context, containerID string, optio } resp, err := cli.post(ctx, "/containers/"+containerID+"/start", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/container_stop.go b/vendor/github.com/moby/moby/client/container_stop.go index 8ea2e6bd35..361464eea4 100644 --- a/vendor/github.com/moby/moby/client/container_stop.go +++ b/vendor/github.com/moby/moby/client/container_stop.go @@ -40,6 +40,6 @@ func (cli *Client) ContainerStop(ctx context.Context, containerID string, option } } resp, err := cli.post(ctx, "/containers/"+containerID+"/stop", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/container_unpause.go b/vendor/github.com/moby/moby/client/container_unpause.go index 5910115b7a..edaf236c1f 100644 --- a/vendor/github.com/moby/moby/client/container_unpause.go +++ b/vendor/github.com/moby/moby/client/container_unpause.go @@ -10,6 +10,6 @@ func (cli *Client) ContainerUnpause(ctx context.Context, containerID string) err } resp, err := cli.post(ctx, "/containers/"+containerID+"/unpause", nil, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/image_tag.go b/vendor/github.com/moby/moby/client/image_tag.go index 2d9fc2a80a..a07f230b8b 100644 --- a/vendor/github.com/moby/moby/client/image_tag.go +++ b/vendor/github.com/moby/moby/client/image_tag.go @@ -33,6 +33,6 @@ func (cli *Client) ImageTag(ctx context.Context, source, target string) error { } resp, err := cli.post(ctx, "/images/"+source+"/tag", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/network_connect.go b/vendor/github.com/moby/moby/client/network_connect.go index 0f76056f1a..74a856e833 100644 --- a/vendor/github.com/moby/moby/client/network_connect.go +++ b/vendor/github.com/moby/moby/client/network_connect.go @@ -23,6 +23,6 @@ func (cli *Client) NetworkConnect(ctx context.Context, networkID, containerID st EndpointConfig: config, } resp, err := cli.post(ctx, "/networks/"+networkID+"/connect", nil, nc, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/network_disconnect.go b/vendor/github.com/moby/moby/client/network_disconnect.go index 09063fcc32..5f52c84d48 100644 --- a/vendor/github.com/moby/moby/client/network_disconnect.go +++ b/vendor/github.com/moby/moby/client/network_disconnect.go @@ -23,6 +23,6 @@ func (cli *Client) NetworkDisconnect(ctx context.Context, networkID, containerID Force: force, } resp, err := cli.post(ctx, "/networks/"+networkID+"/disconnect", nil, nd, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/node_update.go b/vendor/github.com/moby/moby/client/node_update.go index 0265d4fc01..6dfa11b3a6 100644 --- a/vendor/github.com/moby/moby/client/node_update.go +++ b/vendor/github.com/moby/moby/client/node_update.go @@ -17,6 +17,6 @@ func (cli *Client) NodeUpdate(ctx context.Context, nodeID string, version swarm. query := url.Values{} query.Set("version", version.String()) resp, err := cli.post(ctx, "/nodes/"+nodeID+"/update", query, node, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/plugin_create.go b/vendor/github.com/moby/moby/client/plugin_create.go index b1216c1224..c143db7061 100644 --- a/vendor/github.com/moby/moby/client/plugin_create.go +++ b/vendor/github.com/moby/moby/client/plugin_create.go @@ -21,6 +21,6 @@ func (cli *Client) PluginCreate(ctx context.Context, createContext io.Reader, cr query.Set("name", createOptions.RepoName) resp, err := cli.postRaw(ctx, "/plugins/create", query, createContext, headers) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/plugin_disable.go b/vendor/github.com/moby/moby/client/plugin_disable.go index 3f728ab304..b368dc6e58 100644 --- a/vendor/github.com/moby/moby/client/plugin_disable.go +++ b/vendor/github.com/moby/moby/client/plugin_disable.go @@ -21,6 +21,6 @@ func (cli *Client) PluginDisable(ctx context.Context, name string, options Plugi query.Set("force", "1") } resp, err := cli.post(ctx, "/plugins/"+name+"/disable", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/plugin_enable.go b/vendor/github.com/moby/moby/client/plugin_enable.go index 5d534c456d..c79361a473 100644 --- a/vendor/github.com/moby/moby/client/plugin_enable.go +++ b/vendor/github.com/moby/moby/client/plugin_enable.go @@ -21,6 +21,6 @@ func (cli *Client) PluginEnable(ctx context.Context, name string, options Plugin query.Set("timeout", strconv.Itoa(options.Timeout)) resp, err := cli.post(ctx, "/plugins/"+name+"/enable", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/plugin_set.go b/vendor/github.com/moby/moby/client/plugin_set.go index f0e4a0c305..f606311602 100644 --- a/vendor/github.com/moby/moby/client/plugin_set.go +++ b/vendor/github.com/moby/moby/client/plugin_set.go @@ -12,6 +12,6 @@ func (cli *Client) PluginSet(ctx context.Context, name string, args []string) er } resp, err := cli.post(ctx, "/plugins/"+name+"/set", nil, args, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/secret_update.go b/vendor/github.com/moby/moby/client/secret_update.go index d7cb995361..ebc2007d5b 100644 --- a/vendor/github.com/moby/moby/client/secret_update.go +++ b/vendor/github.com/moby/moby/client/secret_update.go @@ -19,6 +19,6 @@ func (cli *Client) SecretUpdate(ctx context.Context, id string, version swarm.Ve query := url.Values{} query.Set("version", version.String()) resp, err := cli.post(ctx, "/secrets/"+id+"/update", query, secret, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/swarm_join.go b/vendor/github.com/moby/moby/client/swarm_join.go index b144593015..7a9fa076d6 100644 --- a/vendor/github.com/moby/moby/client/swarm_join.go +++ b/vendor/github.com/moby/moby/client/swarm_join.go @@ -9,6 +9,6 @@ import ( // SwarmJoin joins the swarm. func (cli *Client) SwarmJoin(ctx context.Context, req swarm.JoinRequest) error { resp, err := cli.post(ctx, "/swarm/join", nil, req, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/swarm_leave.go b/vendor/github.com/moby/moby/client/swarm_leave.go index 709e5adb35..fb0fe3b5d5 100644 --- a/vendor/github.com/moby/moby/client/swarm_leave.go +++ b/vendor/github.com/moby/moby/client/swarm_leave.go @@ -12,6 +12,6 @@ func (cli *Client) SwarmLeave(ctx context.Context, force bool) error { query.Set("force", "1") } resp, err := cli.post(ctx, "/swarm/leave", query, nil, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/swarm_unlock.go b/vendor/github.com/moby/moby/client/swarm_unlock.go index 3d8d68b67a..5eb3d59399 100644 --- a/vendor/github.com/moby/moby/client/swarm_unlock.go +++ b/vendor/github.com/moby/moby/client/swarm_unlock.go @@ -9,6 +9,6 @@ import ( // SwarmUnlock unlocks locked swarm. func (cli *Client) SwarmUnlock(ctx context.Context, req swarm.UnlockRequest) error { resp, err := cli.post(ctx, "/swarm/unlock", nil, req, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/swarm_update.go b/vendor/github.com/moby/moby/client/swarm_update.go index 948d07b7a8..fc95ac6c3a 100644 --- a/vendor/github.com/moby/moby/client/swarm_update.go +++ b/vendor/github.com/moby/moby/client/swarm_update.go @@ -16,6 +16,6 @@ func (cli *Client) SwarmUpdate(ctx context.Context, version swarm.Version, swarm query.Set("rotateManagerToken", strconv.FormatBool(flags.RotateManagerToken)) query.Set("rotateManagerUnlockKey", strconv.FormatBool(flags.RotateManagerUnlockKey)) resp, err := cli.post(ctx, "/swarm/update", query, swarm, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err } diff --git a/vendor/github.com/moby/moby/client/volume_update.go b/vendor/github.com/moby/moby/client/volume_update.go index 50a16e2c0f..7094c9937e 100644 --- a/vendor/github.com/moby/moby/client/volume_update.go +++ b/vendor/github.com/moby/moby/client/volume_update.go @@ -23,6 +23,6 @@ func (cli *Client) VolumeUpdate(ctx context.Context, volumeID string, version sw query.Set("version", version.String()) resp, err := cli.put(ctx, "/volumes/"+volumeID, query, options, nil) - ensureReaderClosed(resp) + defer ensureReaderClosed(resp) return err }