From df38e79590826d2c1ddd61ffa962ee906524acb3 Mon Sep 17 00:00:00 2001
From: Sheen Capadngan <sheensantoscapadngan@gmail.com>
Date: Wed, 29 May 2024 21:11:03 +0800
Subject: [PATCH] fix: addressed type issue

---
 cli/packages/cmd/secrets.go | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/cli/packages/cmd/secrets.go b/cli/packages/cmd/secrets.go
index 649d9fa3d..423fe1657 100644
--- a/cli/packages/cmd/secrets.go
+++ b/cli/packages/cmd/secrets.go
@@ -229,8 +229,16 @@ var secretsSetCmd = &cobra.Command{
 		secretsToModify := []api.Secret{}
 		secretOperations := []SecretSetOperation{}
 
-		secretByKey := getSecretsByKeys(secrets)
-		personalSecretByKey := getPersonalSecretsByKeys(secrets)
+		sharedSecretMapByName := make(map[string]models.SingleEnvironmentVariable, len(secrets))
+		personalSecretMapByName := make(map[string]models.SingleEnvironmentVariable, len(secrets))
+	
+		for _, secret := range secrets {
+			if secret.Type == util.SECRET_TYPE_PERSONAL {
+				personalSecretMapByName[secret.Key] = secret
+			} else {
+				sharedSecretMapByName[secret.Key] = secret
+			}
+		}
 
 		for _, arg := range args {
 			splitKeyValueFromArg := strings.SplitN(arg, "=", 2)
@@ -262,9 +270,9 @@ var secretsSetCmd = &cobra.Command{
 			var doesSecretExist bool
 
 			if secretType == util.SECRET_TYPE_SHARED {
-				existingSecret, doesSecretExist = secretByKey[key]
+				existingSecret, doesSecretExist = sharedSecretMapByName[key]
 			} else {
-				existingSecret, doesSecretExist = personalSecretByKey[key]
+				existingSecret, doesSecretExist = personalSecretMapByName[key]
 			}
 
 			if doesSecretExist {
@@ -780,19 +788,6 @@ func getSecretsByKeys(secrets []models.SingleEnvironmentVariable) map[string]mod
 	return secretMapByName
 }
 
-func getPersonalSecretsByKeys(secrets []models.SingleEnvironmentVariable) map[string]models.SingleEnvironmentVariable {
-	secretMapByName := make(map[string]models.SingleEnvironmentVariable, len(secrets))
-
-	for _, secret := range secrets {
-		if secret.Type == util.SECRET_TYPE_PERSONAL {
-		secretMapByName[secret.Key] = secret
-
-		}
-	}
-
-	return secretMapByName
-}
-
 func init() {
 	secretsGenerateExampleEnvCmd.Flags().String("token", "", "Fetch secrets using the Infisical Token")
 	secretsGenerateExampleEnvCmd.Flags().String("projectId", "", "manually set the projectId to fetch folders from for machine identity")