summaryrefslogtreecommitdiff
path: root/cmd/gitlab-shell-authorized-principals-check/command
diff options
context:
space:
mode:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2021-09-08 15:04:21 +0000
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2021-09-08 15:04:21 +0000
commitd0e09b414a9b069ec7bcbed2880b93c27cf3727c (patch)
tree16ab2acb6bcaeb1cc88acf01f1f7f4eb9dc1ca76 /cmd/gitlab-shell-authorized-principals-check/command
parent67415dc4f6f293460517d4281b5e4e80e66ffb91 (diff)
downloadgitlab-shell-d0e09b414a9b069ec7bcbed2880b93c27cf3727c.tar.gz
refactor: cleanup func signature and remove unused args
Diffstat (limited to 'cmd/gitlab-shell-authorized-principals-check/command')
-rw-r--r--cmd/gitlab-shell-authorized-principals-check/command/command.go8
-rw-r--r--cmd/gitlab-shell-authorized-principals-check/command/command_test.go6
2 files changed, 6 insertions, 8 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)
})