Remove with setup code option and make setup code a credential provider

This commit also makes the cli point to the version of the client containing the required changes.

Author: Marton6

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/secrethub/demo-app v0.1.0
-	github.com/secrethub/secrethub-go v0.30.1-0.20200812121649-846d80e97296
+	github.com/secrethub/secrethub-go v0.30.1-0.20200814123323-7aac428a99e4
 	github.com/zalando/go-keyring v0.0.0-20190208082241-fbe81aec3a07
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
 	golang.org/x/sys v0.0.0-20200501052902-10377860bb8e

go.sum

@@ -168,6 +168,8 @@ github.com/secrethub/secrethub-go v0.30.1-0.20200812113929-edff110cddfc h1:dN6YU
 github.com/secrethub/secrethub-go v0.30.1-0.20200812113929-edff110cddfc/go.mod h1:ZIco8Y0G0Pi0Vb7pQROjvEKgSreZiRMLhAbzWUneUSQ=
 github.com/secrethub/secrethub-go v0.30.1-0.20200812121649-846d80e97296 h1:IsbGXusKlVYSThYYepv80H0S9dXYOWMHDSNgoEamt1c=
 github.com/secrethub/secrethub-go v0.30.1-0.20200812121649-846d80e97296/go.mod h1:ZIco8Y0G0Pi0Vb7pQROjvEKgSreZiRMLhAbzWUneUSQ=
+github.com/secrethub/secrethub-go v0.30.1-0.20200814123323-7aac428a99e4 h1:zIOs8q0BK5pI55Fa8y3MMuxIfD7nAv9sh+3GbOiT6hM=
+github.com/secrethub/secrethub-go v0.30.1-0.20200814123323-7aac428a99e4/go.mod h1:ZIco8Y0G0Pi0Vb7pQROjvEKgSreZiRMLhAbzWUneUSQ=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=

internals/secrethub/app.go

@@ -173,7 +173,7 @@ func (app *App) registerCommands() {
 	NewEnvCommand(app.io, app.clientFactory.NewClient).Register(app.cli)
 
 	// Commands
-	NewInitCommand(app.io, app.clientFactory.NewUnauthenticatedClient, app.clientFactory.NewClientWithCredentials, app.clientFactory.NewClientWithSetupCode, app.credentialStore).Register(app.cli)
+	NewInitCommand(app.io, app.clientFactory.NewUnauthenticatedClient, app.clientFactory.NewClientWithCredentials, app.credentialStore).Register(app.cli)
 	NewSignUpCommand(app.io, app.clientFactory.NewUnauthenticatedClient, app.credentialStore).Register(app.cli)
 	NewWriteCommand(app.io, app.clientFactory.NewClient).Register(app.cli)
 	NewReadCommand(app.io, app.clientFactory.NewClient).Register(app.cli)

internals/secrethub/client_factory.go

@@ -20,7 +20,6 @@ type ClientFactory interface {
 	// NewClient returns a new SecretHub client.
 	NewClient() (secrethub.ClientInterface, error)
 	NewClientWithCredentials(credentials.Provider) (secrethub.ClientInterface, error)
-	NewClientWithSetupCode(code string) (secrethub.ClientInterface, error)
 	NewUnauthenticatedClient() (secrethub.ClientInterface, error)
 	Register(FlagRegisterer)
 }
@@ -89,18 +88,6 @@ func (f *clientFactory) NewClientWithCredentials(provider credentials.Provider)
 	return client, nil
 }
 
-func (f *clientFactory) NewClientWithSetupCode(code string) (secrethub.ClientInterface, error) {
-	options := f.baseClientOptions()
-	options = append(options, secrethub.WithSetupCode(code))
-
-	client, err := secrethub.NewClient(options...)
-	if err != nil {
-		return nil, err
-	}
-
-	return client, nil
-}
-
 func (f *clientFactory) NewUnauthenticatedClient() (secrethub.ClientInterface, error) {
 	options := f.baseClientOptions()
 

internals/secrethub/init.go

@@ -24,18 +24,16 @@ type InitCommand struct {
 	io                       ui.IO
 	newUnauthenticatedClient newClientFunc
 	newClientWithCredentials func(credentials.Provider) (secrethub.ClientInterface, error)
-	newClientWithSetupCode   func(string) (secrethub.ClientInterface, error)
 	credentialStore          CredentialConfig
 	progressPrinter          progress.Printer
 }
 
 // NewInitCommand creates a new InitCommand.
-func NewInitCommand(io ui.IO, newUnauthenticatedClient newClientFunc, newClientWithCredentials func(credentials.Provider) (secrethub.ClientInterface, error), newClientWithSetupCode func(string) (secrethub.ClientInterface, error), credentialStore CredentialConfig) *InitCommand {
+func NewInitCommand(io ui.IO, newUnauthenticatedClient newClientFunc, newClientWithCredentials func(credentials.Provider) (secrethub.ClientInterface, error), credentialStore CredentialConfig) *InitCommand {
 	return &InitCommand{
 		io:                       io,
 		newUnauthenticatedClient: newUnauthenticatedClient,
 		newClientWithCredentials: newClientWithCredentials,
-		newClientWithSetupCode:   newClientWithSetupCode,
 		credentialStore:          credentialStore,
 		progressPrinter:          progress.NewPrinter(io.Output(), 500*time.Millisecond),
 	}
@@ -159,7 +157,7 @@ func (cmd *InitCommand) Run() error {
 		fmt.Fprint(cmd.io.Output(), "Setting up your account...")
 		cmd.progressPrinter.Start()
 
-		client, err := cmd.newClientWithSetupCode(setupCode)
+		client, err := cmd.newClientWithCredentials(credentials.NewSetupCode(setupCode))
 		if err != nil {
 			cmd.progressPrinter.Stop()
 			return err