From c33bc819bcfb294f863c4fdf5f999f003aadc1a6 Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Mon, 25 Mar 2024 09:58:40 +0100
Subject: [PATCH] SigningKeys: Add added_at when creating new signing key
 (#85060)

---
 pkg/services/signingkeys/signingkeysimpl/service.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/services/signingkeys/signingkeysimpl/service.go b/pkg/services/signingkeys/signingkeysimpl/service.go
index 500f0606dd9..7c7d0f718f4 100644
--- a/pkg/services/signingkeys/signingkeysimpl/service.go
+++ b/pkg/services/signingkeys/signingkeysimpl/service.go
@@ -177,12 +177,14 @@ func (s *Service) addPrivateKey(ctx context.Context, keyID string, alg jose.Sign
 		return nil, err
 	}
 
-	expiry := time.Now().Add(30 * 24 * time.Hour)
+	now := time.Now()
+	expiry := now.Add(30 * 24 * time.Hour)
 	key, err := s.store.Add(ctx, &signingkeys.SigningKey{
 		KeyID:      keyID,
 		PrivateKey: encoded,
 		ExpiresAt:  &expiry,
 		Alg:        alg,
+		AddedAt:    now,
 	}, force)
 
 	if err != nil && !errors.Is(err, signingkeys.ErrSigningKeyAlreadyExists) {