mirror of
https://github.com/containers/podman.git
synced 2025-06-21 01:19:15 +08:00
V2 enable ps tests
* Combine cobra.Command helper functions into validate package from registry and common packages * Introduce ChoiceValue for flags Signed-off-by: Jhon Honce <jhonce@redhat.com>
This commit is contained in:
@ -9,10 +9,10 @@ func verifyExpose(expose []string) error {
|
||||
// add the expose ports from the user (--expose)
|
||||
// can be single or a range
|
||||
for _, expose := range expose {
|
||||
//support two formats for expose, original format <portnum>/[<proto>] or <startport-endport>/[<proto>]
|
||||
// support two formats for expose, original format <portnum>/[<proto>] or <startport-endport>/[<proto>]
|
||||
_, port := nat.SplitProtoPort(expose)
|
||||
//parse the start and end port and create a sequence of ports to expose
|
||||
//if expose a port, the start and end port are the same
|
||||
// parse the start and end port and create a sequence of ports to expose
|
||||
// if expose a port, the start and end port are the same
|
||||
_, _, err := nat.ParsePortRange(port)
|
||||
if err != nil {
|
||||
return errors.Wrapf(err, "invalid range format for --expose: %s", expose)
|
||||
|
@ -192,7 +192,7 @@ func getMemoryLimits(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []strin
|
||||
func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string) error {
|
||||
var (
|
||||
err error
|
||||
//namespaces map[string]string
|
||||
// namespaces map[string]string
|
||||
)
|
||||
|
||||
// validate flags as needed
|
||||
@ -485,7 +485,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
|
||||
// TODO
|
||||
// ouitside of specgen and oci though
|
||||
// defaults to true, check spec/storage
|
||||
//s.readon = c.ReadOnlyTmpFS
|
||||
// s.readon = c.ReadOnlyTmpFS
|
||||
// TODO convert to map?
|
||||
// check if key=value and convert
|
||||
sysmap := make(map[string]string)
|
||||
@ -528,7 +528,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
|
||||
|
||||
// Only add read-only tmpfs mounts in case that we are read-only and the
|
||||
// read-only tmpfs flag has been set.
|
||||
mounts, volumes, err := parseVolumes(c.Volume, c.Mount, c.TmpFS, (c.ReadOnlyTmpFS && c.ReadOnly))
|
||||
mounts, volumes, err := parseVolumes(c.Volume, c.Mount, c.TmpFS, c.ReadOnlyTmpFS && c.ReadOnly)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@ -536,12 +536,12 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
|
||||
s.Volumes = volumes
|
||||
|
||||
// TODO any idea why this was done
|
||||
//devices := rtc.Containers.Devices
|
||||
// devices := rtc.Containers.Devices
|
||||
// TODO conflict on populate?
|
||||
//
|
||||
//if c.Changed("device") {
|
||||
// if c.Changed("device") {
|
||||
// devices = append(devices, c.StringSlice("device")...)
|
||||
//}
|
||||
// }
|
||||
|
||||
for _, dev := range c.Devices {
|
||||
s.Devices = append(s.Devices, specs.LinuxDevice{Path: dev})
|
||||
@ -553,7 +553,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
|
||||
// initpath
|
||||
s.Stdin = c.Interactive
|
||||
// quiet
|
||||
//DeviceCgroupRules: c.StringSlice("device-cgroup-rule"),
|
||||
// DeviceCgroupRules: c.StringSlice("device-cgroup-rule"),
|
||||
|
||||
// Rlimits/Ulimits
|
||||
for _, u := range c.Ulimit {
|
||||
@ -573,10 +573,10 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
|
||||
s.Rlimits = append(s.Rlimits, rl)
|
||||
}
|
||||
|
||||
//Tmpfs: c.StringArray("tmpfs"),
|
||||
// Tmpfs: c.StringArray("tmpfs"),
|
||||
|
||||
// TODO how to handle this?
|
||||
//Syslog: c.Bool("syslog"),
|
||||
// Syslog: c.Bool("syslog"),
|
||||
|
||||
logOpts := make(map[string]string)
|
||||
for _, o := range c.LogOptions {
|
||||
@ -602,7 +602,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string
|
||||
s.StopTimeout = &c.StopTimeout
|
||||
|
||||
// TODO where should we do this?
|
||||
//func verifyContainerResources(config *cc.CreateConfig, update bool) ([]string, error) {
|
||||
// func verifyContainerResources(config *cc.CreateConfig, update bool) ([]string, error) {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -1,11 +1,8 @@
|
||||
package common
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"github.com/cri-o/ocicni/pkg/ocicni"
|
||||
"github.com/docker/go-connections/nat"
|
||||
"github.com/pkg/errors"
|
||||
@ -44,11 +41,3 @@ func createPortBindings(ports []string) ([]ocicni.PortMapping, error) {
|
||||
}
|
||||
return portBindings, nil
|
||||
}
|
||||
|
||||
// NoArgs returns an error if any args are included.
|
||||
func NoArgs(cmd *cobra.Command, args []string) error {
|
||||
if len(args) > 0 {
|
||||
return fmt.Errorf("`%s` takes no arguments", cmd.CommandPath())
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ package containers
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/containers/libpod/pkg/util"
|
||||
"github.com/spf13/cobra"
|
||||
@ -17,7 +18,7 @@ var (
|
||||
Short: "Manage containers",
|
||||
Long: "Manage containers",
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
}
|
||||
|
||||
containerConfig = util.DefaultContainerConfig()
|
||||
|
@ -59,7 +59,7 @@ func init() {
|
||||
Mode: []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
|
||||
Command: createCommand,
|
||||
})
|
||||
//common.GetCreateFlags(createCommand)
|
||||
// common.GetCreateFlags(createCommand)
|
||||
flags := createCommand.Flags()
|
||||
createFlags(flags)
|
||||
|
||||
|
@ -3,6 +3,7 @@ package containers
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/report"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/spf13/cobra"
|
||||
@ -12,7 +13,7 @@ var (
|
||||
// podman container _diff_
|
||||
diffCmd = &cobra.Command{
|
||||
Use: "diff [flags] CONTAINER",
|
||||
Args: registry.IdOrLatestArgs,
|
||||
Args: validate.IdOrLatestArgs,
|
||||
Short: "Inspect changes on container's file systems",
|
||||
Long: `Displays changes on a container filesystem. The container will be compared to its parent layer.`,
|
||||
RunE: diff,
|
||||
|
@ -1,8 +1,8 @@
|
||||
package containers
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -12,7 +12,7 @@ var (
|
||||
listCmd = &cobra.Command{
|
||||
Use: "list",
|
||||
Aliases: []string{"ls"},
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Short: "List containers",
|
||||
Long: "Prints out information about the containers",
|
||||
RunE: ps,
|
||||
|
@ -12,8 +12,8 @@ import (
|
||||
|
||||
tm "github.com/buger/goterm"
|
||||
"github.com/containers/buildah/pkg/formats"
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/cri-o/ocicni/pkg/ocicni"
|
||||
"github.com/docker/go-units"
|
||||
@ -26,7 +26,7 @@ var (
|
||||
psDescription = "Prints out information about the containers"
|
||||
psCommand = &cobra.Command{
|
||||
Use: "ps",
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Short: "List containers",
|
||||
Long: psDescription,
|
||||
RunE: ps,
|
||||
@ -41,7 +41,7 @@ var (
|
||||
}
|
||||
filters []string
|
||||
noTrunc bool
|
||||
defaultHeaders string = "CONTAINER ID\tIMAGE\tCOMMAND\tCREATED\tSTATUS\tPORTS\tNAMES"
|
||||
defaultHeaders = "CONTAINER ID\tIMAGE\tCOMMAND\tCREATED\tSTATUS\tPORTS\tNAMES"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@ -64,9 +64,12 @@ func listFlagSet(flags *pflag.FlagSet) {
|
||||
flags.BoolVarP(&listOpts.Pod, "pod", "p", false, "Print the ID and name of the pod the containers are associated with")
|
||||
flags.BoolVarP(&listOpts.Quiet, "quiet", "q", false, "Print the numeric IDs of the containers only")
|
||||
flags.BoolVarP(&listOpts.Size, "size", "s", false, "Display the total file sizes")
|
||||
flags.StringVar(&listOpts.Sort, "sort", "created", "Sort output by command, created, id, image, names, runningfor, size, or status")
|
||||
flags.BoolVar(&listOpts.Sync, "sync", false, "Sync container state with OCI runtime")
|
||||
flags.UintVarP(&listOpts.Watch, "watch", "w", 0, "Watch the ps output on an interval in seconds")
|
||||
|
||||
created := validate.ChoiceValue(&listOpts.Sort, "command", "created", "id", "image", "names", "runningfor", "size", "status")
|
||||
flags.Var(created, "sort", "Sort output by: "+created.Choices())
|
||||
|
||||
if registry.IsRemote() {
|
||||
_ = flags.MarkHidden("latest")
|
||||
}
|
||||
@ -175,7 +178,7 @@ func ps(cmd *cobra.Command, args []string) error {
|
||||
|
||||
headers, format := createPsOut()
|
||||
if cmd.Flag("format").Changed {
|
||||
format = listOpts.Format
|
||||
format = strings.TrimPrefix(listOpts.Format, "table ")
|
||||
if !strings.HasPrefix(format, "\n") {
|
||||
format += "\n"
|
||||
}
|
||||
@ -352,7 +355,7 @@ func portsToString(ports []ocicni.PortMapping) string {
|
||||
if len(ports) == 0 {
|
||||
return ""
|
||||
}
|
||||
//Sort the ports, so grouping continuous ports become easy.
|
||||
// Sort the ports, so grouping continuous ports become easy.
|
||||
sort.Slice(ports, func(i, j int) bool {
|
||||
return comparePorts(ports[i], ports[j])
|
||||
})
|
||||
|
@ -7,6 +7,7 @@ import (
|
||||
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/utils"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/libpod/define"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/pkg/errors"
|
||||
@ -22,7 +23,7 @@ var (
|
||||
Short: "Block on one or more containers",
|
||||
Long: waitDescription,
|
||||
RunE: wait,
|
||||
Args: registry.IdOrLatestArgs,
|
||||
Args: validate.IdOrLatestArgs,
|
||||
Example: `podman wait --latest
|
||||
podman wait --interval 5000 ctrID
|
||||
podman wait ctrID1 ctrID2`,
|
||||
|
@ -6,6 +6,7 @@ import (
|
||||
"github.com/containers/libpod/cmd/podman/containers"
|
||||
"github.com/containers/libpod/cmd/podman/images"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -17,7 +18,7 @@ var (
|
||||
diffDescription = `Displays changes on a container or image's filesystem. The container or image will be compared to its parent layer.`
|
||||
diffCmd = &cobra.Command{
|
||||
Use: "diff [flags] {CONTAINER_ID | IMAGE_ID}",
|
||||
Args: registry.IdOrLatestArgs,
|
||||
Args: validate.IdOrLatestArgs,
|
||||
Short: "Display the changes of object's file system",
|
||||
Long: diffDescription,
|
||||
TraverseChildren: true,
|
||||
|
@ -2,6 +2,7 @@ package pods
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/containers/libpod/pkg/util"
|
||||
"github.com/spf13/cobra"
|
||||
@ -14,7 +15,7 @@ var (
|
||||
Short: "Generate structured data based on containers and pods.",
|
||||
Long: "Generate structured data (e.g., Kubernetes yaml or systemd units) based on containers and pods.",
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
}
|
||||
containerConfig = util.DefaultContainerConfig()
|
||||
)
|
||||
|
@ -2,6 +2,7 @@ package healthcheck
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -13,7 +14,7 @@ var (
|
||||
Short: "Manage Healthcheck",
|
||||
Long: "Manage Healthcheck",
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -2,6 +2,7 @@ package images
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -16,7 +17,7 @@ var (
|
||||
Short: "Manage images",
|
||||
Long: "Manage images",
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -6,8 +6,8 @@ import (
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/spf13/cobra"
|
||||
@ -19,7 +19,7 @@ var (
|
||||
If an image is not being used by a container, it will be removed from the system.`
|
||||
pruneCmd = &cobra.Command{
|
||||
Use: "prune",
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Short: "Remove unused images",
|
||||
Long: pruneDescription,
|
||||
RunE: prune,
|
||||
|
@ -2,6 +2,7 @@ package manifest
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -13,7 +14,7 @@ var (
|
||||
Short: "Manipulate manifest lists and image indexes",
|
||||
Long: manifestDescription,
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
Example: `podman manifest create localhost/list
|
||||
podman manifest inspect localhost/list`,
|
||||
}
|
||||
|
@ -2,6 +2,7 @@ package images
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -13,13 +14,13 @@ var (
|
||||
Short: "Manage networks",
|
||||
Long: "Manage networks",
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
}
|
||||
)
|
||||
|
||||
// TODO add the following to main.go to get networks back onto the
|
||||
// command list.
|
||||
//_ "github.com/containers/libpod/cmd/podman/networks"
|
||||
// _ "github.com/containers/libpod/cmd/podman/networks"
|
||||
func init() {
|
||||
registry.Commands = append(registry.Commands, registry.CliCommand{
|
||||
Mode: []entities.EngineMode{entities.ABIMode},
|
||||
|
@ -1,4 +1,4 @@
|
||||
//nolint
|
||||
// nolint
|
||||
// most of these validate and parse functions have been taken from projectatomic/docker
|
||||
// and modified for cri-o
|
||||
package parse
|
||||
@ -46,7 +46,7 @@ var (
|
||||
// validateExtraHost validates that the specified string is a valid extrahost and returns it.
|
||||
// ExtraHost is in the form of name:ip where the ip has to be a valid ip (ipv4 or ipv6).
|
||||
// for add-host flag
|
||||
func ValidateExtraHost(val string) (string, error) { //nolint
|
||||
func ValidateExtraHost(val string) (string, error) { // nolint
|
||||
// allow for IPv6 addresses in extra hosts by only splitting on first ":"
|
||||
arr := strings.SplitN(val, ":", 2)
|
||||
if len(arr) != 2 || len(arr[0]) == 0 {
|
||||
|
@ -1,4 +1,4 @@
|
||||
//nolint
|
||||
// nolint
|
||||
// most of these validate and parse functions have been taken from projectatomic/docker
|
||||
// and modified for cri-o
|
||||
package parse
|
||||
@ -41,7 +41,7 @@ func TestValidateExtraHost(t *testing.T) {
|
||||
want string
|
||||
wantErr bool
|
||||
}{
|
||||
//2001:0db8:85a3:0000:0000:8a2e:0370:7334
|
||||
// 2001:0db8:85a3:0000:0000:8a2e:0370:7334
|
||||
{name: "good-ipv4", args: args{val: "foobar:192.168.1.1"}, want: "foobar:192.168.1.1", wantErr: false},
|
||||
{name: "bad-ipv4", args: args{val: "foobar:999.999.999.99"}, want: "", wantErr: true},
|
||||
{name: "bad-ipv4", args: args{val: "foobar:999.999.999"}, want: "", wantErr: true},
|
||||
|
@ -9,6 +9,7 @@ import (
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/parse"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/containers/libpod/pkg/errorhandling"
|
||||
"github.com/containers/libpod/pkg/specgen"
|
||||
@ -24,7 +25,7 @@ var (
|
||||
|
||||
createCommand = &cobra.Command{
|
||||
Use: "create",
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Short: "Create a new empty pod",
|
||||
Long: podCreateDescription,
|
||||
RunE: create,
|
||||
@ -116,7 +117,7 @@ func create(cmd *cobra.Command, args []string) error {
|
||||
case "slip4netns":
|
||||
n.NSMode = specgen.Slirp
|
||||
default:
|
||||
if strings.HasPrefix(netInput, "container:") { //nolint
|
||||
if strings.HasPrefix(netInput, "container:") { // nolint
|
||||
split := strings.Split(netInput, ":")
|
||||
if len(split) != 2 {
|
||||
return errors.Errorf("invalid network paramater: %q", netInput)
|
||||
|
@ -2,6 +2,7 @@ package pods
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/containers/libpod/pkg/util"
|
||||
"github.com/spf13/cobra"
|
||||
@ -17,7 +18,7 @@ var (
|
||||
Short: "Manage pods",
|
||||
Long: "Manage pods",
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
}
|
||||
containerConfig = util.DefaultContainerConfig()
|
||||
)
|
||||
|
@ -11,8 +11,8 @@ import (
|
||||
"text/template"
|
||||
"time"
|
||||
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/docker/go-units"
|
||||
"github.com/pkg/errors"
|
||||
@ -29,12 +29,12 @@ var (
|
||||
Short: "list pods",
|
||||
Long: psDescription,
|
||||
RunE: pods,
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
}
|
||||
)
|
||||
|
||||
var (
|
||||
defaultHeaders string = "POD ID\tNAME\tSTATUS\tCREATED"
|
||||
defaultHeaders = "POD ID\tNAME\tSTATUS\tCREATED"
|
||||
inputFilters []string
|
||||
noTrunc bool
|
||||
psInput entities.PodPSOptions
|
||||
|
@ -2,11 +2,9 @@ package registry
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/containers/libpod/pkg/domain/infra"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
@ -77,21 +75,6 @@ func NewContainerEngine(cmd *cobra.Command, args []string) (entities.ContainerEn
|
||||
return containerEngine, nil
|
||||
}
|
||||
|
||||
func SubCommandExists(cmd *cobra.Command, args []string) error {
|
||||
if len(args) > 0 {
|
||||
return errors.Errorf("unrecognized command `%[1]s %[2]s`\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0])
|
||||
}
|
||||
return errors.Errorf("missing command '%[1]s COMMAND'\nTry '%[1]s --help' for more information.", cmd.CommandPath())
|
||||
}
|
||||
|
||||
// IdOrLatestArgs used to validate a nameOrId was provided or the "--latest" flag
|
||||
func IdOrLatestArgs(cmd *cobra.Command, args []string) error {
|
||||
if len(args) > 1 || (len(args) == 0 && !cmd.Flag("latest").Changed) {
|
||||
return fmt.Errorf("%s requires a name, id or the '--latest' flag", cmd.Name())
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type PodmanOptionsKey struct{}
|
||||
|
||||
func Context() context.Context {
|
||||
|
@ -9,6 +9,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/containers/libpod/pkg/rootless"
|
||||
"github.com/containers/libpod/pkg/tracing"
|
||||
@ -60,7 +61,7 @@ var (
|
||||
SilenceErrors: true,
|
||||
TraverseChildren: true,
|
||||
PersistentPreRunE: persistentPreRunE,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
PersistentPostRunE: persistentPostRunE,
|
||||
Version: version.Version,
|
||||
}
|
||||
|
@ -7,8 +7,8 @@ import (
|
||||
"os"
|
||||
|
||||
"github.com/containers/buildah/pkg/formats"
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/libpod/events"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/pkg/errors"
|
||||
@ -19,7 +19,7 @@ var (
|
||||
eventsDescription = "Monitor podman events"
|
||||
eventsCommand = &cobra.Command{
|
||||
Use: "events",
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Short: "Show podman events",
|
||||
Long: eventsDescription,
|
||||
RunE: eventsCmd,
|
||||
|
@ -5,8 +5,8 @@ import (
|
||||
"os"
|
||||
"text/template"
|
||||
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/ghodss/yaml"
|
||||
"github.com/spf13/cobra"
|
||||
@ -19,7 +19,7 @@ var (
|
||||
`
|
||||
infoCommand = &cobra.Command{
|
||||
Use: "info",
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Long: infoDescription,
|
||||
Short: "Display podman system information",
|
||||
RunE: info,
|
||||
|
@ -2,6 +2,7 @@ package system
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -16,7 +17,7 @@ var (
|
||||
Short: "Manage podman",
|
||||
Long: "Manage podman",
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
}
|
||||
)
|
||||
|
||||
|
@ -9,8 +9,8 @@ import (
|
||||
"time"
|
||||
|
||||
"github.com/containers/buildah/pkg/formats"
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/libpod/define"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/pkg/errors"
|
||||
@ -20,7 +20,7 @@ import (
|
||||
var (
|
||||
versionCommand = &cobra.Command{
|
||||
Use: "version",
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Short: "Display the Podman Version Information",
|
||||
RunE: version,
|
||||
Annotations: map[string]string{
|
||||
@ -56,14 +56,14 @@ func version(cmd *cobra.Command, args []string) error {
|
||||
// TODO we need to discuss how to implement
|
||||
// this more. current endpoints dont have a
|
||||
// version endpoint. maybe we use info?
|
||||
//if remote {
|
||||
// if remote {
|
||||
// v.Server, err = getRemoteVersion(c)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
//} else {
|
||||
// } else {
|
||||
v.Server = v.Client
|
||||
//}
|
||||
// }
|
||||
|
||||
versionOutputFormat := versionFormat
|
||||
if versionOutputFormat != "" {
|
||||
|
@ -2,7 +2,7 @@ package utils
|
||||
|
||||
import "github.com/spf13/pflag"
|
||||
|
||||
// AliasFlags is a function to handle backwards compatability with old flags
|
||||
// AliasFlags is a function to handle backwards compatibility with old flags
|
||||
func AliasFlags(f *pflag.FlagSet, name string) pflag.NormalizedName {
|
||||
switch name {
|
||||
case "healthcheck-command":
|
||||
|
32
cmd/podman/validate/args.go
Normal file
32
cmd/podman/validate/args.go
Normal file
@ -0,0 +1,32 @@
|
||||
package validate
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
// NoArgs returns an error if any args are included.
|
||||
func NoArgs(cmd *cobra.Command, args []string) error {
|
||||
if len(args) > 0 {
|
||||
return fmt.Errorf("`%s` takes no arguments", cmd.CommandPath())
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// SubCommandExists returns an error if no sub command is provided
|
||||
func SubCommandExists(cmd *cobra.Command, args []string) error {
|
||||
if len(args) > 0 {
|
||||
return errors.Errorf("unrecognized command `%[1]s %[2]s`\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0])
|
||||
}
|
||||
return errors.Errorf("missing command '%[1]s COMMAND'\nTry '%[1]s --help' for more information.", cmd.CommandPath())
|
||||
}
|
||||
|
||||
// IdOrLatestArgs used to validate a nameOrId was provided or the "--latest" flag
|
||||
func IdOrLatestArgs(cmd *cobra.Command, args []string) error {
|
||||
if len(args) > 1 || (len(args) == 0 && !cmd.Flag("latest").Changed) {
|
||||
return fmt.Errorf("`%s` requires a name, id or the \"--latest\" flag", cmd.CommandPath())
|
||||
}
|
||||
return nil
|
||||
}
|
46
cmd/podman/validate/choice.go
Normal file
46
cmd/podman/validate/choice.go
Normal file
@ -0,0 +1,46 @@
|
||||
package validate
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// Honors cobra.Value interface
|
||||
type choiceValue struct {
|
||||
value *string
|
||||
choices []string
|
||||
}
|
||||
|
||||
// ChoiceValue may be used in cobra FlagSet methods Var/VarP/VarPF() to select from a set of values
|
||||
//
|
||||
// Example:
|
||||
// created := validate.ChoiceValue(&opts.Sort, "command", "created", "id", "image", "names", "runningfor", "size", "status")
|
||||
// flags.Var(created, "sort", "Sort output by: "+created.Choices())
|
||||
func ChoiceValue(p *string, choices ...string) *choiceValue {
|
||||
return &choiceValue{
|
||||
value: p,
|
||||
choices: choices,
|
||||
}
|
||||
}
|
||||
|
||||
func (c *choiceValue) String() string {
|
||||
return *c.value
|
||||
}
|
||||
|
||||
func (c *choiceValue) Set(value string) error {
|
||||
for _, v := range c.choices {
|
||||
if v == value {
|
||||
*c.value = value
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return fmt.Errorf("%q is not a valid value. Choose from: %q", value, c.Choices())
|
||||
}
|
||||
|
||||
func (c *choiceValue) Choices() string {
|
||||
return strings.Join(c.choices, ", ")
|
||||
}
|
||||
|
||||
func (c *choiceValue) Type() string {
|
||||
return "choice"
|
||||
}
|
@ -9,8 +9,8 @@ import (
|
||||
"strings"
|
||||
"text/tabwriter"
|
||||
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/spf13/cobra"
|
||||
@ -25,7 +25,7 @@ and the output format can be changed to JSON or a user specified Go template.`
|
||||
lsCommand = &cobra.Command{
|
||||
Use: "ls",
|
||||
Aliases: []string{"list"},
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Short: "List volumes",
|
||||
Long: volumeLsDescription,
|
||||
RunE: list,
|
||||
|
@ -7,9 +7,9 @@ import (
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"github.com/containers/libpod/cmd/podman/common"
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/utils"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/spf13/cobra"
|
||||
@ -22,7 +22,7 @@ var (
|
||||
Note all data will be destroyed.`
|
||||
pruneCommand = &cobra.Command{
|
||||
Use: "prune",
|
||||
Args: common.NoArgs,
|
||||
Args: validate.NoArgs,
|
||||
Short: "Remove all unused volumes",
|
||||
Long: volumePruneDescription,
|
||||
RunE: prune,
|
||||
|
@ -2,6 +2,7 @@ package volumes
|
||||
|
||||
import (
|
||||
"github.com/containers/libpod/cmd/podman/registry"
|
||||
"github.com/containers/libpod/cmd/podman/validate"
|
||||
"github.com/containers/libpod/pkg/domain/entities"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
@ -16,7 +17,7 @@ var (
|
||||
Short: "Manage volumes",
|
||||
Long: "Volumes are created in and can be shared between containers",
|
||||
TraverseChildren: true,
|
||||
RunE: registry.SubCommandExists,
|
||||
RunE: validate.SubCommandExists,
|
||||
}
|
||||
)
|
||||
|
||||
|
Reference in New Issue
Block a user