feat(core): rename send_usage into send_telemetry (#689)

QuentinBrosse · web-flow · commit a0a79b9cedc9 · 2020-02-11T15:03:36.000+01:00
diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mattn/go-isatty v0.0.9
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200130170711-05d27d10a3b8
+	github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200211104822-047c88bb15c4
 	github.com/sergi/go-diff v1.0.0 // indirect
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
diff --git a/go.sum b/go.sum
@@ -74,6 +74,8 @@ github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNue
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200130170711-05d27d10a3b8 h1:+y+U0MHG110iL4TkTKEb3Wh07OK7ALY2XbNFxeAEb80=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200130170711-05d27d10a3b8/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200211104822-047c88bb15c4 h1:7MhGZPXmbEqx97kIrBA7Xen1obsqQPnR0HKErxh76S4=
+github.com/scaleway/scaleway-sdk-go v1.0.0-beta.5.0.20200211104822-047c88bb15c4/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8=
 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/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
diff --git a/internal/e2e/testdata/test-human-create-simple.stdout.golden b/internal/e2e/testdata/test-human-create-simple.stdout.golden
@@ -11,4 +11,5 @@ hair-count              0
 is-happy                false
 eyes-color              unknown
 status                  stopped
+name                    
 region                  fr-par
diff --git a/internal/e2e/testdata/test-human-create-with-args.stdout.golden b/internal/e2e/testdata/test-human-create-with-args.stdout.golden
@@ -11,4 +11,5 @@ hair-count              9223372036854775808
 is-happy                true
 eyes-color              amber
 status                  stopped
+name                    
 region                  fr-par
diff --git a/internal/e2e/testdata/test-human-delete-simple.stdout.golden b/internal/e2e/testdata/test-human-delete-simple.stdout.golden
@@ -11,4 +11,5 @@ hair-count              9223372036854775809
 is-happy                true
 eyes-color              blue
 status                  stopped
+name                    
 region                  fr-par
diff --git a/internal/e2e/testdata/test-human-get-simple.stdout.golden b/internal/e2e/testdata/test-human-get-simple.stdout.golden
@@ -11,4 +11,5 @@ hair-count              9223372036854775809
 is-happy                true
 eyes-color              blue
 status                  stopped
+name                    
 region                  fr-par
diff --git a/internal/e2e/testdata/test-human-list-simple.stdout.golden b/internal/e2e/testdata/test-human-list-simple.stdout.golden
@@ -1,4 +1,4 @@
-ID                                    ORGANIZATION ID                       CREATED AT       UPDATED AT       HEIGHT  SHOE SIZE  ALTITUDE IN METER  ALTITUDE IN MILLIMETER  FINGERS COUNT  HAIR COUNT  IS HAPPY  EYES COLOR  STATUS   REGION
-0194fdc2-fa2f-fcc0-41d3-ff12045b73c8  11111111-1111-1111-1111-111111111111  few seconds ago  few seconds ago  0       0          0                  0                       0              0           false     unknown     stopped  fr-par
-62a5eee8-2abd-f44a-2d0b-75fb180daf48  11111111-1111-1111-1111-111111111111  few seconds ago  few seconds ago  0       0          0                  0                       0              0           false     unknown     stopped  fr-par
-39465185-0fd4-a178-892e-e285ece15114  11111111-1111-1111-1111-111111111111  few seconds ago  few seconds ago  0       0          0                  0                       0              0           false     unknown     stopped  fr-par
+ID                                    ORGANIZATION ID                       CREATED AT       UPDATED AT       HEIGHT  SHOE SIZE  ALTITUDE IN METER  ALTITUDE IN MILLIMETER  FINGERS COUNT  HAIR COUNT  IS HAPPY  EYES COLOR  STATUS   NAME  REGION
+0194fdc2-fa2f-fcc0-41d3-ff12045b73c8  11111111-1111-1111-1111-111111111111  few seconds ago  few seconds ago  0       0          0                  0                       0              0           false     unknown     stopped        fr-par
+62a5eee8-2abd-f44a-2d0b-75fb180daf48  11111111-1111-1111-1111-111111111111  few seconds ago  few seconds ago  0       0          0                  0                       0              0           false     unknown     stopped        fr-par
+39465185-0fd4-a178-892e-e285ece15114  11111111-1111-1111-1111-111111111111  few seconds ago  few seconds ago  0       0          0                  0                       0              0           false     unknown     stopped        fr-par
diff --git a/internal/e2e/testdata/test-human-update-multiple-args.stdout.golden b/internal/e2e/testdata/test-human-update-multiple-args.stdout.golden
@@ -11,4 +11,5 @@ hair-count              9223372036854775809
 is-happy                true
 eyes-color              blue
 status                  stopped
+name                    
 region                  fr-par
diff --git a/internal/e2e/testdata/test-human-update-single-arg.stdout.golden b/internal/e2e/testdata/test-human-update-single-arg.stdout.golden
@@ -11,4 +11,5 @@ hair-count              9223372036854775808
 is-happy                false
 eyes-color              amber
 status                  stopped
+name                    
 region                  fr-par
diff --git a/internal/matomo/matomo.go b/internal/matomo/matomo.go
@@ -117,5 +117,5 @@ func IsTelemetryDisabled() bool {
 	if err != nil {
 		return false
 	}
-	return !config.SendUsage
+	return !config.SendTelemetry
 }
diff --git a/internal/namespaces/init/init.go b/internal/namespaces/init/init.go
@@ -61,7 +61,7 @@ type initArgs struct {
 	Region              scw.Region
 	Zone                scw.Zone
 	OrganizationID      string
-	SendUsage           *bool
+	SendTelemetry       *bool
 	InstallAutocomplete *bool
 }
 
@@ -191,22 +191,22 @@ func initCommand() *core.Command {
 			}
 
 			// Ask for send usage permission
-			if args.SendUsage == nil {
+			if args.SendTelemetry == nil {
 				_, _ = interactive.Println()
 				_, _ = interactive.PrintlnWithoutIndent(`
 					To improve this tool we rely on diagnostic and usage data.
-					Sending such data is optional and can be disable at any time by running "scw config set send_usage false"
+					Sending such data is optional and can be disable at any time by running "scw config set send_telemetry false"
 				`)
 
-				sendUsage, err := interactive.PromptBoolWithConfig(&interactive.PromptBoolConfig{
+				sendTelemetry, err := interactive.PromptBoolWithConfig(&interactive.PromptBoolConfig{
 					Prompt:       "Do you want to send usage statistics and diagnostics?",
 					DefaultValue: true,
 				})
 				if err != nil {
 					return err
 				}
 
-				args.SendUsage = scw.BoolPtr(sendUsage)
+				args.SendTelemetry = scw.BoolPtr(sendTelemetry)
 			}
 
 			// Ask whether we should install autocomplete
@@ -240,8 +240,8 @@ func initCommand() *core.Command {
 				interactive.Printf("Creating new config at %v\n", scw.GetConfigPath())
 			}
 
-			if args.SendUsage != nil {
-				config.SendUsage = *args.SendUsage
+			if args.SendTelemetry != nil {
+				config.SendTelemetry = *args.SendTelemetry
 			}
 
 			// Update active profile

Original file line number	Diff line number	Diff line change
`@@ -117,5 +117,5 @@ func IsTelemetryDisabled() bool {`
`117`	`117`	`if err != nil {`
`118`	`118`	`return false`
`119`	`119`	`}`
`120`		`- return !config.SendUsage`
	`120`	`+ return !config.SendTelemetry`
`121`	`121`	`}`