Fix disable-telemetry flag to be a true boolean flag (#124)

jnummelin · web-flow · commit 9dc8830aafeb · 2021-04-21T10:54:58.000+03:00
Signed-off-by: Jussi Nummelin &lt;jnummelin@mirantis.com&gt;
diff --git a/cmd/flags.go b/cmd/flags.go
@@ -44,9 +44,10 @@ var (
 		TakesFile: true,
 	}
 
-	analyticsFlag = &cli.StringFlag{
-		Name:   "--disable-telemetry",
-		Hidden: true,
+	analyticsFlag = &cli.BoolFlag{
+		Name:    "disable-telemetry",
+		EnvVars: []string{"DISABLE_TELEMETRY"},
+		Hidden:  true,
 	}
 )
 
@@ -95,6 +96,7 @@ func displayCopyright(ctx *cli.Context) error {
 
 func initAnalytics(ctx *cli.Context) error {
 	if ctx.Bool("disable-telemetry") {
+		log.Tracef("disabling telemetry")
 		return nil
 	}
 
diff --git a/smoke-test/smoke.common.sh b/smoke-test/smoke.common.sh
@@ -2,6 +2,7 @@ FOOTLOOSE_TEMPLATE=${FOOTLOOSE_TEMPLATE:-"footloose.yaml.tpl"}
 
 export LINUX_IMAGE=${LINUX_IMAGE:-"quay.io/footloose/ubuntu18.04"}
 export PRESERVE_CLUSTER=${PRESERVE_CLUSTER:-""}
+export DISABLE_TELEMETRY=true
 
 
 function createCluster() {

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,10 @@ var (`
`44`	`44`	`TakesFile: true,`
`45`	`45`	`}`
`46`	`46`
`47`		`- analyticsFlag = &cli.StringFlag{`
`48`		`- Name: "--disable-telemetry",`
`49`		`- Hidden: true,`
	`47`	`+ analyticsFlag = &cli.BoolFlag{`
	`48`	`+ Name: "disable-telemetry",`
	`49`	`+ EnvVars: []string{"DISABLE_TELEMETRY"},`
	`50`	`+ Hidden: true,`
`50`	`51`	`}`
`51`	`52`	`)`
`52`	`53`
`@@ -95,6 +96,7 @@ func displayCopyright(ctx *cli.Context) error {`
`95`	`96`
`96`	`97`	`func initAnalytics(ctx *cli.Context) error {`
`97`	`98`	`if ctx.Bool("disable-telemetry") {`
	`99`	`+ log.Tracef("disabling telemetry")`
`98`	`100`	`return nil`
`99`	`101`	`}`
`100`	`102`