Change completion for nodes to use names by default, and bring back
support for the `DOCKER_COMPLETION_SHOW_NODE_IDS` env-var
f9ced58158/contrib/completion/bash/docker (L38)
With this patch:
docker node ps <tab>
docker-desktop self
export DOCKER_COMPLETION_SHOW_NODE_IDS=yes
docker node ps <TAB>
docker-desktop qyeriqk20al6hy4y869d08ff5 self
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
38 lines
1.3 KiB
Go
38 lines
1.3 KiB
Go
package node
|
|
|
|
import (
|
|
"os"
|
|
|
|
"github.com/docker/cli/cli/command/completion"
|
|
"github.com/docker/docker/api/types"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
// completeNodeNames offers completion for swarm node (host)names and optional IDs.
|
|
// By default, only names are returned.
|
|
// Set DOCKER_COMPLETION_SHOW_NODE_IDS=yes to also complete IDs.
|
|
//
|
|
// TODO(thaJeztah): add support for filters.
|
|
func completeNodeNames(dockerCLI completion.APIClientProvider) completion.ValidArgsFn {
|
|
// https://github.com/docker/cli/blob/f9ced58158d5e0b358052432244b483774a1983d/contrib/completion/bash/docker#L41-L43
|
|
showIDs := os.Getenv("DOCKER_COMPLETION_SHOW_NODE_IDS") == "yes"
|
|
return func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
|
|
list, err := dockerCLI.Client().NodeList(cmd.Context(), types.NodeListOptions{})
|
|
if err != nil {
|
|
return nil, cobra.ShellCompDirectiveError
|
|
}
|
|
|
|
names := make([]string, 0, len(list)+1)
|
|
for _, node := range list {
|
|
if showIDs {
|
|
names = append(names, node.Description.Hostname, node.ID)
|
|
} else {
|
|
names = append(names, node.Description.Hostname)
|
|
}
|
|
}
|
|
// Nodes allow "self" as magic word for the current node.
|
|
names = append(names, "self")
|
|
return names, cobra.ShellCompDirectiveNoFileComp
|
|
}
|
|
}
|