Skip to content

feat(coderd/database/dbpurge): make API keys retention configurable #21037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mafredri merged 6 commits into from
Dec 2, 2025
+167 −41
Merged

feat(coderd/database/dbpurge): make API keys retention configurable #21037

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5e8003f
feat(coderd/database/dbpurge): make API keys retention configurable
mafredri Dec 1, 2025
a8c815d
fix: improve comment wording for API keys retention
mafredri Dec 1, 2025
85235cc
test(coderd/database/dbpurge): convert API keys tests to table-driven
mafredri Dec 1, 2025
1a09ab4
chore: remove global retention fallback for API keys
mafredri Dec 2, 2025
a6744f0
refactor: optimize DeleteExpiredAPIKeys to use :execrows
mafredri Dec 2, 2025
87f1ce1
Merge branch 'main' into mafredri/feat-coderd-db-retention-policy-4
mafredri Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: remove global retention fallback for API keys 
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.
  • Loading branch information
@mafredri
mafredri committed Dec 2, 2025
commit 1a09ab43ff978229eb13ebff94aa318645c53413
3 changes: 0 additions & 3 deletions coderd/database/dbpurge/dbpurge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,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
Expand Down
13 changes: 1 addition & 12 deletions coderd/database/dbpurge/dbpurge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down