From eb3320b306709b60eebc81db7566b37478e51372 Mon Sep 17 00:00:00 2001
From: Philippe Martin <phmartin@redhat.com>
Date: Tue, 23 Aug 2022 16:22:56 +0200
Subject: [PATCH] Do not send userId to registry when ODO_DEBUG_TELEMETRY_FILE
 is set (#6031)

* Do not send userId to registry when ODO_DEBUG_TELEMETRY_FILE is set

* Unit tests
---
 pkg/segment/integrations.go      |  4 ++++
 pkg/segment/integrations_test.go | 41 ++++++++++++++++++++++----------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/pkg/segment/integrations.go b/pkg/segment/integrations.go
index e56fe0816ec..3ce9d706164 100644
--- a/pkg/segment/integrations.go
+++ b/pkg/segment/integrations.go
@@ -17,6 +17,10 @@ func getTelemetryForDevfileRegistry() (registryLibrary.TelemetryData, error) {
 		Client: TelemetryClient,
 	}
 
+	if GetDebugTelemetryFile() != "" {
+		return td, nil
+	}
+
 	// TODO(feloy) Get from DI
 	cfg, err := preference.NewClient()
 	if err != nil {
diff --git a/pkg/segment/integrations_test.go b/pkg/segment/integrations_test.go
index 2cb7c736b00..725958903b3 100644
--- a/pkg/segment/integrations_test.go
+++ b/pkg/segment/integrations_test.go
@@ -20,18 +20,31 @@ func TestGetRegistryOptions(t *testing.T) {
 	t.Setenv(preference.GlobalConfigEnvName, tempConfigFile.Name())
 
 	tests := []struct {
-		testName string
-		consent  string
-		cfg      preference.Client
+		testName      string
+		consent       string
+		telemetryFile bool
+		cfg           preference.Client
 	}{
 		{
-			testName: "Registry options with telemetry consent",
-			consent:  "true",
+			testName:      "Registry options with telemetry consent and telemetry file",
+			consent:       "true",
+			telemetryFile: true,
+		},
+		{
+			testName:      "Registry options with telemetry consent and no telemetry file",
+			consent:       "true",
+			telemetryFile: false,
 		},
 
 		{
-			testName: "Registry options without telemetry consent",
-			consent:  "false",
+			testName:      "Registry options without telemetry consent and telemetry file",
+			consent:       "false",
+			telemetryFile: true,
+		},
+		{
+			testName:      "Registry options without telemetry consent and no telemetry file",
+			consent:       "false",
+			telemetryFile: false,
 		},
 	}
 
@@ -46,8 +59,12 @@ func TestGetRegistryOptions(t *testing.T) {
 				t.Error(err)
 			}
 
+			if tt.telemetryFile {
+				t.Setenv(DebugTelemetryFileEnv, "/a/telemetry/file")
+			}
+
 			ro := GetRegistryOptions()
-			err = verifyRegistryOptions(cfg.GetConsentTelemetry(), ro)
+			err = verifyRegistryOptions(cfg.GetConsentTelemetry(), tt.telemetryFile, ro)
 			if err != nil {
 				t.Error(err)
 			}
@@ -55,16 +72,16 @@ func TestGetRegistryOptions(t *testing.T) {
 	}
 }
 
-func verifyRegistryOptions(isSet bool, ro library.RegistryOptions) error {
+func verifyRegistryOptions(isSet bool, telemetryFile bool, ro library.RegistryOptions) error {
 	if ro.SkipTLSVerify {
 		return errors.New("SkipTLSVerify should be set to false by default")
 	}
 
-	return verifyTelemetryData(isSet, ro.Telemetry)
+	return verifyTelemetryData(isSet, telemetryFile, ro.Telemetry)
 }
 
-func verifyTelemetryData(isSet bool, data library.TelemetryData) error {
-	if !isSet {
+func verifyTelemetryData(isSet bool, telemetryFile bool, data library.TelemetryData) error {
+	if !isSet || telemetryFile {
 		if data.Locale == "" && data.User == "" {
 			return nil
 		}