Merge branch 'feature/init-with-setup-code' into feature/refer-to-web-signup

Author: jpcoenen

internals/secrethub/init.go

@@ -6,8 +6,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/secrethub/secrethub-go/internals/api"
-
 	"github.com/secrethub/secrethub-cli/internals/cli/progress"
 	"github.com/secrethub/secrethub-cli/internals/cli/ui"
 	"github.com/secrethub/secrethub-cli/internals/secrethub/command"
@@ -97,8 +95,7 @@ func (cmd *InitCommand) Run() error {
 		}
 		option, err := ui.Choose(cmd.io, "How do you want to initialize your SecretHub account on this device?",
 			[]string{
-				"Create a new SecretHub account",
-				"Use a setup code to set up an account created on the SecretHub website",
+				"Sign up for a new account",
 				"Use a backup code to recover an existing account",
 			}, 3)
 		if err != nil {
@@ -111,8 +108,6 @@ func (cmd *InitCommand) Run() error {
 			fmt.Fprintln(cmd.io.Output(), "Go to https://signup.secrethub.io/ and follow the steps to create an account and get it set up on this machine.")
 			return nil
 		case 1:
-			mode = InitModeSetupCode
-		case 2:
 			mode = InitModeBackupCode
 		}
 	}
@@ -129,13 +124,6 @@ func (cmd *InitCommand) Run() error {
 		return signupCommand.Run()
 	case InitModeSetupCode:
 		setupCode := cmd.setupCode
-		if setupCode == "" {
-			var err error
-			setupCode, err = ui.AskAndValidate(cmd.io, "What is your setup code?\n", 3, api.ValidateSetupCode)
-			if err != nil {
-				return err
-			}
-		}
 
 		fmt.Fprintf(cmd.io.Output(), credentialCreationMessage, credentialPath)