Merge pull request #16537 from influxdata/cli_update_password

feat(cmd/influx): update password in cli

CHANGELOG.md

@@ -44,6 +44,7 @@
 1. [16509](https://github.com/influxdata/influxdb/pull/16509): Add support for applying an influx package via a public facing URL
 1. [16511](https://github.com/influxdata/influxdb/pull/16511): Add jsonnet support for influx packages
 1. [14782](https://github.com/influxdata/influxdb/pull/16336): Add view page for Check
+1. [16537](https://github.com/influxdata/influxdb/pull/16537): Add update password for CLI
 
 ### Bug Fixes
 
@@ -68,6 +69,7 @@
 1. [16491](https://github.com/influxdata/influxdb/pull/16491): Add missing env vals to influx cli usage and fixes precedence of flag/env var priority
 
 ### UI Improvements
+
 1. [16444](https://github.com/influxdata/influxdb/pull/16444): Add honeybadger reporting to create checks
 
 ## v2.0.0-alpha.21 [2019-12-13]

cmd/influx/bucket_test.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"reflect"
 	"testing"
+	"io/ioutil"
 	"time"
 
 	"github.com/influxdata/influxdb"
@@ -102,7 +103,7 @@ func TestCmdBucket(t *testing.T) {
 				return nil
 			}
 
-			builder := newCmdBucketBuilder(fakeSVCFn(svc), out(new(bytes.Buffer)))
+			builder := newCmdBucketBuilder(fakeSVCFn(svc), out(ioutil.Discard))
 			cmd := builder.cmdCreate()
 			cmd.RunE = builder.cmdCreateRunEFn
 			return cmd
@@ -151,7 +152,7 @@ func TestCmdBucket(t *testing.T) {
 				return nil
 			}
 
-			builder := newCmdBucketBuilder(fakeSVCFn(svc), out(new(bytes.Buffer)))
+			builder := newCmdBucketBuilder(fakeSVCFn(svc), out(ioutil.Discard))
 			cmd := builder.cmdDelete()
 			cmd.RunE = builder.cmdDeleteRunEFn
 			return cmd
@@ -258,7 +259,7 @@ func TestCmdBucket(t *testing.T) {
 				return nil, 0, nil
 			}
 
-			builder := newCmdBucketBuilder(fakeSVCFn(svc), in(new(bytes.Buffer)), out(new(bytes.Buffer)))
+			builder := newCmdBucketBuilder(fakeSVCFn(svc), in(new(bytes.Buffer)), out(ioutil.Discard))
 			cmd := builder.cmdFind()
 			cmd.RunE = builder.cmdFindRunEFn
 			return cmd, calls
@@ -352,7 +353,7 @@ func TestCmdBucket(t *testing.T) {
 				return &influxdb.Bucket{}, nil
 			}
 
-			builder := newCmdBucketBuilder(fakeSVCFn(svc), out(new(bytes.Buffer)))
+			builder := newCmdBucketBuilder(fakeSVCFn(svc), out(ioutil.Discard))
 			cmd := builder.cmdUpdate()
 			cmd.RunE = builder.cmdUpdateRunEFn
 			return cmd

cmd/influx/main.go

@@ -128,7 +128,7 @@ func influxCmd(opts ...genericCLIOptFn) *cobra.Command {
 		cmdREPL(),
 		cmdSetup(),
 		cmdTask(),
-		cmdUser(),
+		cmdUser(runEWrapper),
 		cmdWrite(),
 	)
 

cmd/influx/organization_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io/ioutil"
 	"reflect"
 	"testing"
 
@@ -63,7 +64,7 @@ func TestCmdOrg(t *testing.T) {
 				return nil
 			}
 
-			builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), out(new(bytes.Buffer)))
+			builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), out(ioutil.Discard))
 			cmd := builder.cmdCreate()
 			return cmd
 		}
@@ -109,7 +110,7 @@ func TestCmdOrg(t *testing.T) {
 				return nil
 			}
 
-			builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), out(new(bytes.Buffer)))
+			builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), out(ioutil.Discard))
 			cmd := builder.cmdDelete()
 			return cmd
 		}
@@ -181,7 +182,7 @@ func TestCmdOrg(t *testing.T) {
 				return nil, 0, nil
 			}
 
-			builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), in(new(bytes.Buffer)), out(new(bytes.Buffer)))
+			builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), in(new(bytes.Buffer)), out(ioutil.Discard))
 			cmd := builder.cmdFind()
 			return cmd, calls
 		}
@@ -268,7 +269,7 @@ func TestCmdOrg(t *testing.T) {
 				return &influxdb.Organization{}, nil
 			}
 
-			builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), out(new(bytes.Buffer)))
+			builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), out(ioutil.Discard))
 			cmd := builder.cmdUpdate()
 			return cmd
 		}
@@ -366,7 +367,7 @@ func TestCmdOrg(t *testing.T) {
 					return &influxdb.Organization{ID: 1}, nil
 				}
 
-				builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), in(new(bytes.Buffer)), out(new(bytes.Buffer)))
+				builder := newCmdOrgBuilder(fakeOrgSVCFn(svc), in(new(bytes.Buffer)), out(ioutil.Discard))
 				cmd := builder.cmdMemberList()
 				return cmd, calls
 			}
@@ -394,7 +395,7 @@ func TestCmdOrg(t *testing.T) {
 					return nil
 				}
 
-				builder := newCmdOrgBuilder(fakeOrgUrmSVCsFn(svc, urmSVC), in(new(bytes.Buffer)), out(new(bytes.Buffer)))
+				builder := newCmdOrgBuilder(fakeOrgUrmSVCsFn(svc, urmSVC), in(new(bytes.Buffer)), out(ioutil.Discard))
 				cmd := builder.cmdMemberAdd()
 				return cmd, calls
 			}
@@ -457,7 +458,7 @@ func TestCmdOrg(t *testing.T) {
 					return nil
 				}
 
-				builder := newCmdOrgBuilder(fakeOrgUrmSVCsFn(svc, urmSVC), in(new(bytes.Buffer)), out(new(bytes.Buffer)))
+				builder := newCmdOrgBuilder(fakeOrgUrmSVCsFn(svc, urmSVC), in(new(bytes.Buffer)), out(ioutil.Discard))
 				cmd := builder.cmdMemberRemove()
 				return cmd, calls
 			}

cmd/influx/setup.go

@@ -88,7 +88,7 @@ func setupF(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("failed to write token to path %q: %v", dPath, err)
 	}
 
-	fmt.Println(promptWithColor("Your token has been stored in "+dPath+".", colorCyan))
+	fmt.Println(string(promptWithColor("Your token has been stored in "+dPath+".", colorCyan)))
 
 	w := internal.NewTabWriter(os.Stdout)
 	w.WriteHeaders(
@@ -144,7 +144,7 @@ func interactive() (req *platform.OnboardingRequest, err error) {
 		Reader: os.Stdin,
 	}
 	req = new(platform.OnboardingRequest)
-	fmt.Println(promptWithColor(`Welcome to InfluxDB 2.0!`, colorYellow))
+	fmt.Println(string(promptWithColor(`Welcome to InfluxDB 2.0!`, colorYellow)))
 	if setupFlags.username != "" {
 		req.User = setupFlags.username
 	} else {
@@ -153,7 +153,7 @@ func interactive() (req *platform.OnboardingRequest, err error) {
 	if setupFlags.password != "" {
 		req.Password = setupFlags.password
 	} else {
-		req.Password = getPassword(ui)
+		req.Password = getPassword(ui, false)
 	}
 	if setupFlags.token != "" {
 		req.Token = setupFlags.token
@@ -200,8 +200,9 @@ var (
 	keyReset    = []byte{keyEscape, '[', '0', 'm'}
 )
 
-func promptWithColor(s string, color []byte) string {
-	return string(color) + s + string(keyReset)
+func promptWithColor(s string, color []byte) []byte {
+	bb := append(color, []byte(s)...)
+	return append(bb, keyReset...)
 }
 
 func getConfirm(ui *input.UI, or *platform.OnboardingRequest) bool {
@@ -211,14 +212,14 @@ func getConfirm(ui *input.UI, or *platform.OnboardingRequest) bool {
 		if or.RetentionPeriod > 0 {
 			rp = fmt.Sprintf("%d hrs", or.RetentionPeriod)
 		}
-		fmt.Print(promptWithColor(fmt.Sprintf(`
+		ui.Writer.Write(promptWithColor(fmt.Sprintf(`
 You have entered:
   Username:          %s
   Organization:      %s
   Bucket:            %s
   Retention Period:  %s
 `, or.User, or.Org, or.Bucket, rp), colorCyan))
-		result, err := ui.Ask(prompt, &input.Options{
+		result, err := ui.Ask(string(prompt), &input.Options{
 			HideOrder: true,
 		})
 		if err != nil {
@@ -240,15 +241,20 @@ var (
 	errPasswordIsTooShort = fmt.Errorf("passwords is too short")
 )
 
-func getPassword(ui *input.UI) (password string) {
+func getPassword(ui *input.UI, showNew bool) (password string) {
+	newStr := ""
+	if showNew {
+		newStr = " new"
+	}
 	var err error
 enterPasswd:
-	query := promptWithColor("Please type your password", colorCyan)
+	query := string(promptWithColor("Please type your"+newStr+" password", colorCyan))
 	for {
 		password, err = ui.Ask(query, &input.Options{
 			Required:  true,
 			HideOrder: true,
 			Hide:      true,
+			Mask:      false,
 			ValidateFunc: func(s string) error {
 				if len(s) < 8 {
 					return errPasswordIsTooShort
@@ -260,7 +266,7 @@ enterPasswd:
 		case input.ErrInterrupted:
 			os.Exit(1)
 		case errPasswordIsTooShort:
-			fmt.Println(promptWithColor("Password too short - minimum length is 8 characters!", colorRed))
+			ui.Writer.Write(promptWithColor("Password too short - minimum length is 8 characters!", colorRed))
 			goto enterPasswd
 		default:
 			if password = strings.TrimSpace(password); password == "" {
@@ -269,7 +275,7 @@ enterPasswd:
 		}
 		break
 	}
-	query = promptWithColor("Please type your password again", colorCyan)
+	query = string(promptWithColor("Please type your"+newStr+" password again", colorCyan))
 	for {
 		_, err = ui.Ask(query, &input.Options{
 			Required:  true,
@@ -288,7 +294,7 @@ enterPasswd:
 		case nil:
 			// Nothing.
 		default:
-			fmt.Println(promptWithColor("Passwords do not match!", colorRed))
+			ui.Writer.Write(promptWithColor("Passwords do not match!\n", colorRed))
 			goto enterPasswd
 		}
 		break
@@ -305,7 +311,7 @@ func getInput(ui *input.UI, prompt, defaultValue string) string {
 		option.Default = defaultValue
 		option.HideDefault = true
 	}
-	prompt = promptWithColor(prompt, colorCyan)
+	prompt = string(promptWithColor(prompt, colorCyan))
 	for {
 		line, err := ui.Ask(prompt, option)
 		switch err {