public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: pass context into secrets logs (#95944)

Browse Source
This commit is contained in:
Mariell Hoversholm
2024-11-06 12:52:29 +01:00
committed by GitHub
parent 3c1a5ab439
commit f15f6022de
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ssosettings/ssosettingsimpl/service.go
+3 -3
View File
@@ -436,19 +436,19 @@ func (s *Service) decryptSecrets(ctx context.Context, settings map[string]any) (
if IsSecretField(k) && v != "" {
strValue, ok := v.(string)
if !ok {
s.logger.Error("Failed to parse secret value, it is not a string", "key", k)
s.logger.FromContext(ctx).Error("Failed to parse secret value, it is not a string", "key", k)
return nil, fmt.Errorf("secret value is not a string")
}
decoded, err := base64.RawStdEncoding.DecodeString(strValue)
if err != nil {
s.logger.Error("Failed to decode secret string", "err", err, "value")
s.logger.FromContext(ctx).Error("Failed to decode secret string", "err", err, "value")
return nil, err
}
decrypted, err := s.secrets.Decrypt(ctx, decoded)
if err != nil {
s.logger.Error("Failed to decrypt secret", "err", err)
s.logger.FromContext(ctx).Error("Failed to decrypt secret", "err", err)
return nil, err
}