chore: remove global retention fallback for API keys

mafredri · mafredri · commit 46f07e15cfd1 · 2025-12-02T10:05:39.000Z
API keys retention is now explicit - it's enabled when
--api-keys-retention is set to a non-zero duration (default 7d),
and disabled when set to 0. No fallback to global retention.
diff --git a/coderd/database/dbpurge/dbpurge.go b/coderd/database/dbpurge/dbpurge.go
@@ -86,9 +86,6 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, vals *coder
 
 			var expiredAPIKeys int64
 			apiKeysRetention := vals.Retention.APIKeys.Value()
-			if apiKeysRetention == 0 {
-				apiKeysRetention = vals.Retention.Global.Value()
-			}
 			if apiKeysRetention > 0 {
 				// Delete keys that have been expired for at least the retention period.
 				// A higher retention period allows the backend to return a more helpful
diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go
@@ -1282,18 +1282,7 @@ func TestDeleteExpiredAPIKeys(t *testing.T) {
 			expectOldExpiredDeleted: false,
 			expectedKeysRemaining:   1, // old expired is kept
 		},
-		{
-			name: "GlobalRetentionFallback",
-			retentionConfig: codersdk.RetentionConfig{
-				Global:  serpent.Duration(14 * 24 * time.Hour), // 14 days global
-				APIKeys: serpent.Duration(0),                   // Not set, should fall back to global
-			},
-			oldExpiredTime:          now.Add(-15 * 24 * time.Hour),      // Expired 15 days ago
-			recentExpiredTime:       ptr(now.Add(-13 * 24 * time.Hour)), // Expired 13 days ago
-			activeTime:              nil,
-			expectOldExpiredDeleted: true,
-			expectedKeysRemaining:   1, // only recent expired remains
-		},
+
 		{
 			name: "CustomRetention30Days",
 			retentionConfig: codersdk.RetentionConfig{
