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

@@ -29,33 +29,35 @@ import (
"github.com/containerd/platforms"
pluginutils "github.com/containerd/plugin"
v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli"
"github.com/urfave/cli/v2"
"google.golang.org/grpc/codes"
)
// Command is a cli command that outputs plugin information
var Command = cli.Command{
var Command = &cli.Command{
Name: "plugins",
Aliases: []string{"plugin"},
Usage: "Provides information about containerd plugins",
Subcommands: []cli.Command{
Subcommands: []*cli.Command{
listCommand,
inspectRuntimeCommand,
},
}
var listCommand = cli.Command{
var listCommand = &cli.Command{
Name: "list",
Aliases: []string{"ls"},
Usage: "Lists containerd plugins",
Flags: []cli.Flag{
cli.BoolFlag{
Name: "quiet,q",
Usage: "Print only the plugin ids",
&cli.BoolFlag{
Name: "quiet",
Aliases: []string{"q"},
Usage: "Print only the plugin ids",
},
cli.BoolFlag{
Name: "detailed,d",
Usage: "Print detailed information about each plugin",
&cli.BoolFlag{
Name: "detailed",
Aliases: []string{"d"},
Usage: "Print detailed information about each plugin",
},
},
Action: func(context *cli.Context) error {
@@ -69,7 +71,7 @@ var listCommand = cli.Command{
}
defer cancel()
ps := client.IntrospectionService()
response, err := ps.Plugins(ctx, context.Args())
response, err := ps.Plugins(ctx, context.Args().Slice())
if err != nil {
return err
}
@@ -165,7 +167,7 @@ func prettyPlatforms(pspb []*types.Platform) string {
return strings.Join(ps, ",")
}
var inspectRuntimeCommand = cli.Command{
var inspectRuntimeCommand = &cli.Command{
Name: "inspect-runtime",
Usage: "Display runtime info",
ArgsUsage: "[flags]",