Merge pull request #559 from openSUSE/urfave-cli-2

Switch to urfave/cli/v2
kubernetes-sigs · Feb 11, 2020 · acd1611 · acd1611
2 parents 3e9b7dc + 3216a7e
commit acd1611
Show file tree

Hide file tree

Showing 61 changed files with 2,196 additions and 1,906 deletions.
diff --git a/cmd/crictl/attach.go b/cmd/crictl/attach.go
@@ -21,25 +21,26 @@ import (
 	"net/url"
 
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 	"golang.org/x/net/context"
 	pb "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
-var runtimeAttachCommand = cli.Command{
+var runtimeAttachCommand = &cli.Command{
 	Name:                   "attach",
 	Usage:                  "Attach to a running container",
 	ArgsUsage:              "CONTAINER-ID",
-	SkipArgReorder:         true,
 	UseShortOptionHandling: true,
 	Flags: []cli.Flag{
-		cli.BoolFlag{
-			Name:  "tty,t",
-			Usage: "Allocate a pseudo-TTY",
+		&cli.BoolFlag{
+			Name:    "tty",
+			Aliases: []string{"t"},
+			Usage:   "Allocate a pseudo-TTY",
 		},
-		cli.BoolFlag{
-			Name:  "stdin,i",
-			Usage: "Keep STDIN open",
+		&cli.BoolFlag{
+			Name:    "stdin",
+			Aliases: []string{"i"},
+			Usage:   "Keep STDIN open",
 		},
 	},
 	Action: func(context *cli.Context) error {

diff --git a/cmd/crictl/completion.go b/cmd/crictl/completion.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
 var bashCompletionTemplate = `_cli_bash_autocomplete() {
@@ -47,7 +47,7 @@ func bashCompletion(c *cli.Context) error {
 
 	for _, flag := range c.App.Flags {
 		// only includes full flag name.
-		subcommands = append(subcommands, "--"+strings.Split(flag.GetName(), ",")[0])
+		subcommands = append(subcommands, "--"+flag.Names()[0])
 	}
 
 	fmt.Fprintln(c.App.Writer, fmt.Sprintf(bashCompletionTemplate, strings.Join(subcommands, "\n")))
@@ -83,15 +83,15 @@ func zshCompletion(c *cli.Context) error {
 	opts := []string{}
 	for _, flag := range c.App.Flags {
 		// only includes full flag name.
-		opts = append(opts, "--"+strings.Split(flag.GetName(), ",")[0])
+		opts = append(opts, "--"+flag.Names()[0])
 	}
 
 	fmt.Fprintln(c.App.Writer, fmt.Sprintf(zshCompletionTemplate, strings.Join(subcommands, "' '"), strings.Join(opts, "' '")))
 	return nil
 
 }
 
-var completionCommand = cli.Command{
+var completionCommand = &cli.Command{
 	Name:      "completion",
 	Usage:     "Output shell completion code",
 	ArgsUsage: "SHELL",

diff --git a/cmd/crictl/config.go b/cmd/crictl/config.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 	"gopkg.in/yaml.v2"
 )
 
@@ -63,20 +63,19 @@ func writeConfig(c *Config, filepath string) error {
 	return ioutil.WriteFile(filepath, data, 0644)
 }
 
-var configCommand = cli.Command{
+var configCommand = &cli.Command{
 	Name:                   "config",
 	Usage:                  "Get and set crictl options",
 	ArgsUsage:              "[<options>]",
-	SkipArgReorder:         true,
 	UseShortOptionHandling: true,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "get",
 			Usage: "get value: name",
 		},
 	},
 	Action: func(context *cli.Context) error {
-		configFile := context.GlobalString("config")
+		configFile := context.String("config")
 		if _, err := os.Stat(configFile); err != nil {
 			if err := writeConfig(nil, configFile); err != nil {
 				return err