diff --git a/cli/aeon/cmd/connect.go b/cli/aeon/cmd/connect.go index d153b9c64..d84272ccd 100644 --- a/cli/aeon/cmd/connect.go +++ b/cli/aeon/cmd/connect.go @@ -20,5 +20,4 @@ type ConnectCtx struct { Network string // Address is a connection URL, unix socket address and etc. Address string - } diff --git a/cli/cmd/aeon.go b/cli/cmd/aeon.go index ceb1fba20..4a81e17de 100644 --- a/cli/cmd/aeon.go +++ b/cli/cmd/aeon.go @@ -1,7 +1,6 @@ package cmd import ( - "encoding/json" "errors" "fmt" "os" @@ -28,7 +27,6 @@ var connectCtx = aeoncmd.ConnectCtx{ Transport: aeoncmd.TransportPlain, } -// Определяем переменные для флагов var configPath string var instance string @@ -38,7 +36,8 @@ func newAeonConnectCmd() *cobra.Command { Short: "Connect to the aeon instance", Long: `Connect to the aeon instance. tt aeon connect localhost:50051 -tt aeon connect unix://`, +tt aeon connect unix:// +tt aeon connect -c path instanceName>`, PreRunE: func(cmd *cobra.Command, args []string) error { err := aeonConnectValidateArgs(cmd, args) util.HandleCmdErr(cmd, err) @@ -50,7 +49,6 @@ tt aeon connect unix://`, internalAeonConnect, args) util.HandleCmdErr(cmd, err) }, - // Args: cobra.ExactArgs(1), } aeonCmd.Flags().StringVar(&connectCtx.Ssl.KeyFile, "sslkeyfile", "", @@ -120,7 +118,7 @@ func aeonConnectValidateArgs(cmd *cobra.Command, args []string) error { us, ok := uri.(string) if !ok { - return fmt.Errorf("fail to conver string") + return fmt.Errorf("it is impossible to result in a string") } re := regexp.MustCompile("^https?://") diff --git a/test/integration/aeon/test_aeon.py b/test/integration/aeon/test_aeon.py index 4022f03ac..98df4712e 100644 --- a/test/integration/aeon/test_aeon.py +++ b/test/integration/aeon/test_aeon.py @@ -84,11 +84,6 @@ def test_cli_ssl_arguments_success(tt_cmd, aeon_ssl, certificates): @pytest.mark.parametrize( "args, error", [ - ((), "Error: accepts 1 arg(s), received 0"), - ( - ("localhost:50051", "@aeon_unix_socket"), - "Error: accepts 1 arg(s), received 2", - ), ( ( "--transport", @@ -184,6 +179,7 @@ def test_cli_ssl_arguments_success(tt_cmd, aeon_ssl, certificates): ), ], ) + def test_cli_arguments_fail(tt_cmd, certificates, args, error): cmd = [str(tt_cmd), *AeonConnectCommand] cmd += (a.format(**certificates) for a in args)