Merge branch 'id-go-refactorings' into 'master'

Refactor execution and parsing logic in Go's implementation

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

1 files changed, 6 insertions, 6 deletions

diff --git a/go/internal/command/command.go b/go/internal/command/command.go
index 560e0b2..0ceb7fc 100644
--- a/go/internal/command/command.go
+++ b/go/internal/command/command.go
@@ -10,10 +10,10 @@ import (
 )
 
 type Command interface {
-	Execute(*readwriter.ReadWriter) error
+	Execute() error
 }
 
-func New(arguments []string, config *config.Config) (Command, error) {
+func New(arguments []string, config *config.Config, readWriter *readwriter.ReadWriter) (Command, error) {
 	args, err := commandargs.Parse(arguments)
 
 	if err != nil {
@@ -21,18 +21,18 @@ func New(arguments []string, config *config.Config) (Command, error) {
 	}
 
 	if config.FeatureEnabled(string(args.CommandType)) {
-		return buildCommand(args, config), nil
+		return buildCommand(args, config, readWriter), nil
 	}
 
 	return &fallback.Command{RootDir: config.RootDir, Args: arguments}, nil
 }
 
-func buildCommand(args *commandargs.CommandArgs, config *config.Config) Command {
+func buildCommand(args *commandargs.CommandArgs, config *config.Config, readWriter *readwriter.ReadWriter) Command {
 	switch args.CommandType {
 	case commandargs.Discover:
-		return &discover.Command{Config: config, Args: args}
+		return &discover.Command{Config: config, Args: args, ReadWriter: readWriter}
 	case commandargs.TwoFactorRecover:
-		return &twofactorrecover.Command{Config: config, Args: args}
+		return &twofactorrecover.Command{Config: config, Args: args, ReadWriter: readWriter}
 	}
 
 	return nil