github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

cmd: don't alias context package, and use cliContext for cli.Context

Browse Source 
Unfortunately, this is a rather large diff, but perhaps worth a one-time
"rip off the bandaid" for v2. This patch removes the use of "gocontext"
as alias for stdLib's "context", and uses "cliContext" for uses of
cli.context.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-06-20 02:15:13 +02:00
parent 741c4bde51
commit dd0542f7c1
65 changed files with 754 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/ctr/commands/leases/leases.go
View File

@@ -54,12 +54,12 @@ var listCommand = &cli.Command{
Usage: "Print only the blob digest",
},
},
Action: func(context *cli.Context) error {
Action: func(cliContext *cli.Context) error {
var (
filters = context.Args().Slice()
quiet = context.Bool("quiet")
filters = cliContext.Args().Slice()
quiet = cliContext.Bool("quiet")
)
client, ctx, cancel, err := commands.NewClient(context)
client, ctx, cancel, err := commands.NewClient(cliContext)
if err != nil {
return err
}
@@ -117,9 +117,9 @@ var createCommand = &cli.Command{
Value: 24 * time.Hour,
},
},
Action: func(context *cli.Context) error {
var labelstr = context.Args().Slice()
client, ctx, cancel, err := commands.NewClient(context)
Action: func(cliContext *cli.Context) error {
var labelstr = cliContext.Args().Slice()
client, ctx, cancel, err := commands.NewClient(cliContext)
if err != nil {
return err
}
@@ -136,10 +136,10 @@ var createCommand = &cli.Command{
opts = append(opts, leases.WithLabels(labels))
}
if id := context.String("id"); id != "" {
if id := cliContext.String("id"); id != "" {
opts = append(opts, leases.WithID(id))
}
if exp := context.Duration("expires"); exp > 0 {
if exp := cliContext.Duration("expires"); exp > 0 {
opts = append(opts, leases.WithExpiration(exp))
}
@@ -166,19 +166,19 @@ var deleteCommand = &cli.Command{
Usage: "Synchronously remove leases and all unreferenced resources",
},
},
Action: func(context *cli.Context) error {
var lids = context.Args().Slice()
Action: func(cliContext *cli.Context) error {
var lids = cliContext.Args().Slice()
if len(lids) == 0 {
return cli.ShowSubcommandHelp(context)
return cli.ShowSubcommandHelp(cliContext)
}
client, ctx, cancel, err := commands.NewClient(context)
client, ctx, cancel, err := commands.NewClient(cliContext)
if err != nil {
return err
}
defer cancel()
ls := client.LeasesService()
sync := context.Bool("sync")
sync := cliContext.Bool("sync")
for i, lid := range lids {
var opts []leases.DeleteOpt
if sync && i == len(lids)-1 {