Move IsExactArgs and FindIPv6 to helpers

Signed-off-by: apostasie <[email protected]>

Author: apostasie

cmd/nerdctl/container_commit.go

@@ -30,7 +30,7 @@ func newCommitCommand() *cobra.Command {
 	var commitCommand = &cobra.Command{
 		Use:               "commit [flags] CONTAINER REPOSITORY[:TAG]",
 		Short:             "Create a new image from a container's changes",
-		Args:              IsExactArgs(2),
+		Args:              helpers.IsExactArgs(2),
 		RunE:              commitAction,
 		ValidArgsFunction: commitShellComplete,
 		SilenceUsage:      true,

cmd/nerdctl/container_cp_linux.go

@@ -44,7 +44,7 @@ Using 'nerdctl cp' with untrusted or malicious containers is unsupported and may
   nerdctl cp [flags] SRC_PATH|- CONTAINER:DEST_PATH`
 	var cpCommand = &cobra.Command{
 		Use:               usage,
-		Args:              IsExactArgs(2),
+		Args:              helpers.IsExactArgs(2),
 		Short:             shortHelp,
 		Long:              longHelp,
 		RunE:              cpAction,

cmd/nerdctl/container_logs.go

@@ -40,7 +40,7 @@ The following containers are supported:
 `
 	var logsCommand = &cobra.Command{
 		Use:               "logs [flags] CONTAINER",
-		Args:              IsExactArgs(1),
+		Args:              helpers.IsExactArgs(1),
 		Short:             shortUsage,
 		Long:              longUsage,
 		RunE:              logsAction,

cmd/nerdctl/container_rename.go

@@ -29,7 +29,7 @@ import (
 func newRenameCommand() *cobra.Command {
 	var renameCommand = &cobra.Command{
 		Use:               "rename [flags] CONTAINER NEW_NAME",
-		Args:              IsExactArgs(2),
+		Args:              helpers.IsExactArgs(2),
 		Short:             "rename a container",
 		RunE:              renameAction,
 		ValidArgsFunction: renameShellComplete,

cmd/nerdctl/container_run_network_linux_test.go

@@ -31,6 +31,7 @@ import (
 
 	"github.com/containerd/errdefs"
 
+	"github.com/containerd/nerdctl/v2/cmd/nerdctl/helpers"
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil"
 	"github.com/containerd/nerdctl/v2/pkg/testutil/nettestutil"
@@ -632,7 +633,7 @@ func TestRunContainerWithStaticIP6(t *testing.T) {
 				return
 			}
 			cmd.AssertOutWithFunc(func(stdout string) error {
-				ip := findIPv6(stdout)
+				ip := helpers.FindIPv6(stdout)
 				if !subnet.Contains(ip) {
 					return fmt.Errorf("expected subnet %s include ip %s", subnet, ip)
 				}

cmd/nerdctl/helpers/cobra.go

@@ -41,3 +41,21 @@ func UnknownSubcommandAction(cmd *cobra.Command, args []string) error {
 	}
 	return errors.New(msg)
 }
+
+// IsExactArgs returns an error if there is not the exact number of args
+func IsExactArgs(number int) cobra.PositionalArgs {
+	return func(cmd *cobra.Command, args []string) error {
+		if len(args) == number {
+			return nil
+		}
+		return fmt.Errorf(
+			"%q requires exactly %d %s.\nSee '%s --help'.\n\nUsage:  %s\n\n%s",
+			cmd.CommandPath(),
+			number,
+			"argument(s)",
+			cmd.CommandPath(),
+			cmd.UseLine(),
+			cmd.Short,
+		)
+	}
+}

cmd/nerdctl/helpers/testing.go

@@ -0,0 +1,37 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package helpers
+
+import (
+	"net"
+	"strings"
+)
+
+func FindIPv6(output string) net.IP {
+	var ipv6 string
+	lines := strings.Split(output, "\n")
+	for _, line := range lines {
+		if strings.Contains(line, "inet6") {
+			fields := strings.Fields(line)
+			if len(fields) > 1 {
+				ipv6 = strings.Split(fields[1], "/")[0]
+				break
+			}
+		}
+	}
+	return net.ParseIP(ipv6)
+}

cmd/nerdctl/image_history.go

@@ -47,7 +47,7 @@ func newHistoryCommand() *cobra.Command {
 	var historyCommand = &cobra.Command{
 		Use:               "history [flags] IMAGE",
 		Short:             "Show the history of an image",
-		Args:              IsExactArgs(1),
+		Args:              helpers.IsExactArgs(1),
 		RunE:              historyAction,
 		ValidArgsFunction: historyShellComplete,
 		SilenceUsage:      true,

cmd/nerdctl/image_pull.go

@@ -32,7 +32,7 @@ func newPullCommand() *cobra.Command {
 	var pullCommand = &cobra.Command{
 		Use:           "pull [flags] NAME[:TAG]",
 		Short:         "Pull an image from a registry. Optionally specify \"ipfs://\" or \"ipns://\" scheme to pull image from IPFS.",
-		Args:          IsExactArgs(1),
+		Args:          helpers.IsExactArgs(1),
 		RunE:          pullAction,
 		SilenceUsage:  true,
 		SilenceErrors: true,

cmd/nerdctl/image_push.go

@@ -34,7 +34,7 @@ func newPushCommand() *cobra.Command {
 	var pushCommand = &cobra.Command{
 		Use:               "push [flags] NAME[:TAG]",
 		Short:             "Push an image or a repository to a registry. Optionally specify \"ipfs://\" or \"ipns://\" scheme to push image to IPFS.",
-		Args:              IsExactArgs(1),
+		Args:              helpers.IsExactArgs(1),
 		RunE:              pushAction,
 		ValidArgsFunction: pushShellComplete,
 		SilenceUsage:      true,