Merge pull request #225 from secrethub/feature/validate-bootstrap-code

Use new client function to validate backup code input

Author: jpcoenen

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/secrethub/demo-app v0.1.0
-	github.com/secrethub/secrethub-go v0.23.1-0.20191202095158-6e6ed56b9d3f
+	github.com/secrethub/secrethub-go v0.23.1-0.20191202112815-8e4536fffb73
 	github.com/zalando/go-keyring v0.0.0-20190208082241-fbe81aec3a07
 	golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a
 	golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223

go.sum

@@ -72,8 +72,8 @@ github.com/secrethub/demo-app v0.1.0 h1:HwPPxuiSvx4TBE7Qppzu3A9eHqmsBrIz4Ko8u8pq
 github.com/secrethub/demo-app v0.1.0/go.mod h1:ymjm8+WXTSDTFqsGVBNVmHSnwtZMYi7KptHvpo/fLH4=
 github.com/secrethub/secrethub-cli v0.30.0/go.mod h1:dC0wd40v+iQdV83/0rUrOa01LYq+8Yj2AtJB1vzh2ao=
 github.com/secrethub/secrethub-go v0.21.0/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
-github.com/secrethub/secrethub-go v0.23.1-0.20191202095158-6e6ed56b9d3f h1:T09TTodgSY3+QQYyLOYdpAqGri2kjK1U04KN0Tak2HY=
-github.com/secrethub/secrethub-go v0.23.1-0.20191202095158-6e6ed56b9d3f/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
+github.com/secrethub/secrethub-go v0.23.1-0.20191202112815-8e4536fffb73 h1:TChbs2D26POGnhQ87QWCg17b3PQukTHPaxgGxAxxTgU=
+github.com/secrethub/secrethub-go v0.23.1-0.20191202112815-8e4536fffb73/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
 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/init.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"regexp"
 	"time"
 
 	"github.com/secrethub/secrethub-cli/internals/cli/progress"
@@ -113,26 +112,15 @@ func (cmd *InitCommand) Run() error {
 		}
 		return signupCommand.Run()
 	case InitModeBackupCode:
-		filterFunc := func(code string) string {
-			reg := regexp.MustCompile("[^a-zA-Z0-9]+")
-			return reg.ReplaceAllString(code, "")
-		}
-
 		backupCode := cmd.backupCode
 
 		if backupCode == "" {
 			var err error
-			backupCode, err = ui.AskAndValidate(cmd.io, "What is your backup code?\n", 3, func(code string) error {
-				if len(filterFunc(code)) != 64 {
-					return errors.New("code should consist of 64 hexadecimal characters")
-				}
-				return nil
-			})
+			backupCode, err = ui.AskAndValidate(cmd.io, "What is your backup code?\n", 3, credentials.ValidateBootstrapCode)
 			if err != nil {
 				return err
 			}
 		}
-		backupCode = filterFunc(backupCode)
 
 		client, err := cmd.newClientWithoutCredentials(credentials.UseBackupCode(backupCode))
 		if err != nil {