diff --git a/cli/command/node/demote.go b/cli/command/node/demote.go index ea914bb094..9f6b25ac96 100644 --- a/cli/command/node/demote.go +++ b/cli/command/node/demote.go @@ -24,14 +24,14 @@ func newDemoteCommand(dockerCli command.Cli) *cobra.Command { func runDemote(ctx context.Context, dockerCli command.Cli, nodes []string) error { demote := func(node *swarm.Node) error { if node.Spec.Role == swarm.NodeRoleWorker { - fmt.Fprintf(dockerCli.Out(), "Node %s is already a worker.\n", node.ID) + _, _ = fmt.Fprintf(dockerCli.Out(), "Node %s is already a worker.\n", node.ID) return errNoRoleChange } node.Spec.Role = swarm.NodeRoleWorker return nil } success := func(nodeID string) { - fmt.Fprintf(dockerCli.Out(), "Manager %s demoted in the swarm.\n", nodeID) + _, _ = fmt.Fprintf(dockerCli.Out(), "Manager %s demoted in the swarm.\n", nodeID) } return updateNodes(ctx, dockerCli, nodes, demote, success) } diff --git a/cli/command/node/promote.go b/cli/command/node/promote.go index c9d45e9cda..2257273972 100644 --- a/cli/command/node/promote.go +++ b/cli/command/node/promote.go @@ -24,14 +24,14 @@ func newPromoteCommand(dockerCli command.Cli) *cobra.Command { func runPromote(ctx context.Context, dockerCli command.Cli, nodes []string) error { promote := func(node *swarm.Node) error { if node.Spec.Role == swarm.NodeRoleManager { - fmt.Fprintf(dockerCli.Out(), "Node %s is already a manager.\n", node.ID) + _, _ = fmt.Fprintf(dockerCli.Out(), "Node %s is already a manager.\n", node.ID) return errNoRoleChange } node.Spec.Role = swarm.NodeRoleManager return nil } success := func(nodeID string) { - fmt.Fprintf(dockerCli.Out(), "Node %s promoted to a manager in the swarm.\n", nodeID) + _, _ = fmt.Fprintf(dockerCli.Out(), "Node %s promoted to a manager in the swarm.\n", nodeID) } return updateNodes(ctx, dockerCli, nodes, promote, success) } diff --git a/cli/command/node/remove.go b/cli/command/node/remove.go index fedf34dec4..809c6b16fa 100644 --- a/cli/command/node/remove.go +++ b/cli/command/node/remove.go @@ -33,18 +33,18 @@ func newRemoveCommand(dockerCli command.Cli) *cobra.Command { return cmd } -func runRemove(ctx context.Context, dockerCli command.Cli, args []string, opts removeOptions) error { - client := dockerCli.Client() +func runRemove(ctx context.Context, dockerCLI command.Cli, nodeIDs []string, opts removeOptions) error { + apiClient := dockerCLI.Client() var errs []string - for _, nodeID := range args { - err := client.NodeRemove(ctx, nodeID, types.NodeRemoveOptions{Force: opts.force}) + for _, id := range nodeIDs { + err := apiClient.NodeRemove(ctx, id, types.NodeRemoveOptions{Force: opts.force}) if err != nil { errs = append(errs, err.Error()) continue } - fmt.Fprintf(dockerCli.Out(), "%s\n", nodeID) + _, _ = fmt.Fprintln(dockerCLI.Out(), id) } if len(errs) > 0 {