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

Merge pull request #28789 from yongtang/28735-plugin-inspect-id-or-name 

Allow `docker plugin inspect` to search based on ID or name
This commit is contained in:
Anusha Ragunathan 2016-12-02 08:46:47 -08:00 committed by GitHub
parent c84b90291c 312958f4db
commit ae4fc345a4
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
command/plugin/inspect.go
View File

@ -1,12 +1,9 @@
package plugin package plugin
import ( import (
"fmt"
"github.com/docker/docker/cli" "github.com/docker/docker/cli"
"github.com/docker/docker/cli/command" "github.com/docker/docker/cli/command"
"github.com/docker/docker/cli/command/inspect" "github.com/docker/docker/cli/command/inspect"
"github.com/docker/docker/reference"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/net/context" "golang.org/x/net/context"
) )
@ -20,7 +17,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts inspectOptions var opts inspectOptions
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "inspect [OPTIONS] PLUGIN [PLUGIN...]", Use: "inspect [OPTIONS] PLUGIN|ID [PLUGIN|ID...]",
Short: "Display detailed information on one or more plugins", Short: "Display detailed information on one or more plugins",
Args: cli.RequiresMinArgs(1), Args: cli.RequiresMinArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
@ -37,20 +34,8 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error { func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
client := dockerCli.Client() client := dockerCli.Client()
ctx := context.Background() ctx := context.Background()
getRef := func(name string) (interface{}, []byte, error) { getRef := func(ref string) (interface{}, []byte, error) {
named, err := reference.ParseNamed(name) // FIXME: validate return client.PluginInspectWithRaw(ctx, ref)
if err != nil {
return nil, nil, err
}
if reference.IsNameOnly(named) {
named = reference.WithDefaultTag(named)
}
ref, ok := named.(reference.NamedTagged)
if !ok {
return nil, nil, fmt.Errorf("invalid name: %s", named.String())
}
return client.PluginInspectWithRaw(ctx, ref.String())
} }
return inspect.Inspect(dockerCli.Out(), opts.pluginNames, opts.format, getRef) return inspect.Inspect(dockerCli.Out(), opts.pluginNames, opts.format, getRef)