mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
ad1c96c6a7
"docker node ps" behaves strangely outside swarm mode:
$ docker node ps
ID NAME IMAGE NODE DESIRED STATE CURRENT STATE ERROR PORTS
Error: No such node:
It should explain that the node is not a swarm manager.
The reason this happens is that the argument to "docker node ps" defaults
to "self". The first thing the command does is try to resolve "self" to
a node ID using the /info endpoint. If there is no node ID, it tries to
use the empty string as an ID, and tries to GET /nodes/, which is not a
valid endpoint.
Change the command to check if the node ID is present in the /info
response. If it isn't, a swarm API endpoint can supply a useful error
message.
Also, avoid printing the column headers if the only following text is an
error.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
57 lines
1.5 KiB
Go
57 lines
1.5 KiB
Go
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"
|
|
"github.com/spf13/cobra"
|
|
"golang.org/x/net/context"
|
|
)
|
|
|
|
// NewNodeCommand returns a cobra command for `node` subcommands
|
|
func NewNodeCommand(dockerCli *command.DockerCli) *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "node",
|
|
Short: "Manage Swarm nodes",
|
|
Args: cli.NoArgs,
|
|
RunE: dockerCli.ShowHelp,
|
|
Tags: map[string]string{"version": "1.24"},
|
|
}
|
|
cmd.AddCommand(
|
|
newDemoteCommand(dockerCli),
|
|
newInspectCommand(dockerCli),
|
|
newListCommand(dockerCli),
|
|
newPromoteCommand(dockerCli),
|
|
newRemoveCommand(dockerCli),
|
|
newPsCommand(dockerCli),
|
|
newUpdateCommand(dockerCli),
|
|
)
|
|
return cmd
|
|
}
|
|
|
|
// Reference returns the reference of a node. The special value "self" for a node
|
|
// reference is mapped to the current node, hence the node ID is retrieved using
|
|
// the `/info` endpoint.
|
|
func Reference(ctx context.Context, client apiclient.APIClient, ref string) (string, error) {
|
|
if ref == "self" {
|
|
info, err := client.Info(ctx)
|
|
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
|
|
}
|