Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31989 from aaronlehmann/node-ps-outside-swarm-mode 

cli: Wrong error message from "node ps" outside swarm mode
This commit is contained in:
Vincent Demeester 2017-04-03 16:15:24 +02:00 committed by GitHub
parent a090dc9653 d59f6d0933
commit d37d03c9dc
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
command/node/cmd.go
View File

@ -1,6 +1,9 @@
package node
import (
"errors"
"github.com/docker/docker/api/types"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/command"
apiclient "github.com/docker/docker/client"
@ -38,6 +41,16 @@ func Reference(ctx context.Context, client apiclient.APIClient, ref string) (str
if err != nil {
return "", err
}
if info.Swarm.NodeID == "" {
// If there's no node ID in /info, the node probably
// isn't a manager. Call a swarm-specific endpoint to
// get a more specific error message.
_, err = client.NodeList(ctx, types.NodeListOptions{})
if err != nil {
return "", err
}
return "", errors.New("node ID not found in /info")
}
return info.Swarm.NodeID, nil
}
return ref, nil

2
command/node/inspect_test.go
View File

@ -50,7 +50,7 @@ func TestNodeInspectErrors(t *testing.T) {
return swarm.Node{}, []byte{}, errors.Errorf("error inspecting the node")
},
infoFunc: func() (types.Info, error) {
return types.Info{}, nil
return types.Info{Swarm: swarm.Info{NodeID: "abc"}}, nil
},
expectedError: "error inspecting the node",
},

6
command/node/ps.go
View File

@ -95,8 +95,10 @@ func runPs(dockerCli command.Cli, opts psOptions) error {
}
}
if err := task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), !opts.noTrunc, opts.quiet, format); err != nil {
errs = append(errs, err.Error())
if len(errs) == 0 || len(tasks) != 0 {
if err := task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), !opts.noTrunc, opts.quiet, format); err != nil {
errs = append(errs, err.Error())
}
}
if len(errs) > 0 {