Segmentio

cmd/confluent/main.go

@@ -5,24 +5,29 @@ import (
 	"os"
 	"strconv"
 
+	"github.com/jonboulle/clockwork"
+	segment "github.com/segmentio/analytics-go"
 	"github.com/spf13/viper"
 
 	"github.com/confluentinc/cli/internal/cmd"
+	"github.com/confluentinc/cli/internal/pkg/analytics"
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
 	"github.com/confluentinc/cli/internal/pkg/config"
 	"github.com/confluentinc/cli/internal/pkg/log"
 	"github.com/confluentinc/cli/internal/pkg/metric"
 	"github.com/confluentinc/cli/internal/pkg/test-integ"
 	cliVersion "github.com/confluentinc/cli/internal/pkg/version"
+	"github.com/confluentinc/cli/mock"
 )
 
 var (
 	// Injected from linker flags like `go build -ldflags "-X main.version=$VERSION" -X ...`
-	version = "v0.0.0"
-	commit  = ""
-	date    = ""
-	host    = ""
-	cliName = "confluent"
+	version    = "v0.0.0"
+	commit     = ""
+	date       = ""
+	host       = ""
+	cliName    = "confluent"
+	segmentKey = "KDsYPLPBNVB1IPJIN5oqrXnxQT9iKezo"
 	isTest  = "false"
 )
 
@@ -51,25 +56,48 @@ func main() {
 
 	version := cliVersion.NewVersion(cfg.CLIName, cfg.Name(), cfg.Support(), version, commit, date, host)
 
-	cli, err := cmd.NewConfluentCommand(cliName, cfg, version, logger)
+	var analyticsClient analytics.Client
+	if !isTest && cfg.CLIName == "ccloud" {
+		segmentClient, _ := segment.NewWithConfig(segmentKey, segment.Config{
+			Logger:  analytics.NewLogger(logger),
+		})
+
+		analyticsClient = analytics.NewAnalyticsClient(cfg.CLIName, cfg, version.Version, segmentClient, clockwork.NewRealClock())
+	} else {
+		analyticsClient = mock.NewDummyAnalyticsMock()
+	}
+
+	cli, err := cmd.NewConfluentCommand(cliName, cfg, version, logger, analyticsClient)
 	if err != nil {
 		if cli == nil {
 			fmt.Fprintln(os.Stderr, err)
 		} else {
-			pcmd.ErrPrintln(cli, err)
+			pcmd.ErrPrintln(cli.Command, err)
 		}
 		if isTest {
 			test_integ.ExitCode = 1
 		} else {
-			os.Exit(1)
+			exit(1, analyticsClient, logger)
 		}
 	}
-	err = cli.Execute()
+	err = cli.Execute(os.Args[1:])
 	if err != nil {
 		if isTest {
 			test_integ.ExitCode = 1
 		} else {
-			os.Exit(1)
+			exit(1, analyticsClient, logger)
 		}
 	}
+	exit(0, analyticsClient, logger)
+}
+
+func exit(exitCode int, analytics analytics.Client, logger *log.Logger) {
+	err := analytics.Close()
+	if err != nil {
+		logger.Debug(err)
+	}
+	if exitCode == 1 {
+		os.Exit(exitCode)
+	}
+	// no os.Exit(0) because it will shutdown integration test
 }

cmd/confluent/main_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/confluentinc/cli/internal/pkg/config"
 	"github.com/confluentinc/cli/internal/pkg/log"
 	cliVersion "github.com/confluentinc/cli/internal/pkg/version"
+	"github.com/confluentinc/cli/mock"
 )
 
 func TestAddCommands_ShownInHelpUsage_CCloud(t *testing.T) {
@@ -24,10 +25,10 @@ func TestAddCommands_ShownInHelpUsage_CCloud(t *testing.T) {
 
 	version := cliVersion.NewVersion("ccloud", "Confluent Cloud CLI", "https://confluent.cloud; support@confluent.io", "1.2.3", "abc1234", "01/23/45", "CI")
 
-	root, err := cmd.NewConfluentCommand("ccloud", cfg, version, logger)
+	root, err := cmd.NewConfluentCommand("ccloud", cfg, version, logger, mock.NewDummyAnalyticsMock())
 	req.NoError(err)
 
-	output, err := pcmd.ExecuteCommand(root, "help")
+	output, err := pcmd.ExecuteCommand(root.Command, "help")
 	req.NoError(err)
 	req.Contains(output, "kafka")
 	//Hidden: req.Contains(output, "ksql")
@@ -53,10 +54,10 @@ func TestAddCommands_ShownInHelpUsage_Confluent(t *testing.T) {
 
 	version := cliVersion.NewVersion("confluent", "Confluent CLI", "https://confluent.io; support@confluent.io", "1.2.3", "abc1234", "01/23/45", "CI")
 
-	root, err := cmd.NewConfluentCommand("confluent", cfg, version, logger)
+	root, err := cmd.NewConfluentCommand("confluent", cfg, version, logger, mock.NewDummyAnalyticsMock())
 	req.NoError(err)
 
-	output, err := pcmd.ExecuteCommand(root, "help")
+	output, err := pcmd.ExecuteCommand(root.Command, "help")
 	req.NoError(err)
 	req.NotContains(output, "kafka")
 	req.NotContains(output, "ksql")

cmd/docs/main.go

@@ -9,6 +9,7 @@ import (
 	"github.com/confluentinc/cli/internal/pkg/doc"
 	"github.com/confluentinc/cli/internal/pkg/log"
 	"github.com/confluentinc/cli/internal/pkg/version"
+	"github.com/confluentinc/cli/mock"
 )
 
 var (
@@ -20,11 +21,11 @@ var (
 func main() {
 	emptyStr := func(filename string) string { return "" }
 	sphinxRef := func(name, ref string) string { return fmt.Sprintf(":ref:`%s`", ref) }
-	confluent, err := cmd.NewConfluentCommand(cliName, &config.Config{CLIName: cliName}, &version.Version{}, log.New())
+	confluent, err := cmd.NewConfluentCommand(cliName, &config.Config{CLIName: cliName}, &version.Version{}, log.New(), mock.NewDummyAnalyticsMock())
 	if err != nil {
 		panic(err)
 	}
-	err = doc.GenReSTTreeCustom(confluent, path.Join(".", "docs", cliName), emptyStr, sphinxRef)
+	err = doc.GenReSTTreeCustom(confluent.Command, path.Join(".", "docs", cliName), emptyStr, sphinxRef)
 	if err != nil {
 		panic(err)
 	}
@@ -39,7 +40,7 @@ The available |ccloud| CLI commands are documented here.
 
 `
 	}
-	err = doc.GenReSTIndex(confluent, path.Join(".", "docs", cliName, "index.rst"), indexHeader, sphinxRef)
+	err = doc.GenReSTIndex(confluent.Command, path.Join(".", "docs", cliName, "index.rst"), indexHeader, sphinxRef)
 	if err != nil {
 		panic(err)
 	}

cmd/lint/main.go

@@ -14,6 +14,7 @@ import (
 	linter "github.com/confluentinc/cli/internal/pkg/lint-cli"
 	"github.com/confluentinc/cli/internal/pkg/log"
 	"github.com/confluentinc/cli/internal/pkg/version"
+	"github.com/confluentinc/cli/mock"
 )
 
 var (
@@ -163,12 +164,12 @@ func main() {
 
 	var issues *multierror.Error
 	for _, cliName := range cliNames {
-		cli, err := cmd.NewConfluentCommand(cliName, &config.Config{CLIName: cliName}, &version.Version{Binary: cliName}, log.New())
+		cli, err := cmd.NewConfluentCommand(cliName, &config.Config{CLIName: cliName}, &version.Version{Binary: cliName}, log.New(), mock.NewDummyAnalyticsMock())
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
 		}
-		err = l.Lint(cli)
+		err = l.Lint(cli.Command)
 		if err != nil {
 			issues = multierror.Append(issues, err)
 		}

go.mod

@@ -7,6 +7,8 @@ require (
 	github.com/Shopify/sarama v1.20.1
 	github.com/Shopify/toxiproxy v2.1.3+incompatible // indirect
 	github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
+	github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect
 	github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6 // indirect
 	github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da
@@ -33,7 +35,7 @@ require (
 	github.com/gliderlabs/ssh v0.1.4 // indirect
 	github.com/gobuffalo/flect v0.1.3
 	github.com/gogo/protobuf v1.2.1
-	github.com/golang/mock v1.3.1
+	github.com/golang/mock v1.2.0
 	github.com/golang/protobuf v1.3.2
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d // indirect
@@ -51,6 +53,7 @@ require (
 	github.com/hashicorp/golang-lru v0.5.3 // indirect
 	github.com/havoc-io/gopass v0.0.0-20170602182606-9a121bec1ae7
 	github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365
+	github.com/joeshaw/iso8601 v0.0.0-20140327141645-861d1ce636d0
 	github.com/jonboulle/clockwork v0.1.0
 	github.com/kevinburke/go-bindata v3.13.0+incompatible
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
@@ -66,6 +69,8 @@ require (
 	github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
 	github.com/pkg/errors v0.8.1
 	github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a // indirect
+	github.com/segmentio/analytics-go v3.1.0+incompatible
+	github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c // indirect
 	github.com/shurcooL/go v0.0.0-20190704215121-7189cc372560 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
@@ -75,7 +80,7 @@ require (
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.4.0
 	github.com/tidwall/pretty v0.0.0-20190325153808-1166b9ac2b65
-	github.com/travisjeffery/mocker v1.1.0
+	github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c // indirect
 	golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392
 	golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45

go.sum

@@ -171,6 +171,8 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -283,6 +285,8 @@ github.com/jdkato/prose v1.1.0 h1:LpvmDGwbKGTgdCH3a8VJL56sr7p/wOFPw/R4lM4PfFg=
 github.com/jdkato/prose v1.1.0/go.mod h1:jkF0lkxaX5PFSlk9l4Gh9Y+T57TqUZziWT7uZbW5ADg=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/joeshaw/iso8601 v0.0.0-20140327141645-861d1ce636d0 h1:wrf53Uj+TG07ntTSFTuWYyJdPPfaSbRHn7CZvlzAxq8=
+github.com/joeshaw/iso8601 v0.0.0-20140327141645-861d1ce636d0/go.mod h1:sPXhe9b9ZqQe0SoSy9DSlN2zaifj5LoQs/zs8mCETOQ=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -402,6 +406,10 @@ github.com/sebdah/goldie v0.0.0-20180424091453-8784dd1ab561 h1:IY+sDBJR/wRtsxq+6
 github.com/sebdah/goldie v0.0.0-20180424091453-8784dd1ab561/go.mod h1:lvjGftC8oe7XPtyrOidaMi0rp5B9+XY/ZRUynGnuaxQ=
 github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d h1:BzRvVq1EHuIjxpijCEKpAxzKUUMurOQ4sknehIATRh8=
 github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod h1:w5+eXa0mYznDkHaMCXA4XYffjlH+cy1oyKbfzJXa2Do=
+github.com/segmentio/analytics-go v3.1.0+incompatible h1:IyiOfUgQFVHvsykKKbdI7ZsH374uv3/DfZUo9+G0Z80=
+github.com/segmentio/analytics-go v3.1.0+incompatible/go.mod h1:C7CYBtQWk4vRk2RyLu0qOcbHJ18E3F1HV2C/8JvKN48=
+github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c h1:rsRTAcCR5CeNLkvgBVSjQoDGRRt6kggsE6XYBqCv2KQ=
+github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c/go.mod h1:kJ9mm9YmoWSkk+oQ+5Cj8DEoRCX2JT6As4kEtIIOp1M=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc=
@@ -479,6 +487,8 @@ github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro
 github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c h1:3lbZUMbMiGUW/LMkfsEABsc5zNT9+b1CvsJx47JzJ8g=
+github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM=
 github.com/zclconf/go-cty v0.0.0-20180815031001-58bb2bc0302a h1:x70ZZ4caA8eY4abjpcCnf6uvIPY3cpgRFrXE47JF4Sc=
 github.com/zclconf/go-cty v0.0.0-20180815031001-58bb2bc0302a/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=

internal/cmd/auth/auth.go

@@ -17,6 +17,7 @@ import (
 	"github.com/confluentinc/ccloud-sdk-go"
 	orgv1 "github.com/confluentinc/ccloudapis/org/v1"
 
+	"github.com/confluentinc/cli/internal/pkg/analytics"
 	auth_server "github.com/confluentinc/cli/internal/pkg/auth-server"
 	pcmd "github.com/confluentinc/cli/internal/pkg/cmd"
 	"github.com/confluentinc/cli/internal/pkg/config"
@@ -27,10 +28,11 @@ import (
 )
 
 type commands struct {
-	Commands   []*cobra.Command
-	config     *config.Config
-	mdsClient  *mds.APIClient
-	Logger     *log.Logger
+	Commands             []*cobra.Command
+	config               *config.Config
+	mdsClient            *mds.APIClient
+	Logger               *log.Logger
+	analyticsClient      analytics.Client
 	// @VisibleForTesting, defaults to the OS filesystem
 	certReader io.Reader
 	// for testing
@@ -40,21 +42,22 @@ type commands struct {
 }
 
 // New returns a list of auth-related Cobra commands.
-func New(prerunner pcmd.PreRunner, config *config.Config, logger *log.Logger, mdsClient *mds.APIClient, userAgent string) []*cobra.Command {
+func New(prerunner pcmd.PreRunner, config *config.Config, logger *log.Logger, mdsClient *mds.APIClient, userAgent string, analyticsClient analytics.Client) []*cobra.Command {
 	var defaultAnonHTTPClientFactory = func(baseURL string, logger *log.Logger) *ccloud.Client {
 		return ccloud.NewClient(&ccloud.Params{BaseURL: baseURL, HttpClient: ccloud.BaseClient, Logger: logger, UserAgent: userAgent})
 	}
 	var defaultJwtHTTPClientFactory = func(ctx context.Context, jwt string, baseURL string, logger *log.Logger) *ccloud.Client {
 		return ccloud.NewClientWithJWT(ctx, jwt, &ccloud.Params{BaseURL: baseURL, Logger: logger, UserAgent: userAgent})
 	}
 	return newCommands(prerunner, config, logger, mdsClient, pcmd.NewPrompt(os.Stdin),
-		defaultAnonHTTPClientFactory, defaultJwtHTTPClientFactory,
+		defaultAnonHTTPClientFactory, defaultJwtHTTPClientFactory, analyticsClient,
 	).Commands
 }
 
 func newCommands(prerunner pcmd.PreRunner, config *config.Config, log *log.Logger, mdsClient *mds.APIClient, prompt pcmd.Prompt,
 	anonHTTPClientFactory func(baseURL string, logger *log.Logger) *ccloud.Client,
 	jwtHTTPClientFactory func(ctx context.Context, authToken string, baseURL string, logger *log.Logger) *ccloud.Client,
+	analyticsClient analytics.Client,
 ) *commands {
 	cmd := &commands{
 		config:                config,
@@ -63,6 +66,7 @@ func newCommands(prerunner pcmd.PreRunner, config *config.Config, log *log.Logge
 		prompt:                prompt,
 		anonHTTPClientFactory: anonHTTPClientFactory,
 		jwtHTTPClientFactory:  jwtHTTPClientFactory,
+		analyticsClient:       analyticsClient,
 	}
 	cmd.init(prerunner)
 	return cmd
@@ -87,7 +91,7 @@ func (a *commands) init(prerunner pcmd.PreRunner) {
 		check(loginCmd.MarkFlagRequired("url")) // because https://confluent.cloud isn't an MDS endpoint
 	}
 	loginCmd.Flags().SortFlags = false
-	loginCmd.PersistentPreRunE = prerunner.Anonymous()
+	loginCmd.PersistentPreRunE = a.analyticsPreRunCover(analytics.Login, prerunner)
 	logoutCmd := &cobra.Command{
 		Use:   "logout",
 		Short: fmt.Sprintf("Logout of %s.", a.config.APIName()),
@@ -96,7 +100,7 @@ func (a *commands) init(prerunner pcmd.PreRunner) {
 		RunE: a.logout,
 		Args: cobra.NoArgs,
 	}
-	logoutCmd.PersistentPreRunE = prerunner.Anonymous()
+	logoutCmd.PersistentPreRunE = a.analyticsPreRunCover(analytics.Logout, prerunner)
 	a.Commands = []*cobra.Command{loginCmd, logoutCmd}
 }
 
@@ -267,11 +271,9 @@ func (a *commands) loginMDS(cmd *cobra.Command, args []string) error {
 }
 
 func (a *commands) logout(cmd *cobra.Command, args []string) error {
-	a.config.AuthToken = ""
-	a.config.Auth = nil
-	err := a.config.Save()
+	err := a.config.DeleteUserAuth()
 	if err != nil {
-		return errors.Wrap(err, "Unable to delete user auth")
+		return err
 	}
 	pcmd.Println(cmd, "You are now logged out")
 	return nil
@@ -358,6 +360,13 @@ func (a *commands) setContextAndAddContextIfAbsent(username string, caCertPath s
 	return nil
 }
 
+func (a *commands) analyticsPreRunCover(commandType analytics.CommandType, prerunner pcmd.PreRunner) func(cmd *cobra.Command, args []string) error {
+	return func(cmd *cobra.Command, args []string) error {
+		a.analyticsClient.SetCommandType(commandType)
+		return prerunner.Anonymous()(cmd, args)
+	}
+}
+
 func SelfSignedCertClient(certReader io.Reader, logger *log.Logger) (*http.Client, error){
 	certPool, err := x509.SystemCertPool()
 	if err != nil {
@@ -398,3 +407,5 @@ func check(err error) {
 		panic(err)
 	}
 }
+
+

internal/cmd/auth/auth_test.go

@@ -222,7 +222,7 @@ func Test_SelfSignedCerts(t *testing.T) {
 	cfg.Logger = log.New()
 	cfg.CLIName = "confluent"
 	prompt := prompt("cody@confluent.io", "iambatman")
-	cmds := newCommands(&cliMock.Commander{}, cfg, log.New(), mdsClient, prompt, nil, nil)
+	cmds := newCommands(&cliMock.Commander{}, cfg, log.New(), mdsClient, prompt, nil, nil, cliMock.NewDummyAnalyticsMock())
 
 	for _, c := range cmds.Commands {
 		c.PersistentFlags().CountP("verbose", "v", "Increase output verbosity")
@@ -304,7 +304,7 @@ func newAuthCommand(prompt pcmd.Prompt, auth *sdkMock.Auth, user *sdkMock.User,
 			},
 		}
 	}
-	commands := newCommands(&cliMock.Commander{}, cfg, log.New(), mdsClient, prompt, mockAnonHTTPClientFactory, mockJwtHTTPClientFactory)
+	commands := newCommands(&cliMock.Commander{}, cfg, log.New(), mdsClient, prompt, mockAnonHTTPClientFactory, mockJwtHTTPClientFactory, cliMock.NewDummyAnalyticsMock())
 	for _, c := range commands.Commands {
 		c.PersistentFlags().CountP("verbose", "v", "Increase output verbosity")
 	}

internal/cmd/cluster/command.go

@@ -52,8 +52,8 @@ func NewScopedIdService(client *http.Client, userAgent string, logger *log.Logge
 }
 
 type Element struct {
-	Type   string
-	ID string
+	Type string
+	ID   string
 }
 
 var (