container/podman
container/podman
1
0
Fork 0
mirror of https://github.com/containers/podman synced 2024-10-20 01:03:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

podman umount: error out if called with no args

Browse source 
Inspired by #2684, I wrote a CI test to look for other such
instances in which a command is invoked without a required
argument. 'podman umount' seems to be the only one, and
solution is simple: checkAllAndLatest() already does the
check for us.

Resolve a few other problems uncovered by testing:

  podman mount: indicate that CONTAINER arg is optional

  podman pod stats: ditto

  podman generate kube: remove check for -l (latest) flag,
    it isn't actually implemented.

Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago 2019-03-18 13:22:39 -06:00
parent 03160dcf48
commit abf3500e8f
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/podman/generate_kube.go
View file

@ -57,8 +57,8 @@ func generateKubeYAMLCmd(c *cliconfig.GenerateKubeValues) error {
return errors.Wrapf(libpod.ErrNotImplemented, "rootless users") return errors.Wrapf(libpod.ErrNotImplemented, "rootless users")
} }
args := c.InputArgs args := c.InputArgs
if len(args) > 1 || (len(args) < 1 && !c.Bool("latest")) { if len(args) != 1 {
return errors.Errorf("you must provide one container|pod ID or name or --latest") return errors.Errorf("you must provide exactly one container|pod ID or name")
} }
runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand) runtime, err := libpodruntime.GetRuntime(&c.PodmanCommand)

2
cmd/podman/mount.go
View file

@ -25,7 +25,7 @@ var (
` `
_mountCommand = &cobra.Command{ _mountCommand = &cobra.Command{
Use: "mount [flags] CONTAINER", Use: "mount [flags] [CONTAINER]",
Short: "Mount a working container's root filesystem", Short: "Mount a working container's root filesystem",
Long: mountDescription, Long: mountDescription,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {

2
cmd/podman/pod_stats.go
View file

@ -25,7 +25,7 @@ var (
podStatsDescription = `For each specified pod this command will display percentage of CPU, memory, network I/O, block I/O and PIDs for containers in one the pods.` podStatsDescription = `For each specified pod this command will display percentage of CPU, memory, network I/O, block I/O and PIDs for containers in one the pods.`
_podStatsCommand = &cobra.Command{ _podStatsCommand = &cobra.Command{
Use: "stats [flags] POD [POD...]", Use: "stats [flags] [POD...]",
Short: "Display a live stream of resource usage statistics for the containers in one or more pods", Short: "Display a live stream of resource usage statistics for the containers in one or more pods",
Long: podStatsDescription, Long: podStatsDescription,
RunE: func(cmd *cobra.Command, args []string) error { RunE: func(cmd *cobra.Command, args []string) error {

2
cmd/podman/umount.go
View file

@ -31,7 +31,7 @@ var (
return umountCmd(&umountCommand) return umountCmd(&umountCommand)
}, },
Args: func(cmd *cobra.Command, args []string) error { Args: func(cmd *cobra.Command, args []string) error {
return checkAllAndLatest(cmd, args, true) return checkAllAndLatest(cmd, args, false)
}, },
Example: `podman umount ctrID Example: `podman umount ctrID
podman umount ctrID1 ctrID2 ctrID3 podman umount ctrID1 ctrID2 ctrID3