Merge pull request #150 from ferryproxy/clean/verfiy

Verify args
ferryproxy · Oct 9, 2022 · 1870ee0 · 1870ee0
2 parents 50c748d + 7d0bfbf
commit 1870ee0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/pkg/ferryctl/cmd/ferryctl/control_plane/init/init.go b/pkg/ferryctl/cmd/ferryctl/control_plane/init/init.go
@@ -17,7 +17,6 @@ limitations under the License.
 package init
 
 import (
-	"fmt"
 	"strings"
 
 	"github.com/ferryproxy/ferry/pkg/ferryctl/control_plane"
@@ -46,9 +45,6 @@ func NewCommand(logger log.Logger) *cobra.Command {
 		Short: "Control plane init commands",
 		Long:  `Control plane init commands is used to initialize the control plane`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) > 0 {
-				return fmt.Errorf("too many arguments")
-			}
 
 			kctl := kubectl.NewKubectl()
 

diff --git a/pkg/ferryctl/cmd/ferryctl/local/forward/dial/forward_dial.go b/pkg/ferryctl/cmd/ferryctl/local/forward/dial/forward_dial.go
@@ -17,27 +17,20 @@ limitations under the License.
 package dial
 
 import (
-	"fmt"
-
 	"github.com/ferryproxy/ferry/pkg/ferryctl/local"
 	"github.com/ferryproxy/ferry/pkg/ferryctl/log"
 	"github.com/spf13/cobra"
 )
 
 func NewCommand(logger log.Logger) *cobra.Command {
 	cmd := &cobra.Command{
-		Use: "dial <local address port> <remote service port>",
+		Use:  "dial <local address port> <remote service port>",
+		Args: cobra.ExactArgs(2),
 		Aliases: []string{
 			"d",
 		},
 		Short: "local forward dial commands",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) < 2 {
-				return fmt.Errorf("too few arguments")
-			}
-			if len(args) > 2 {
-				return fmt.Errorf("too many arguments")
-			}
 
 			return local.ForwardDial(cmd.Context(), args[0], args[1])
 		},

diff --git a/pkg/ferryctl/cmd/ferryctl/local/forward/listen/forward_listen.go b/pkg/ferryctl/cmd/ferryctl/local/forward/listen/forward_listen.go
@@ -17,28 +17,20 @@ limitations under the License.
 package listen
 
 import (
-	"fmt"
-
 	"github.com/ferryproxy/ferry/pkg/ferryctl/local"
 	"github.com/ferryproxy/ferry/pkg/ferryctl/log"
 	"github.com/spf13/cobra"
 )
 
 func NewCommand(logger log.Logger) *cobra.Command {
 	cmd := &cobra.Command{
-		Use: "listen <remote service port> <local address port>",
+		Use:  "listen <remote service port> <local address port>",
+		Args: cobra.ExactArgs(2),
 		Aliases: []string{
 			"l",
 		},
 		Short: "local forward listen commands",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) < 2 {
-				return fmt.Errorf("too few arguments")
-			}
-			if len(args) > 2 {
-				return fmt.Errorf("too many arguments")
-			}
-
 			return local.ForwardListen(cmd.Context(), args[0], args[1])
 		},
 	}