chore: remove global retention fallback for connection logs

mafredri · mafredri · commit 039afdb4b0d8 · 2025-12-02T09:59:25.000Z
Connection logs retention is now explicit - it's enabled when
--connection-logs-retention is set to a non-zero duration, 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
@@ -21,8 +21,8 @@ const (
 	delay          = 10 * time.Minute
 	maxAgentLogAge = 7 * 24 * time.Hour
 	// Connection events are now inserted into the `connection_logs` table.
-	// We'll slowly remove old connection events from the `audit_logs` table,
-	// but we won't touch the `connection_logs` table.
+	// We'll slowly remove old connection events from the `audit_logs` table.
+	// The `connection_logs` table is purged based on the configured retention.
 	maxAuditLogConnectionEventAge    = 90 * 24 * time.Hour // 90 days
 	auditLogConnectionEventBatchSize = 1000
 	// Batch size for connection log deletion. Smaller batches prevent long-held
@@ -116,9 +116,6 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, vals *coder
 
 			var purgedConnectionLogs int64
 			connectionLogsRetention := vals.Retention.ConnectionLogs.Value()
-			if connectionLogsRetention == 0 {
-				connectionLogsRetention = vals.Retention.Global.Value()
-			}
 			if connectionLogsRetention > 0 {
 				deleteConnectionLogsBefore := start.Add(-connectionLogsRetention)
 				purgedConnectionLogs, err = tx.DeleteOldConnectionLogs(ctx, database.DeleteOldConnectionLogsParams{
diff --git a/coderd/database/dbpurge/dbpurge_test.go b/coderd/database/dbpurge/dbpurge_test.go
@@ -795,17 +795,6 @@ func TestDeleteOldConnectionLogs(t *testing.T) {
 			expectOldDeleted:      false,
 			expectedLogsRemaining: 1, // old log is kept
 		},
-		{
-			name: "GlobalRetentionFallback",
-			retentionConfig: codersdk.RetentionConfig{
-				Global:         serpent.Duration(retentionPeriod),
-				ConnectionLogs: serpent.Duration(0), // Not set, should fall back to global
-			},
-			oldLogTime:            afterThreshold,
-			recentLogTime:         &beforeThreshold,
-			expectOldDeleted:      true,
-			expectedLogsRemaining: 1, // only recent log remains
-		},
 	}
 
 	for _, tc := range testCases {
