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

16
cmd/ctr/commands/tasks/delete.go
View File

@@ -17,7 +17,7 @@
package tasks
import (
gocontext "context"
"context"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands"
@@ -42,12 +42,12 @@ var deleteCommand = &cli.Command{
Usage: "Process ID to kill",
},
},
Action: func(context *cli.Context) error {
Action: func(cliContext *cli.Context) error {
var (
execID = context.String("exec-id")
force = context.Bool("force")
execID = cliContext.String("exec-id")
force = cliContext.Bool("force")
)
client, ctx, cancel, err := commands.NewClient(context)
client, ctx, cancel, err := commands.NewClient(cliContext)
if err != nil {
return err
}
@@ -58,7 +58,7 @@ var deleteCommand = &cli.Command{
}
var exitErr error
if execID != "" {
task, err := loadTask(ctx, client, context.Args().First())
task, err := loadTask(ctx, client, cliContext.Args().First())
if err != nil {
return err
}
@@ -74,7 +74,7 @@ var deleteCommand = &cli.Command{
return cli.Exit("", int(ec))
}
} else {
for _, target := range context.Args().Slice() {
for _, target := range cliContext.Args().Slice() {
task, err := loadTask(ctx, client, target)
if err != nil {
if exitErr == nil {
@@ -100,7 +100,7 @@ var deleteCommand = &cli.Command{
},
}
func loadTask(ctx gocontext.Context, client *containerd.Client, containerID string) (containerd.Task, error) {
func loadTask(ctx context.Context, client *containerd.Client, containerID string) (containerd.Task, error) {
container, err := client.LoadContainer(ctx, containerID)
if err != nil {
return nil, err