Skip to content

Commit 506100d

Browse files
committed
Fix empty tokens
1 parent c37d811 commit 506100d

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

secure_storage_manager.go

+5-8
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,13 @@ func buildCredCacheDirPath(confs []cacheDirConf) (string, error) {
160160

161161
func (ssm *fileBasedSecureStorageManager) getTokens(data map[string]any) map[string]interface{} {
162162
val, ok := data["tokens"]
163-
emptyMap := map[string]interface{}{}
164163
if !ok {
165-
data["tokens"] = emptyMap
166-
return emptyMap
164+
return map[string]interface{}{}
167165
}
168166

169167
tokens, ok := val.(map[string]interface{})
170168
if !ok {
171-
data["tokens"] = emptyMap
172-
return emptyMap
169+
return map[string]interface{}{}
173170
}
174171

175172
return tokens
@@ -189,8 +186,9 @@ func (ssm *fileBasedSecureStorageManager) setCredential(tokenSpec *secureTokenSp
189186
defer ssm.unlockFile()
190187

191188
credCache := ssm.readTemporaryCacheFile()
192-
ssm.getTokens(credCache)[credentialsKey] = value
193-
189+
tokens := ssm.getTokens(credCache)
190+
tokens[credentialsKey] = value
191+
credCache["tokens"] = tokens
194192
err = ssm.writeTemporaryCacheFile(credCache)
195193
if err != nil {
196194
logger.Warnf("Set credential failed. Unable to write cache. %v", err)
@@ -297,7 +295,6 @@ func (ssm *fileBasedSecureStorageManager) ensurePermissions() error {
297295

298296
if fileInfo.Mode().Perm() != 0o600&os.ModePerm {
299297
return fmt.Errorf("incorrect permissions(%v, expected 600) for credential file", fileInfo.Mode().Perm())
300-
301298
}
302299

303300
return nil

0 commit comments

Comments
 (0)