diff options
Diffstat (limited to 'cmd/gitlab-shell/command')
-rw-r--r-- | cmd/gitlab-shell/command/command.go | 7 | ||||
-rw-r--r-- | cmd/gitlab-shell/command/command_test.go | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/cmd/gitlab-shell/command/command.go b/cmd/gitlab-shell/command/command.go index 98bfdff..be54ac6 100644 --- a/cmd/gitlab-shell/command/command.go +++ b/cmd/gitlab-shell/command/command.go @@ -14,12 +14,11 @@ import ( "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadarchive" "gitlab.com/gitlab-org/gitlab-shell/internal/command/uploadpack" "gitlab.com/gitlab-org/gitlab-shell/internal/config" - "gitlab.com/gitlab-org/gitlab-shell/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv" ) -func New(e *executable.Executable, arguments []string, env sshenv.Env, config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) { - args, err := Parse(e, arguments, env) +func New(arguments []string, env sshenv.Env, config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) { + args, err := Parse(arguments, env) if err != nil { return nil, err } @@ -31,7 +30,7 @@ func New(e *executable.Executable, arguments []string, env sshenv.Env, config *c return nil, disallowedcommand.Error } -func Parse(e *executable.Executable, arguments []string, env sshenv.Env) (*commandargs.Shell, error) { +func Parse(arguments []string, env sshenv.Env) (*commandargs.Shell, error) { args := &commandargs.Shell{Arguments: arguments, Env: env} if err := args.Parse(); err != nil { diff --git a/cmd/gitlab-shell/command/command_test.go b/cmd/gitlab-shell/command/command_test.go index 5dacb67..2db644b 100644 --- a/cmd/gitlab-shell/command/command_test.go +++ b/cmd/gitlab-shell/command/command_test.go @@ -95,7 +95,7 @@ func TestNew(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - command, err := cmd.New(tc.executable, tc.arguments, tc.env, tc.config, nil) + command, err := cmd.New(tc.arguments, tc.env, tc.config, nil) require.NoError(t, err) require.IsType(t, tc.expectedType, command) @@ -125,7 +125,7 @@ func TestFailingNew(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - command, err := cmd.New(tc.executable, []string{}, tc.env, basicConfig, nil) + command, err := cmd.New([]string{}, tc.env, basicConfig, nil) require.Nil(t, command) require.Equal(t, tc.expectedError, err) }) @@ -236,7 +236,7 @@ func TestParseSuccess(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - result, err := cmd.Parse(tc.executable, tc.arguments, tc.env) + result, err := cmd.Parse(tc.arguments, tc.env) if !tc.expectError { require.NoError(t, err) @@ -273,7 +273,7 @@ func TestParseFailure(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { - _, err := cmd.Parse(tc.executable, tc.arguments, tc.env) + _, err := cmd.Parse(tc.arguments, tc.env) require.EqualError(t, err, tc.expectedError) }) |