Merge pull request #342 from secrethub/feature/refer-to-web-signup

secrethub · Sep 7, 2020 · 2b4a6c9 · 2b4a6c9
2 parents 6c3a6bb + 22c2756
commit 2b4a6c9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/internals/secrethub/app.go b/internals/secrethub/app.go
@@ -79,6 +79,8 @@ func NewApp() *App {
 	io := ui.NewUserIO()
 	store := NewCredentialConfig(io)
 	help := "The SecretHub command-line interface is a unified tool to manage your infrastructure secrets with SecretHub.\n\n" +
+		"If you do not yet have a SecretHub account, go here to create one:\n\n" +
+		"  https://signup.secrethub.io/\n\n" +
 		"For a step-by-step introduction, check out:\n\n" +
 		"  https://secrethub.io/docs/getting-started/\n\n" +
 		"To get help, see:\n\n" +

diff --git a/internals/secrethub/credential_store.go b/internals/secrethub/credential_store.go
@@ -11,7 +11,7 @@ import (
 
 // Errors
 var (
-	ErrCredentialNotExist = errMain.Code("credential_not_exist").Error("could not find credential file. Run `secrethub signup` to create an account.")
+	ErrCredentialNotExist = errMain.Code("credential_not_exist").Error("could not find credential file. Go to https://signup.secrethub.io/ to create an account or run `secrethub init` to use an already existing account on this machine.")
 )
 
 // CredentialConfig handles the configuration necessary for local credentials.

diff --git a/internals/secrethub/init.go b/internals/secrethub/init.go
@@ -95,16 +95,18 @@ func (cmd *InitCommand) Run() error {
 		}
 		option, err := ui.Choose(cmd.io, "How do you want to initialize your SecretHub account on this device?",
 			[]string{
-				"Signup for a new account",
+				"Sign up for a new account",
 				"Use a backup code to recover an existing account",
 			}, 3)
 		if err != nil {
 			return err
 		}
+		fmt.Fprintln(cmd.io.Output())
 
 		switch option {
 		case 0:
-			mode = InitModeSignup
+			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 = InitModeBackupCode
 		}

diff --git a/internals/secrethub/signup.go b/internals/secrethub/signup.go
@@ -52,7 +52,7 @@ func NewSignUpCommand(io ui.IO, newClient newClientFunc, credentialStore Credent
 
 // Register registers the command, arguments and flags on the provided Registerer.
 func (cmd *SignUpCommand) Register(r command.Registerer) {
-	clause := r.Command("signup", "Create a free personal developer account.")
+	clause := r.Command("signup", "Create a free personal developer account.").Hidden()
 	clause.Flag("username", "The username you would like to use on SecretHub.").StringVar(&cmd.username)
 	clause.Flag("full-name", "Your full name.").StringVar(&cmd.fullName)
 	clause.Flag("email", "Your (work) email address we will use for all correspondence.").StringVar(&cmd.email)