diff options
author | Igor Drozdov <idrozdov@gitlab.com> | 2019-05-20 10:09:56 +0300 |
---|---|---|
committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-05-20 13:03:11 +0300 |
commit | 60280bbfc1a1cfb591bf01f3a06e828dcf97728a (patch) | |
tree | e374fb22294861082fa6fc82098b2db3d0ebb856 /go/internal/command/command.go | |
parent | 58d8c7691ac52c00dfebe2154e793c8fccc46aa0 (diff) | |
download | gitlab-shell-60280bbfc1a1cfb591bf01f3a06e828dcf97728a.tar.gz |
Pass readWriter to Command constructor
Diffstat (limited to 'go/internal/command/command.go')
-rw-r--r-- | go/internal/command/command.go | 12 |
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 |