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

Add HTTP client timeout. 

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
This commit is contained in:
Anusha Ragunathan 2016-11-21 09:24:01 -08:00
parent 2d7ef04a57
commit 752a9a7c56
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
command/plugin/enable.go
View File

@ -3,6 +3,7 @@ package plugin
import ( import (
"fmt" "fmt"
"github.com/docker/docker/api/types"
"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/reference" "github.com/docker/docker/reference"
@ -10,20 +11,32 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
) )
type enableOpts struct {
timeout int
name string
}
func newEnableCommand(dockerCli *command.DockerCli) *cobra.Command { func newEnableCommand(dockerCli *command.DockerCli) *cobra.Command {
var opts enableOpts
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "enable PLUGIN", Use: "enable PLUGIN",
Short: "Enable a plugin", Short: "Enable a plugin",
Args: cli.ExactArgs(1), Args: cli.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {
return runEnable(dockerCli, args[0]) opts.name = args[0]
return runEnable(dockerCli, &opts)
}, },
} }
flags := cmd.Flags()
flags.IntVar(&opts.timeout, "timeout", 0, "HTTP client timeout (in seconds)")
return cmd return cmd
} }
func runEnable(dockerCli *command.DockerCli, name string) error { func runEnable(dockerCli *command.DockerCli, opts *enableOpts) error {
name := opts.name
named, err := reference.ParseNamed(name) // FIXME: validate named, err := reference.ParseNamed(name) // FIXME: validate
if err != nil { if err != nil {
return err return err
@ -35,7 +48,11 @@ func runEnable(dockerCli *command.DockerCli, name string) error {
if !ok { if !ok {
return fmt.Errorf("invalid name: %s", named.String()) return fmt.Errorf("invalid name: %s", named.String())
} }
if err := dockerCli.Client().PluginEnable(context.Background(), ref.String()); err != nil { if opts.timeout < 0 {
return fmt.Errorf("negative timeout %d is invalid", opts.timeout)
}
if err := dockerCli.Client().PluginEnable(context.Background(), ref.String(), types.PluginEnableOptions{Timeout: opts.timeout}); err != nil {
return err return err
} }
fmt.Fprintln(dockerCli.Out(), name) fmt.Fprintln(dockerCli.Out(), name)