Deploy main eacf1e7 to prod

Replaces #559, which conflicted. Model: opus-5-5
2026-10-25 01:55:36 +00:00
parent 1647b43aa6
commit 537374e4cc
311 changed files with 35614 additions and 14120 deletions
@@ -45,7 +45,7 @@ func tSeedDeletedTarget(

 	iCreateTarget(
 		t, s.MainDB, targetID, s.WebhookID, name,
-		database.TargetTypeHTTP, iHTTPConfig(url), 5,
+		database.TargetTypeHTTP, url, 5,
 	)

 	event := iSeedEvent(
@@ -122,9 +122,9 @@ func TestProcessDelivery_UnknownTargetType_RecordsWhy(
 	)

 	target := database.Target{
-		Name:   "mystery",
-		Type:   tUnknownType,
-		Config: iHTTPConfig("http://example.com/hook"),
+		Name: "mystery",
+		Type: tUnknownType,
+		URL:  "http://example.com/hook",
 	}
 	target.ID = targetID

@@ -140,7 +140,7 @@ func TestProcessDelivery_UnknownTargetType_RecordsWhy(
 	body := event.Body
 	task := iTask(
 		seeded, event, s.WebhookID, targetID, "mystery",
-		target.Config, 0, 1, &body,
+		target.URL, 0, 1, &body,
 	)
 	task.TargetType = tUnknownType

@@ -178,7 +178,7 @@ func TestRecoverSingleRetry_TargetDeleted(t *testing.T) {
 	)

 	s.Engine.ExportRecoverWebhookDeliveries(
-		context.Background(), s.WebhookID,
+		context.Background(), s.WebhookID, atStart,
 	)

 	iAssertStatus(
@@ -201,7 +201,7 @@ func TestRecoverSingleRetry_TargetDeleted(t *testing.T) {
 	)
 }

-func TestSweepSingleRetry_TargetDeleted(t *testing.T) {
+func TestRecoverSingleRetry_OnTick_TargetDeleted(t *testing.T) {
 	t.Parallel()

 	s := newISetup(t)
@@ -218,11 +218,11 @@ func TestSweepSingleRetry_TargetDeleted(t *testing.T) {
 	// Twice, because the bug was an error the sweep repeated every
 	// minute for the life of the database: the second sweep must
 	// find nothing left to do.
-	s.Engine.ExportSweepWebhookRetries(
-		context.Background(), s.WebhookID,
+	s.Engine.ExportRecoverWebhookDeliveries(
+		context.Background(), s.WebhookID, onTick,
 	)
-	s.Engine.ExportSweepWebhookRetries(
-		context.Background(), s.WebhookID,
+	s.Engine.ExportRecoverWebhookDeliveries(
+		context.Background(), s.WebhookID, onTick,
 	)

 	iAssertStatus(
@@ -239,10 +239,11 @@ func TestSweepSingleRetry_TargetDeleted(t *testing.T) {
 	assert.Zero(t, s.Engine.ExportInflightHeld())
 }

-// TestSweepSingleRetry_TargetNeverExisted covers the other half of the
-// soft-delete distinction: an id with no row at all, deleted or
-// otherwise, must not be reported as something the operator deleted.
-func TestSweepSingleRetry_TargetNeverExisted(t *testing.T) {
+// TestRecoverSingleRetry_OnTick_TargetNeverExisted covers the other
+// half of the soft-delete distinction: an id with no row at all,
+// deleted or otherwise, must not be reported as something the operator
+// deleted.
+func TestRecoverSingleRetry_OnTick_TargetNeverExisted(t *testing.T) {
 	t.Parallel()

 	s := newISetup(t)
@@ -264,8 +265,8 @@ func TestSweepSingleRetry_TargetNeverExisted(t *testing.T) {

 	iSeedFailedResult(t, s.WebhookDB, d.ID)

-	s.Engine.ExportSweepWebhookRetries(
-		context.Background(), s.WebhookID,
+	s.Engine.ExportRecoverWebhookDeliveries(
+		context.Background(), s.WebhookID, onTick,
 	)

 	iAssertStatus(
@@ -303,8 +304,8 @@ func TestFailMissingTarget_WritesNoTargetRow(
 		database.DeliveryStatusRetrying,
 	)

-	s.Engine.ExportSweepWebhookRetries(
-		context.Background(), s.WebhookID,
+	s.Engine.ExportRecoverWebhookDeliveries(
+		context.Background(), s.WebhookID, onTick,
 	)

 	iAssertStatus(
@@ -312,13 +313,9 @@ func TestFailMissingTarget_WritesNoTargetRow(
 		database.DeliveryStatusFailed,
 	)

-	var configs []string
-
-	require.NoError(t, s.WebhookDB.
-		Table("targets").
-		Pluck("config", &configs).Error)
-
-	assert.Empty(t, configs,
+	// The per-webhook database has no targets table, so writing a
+	// target row there would have failed the status write above.
+	assert.False(t, s.WebhookDB.Migrator().HasTable("targets"),
 		"the deleted-target terminal path wrote a target row "+
 			"into the per-webhook event database",
 	)
@@ -349,11 +346,10 @@ func tRetryChainSetup(
 	iCreateWebhook(t, s.MainDB, s.WebhookID, name)

 	targetID := uuid.New().String()
-	cfg := iHTTPConfig(ts.URL)

 	iCreateTarget(
 		t, s.MainDB, targetID, s.WebhookID, name,
-		database.TargetTypeHTTP, cfg, 5,
+		database.TargetTypeHTTP, ts.URL, 5,
 	)

 	event := iSeedEvent(
@@ -370,7 +366,7 @@ func tRetryChainSetup(
 	body := event.Body

 	return iTask(
-		d, event, s.WebhookID, targetID, name, cfg, 5, 2, &body,
+		d, event, s.WebhookID, targetID, name, ts.URL, 5, 2, &body,
 	), targetID
 }

@@ -418,6 +414,38 @@ func TestProcessRetryTask_TargetDeleted_MakesNoAttempt(
 	assert.Zero(t, s.Engine.ExportInflightHeld())
 }

+// TestProcessRetryTask_TargetDeleted_CountsFailureOnTarget verifies
+// that the failure of a retry abandoned because its target is gone is
+// added to that target's own totals, not to a row with no target.
+func TestProcessRetryTask_TargetDeleted_CountsFailureOnTarget(
+	t *testing.T,
+) {
+	t.Parallel()
+
+	s := newISetup(t)
+
+	var hits atomic.Int64
+
+	task, targetID := tRetryChainSetup(
+		t, s, "gone-counted", &hits,
+	)
+
+	require.NoError(t, s.MainDB.Delete(
+		&database.Target{}, "id = ?", targetID,
+	).Error)
+
+	s.Engine.ExportProcessRetryTask(
+		context.Background(), &task,
+	)
+
+	var rows []database.TargetTotals
+
+	require.NoError(t, s.WebhookDB.Find(&rows).Error)
+	assert.Equal(t, []database.TargetTotals{
+		{TargetID: targetID, Failed: 1},
+	}, rows)
+}
+
 // TestProcessRetryTask_TargetPresent_StillDelivers is the guard's
 // mutation check: a liveness check that refused every retry would pass
 // the test above and break every retry there is.
@@ -499,7 +527,7 @@ func TestRecoverSingleRetry_TargetUnreadable_LeavesDeliveryAlone(
 	iCreateTarget(
 		t, s.MainDB, targetID, s.WebhookID, "healthy",
 		database.TargetTypeHTTP,
-		iHTTPConfig("http://example.com/hook"), 5,
+		"http://example.com/hook", 5,
 	)

 	event := iSeedEvent(
@@ -518,7 +546,7 @@ func TestRecoverSingleRetry_TargetUnreadable_LeavesDeliveryAlone(
 	require.NoError(t, sqlDB.Close())

 	s.Engine.ExportRecoverRetryingDeliveries(
-		s.WebhookDB, s.WebhookID,
+		context.Background(), s.WebhookDB, s.WebhookID,
 	)

 	iAssertStatus(
@@ -536,18 +564,20 @@ func TestRecoverSingleRetry_TargetUnreadable_LeavesDeliveryAlone(

 // --- 4. A pending delivery whose target is gone ---

-func TestRecoverPending_TargetDeleted(t *testing.T) {
+func TestRecoverPendingDeliveries_TargetDeleted(t *testing.T) {
 	t.Parallel()

 	s := newISetup(t)

+	iCreateWebhook(t, s.MainDB, s.WebhookID, "pending-recovery")
+
 	deliveryID := tSeedDeletedTarget(
 		t, s, "gone-while-pending", "http://example.com/hook",
 		database.DeliveryStatusPending,
 	)

 	s.Engine.ExportRecoverWebhookDeliveries(
-		context.Background(), s.WebhookID,
+		context.Background(), s.WebhookID, atStart,
 	)

 	iAssertStatus(
@@ -570,16 +600,18 @@ func TestRecoverPending_TargetDeleted(t *testing.T) {
 	)
 }

-// TestRecoverPending_TargetDeleted_LeavesAnOwnedDeliveryAlone: the
-// terminal write takes ownership like every other recovery write, so a
-// delivery the engine still holds is not failed underneath its worker.
-func TestRecoverPending_TargetDeleted_LeavesAnOwnedDeliveryAlone(
+// TestRecoverPendingDeliveries_TargetDeleted_LeavesAnOwnedDeliveryAlone:
+// the terminal write takes ownership like every other recovery write, so
+// a delivery the engine still holds is not failed underneath its worker.
+func TestRecoverPendingDeliveries_TargetDeleted_LeavesAnOwnedDeliveryAlone(
 	t *testing.T,
 ) {
 	t.Parallel()

 	s := newISetup(t)

+	iCreateWebhook(t, s.MainDB, s.WebhookID, "owned-recovery")
+
 	deliveryID := tSeedDeletedTarget(
 		t, s, "gone-but-owned", "http://example.com/hook",
 		database.DeliveryStatusPending,
@@ -588,7 +620,7 @@ func TestRecoverPending_TargetDeleted_LeavesAnOwnedDeliveryAlone(
 	require.True(t, s.Engine.ExportRetainDelivery(deliveryID))

 	s.Engine.ExportRecoverWebhookDeliveries(
-		context.Background(), s.WebhookID,
+		context.Background(), s.WebhookID, atStart,
 	)

 	iAssertStatus(
@@ -643,18 +675,18 @@ func TestFailMissingTarget_LeavesASettledDeliveryAlone(
 	assert.Zero(t, s.Engine.ExportInflightHeld())
 }

-// TestSweepPending_TargetDeleted sweeps twice over a batch that also
-// holds a healthy stranded delivery. The one whose target is gone is
-// failed once and then left alone; the healthy one is queued by the
-// first sweep and not again by the second.
-func TestSweepPending_TargetDeleted(t *testing.T) {
+// TestRecoverPendingDeliveries_OnTick_TargetDeleted sweeps twice over a
+// batch that also holds a healthy stranded delivery. The one whose
+// target is gone is failed once and then left alone; the healthy one is
+// queued by the first sweep and not again by the second.
+func TestRecoverPendingDeliveries_OnTick_TargetDeleted(t *testing.T) {
 	t.Parallel()

 	liveTargetID := uuid.New().String()
 	s := fSweepSetup(t, liveTargetID, "still-there")

 	deliveryID := tSeedDeletedTarget(
-		t, s, "gone-on-pending-sweep", "http://example.com/hook",
+		t, s, "gone-while-pending-on-tick", "http://example.com/hook",
 		database.DeliveryStatusPending,
 	)
 	rAgePending(t, s.WebhookDB, deliveryID)
@@ -671,7 +703,7 @@ func TestSweepPending_TargetDeleted(t *testing.T) {

 	ctx := context.Background()

-	s.Engine.ExportSweepWebhookRetries(ctx, s.WebhookID)
+	s.Engine.ExportRecoverWebhookDeliveries(ctx, s.WebhookID, onTick)

 	tasks := fDrain(s.Engine)
 	require.Len(t, tasks, 1,
@@ -679,7 +711,7 @@ func TestSweepPending_TargetDeleted(t *testing.T) {
 	)
 	assert.Equal(t, healthy.ID, tasks[0].DeliveryID)

-	s.Engine.ExportSweepWebhookRetries(ctx, s.WebhookID)
+	s.Engine.ExportRecoverWebhookDeliveries(ctx, s.WebhookID, onTick)

 	assert.Empty(t, fDrain(s.Engine),
 		"the second sweep queued a delivery again",
@@ -692,7 +724,7 @@ func TestSweepPending_TargetDeleted(t *testing.T) {

 	last := tLastResult(t, s, deliveryID, 2)

-	assert.Contains(t, last.Error, "gone-on-pending-sweep")
+	assert.Contains(t, last.Error, "gone-while-pending-on-tick")
 	assert.Contains(t, last.Error, "was deleted")
 }

@@ -711,7 +743,7 @@ func TestSendRecoveredDeliveries_TargetMissingFromMap(

 	iCreateTarget(
 		t, s.MainDB, targetID, s.WebhookID, "found-on-lookup",
-		database.TargetTypeLog, "", 0,
+		database.TargetTypeLog, "", 1,
 	)

 	event := iSeedEvent(
@@ -743,11 +775,11 @@ func TestSendRecoveredDeliveries_TargetMissingFromMap(
 	)
 }

-// TestRecoverPending_TargetUnreadable_LeavesDeliveryAlone: a failed
-// read of the main database is not a deleted target. Restart recovery
-// holds every pending delivery of the webhook in one batch, so failing
-// on this would fail all of them.
-func TestRecoverPending_TargetUnreadable_LeavesDeliveryAlone(
+// TestRecoverPendingDeliveries_TargetUnreadable_LeavesDeliveryAlone: a
+// failed read of the main database is not a deleted target. At start the
+// recovery routine holds every pending delivery of the webhook in one
+// batch, so failing on this would fail all of them.
+func TestRecoverPendingDeliveries_TargetUnreadable_LeavesDeliveryAlone(
 	t *testing.T,
 ) {
 	t.Parallel()
@@ -758,7 +790,7 @@ func TestRecoverPending_TargetUnreadable_LeavesDeliveryAlone(

 	iCreateTarget(
 		t, s.MainDB, targetID, s.WebhookID, "healthy",
-		database.TargetTypeLog, "", 0,
+		database.TargetTypeLog, "", 1,
 	)

 	event := iSeedEvent(
@@ -775,7 +807,7 @@ func TestRecoverPending_TargetUnreadable_LeavesDeliveryAlone(
 	require.NoError(t, sqlDB.Close())

 	s.Engine.ExportRecoverPendingDeliveries(
-		context.Background(), s.WebhookDB, s.WebhookID,
+		context.Background(), s.WebhookDB, s.WebhookID, atStart,
 	)

 	iAssertStatus(