Convert CLI to urfave v2

Followed the Migration Guide at https://cli.urfave.org/migrate-v1-to-v2/
The major changes not pointed out in the migration guide are:
- context.Args() no longer produces a []slice, so context.Args().Slice()
  in substitued
- All cli.Global***** are deprecated (the migration guide is somewhat
  unclear on this)

Signed-off-by: Derek Nola <derek.nola@suse.com>

Vendor in urfave cli/v2

Signed-off-by: Derek Nola <derek.nola@suse.com>

Fix NewStringSlice calls

Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola
2024-02-12 10:51:13 -08:00
parent d4d228926c
commit 132485adb0
149 changed files with 11041 additions and 4693 deletions

View File

@@ -25,33 +25,34 @@ import (
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/errdefs"
"github.com/containerd/log"
"github.com/urfave/cli"
"github.com/urfave/cli/v2"
)
var startCommand = cli.Command{
var startCommand = &cli.Command{
Name: "start",
Usage: "Start a container that has been created",
ArgsUsage: "CONTAINER",
Flags: append(platformStartFlags, []cli.Flag{
cli.BoolFlag{
&cli.BoolFlag{
Name: "null-io",
Usage: "Send all IO to /dev/null",
},
cli.StringFlag{
&cli.StringFlag{
Name: "log-uri",
Usage: "Log uri",
},
cli.StringFlag{
&cli.StringFlag{
Name: "fifo-dir",
Usage: "Directory used for storing IO FIFOs",
},
cli.StringFlag{
&cli.StringFlag{
Name: "pid-file",
Usage: "File path to write the task's pid",
},
cli.BoolFlag{
Name: "detach,d",
Usage: "Detach from the task after it has started execution",
&cli.BoolFlag{
Name: "detach",
Aliases: []string{"d"},
Usage: "Detach from the task after it has started execution",
},
}...),
Action: func(context *cli.Context) error {
@@ -137,7 +138,7 @@ var startCommand = cli.Command{
return err
}
if code != 0 {
return cli.NewExitError("", int(code))
return cli.Exit("", int(code))
}
return nil
},