config-file-save

Author: cx-hitesh-madgulkar

internal/commands/auth.go

@@ -121,9 +121,9 @@ func validLogin() func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		defer func() {
 			logger.PrintIfVerbose("Calling GetUniqueId func")
-			uniqueId := wrappers.GetUniqueId()
-			if uniqueId != "" {
-				logger.PrintIfVerbose("Set unique id: " + uniqueId)
+			uniqueID := wrappers.GetUniqueID()
+			if uniqueID != "" {
+				logger.PrintIfVerbose("Set unique id: " + uniqueID)
 			}
 		}()
 		clientID := viper.GetString(params.AccessKeyIDConfigKey)

internal/commands/telemetry.go

@@ -59,7 +59,7 @@ func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Comm
 		scanType, _ := cmd.Flags().GetString("scan-type")
 		status, _ := cmd.Flags().GetString("status")
 		totalCount, _ := cmd.Flags().GetInt("total-count")
-		uniqueId := wrappers.GetUniqueId()
+		uniqueId := wrappers.GetUniqueID()
 		logger.PrintIfVerbose("unique id: " + uniqueId)
 		err := telemetryWrapper.SendAIDataToLog(&wrappers.DataForAITelemetry{
 			AIProvider:      aiProvider,
@@ -71,7 +71,7 @@ func runTelemetryAI(telemetryWrapper wrappers.TelemetryWrapper) func(*cobra.Comm
 			ScanType:        scanType,
 			Status:          status,
 			TotalCount:      totalCount,
-			UniqueId:        uniqueId,
+			UniqueID:        uniqueId,
 		})
 
 		if err != nil {

internal/params/envs.go

@@ -80,5 +80,5 @@ const (
 	RiskManagementPathEnv               = "CX_RISK_MANAGEMENT_PATH"
 	ConfigFilePathEnv                   = "CX_CONFIG_FILE_PATH"
 	RealtimeScannerPathEnv              = "CX_REALTIME_SCANNER_PATH"
-	UniqueIdEnv                         = "CX_UNIQUE_ID"
+	UniqueIDEnv                         = "CX_UNIQUE_ID"
 )

internal/params/keys.go

@@ -79,5 +79,5 @@ var (
 	RiskManagementPathKey               = strings.ToLower(RiskManagementPathEnv)
 	ConfigFilePathKey                   = strings.ToLower(ConfigFilePathEnv)
 	RealtimeScannerPathKey              = strings.ToLower(RealtimeScannerPathEnv)
-	UniqueIdConfigKey                   = strings.ToLower(UniqueIdEnv)
+	UniqueIDConfigKey                   = strings.ToLower(UniqueIDEnv)
 )

internal/wrappers/client.go

@@ -27,6 +27,7 @@ import (
 	"github.com/spf13/viper"
 
 	commonParams "github.com/checkmarx/ast-cli/internal/params"
+	"github.com/checkmarx/ast-cli/internal/wrappers/configuration"
 	"github.com/checkmarx/ast-cli/internal/wrappers/kerberos"
 	"github.com/checkmarx/ast-cli/internal/wrappers/ntlm"
 )
@@ -137,10 +138,10 @@ func setAgentNameAndOrigin(req *http.Request, isAuth bool) {
 	logger.PrintIfVerbose("getting unique id")
 
 	if !isAuth {
-		uniqueId := GetUniqueId()
-		if uniqueId != "" {
-			req.Header.Set("UniqueId", uniqueId)
-			logger.PrintIfVerbose("unique id: " + uniqueId)
+		uniqueID := GetUniqueID()
+		if uniqueID != "" {
+			req.Header.Set("UniqueId", uniqueID)
+			logger.PrintIfVerbose("unique id: " + uniqueID)
 		}
 	}
 }
@@ -984,7 +985,7 @@ func extractAZPFromToken(astToken string) (string, error) {
 	return azp, nil
 }
 
-func GetUniqueId() string {
+func GetUniqueID() string {
 	isAllowed := false
 	accessToken, err := GetAccessToken()
 	if err != nil {
@@ -1013,23 +1014,24 @@ func GetUniqueId() string {
 		logger.PrintIfVerbose("User does not not have permission to standalone dev asists feature")
 		return ""
 	}
-	uniqueId := viper.GetString(commonParams.UniqueIdConfigKey)
-	if uniqueId != "" {
-		return uniqueId
+	uniqueID := viper.GetString(commonParams.UniqueIDConfigKey)
+	if uniqueID != "" {
+		return uniqueID
 	}
 	logger.PrintIfVerbose("Generating new unique id")
 	currentUser, err := user.Current()
 	if err != nil {
 		logger.PrintIfVerbose("Failed to get user: " + err.Error())
 		return ""
 	}
-	uniqueId = uuid.New().String() + currentUser.Username
-	logger.PrintIfVerbose("Unique id: " + uniqueId)
-	viper.Set(commonParams.UniqueIdConfigKey, uniqueId)
-	err = viper.WriteConfig()
+	uniqueID = uuid.New().String() + "_" + currentUser.Username
+	logger.PrintIfVerbose("Unique id: " + uniqueID)
+	viper.Set(commonParams.UniqueIDConfigKey, uniqueID)
+	configFilePath, _ := configuration.GetConfigFilePath()
+	err = configuration.SafeWriteSingleConfigKeyString(configFilePath, commonParams.UniqueIDConfigKey, uniqueID)
 	if err != nil {
 		logger.PrintIfVerbose("Failed to write config: " + err.Error())
 		return ""
 	}
-	return uniqueId
+	return uniqueID
 }

internal/wrappers/telemetry.go

@@ -10,7 +10,7 @@ type DataForAITelemetry struct {
 	ScanType        string `json:"scanType"`
 	Status          string `json:"status"`
 	TotalCount      int    `json:"totalCount"`
-	UniqueId        string `json:"uniqueId"`
+	UniqueID        string `json:"uniqueId"`
 }
 
 type TelemetryWrapper interface {