Skip to content

[Refactor] Move containerd client helper from cmd to pkg/clientutil #1780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AkihiroSuda merged 1 commit into from
Dec 31, 2022
Merged

[Refactor] Move containerd client helper from cmd to pkg/clientutil #1780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions cmd/nerdctl/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/containerd/containerd/errdefs"
dockerreference "github.com/containerd/containerd/reference/docker"
"github.com/containerd/nerdctl/pkg/buildkitutil"
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/defaults"
"github.com/containerd/nerdctl/pkg/platformutil"
"github.com/containerd/nerdctl/pkg/strutil"
Expand Down Expand Up @@ -194,10 +195,17 @@ func buildAction(cmd *cobra.Command, args []string) error {
return err
}
}

namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if len(tags) > 1 {
logrus.Debug("Found more than 1 tag")
client, ctx, cancel, err := newClient(cmd)
if err != nil {
return fmt.Errorf("unable to tag images: %s", err)
}
Expand Down Expand Up @@ -241,8 +249,16 @@ func generateBuildctlArgs(cmd *cobra.Command, buildkitHost string, platform, arg
if err != nil {
return "", nil, false, "", nil, nil, err
}
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return "", nil, false, "", nil, nil, err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return "", nil, false, "", nil, nil, err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if output == "" {
client, ctx, cancel, err := newClient(cmd)
if err != nil {
Comment thread
Zheaoli marked this conversation as resolved.
return "", nil, false, "", nil, nil, err
}
Expand Down
14 changes: 13 additions & 1 deletion cmd/nerdctl/commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"fmt"
"strings"

"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/idutil/containerwalker"
"github.com/containerd/nerdctl/pkg/imgutil/commit"
"github.com/containerd/nerdctl/pkg/referenceutil"
Expand Down Expand Up @@ -51,8 +52,19 @@ func commitAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)

client, ctx, cancel, err := newClient(cmd)
if err != nil {
return err
}
if err != nil {
return err
}
Expand Down
21 changes: 19 additions & 2 deletions cmd/nerdctl/completion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,22 @@ import (
"time"

"github.com/containerd/containerd"
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/labels"
"github.com/containerd/nerdctl/pkg/netutil"
"github.com/spf13/cobra"
)

func shellCompleteImageNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return nil, cobra.ShellCompDirectiveError
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return nil, cobra.ShellCompDirectiveError
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return nil, cobra.ShellCompDirectiveError
}
Expand All @@ -46,7 +55,15 @@ func shellCompleteImageNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirec
}

func shellCompleteContainerNames(cmd *cobra.Command, filterFunc func(containerd.ProcessStatus) bool) ([]string, cobra.ShellCompDirective) {
client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return nil, cobra.ShellCompDirectiveError
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return nil, cobra.ShellCompDirectiveError
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return nil, cobra.ShellCompDirectiveError
}
Expand Down
11 changes: 10 additions & 1 deletion cmd/nerdctl/compose_build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package main

import (
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/composer"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -49,8 +50,16 @@ func composeBuildAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}

client, ctx, cancel, err := newClient(cmd)
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
11 changes: 10 additions & 1 deletion cmd/nerdctl/compose_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package main
import (
"fmt"

"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/composer"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -62,8 +63,16 @@ func composeConfigAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}

client, ctx, cancel, err := newClient(cmd)
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
11 changes: 10 additions & 1 deletion cmd/nerdctl/compose_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package main
import (
"errors"

"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/composer"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -63,7 +64,15 @@ func composeCreateAction(cmd *cobra.Command, args []string) error {
return errors.New("flag --force-recreate and --no-recreate cannot be specified together")
}

client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
15 changes: 12 additions & 3 deletions cmd/nerdctl/compose_down.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package main

import (
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/composer"
"github.com/spf13/cobra"
)
Expand All @@ -40,12 +41,20 @@ func composeDownAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}

removeOrphans, err := cmd.Flags().GetBool("remove-orphans")
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := newClient(cmd)
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}

removeOrphans, err := cmd.Flags().GetBool("remove-orphans")
if err != nil {
return err
}
Expand Down
11 changes: 10 additions & 1 deletion cmd/nerdctl/compose_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package main
import (
"errors"

"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/composer"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -94,7 +95,15 @@ func composeExecAction(cmd *cobra.Command, args []string) error {
return errors.New("currently flag -t and -d cannot be specified together (FIXME)")
}

client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
12 changes: 10 additions & 2 deletions cmd/nerdctl/compose_images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/containerd/containerd"
"github.com/containerd/containerd/pkg/progress"
"github.com/containerd/containerd/snapshots"
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/imgutil"
"github.com/containerd/nerdctl/pkg/labels"
"github.com/containerd/nerdctl/pkg/strutil"
Expand All @@ -50,8 +51,15 @@ func composeImagesAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}

client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
11 changes: 10 additions & 1 deletion cmd/nerdctl/compose_kill.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package main

import (
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/composer"
"github.com/spf13/cobra"
)
Expand All @@ -38,7 +39,15 @@ func composeKillAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
11 changes: 10 additions & 1 deletion cmd/nerdctl/compose_logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package main

import (
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/composer"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -58,8 +59,16 @@ func composeLogsAction(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}

client, ctx, cancel, err := newClient(cmd)
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
21 changes: 19 additions & 2 deletions cmd/nerdctl/compose_pause.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"sync"

"github.com/containerd/containerd"
"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/labels"
"github.com/spf13/cobra"
"golang.org/x/sync/errgroup"
Expand All @@ -39,7 +40,15 @@ func newComposePauseCommand() *cobra.Command {
}

func composePauseAction(cmd *cobra.Command, args []string) error {
client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down Expand Up @@ -97,7 +106,15 @@ func newComposeUnpauseCommand() *cobra.Command {
}

func composeUnpauseAction(cmd *cobra.Command, args []string) error {
client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
12 changes: 10 additions & 2 deletions cmd/nerdctl/compose_port.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"fmt"
"strconv"

"github.com/containerd/nerdctl/pkg/clientutil"
"github.com/containerd/nerdctl/pkg/composer"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -65,8 +66,15 @@ func composePortAction(cmd *cobra.Command, args []string) error {
if port <= 0 {
return fmt.Errorf("unexpected port: %d", port)
}

client, ctx, cancel, err := newClient(cmd)
namespace, err := cmd.Flags().GetString("namespace")
if err != nil {
return err
}
address, err := cmd.Flags().GetString("address")
if err != nil {
return err
}
client, ctx, cancel, err := clientutil.NewClient(cmd.Context(), namespace, address)
if err != nil {
return err
}
Expand Down
Loading