Merge branch 'refactor/unify-shell' into 'main'

refactor: unify instantiation of command.Shell

Closes #517

See merge request gitlab-org/gitlab-shell!520

1 files changed, 14 insertions, 0 deletions

diff --git a/cmd/gitlab-shell/command/command.go b/cmd/gitlab-shell/command/command.go
index be54ac6..5f828cd 100644
--- a/cmd/gitlab-shell/command/command.go
+++ b/cmd/gitlab-shell/command/command.go
@@ -30,6 +30,20 @@ func New(arguments []string, env sshenv.Env, config *config.Config, readWriter *
 	return nil, disallowedcommand.Error
 }
 
+func NewWithKey(gitlabKeyId string, env sshenv.Env, config *config.Config, readWriter *readwriter.ReadWriter) (command.Command, error) {
+	args, err := Parse(nil, env)
+	if err != nil {
+		return nil, err
+	}
+
+	args.GitlabKeyId = gitlabKeyId
+	if cmd := Build(args, config, readWriter); cmd != nil {
+		return cmd, nil
+	}
+
+	return nil, disallowedcommand.Error
+}
+
 func Parse(arguments []string, env sshenv.Env) (*commandargs.Shell, error) {
 	args := &commandargs.Shell{Arguments: arguments, Env: env}