From f15f6022de388c1d201bdb283968eae830266bca Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Wed, 6 Nov 2024 12:52:29 +0100 Subject: [PATCH] fix: pass context into secrets logs (#95944) --- pkg/services/encryption/service/service.go | 2 +- pkg/services/secrets/manager/manager.go | 4 ++-- pkg/services/ssosettings/ssosettingsimpl/service.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/services/encryption/service/service.go b/pkg/services/encryption/service/service.go index e221252ad91..51bf98c5fde 100644 --- a/pkg/services/encryption/service/service.go +++ b/pkg/services/encryption/service/service.go @@ -105,7 +105,7 @@ func (s *Service) Decrypt(ctx context.Context, payload []byte, secret string) ([ var err error defer func() { if err != nil { - s.log.Error("Decryption failed", "error", err) + s.log.FromContext(ctx).Error("Decryption failed", "error", err) } }() diff --git a/pkg/services/secrets/manager/manager.go b/pkg/services/secrets/manager/manager.go index d1b200c7d46..c854a03fe80 100644 --- a/pkg/services/secrets/manager/manager.go +++ b/pkg/services/secrets/manager/manager.go @@ -331,7 +331,7 @@ func (s *SecretsService) Decrypt(ctx context.Context, payload []byte) ([]byte, e }).Inc() if err != nil { - s.log.Error("Failed to decrypt secret", "error", err) + s.log.FromContext(ctx).Error("Failed to decrypt secret", "error", err) } }() @@ -371,7 +371,7 @@ func (s *SecretsService) Decrypt(ctx context.Context, payload []byte) ([]byte, e dataKey, err = s.dataKeyById(ctx, string(keyId)) if err != nil { - s.log.Error("Failed to lookup data key by id", "id", string(keyId), "error", err) + s.log.FromContext(ctx).Error("Failed to lookup data key by id", "id", string(keyId), "error", err) return nil, err } } diff --git a/pkg/services/ssosettings/ssosettingsimpl/service.go b/pkg/services/ssosettings/ssosettingsimpl/service.go index 60ae72c9072..6f27368b095 100644 --- a/pkg/services/ssosettings/ssosettingsimpl/service.go +++ b/pkg/services/ssosettings/ssosettingsimpl/service.go @@ -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 }