diff options
Diffstat (limited to 'cmd/gitlab-shell-authorized-principals-check')
3 files changed, 7 insertions, 10 deletions
diff --git a/cmd/gitlab-shell-authorized-principals-check/command/command.go b/cmd/gitlab-shell-authorized-principals-check/command/command.go index b5ded54..9418dad 100644 --- a/cmd/gitlab-shell-authorized-principals-check/command/command.go +++ b/cmd/gitlab-shell-authorized-principals-check/command/command.go @@ -7,12 +7,10 @@ import ( "gitlab.com/gitlab-org/gitlab-shell/internal/command/readwriter" "gitlab.com/gitlab-org/gitlab-shell/internal/command/shared/disallowedcommand" "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, config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) { + args, err := Parse(arguments) if err != nil { return nil, err } @@ -24,7 +22,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.AuthorizedPrincipals, error) { +func Parse(arguments []string) (*commandargs.AuthorizedPrincipals, error) { args := &commandargs.AuthorizedPrincipals{Arguments: arguments} if err := args.Parse(); err != nil { diff --git a/cmd/gitlab-shell-authorized-principals-check/command/command_test.go b/cmd/gitlab-shell-authorized-principals-check/command/command_test.go index b6a89f5..2ca2125 100644 --- a/cmd/gitlab-shell-authorized-principals-check/command/command_test.go +++ b/cmd/gitlab-shell-authorized-principals-check/command/command_test.go @@ -37,7 +37,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.config, nil) require.NoError(t, err) require.IsType(t, tc.expectedType, command) @@ -64,7 +64,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) if !tc.expectError { require.NoError(t, err) @@ -106,7 +106,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) require.EqualError(t, err, tc.expectedError) }) diff --git a/cmd/gitlab-shell-authorized-principals-check/main.go b/cmd/gitlab-shell-authorized-principals-check/main.go index d0e709c..3e18b9d 100644 --- a/cmd/gitlab-shell-authorized-principals-check/main.go +++ b/cmd/gitlab-shell-authorized-principals-check/main.go @@ -11,7 +11,6 @@ import ( "gitlab.com/gitlab-org/gitlab-shell/internal/console" "gitlab.com/gitlab-org/gitlab-shell/internal/executable" "gitlab.com/gitlab-org/gitlab-shell/internal/logger" - "gitlab.com/gitlab-org/gitlab-shell/internal/sshenv" ) func main() { @@ -36,7 +35,7 @@ func main() { logCloser := logger.Configure(config) defer logCloser.Close() - cmd, err := cmd.New(executable, os.Args[1:], sshenv.Env{}, config, readWriter) + cmd, err := cmd.New(os.Args[1:], config, readWriter) if err != nil { // For now this could happen if `SSH_CONNECTION` is not set on // the environment |