From 506100d003cd620a5c28ab3ec1dea85d073c7447 Mon Sep 17 00:00:00 2001
From: Piotr Fus <piotr.fus@snowflake.com>
Date: Fri, 7 Mar 2025 10:38:59 +0100
Subject: [PATCH] Fix empty tokens

---
 secure_storage_manager.go | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/secure_storage_manager.go b/secure_storage_manager.go
index de4601a89..bde5e7ad7 100644
--- a/secure_storage_manager.go
+++ b/secure_storage_manager.go
@@ -160,16 +160,13 @@ func buildCredCacheDirPath(confs []cacheDirConf) (string, error) {
 
 func (ssm *fileBasedSecureStorageManager) getTokens(data map[string]any) map[string]interface{} {
 	val, ok := data["tokens"]
-	emptyMap := map[string]interface{}{}
 	if !ok {
-		data["tokens"] = emptyMap
-		return emptyMap
+		return map[string]interface{}{}
 	}
 
 	tokens, ok := val.(map[string]interface{})
 	if !ok {
-		data["tokens"] = emptyMap
-		return emptyMap
+		return map[string]interface{}{}
 	}
 
 	return tokens
@@ -189,8 +186,9 @@ func (ssm *fileBasedSecureStorageManager) setCredential(tokenSpec *secureTokenSp
 	defer ssm.unlockFile()
 
 	credCache := ssm.readTemporaryCacheFile()
-	ssm.getTokens(credCache)[credentialsKey] = value
-
+	tokens := ssm.getTokens(credCache)
+	tokens[credentialsKey] = value
+	credCache["tokens"] = tokens
 	err = ssm.writeTemporaryCacheFile(credCache)
 	if err != nil {
 		logger.Warnf("Set credential failed. Unable to write cache. %v", err)
@@ -297,7 +295,6 @@ func (ssm *fileBasedSecureStorageManager) ensurePermissions() error {
 
 	if fileInfo.Mode().Perm() != 0o600&os.ModePerm {
 		return fmt.Errorf("incorrect permissions(%v, expected 600) for credential file", fileInfo.Mode().Perm())
-
 	}
 
 	return nil