Merge pull request #939 from bitrise-io/cli-cleanup

Merge `cli-cleanup` into `master`

.golangci.yml

@@ -1,9 +1,15 @@
 linters:
-  enabled:
+  enable:
   - revive
   - unparam
   disable: []
 
+linters-settings:
+  revive:
+    rules:
+    - name: empty-block
+      disabled: true
+
 issues:
   exclude-rules:
   - path: cli/update.go

analytics/state_checker.go

@@ -5,19 +5,13 @@ import (
 )
 
 const (
-	// DisabledEnvKey controls both the old (analytics plugin) and new (v2) implementations
 	DisabledEnvKey = "BITRISE_ANALYTICS_DISABLED"
-	// V2DisabledEnvKey controls only the new (v2) implementation
-	V2DisabledEnvKey = "BITRISE_ANALYTICS_V2_DISABLED"
-	// V2AsyncDisabledEnvKey can be used to disable the default async queries
-	V2AsyncDisabledEnvKey = "BITRISE_ANALYTICS_V2_ASYNC_DISABLED"
 
 	trueEnv = "true"
 )
 
 type StateChecker interface {
 	Enabled() bool
-	UseAsync() bool
 }
 
 type stateChecker struct {
@@ -29,13 +23,5 @@ func NewStateChecker(repository env.Repository) StateChecker {
 }
 
 func (s stateChecker) Enabled() bool {
-	if s.envRepository.Get(V2DisabledEnvKey) == trueEnv {
-		return false
-	}
-
 	return s.envRepository.Get(DisabledEnvKey) != trueEnv
 }
-
-func (s stateChecker) UseAsync() bool {
-	return s.envRepository.Get(V2AsyncDisabledEnvKey) != trueEnv
-}

analytics/tracker.go

@@ -57,7 +57,7 @@ const (
 	timeoutProperty               = "timeout"
 	runTimeProperty               = "runtime"
 	osProperty                    = "os"
-	stackRevIdProperty            = "stack_rev_id"
+	stackRevIDProperty            = "stack_rev_id"
 	snapshotProperty              = "snapshot"
 	toolVersionsProperty          = "tool_versions"
 
@@ -72,8 +72,8 @@ const (
 	buildSlugEnvKey       = "BITRISE_BUILD_SLUG"
 	appSlugEnvKey         = "BITRISE_APP_SLUG"
 	StepExecutionIDEnvKey = "BITRISE_STEP_EXECUTION_ID"
-	stackRevIdKey         = "BITRISE_STACK_REV_ID"
-	macStackRevIdKey      = "BITRISE_OSX_STACK_REV_ID"
+	stackRevIDKey         = "BITRISE_STACK_REV_ID"
+	macStackRevIDKey      = "BITRISE_OSX_STACK_REV_ID"
 
 	bitriseVersionKey = "bitrise"
 	envmanVersionKey  = "envman"
@@ -108,6 +108,7 @@ type Tracker interface {
 	SendStepFinishedEvent(properties analytics.Properties, result StepResult)
 	SendCLIWarning(message string)
 	SendToolVersionSnapshot(toolVersions, snapshotType string)
+	IsTracking() bool
 	Wait()
 }
 
@@ -128,9 +129,6 @@ func NewDefaultTracker() Tracker {
 
 	logger := log.NewUtilsLogAdapter()
 	tracker := analytics.NewDefaultTracker(&logger)
-	if stateChecker.UseAsync() {
-		tracker = analytics.NewDefaultTracker(&logger)
-	}
 
 	return NewTracker(tracker, envRepository, stateChecker, &logger)
 }
@@ -210,16 +208,16 @@ func (t tracker) SendToolVersionSnapshot(toolVersions, snapshotType string) {
 		return
 	}
 
-	stackRevId := t.envRepository.Get(stackRevIdKey)
-	if stackRevId == "" {
+	stackRevID := t.envRepository.Get(stackRevIDKey)
+	if stackRevID == "" {
 		// Legacy
-		stackRevId = t.envRepository.Get(macStackRevIdKey)
+		stackRevID = t.envRepository.Get(macStackRevIDKey)
 	}
 
 	properties := analytics.Properties{
 		ciModeProperty:       t.envRepository.Get(configs.CIModeEnvKey) == "true",
 		osProperty:           runtime.GOOS,
-		stackRevIdProperty:   stackRevId,
+		stackRevIDProperty:   stackRevID,
 		snapshotProperty:     snapshotType,
 		toolVersionsProperty: toolVersions,
 	}
@@ -278,6 +276,10 @@ func (t tracker) Wait() {
 	t.tracker.Wait()
 }
 
+func (t tracker) IsTracking() bool {
+	return t.stateChecker.Enabled()
+}
+
 func prepareStartProperties(info StepInfo) analytics.Properties {
 	properties := analytics.Properties{}
 	properties.AppendIfNotEmpty(stepIDProperty, info.StepID)

bitrise/setup.go

@@ -38,10 +38,6 @@ var PluginDependencyMap = map[string]PluginDependency{
 		Source:     "https://github.com/bitrise-io/bitrise-workflow-editor.git",
 		MinVersion: "1.3.305",
 	},
-	"analytics": {
-		Source:     "https://github.com/bitrise-io/bitrise-plugins-analytics.git",
-		MinVersion: "0.13.2",
-	},
 }
 
 // RunSetupIfNeeded ...