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

@@ -23,20 +23,21 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/log"
"github.com/urfave/cli"
"github.com/urfave/cli/v2"
)
var deleteCommand = cli.Command{
var deleteCommand = &cli.Command{
Name: "delete",
Usage: "Delete one or more tasks",
ArgsUsage: "CONTAINER [CONTAINER, ...]",
Aliases: []string{"del", "remove", "rm"},
Flags: []cli.Flag{
cli.BoolFlag{
Name: "force, f",
Usage: "Force delete task process",
&cli.BoolFlag{
Name: "force",
Aliases: []string{"f"},
Usage: "Force delete task process",
},
cli.StringFlag{
&cli.StringFlag{
Name: "exec-id",
Usage: "Process ID to kill",
},
@@ -70,10 +71,10 @@ var deleteCommand = cli.Command{
return err
}
if ec := status.ExitCode(); ec != 0 {
return cli.NewExitError("", int(ec))
return cli.Exit("", int(ec))
}
} else {
for _, target := range context.Args() {
for _, target := range context.Args().Slice() {
task, err := loadTask(ctx, client, target)
if err != nil {
if exitErr == nil {