removed unique id logs

Author: cx-rahul-pidde

internal/commands/auth.go

@@ -119,28 +119,26 @@ func NewAuthCommand(authWrapper wrappers.AuthWrapper, telemetryWrapper wrappers.
 
 func validLogin(telemetryWrapper wrappers.TelemetryWrapper) func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {
-		defer func() {
-			logger.PrintIfVerbose("Calling GetUniqueId func")
+		clientID := viper.GetString(params.AccessKeyIDConfigKey)
+		clientSecret := viper.GetString(params.AccessKeySecretConfigKey)
+		apiKey := viper.GetString(params.AstAPIKey)
+		if (clientID != "" && clientSecret != "") || apiKey != "" {
+			authWrapper := wrappers.NewAuthHTTPWrapper()
+			authWrapper.SetPath(viper.GetString(params.ScansPathKey))
+			err := authWrapper.ValidateLogin()
+
 			uniqueID := wrappers.GetUniqueID()
 			if uniqueID != "" {
-				logger.PrintIfVerbose("Set unique id: " + uniqueID)
-				err := telemetryWrapper.SendAIDataToLog(&wrappers.DataForAITelemetry{
+				telemetryErr := telemetryWrapper.SendAIDataToLog(&wrappers.DataForAITelemetry{
 					UniqueID: uniqueID,
 					Type:     "authentication",
 					SubType:  "authentication",
 				})
-				if err != nil {
-					logger.PrintIfVerbose("Failed to send telemetry data: " + err.Error())
+				if telemetryErr != nil {
+					logger.PrintIfVerbose("Failed to send telemetry data: " + telemetryErr.Error())
 				}
 			}
-		}()
-		clientID := viper.GetString(params.AccessKeyIDConfigKey)
-		clientSecret := viper.GetString(params.AccessKeySecretConfigKey)
-		apiKey := viper.GetString(params.AstAPIKey)
-		if (clientID != "" && clientSecret != "") || apiKey != "" {
-			authWrapper := wrappers.NewAuthHTTPWrapper()
-			authWrapper.SetPath(viper.GetString(params.ScansPathKey))
-			err := authWrapper.ValidateLogin()
+
 			if err != nil {
 				return errors.Errorf("%s", err)
 			}

internal/commands/telemetry.go

@@ -2,7 +2,6 @@ package commands
 
 import (
 	"github.com/MakeNowJust/heredoc"
-	"github.com/checkmarx/ast-cli/internal/logger"
 	"github.com/checkmarx/ast-cli/internal/params"
 	"github.com/checkmarx/ast-cli/internal/wrappers"
 	"github.com/pkg/errors"
@@ -60,7 +59,6 @@ func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Comm
 		status, _ := cmd.Flags().GetString("status")
 		totalCount, _ := cmd.Flags().GetInt("total-count")
 		uniqueID := wrappers.GetUniqueID()
-		logger.PrintIfVerbose("unique id: " + uniqueID)
 		err := telemetryWrapper.SendAIDataToLog(&wrappers.DataForAITelemetry{
 			AIProvider:      aiProvider,
 			ProblemSeverity: problemSeverity,

internal/wrappers/client.go

@@ -132,13 +132,11 @@ func setAgentNameAndOrigin(req *http.Request, isAuth bool) {
 
 	originStr := viper.GetString(commonParams.OriginKey)
 	req.Header.Set("Cx-Origin", originStr)
-	logger.PrintIfVerbose("getting unique id")
 
 	if !isAuth {
 		uniqueID := GetUniqueID()
 		if uniqueID != "" {
 			req.Header.Set("UniqueId", uniqueID)
-			logger.PrintIfVerbose("unique id: " + uniqueID)
 		}
 	}
 }

internal/wrappers/jwt-helper.go

@@ -214,21 +214,17 @@ func GetUniqueID() string {
 	}
 
 	// Generate new unique id
-	logger.PrintIfVerbose("Generating new unique id")
 	currentUser, err := user.Current()
 	if err != nil {
 		logger.PrintIfVerbose("Failed to get user: " + err.Error())
 		return ""
 	}
 	username := currentUser.Username
 	username = strings.TrimSpace(username)
-	logger.PrintIfVerbose("Username to be used for unique id: " + username)
 	if strings.Contains(username, "\\") {
 		username = strings.Split(username, "\\")[1]
 	}
 	uniqueID = uuid.New().String() + "_" + username
-
-	logger.PrintIfVerbose("Unique id: " + uniqueID)
 	viper.Set(commonParams.UniqueIDConfigKey, uniqueID)
 	configFilePath, _ := configuration.GetConfigFilePath()
 	err = configuration.SafeWriteSingleConfigKeyString(configFilePath, commonParams.UniqueIDConfigKey, uniqueID)