Skip to content

Commit b8b5d70

Browse files
apostasieapostasie
committed
Move away flagutil under helpers
Signed-off-by: apostasie <[email protected]>
1 parent 51af369 commit b8b5d70

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+197
-118
lines changed

‎cmd/nerdctl/builder.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func builderPruneAction(cmd *cobra.Command, _ []string) error {
102102
}
103103

104104
func processBuilderPruneOptions(cmd *cobra.Command) (types.BuilderPruneOptions, error) {
105-
globalOptions, err := processRootCmdFlags(cmd)
105+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
106106
if err != nil {
107107
return types.BuilderPruneOptions{}, err
108108
}
@@ -151,7 +151,7 @@ func newBuilderDebugCommand() *cobra.Command {
151151
}
152152

153153
func builderDebugAction(cmd *cobra.Command, args []string) error {
154-
globalOptions, err := processRootCmdFlags(cmd)
154+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
155155
if err != nil {
156156
return err
157157
}

‎cmd/nerdctl/builder_build.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
"github.com/spf13/cobra"
2727

28+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
2829
"github.com/containerd/nerdctl/v2/pkg/api/types"
2930
"github.com/containerd/nerdctl/v2/pkg/buildkitutil"
3031
"github.com/containerd/nerdctl/v2/pkg/clientutil"
@@ -82,7 +83,7 @@ If Dockerfile is not present and -f is not specified, it will look for Container
8283
}
8384

8485
func processBuildCommandFlag(cmd *cobra.Command, args []string) (types.BuilderBuildOptions, error) {
85-
globalOptions, err := processRootCmdFlags(cmd)
86+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
8687
if err != nil {
8788
return types.BuilderBuildOptions{}, err
8889
}

‎cmd/nerdctl/completion.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ import (
2424

2525
containerd "github.com/containerd/containerd/v2/client"
2626

27+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
2728
"github.com/containerd/nerdctl/v2/pkg/clientutil"
2829
"github.com/containerd/nerdctl/v2/pkg/labels"
2930
"github.com/containerd/nerdctl/v2/pkg/netutil"
3031
)
3132

3233
func shellCompleteImageNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
33-
globalOptions, err := processRootCmdFlags(cmd)
34+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
3435
if err != nil {
3536
return nil, cobra.ShellCompDirectiveError
3637
}
@@ -53,7 +54,7 @@ func shellCompleteImageNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirec
5354
}
5455

5556
func shellCompleteContainerNames(cmd *cobra.Command, filterFunc func(containerd.ProcessStatus) bool) ([]string, cobra.ShellCompDirective) {
56-
globalOptions, err := processRootCmdFlags(cmd)
57+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
5758
if err != nil {
5859
return nil, cobra.ShellCompDirectiveError
5960
}
@@ -102,7 +103,7 @@ func shellCompleteContainerNames(cmd *cobra.Command, filterFunc func(containerd.
102103

103104
// shellCompleteNetworkNames includes {"bridge","host","none"}
104105
func shellCompleteNetworkNames(cmd *cobra.Command, exclude []string) ([]string, cobra.ShellCompDirective) {
105-
globalOptions, err := processRootCmdFlags(cmd)
106+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
106107
if err != nil {
107108
return nil, cobra.ShellCompDirectiveError
108109
}
@@ -134,7 +135,7 @@ func shellCompleteNetworkNames(cmd *cobra.Command, exclude []string) ([]string,
134135
}
135136

136137
func shellCompleteVolumeNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
137-
globalOptions, err := processRootCmdFlags(cmd)
138+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
138139
if err != nil {
139140
return nil, cobra.ShellCompDirectiveError
140141
}

‎cmd/nerdctl/compose_build.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
2223
"github.com/containerd/nerdctl/v2/pkg/clientutil"
2324
"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
2425
"github.com/containerd/nerdctl/v2/pkg/composer"
@@ -40,7 +41,7 @@ func newComposeBuildCommand() *cobra.Command {
4041
}
4142

4243
func composeBuildAction(cmd *cobra.Command, args []string) error {
43-
globalOptions, err := processRootCmdFlags(cmd)
44+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
4445
if err != nil {
4546
return err
4647
}

‎cmd/nerdctl/compose_config.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
2425
"github.com/containerd/nerdctl/v2/pkg/clientutil"
2526
"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
2627
"github.com/containerd/nerdctl/v2/pkg/composer"
@@ -45,7 +46,7 @@ func newComposeConfigCommand() *cobra.Command {
4546
}
4647

4748
func composeConfigAction(cmd *cobra.Command, args []string) error {
48-
globalOptions, err := processRootCmdFlags(cmd)
49+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
4950
if err != nil {
5051
return err
5152
}

‎cmd/nerdctl/compose_cp.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
2425
"github.com/containerd/nerdctl/v2/pkg/clientutil"
2526
"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
2627
"github.com/containerd/nerdctl/v2/pkg/composer"
@@ -45,7 +46,7 @@ func newComposeCopyCommand() *cobra.Command {
4546
}
4647

4748
func composeCopyAction(cmd *cobra.Command, args []string) error {
48-
globalOptions, err := processRootCmdFlags(cmd)
49+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
4950
if err != nil {
5051
return err
5152
}

‎cmd/nerdctl/compose_create.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
"github.com/spf13/cobra"
2323

24+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
2425
"github.com/containerd/nerdctl/v2/pkg/clientutil"
2526
"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
2627
"github.com/containerd/nerdctl/v2/pkg/composer"
@@ -43,7 +44,7 @@ func newComposeCreateCommand() *cobra.Command {
4344
}
4445

4546
func composeCreateAction(cmd *cobra.Command, args []string) error {
46-
globalOptions, err := processRootCmdFlags(cmd)
47+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
4748
if err != nil {
4849
return err
4950
}

‎cmd/nerdctl/compose_down.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package main
1919
import (
2020
"github.com/spf13/cobra"
2121

22+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
2223
"github.com/containerd/nerdctl/v2/pkg/clientutil"
2324
"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
2425
"github.com/containerd/nerdctl/v2/pkg/composer"
@@ -39,7 +40,7 @@ func newComposeDownCommand() *cobra.Command {
3940
}
4041

4142
func composeDownAction(cmd *cobra.Command, args []string) error {
42-
globalOptions, err := processRootCmdFlags(cmd)
43+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
4344
if err != nil {
4445
return err
4546
}

‎cmd/nerdctl/compose_exec.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/moby/term"
2424
"github.com/spf13/cobra"
2525

26+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
2627
"github.com/containerd/nerdctl/v2/pkg/clientutil"
2728
"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
2829
"github.com/containerd/nerdctl/v2/pkg/composer"
@@ -61,7 +62,7 @@ func newComposeExecCommand() *cobra.Command {
6162
}
6263

6364
func composeExecAction(cmd *cobra.Command, args []string) error {
64-
globalOptions, err := processRootCmdFlags(cmd)
65+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
6566
if err != nil {
6667
return err
6768
}

‎cmd/nerdctl/compose_images.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"github.com/containerd/containerd/v2/core/snapshots"
3030
"github.com/containerd/containerd/v2/pkg/progress"
3131

32+
"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
3233
"github.com/containerd/nerdctl/v2/pkg/clientutil"
3334
"github.com/containerd/nerdctl/v2/pkg/cmd/compose"
3435
"github.com/containerd/nerdctl/v2/pkg/formatter"
@@ -51,7 +52,7 @@ func newComposeImagesCommand() *cobra.Command {
5152
}
5253

5354
func composeImagesAction(cmd *cobra.Command, args []string) error {
54-
globalOptions, err := processRootCmdFlags(cmd)
55+
globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
5556
if err != nil {
5657
return err
5758
}

0 commit comments

Comments
 (0)