refactor(upgrade): moving sharable console input code to internal pac…

…kage
influxdata · Sep 28, 2020 · 65b5c74 · 65b5c74
1 parent e987080
commit 65b5c74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmd/influx/template.go b/cmd/influx/template.go
@@ -21,6 +21,7 @@ import (
 	"github.com/influxdata/influxdb/v2"
 	"github.com/influxdata/influxdb/v2/cmd/influx/internal"
 	ihttp "github.com/influxdata/influxdb/v2/http"
+	internal2 "github.com/influxdata/influxdb/v2/internal"
 	ierror "github.com/influxdata/influxdb/v2/kit/errors"
 	"github.com/influxdata/influxdb/v2/pkger"
 	"github.com/olekukonko/tablewriter"
@@ -1109,7 +1110,7 @@ func (b *cmdTemplateBuilder) getInput(msg, defaultVal string) string {
 		Writer: b.w,
 		Reader: b.in,
 	}
-	return getInput(ui, msg, defaultVal)
+	return internal2.GetInput(ui, msg, defaultVal)
 }
 
 func (b *cmdTemplateBuilder) convertURLEncoding(url string) pkger.Encoding {

diff --git a/cmd/influx/user.go b/cmd/influx/user.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/influxdata/influxdb/v2"
 	"github.com/influxdata/influxdb/v2/http"
+	"github.com/influxdata/influxdb/v2/internal"
 	"github.com/spf13/cobra"
 	input "github.com/tcnksm/go-input"
 )
@@ -365,7 +366,7 @@ func newUserSVC() (cmdUserDeps, error) {
 	orgSvc := &http.OrganizationService{Client: httpClient}
 	passSvc := &http.PasswordService{Client: httpClient}
 	urmSvc := &http.UserResourceMappingService{Client: httpClient}
-	getPassFn := getPassword
+	getPassFn := internal.GetPassword
 
 	return cmdUserDeps{
 		userSVC:   userSvc,