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>
98 lines
2.1 KiB
Go
98 lines
2.1 KiB
Go
package main
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
|
|
"github.com/kubernetes-incubator/cri-o/libpod"
|
|
"github.com/kubernetes-incubator/cri-o/libpod/images"
|
|
"github.com/pkg/errors"
|
|
"github.com/sirupsen/logrus"
|
|
"github.com/urfave/cli"
|
|
)
|
|
|
|
var (
|
|
saveFlags = []cli.Flag{
|
|
cli.StringFlag{
|
|
Name: "output, o",
|
|
Usage: "Write to a file, default is STDOUT",
|
|
Value: "/dev/stdout",
|
|
},
|
|
cli.BoolFlag{
|
|
Name: "quiet, q",
|
|
Usage: "Suppress the output",
|
|
},
|
|
cli.StringFlag{
|
|
Name: "format",
|
|
Usage: "Save image to oci-archive",
|
|
},
|
|
}
|
|
saveDescription = `
|
|
Save an image to docker-archive or oci-archive on the local machine.
|
|
Default is docker-archive`
|
|
|
|
saveCommand = cli.Command{
|
|
Name: "save",
|
|
Usage: "Save image to an archive",
|
|
Description: saveDescription,
|
|
Flags: saveFlags,
|
|
Action: saveCmd,
|
|
ArgsUsage: "",
|
|
}
|
|
)
|
|
|
|
// saveCmd saves the image to either docker-archive or oci
|
|
func saveCmd(c *cli.Context) error {
|
|
args := c.Args()
|
|
if len(args) == 0 {
|
|
return errors.Errorf("need at least 1 argument")
|
|
}
|
|
if err := validateFlags(c, saveFlags); err != nil {
|
|
return err
|
|
}
|
|
|
|
runtime, err := getRuntime(c)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "could not create runtime")
|
|
}
|
|
defer runtime.Shutdown(false)
|
|
|
|
var writer io.Writer
|
|
if !c.Bool("quiet") {
|
|
writer = os.Stdout
|
|
}
|
|
|
|
output := c.String("output")
|
|
if output == "/dev/stdout" {
|
|
fi := os.Stdout
|
|
if logrus.IsTerminal(fi) {
|
|
return errors.Errorf("refusing to save to terminal. Use -o flag or redirect")
|
|
}
|
|
}
|
|
|
|
var dst string
|
|
switch c.String("format") {
|
|
case images.OCIArchive:
|
|
dst = images.OCIArchive + ":" + output
|
|
case images.DockerArchive:
|
|
fallthrough
|
|
case "":
|
|
dst = images.DockerArchive + ":" + output
|
|
default:
|
|
return errors.Errorf("unknown format option %q", c.String("format"))
|
|
}
|
|
|
|
saveOpts := libpod.CopyOptions{
|
|
SignaturePolicyPath: "",
|
|
}
|
|
|
|
// only one image is supported for now
|
|
// future pull requests will fix this
|
|
for _, image := range args {
|
|
dest := dst + ":" + image
|
|
if err := runtime.PushImage(image, dest, saveOpts, writer); err != nil {
|
|
return errors.Wrapf(err, "unable to save %q", image)
|
|
}
|
|
}
|
|
return nil
|
|
}
|