use analytics.enabled from operator configmap instead of analytics.disabled for clarity

Author: dminnear-rh

cmd/main.go

@@ -104,12 +104,12 @@ func main() {
 
 	registerComponentOrExit(mgr, argov1beta1api.AddToScheme)
 
-	analyticsDisabled := isAnalyticsDisabled(mgr.GetAPIReader())
-	setupLog.Info("analytics disabled", "disabled", analyticsDisabled)
+	analyticsEnabled := areAnalyticsEnabled(mgr.GetAPIReader())
+	setupLog.Info("analytics enabled", "enabled", analyticsEnabled)
 	if err = (&controllers.PatternReconciler{
 		Client:          mgr.GetClient(),
 		Scheme:          mgr.GetScheme(),
-		AnalyticsClient: controllers.AnalyticsInit(analyticsDisabled, setupLog),
+		AnalyticsClient: controllers.AnalyticsInit(!analyticsEnabled, setupLog),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Pattern")
 		os.Exit(1)
@@ -187,21 +187,21 @@ func registerComponentOrExit(mgr manager.Manager, f func(*k8sruntime.Scheme) err
 	setupLog.Info(fmt.Sprintf("Component registered: %v", reflect.ValueOf(f)))
 }
 
-// isAnalyticsDisabled determines whether analytics are disabled.
-// Precedence: Operator ConfigMap key "analytics.disabled" (true/false) > ENV ANALYTICS (false means disabled)
-func isAnalyticsDisabled(reader crclient.Reader) bool {
-	disabled := strings.ToLower(os.Getenv("ANALYTICS")) == "false"
+// areAnalyticsEnabled determines whether analytics are enabled.
+// Precedence: Operator ConfigMap key "analytics.enabled" (true/false) > ENV ANALYTICS (false means disabled)
+func areAnalyticsEnabled(reader crclient.Reader) bool {
+	enabled := strings.ToLower(os.Getenv("ANALYTICS")) != "false"
 
 	var cm corev1.ConfigMap
 	err := reader.Get(context.Background(), crclient.ObjectKey{Namespace: controllers.OperatorNamespace, Name: controllers.OperatorConfigMap}, &cm)
 	if err != nil {
 		setupLog.Error(err, "error reading operator configmap for analytics setting")
-		return disabled
+		return enabled
 	}
 
-	if v, ok := cm.Data["analytics.disabled"]; ok {
+	if v, ok := cm.Data["analytics.enabled"]; ok {
 		return strings.EqualFold(v, "true")
 	}
 
-	return disabled
+	return enabled
 }

cmd/main_test.go

@@ -23,52 +23,52 @@ func newFakeReader(objs ...crclient.Object) crclient.Reader {
 	return builder.Build()
 }
 
-func newOperatorConfigMap(analyticsDisabled string) *corev1.ConfigMap {
+func newOperatorConfigMap(analyticsEnabled string) *corev1.ConfigMap {
 	return &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Namespace: controllers.OperatorNamespace,
 			Name:      controllers.OperatorConfigMap,
 		},
 		Data: map[string]string{
-			"analytics.disabled": analyticsDisabled,
+			"analytics.enabled": analyticsEnabled,
 		},
 	}
 }
 
-func TestIsAnalyticsDisabledWithReader_ConfigMapTrue(t *testing.T) {
+func TestAreAnalyticsEnabledWithReader_ConfigMapTrue(t *testing.T) {
 	cm := newOperatorConfigMap("true")
 	reader := newFakeReader(cm)
 
-	if got := isAnalyticsDisabled(reader); got != true {
-		t.Fatalf("expected true when configmap sets analytics.disabled=true, got %v", got)
+	if got := areAnalyticsEnabled(reader); got != true {
+		t.Fatalf("expected true when configmap sets analytics.enabled=true, got %v", got)
 	}
 }
 
-func TestIsAnalyticsDisabledWithReader_ConfigMapFalse(t *testing.T) {
+func TestAreAnalyticsEnabledWithReader_ConfigMapFalse(t *testing.T) {
 	cm := newOperatorConfigMap("false")
 	reader := newFakeReader(cm)
 
-	if got := isAnalyticsDisabled(reader); got != false {
-		t.Fatalf("expected false when configmap sets analytics.disabled=false, got %v", got)
+	if got := areAnalyticsEnabled(reader); got != false {
+		t.Fatalf("expected false when configmap sets analytics.enabled=false, got %v", got)
 	}
 }
 
-func TestIsAnalyticsDisabledWithReader_NoConfigMap_EnvFalseDisables(t *testing.T) {
+func TestAreAnalyticsEnabledWithReader_NoConfigMap_EnvFalseDisables(t *testing.T) {
 	_ = os.Setenv("ANALYTICS", "false")
 	t.Cleanup(func() { _ = os.Unsetenv("ANALYTICS") })
 
 	reader := newFakeReader()
-	if got := isAnalyticsDisabled(reader); got != true {
-		t.Fatalf("expected true when no configmap and ANALYTICS=false, got %v", got)
+	if got := areAnalyticsEnabled(reader); got != false {
+		t.Fatalf("expected false when no configmap and ANALYTICS=false, got %v", got)
 	}
 }
 
-func TestIsAnalyticsDisabledWithReader_NoConfigMap_EnvTrueEnables(t *testing.T) {
+func TestAreAnalyticsEnabledWithReader_NoConfigMap_EnvTrueEnables(t *testing.T) {
 	_ = os.Setenv("ANALYTICS", "true")
 	t.Cleanup(func() { _ = os.Unsetenv("ANALYTICS") })
 
 	reader := newFakeReader()
-	if got := isAnalyticsDisabled(reader); got != false {
-		t.Fatalf("expected false when no configmap and ANALYTICS=true, got %v", got)
+	if got := areAnalyticsEnabled(reader); got != true {
+		t.Fatalf("expected true when no configmap and ANALYTICS=true, got %v", got)
 	}
 }