04e96d05fc
When a user enters a CLI with a StringFlags or StringSliceFlags and does not add a value the CLI mistakently takes the next option and uses it as a value. This usually ends up with an error like not enough options or others. Some times it could also succeed, with weird results. This patch looks for any values that begin with a "-" and return an error. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
76 lines
1.7 KiB
Go
76 lines
1.7 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/kubernetes-incubator/cri-o/libkpod"
|
|
"github.com/pkg/errors"
|
|
"github.com/urfave/cli"
|
|
)
|
|
|
|
var (
|
|
defaultTimeout int64 = 10
|
|
stopFlags = []cli.Flag{
|
|
cli.Int64Flag{
|
|
Name: "timeout, t",
|
|
Usage: "Seconds to wait for stop before killing the container",
|
|
Value: defaultTimeout,
|
|
},
|
|
}
|
|
stopDescription = `
|
|
kpod stop
|
|
|
|
Stops one or more running containers. The container name or ID can be used.
|
|
A timeout to forcibly stop the container can also be set but defaults to 10
|
|
seconds otherwise.
|
|
`
|
|
|
|
stopCommand = cli.Command{
|
|
Name: "stop",
|
|
Usage: "Stop one or more containers",
|
|
Description: stopDescription,
|
|
Flags: stopFlags,
|
|
Action: stopCmd,
|
|
ArgsUsage: "CONTAINER-NAME [CONTAINER-NAME ...]",
|
|
}
|
|
)
|
|
|
|
func stopCmd(c *cli.Context) error {
|
|
args := c.Args()
|
|
stopTimeout := c.Int64("timeout")
|
|
if len(args) < 1 {
|
|
return errors.Errorf("you must provide at least one container name or id")
|
|
}
|
|
if err := validateFlags(c, stopFlags); err != nil {
|
|
return err
|
|
}
|
|
|
|
config, err := getConfig(c)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "could not get config")
|
|
}
|
|
server, err := libkpod.New(config)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "could not get container server")
|
|
}
|
|
defer server.Shutdown()
|
|
err = server.Update()
|
|
if err != nil {
|
|
return errors.Wrapf(err, "could not update list of containers")
|
|
}
|
|
var lastError error
|
|
for _, container := range c.Args() {
|
|
cid, err := server.ContainerStop(container, stopTimeout)
|
|
if err != nil {
|
|
if lastError != nil {
|
|
fmt.Fprintln(os.Stderr, lastError)
|
|
}
|
|
lastError = errors.Wrapf(err, "failed to stop container %v", container)
|
|
} else {
|
|
fmt.Println(cid)
|
|
}
|
|
}
|
|
|
|
return lastError
|
|
}
|