Deploy main eacf1e7 to prod

Replaces #559, which conflicted.

Model: opus-5-5

internal/delivery/event_timestamp_test.go

@@ -93,17 +93,6 @@ func (s *tsSink) text(t *testing.T) string {
 	}
 }
 
-func tsSlackConfig(t *testing.T, url string) string {
-	t.Helper()
-
-	data, err := json.Marshal(
-		delivery.SlackTargetConfig{WebhookURL: url},
-	)
-	require.NoError(t, err)
-
-	return string(data)
-}
-
 // tsSeedEvent writes an event whose CreatedAt is tsEventCreatedAt
 // rather than the write time, so an assertion on the rendered
 // timestamp cannot pass by accident against "roughly now".
@@ -142,16 +131,17 @@ func tsSeedEvent(
 // tsSeedTarget writes the slack target row into the main database.
 // The retry path confirms the target still exists before sending.
 func tsSeedTarget(
-	t *testing.T, mainDB *gorm.DB, webhookID, config string,
+	t *testing.T, mainDB *gorm.DB, webhookID, webhookURL string,
 ) database.Target {
 	t.Helper()
 
 	target := database.Target{
-		WebhookID: webhookID,
-		Name:      "slack-sink",
-		Type:      database.TargetTypeSlack,
-		Config:    config,
-		Active:    true,
+		WebhookID:   webhookID,
+		Name:        "slack-sink",
+		Type:        database.TargetTypeSlack,
+		URL:         webhookURL,
+		Active:      true,
+		MaxAttempts: 1,
 	}
 
 	require.NoError(t, mainDB.Create(&target).Error)
@@ -175,8 +165,8 @@ func tsTask(
 		TargetID:     target.ID,
 		TargetName:   target.Name,
 		TargetType:   database.TargetTypeSlack,
-		TargetConfig: target.Config,
-		MaxRetries:   0,
+		TargetURL:    target.URL,
+		MaxAttempts:  1,
 		Method:       event.Method,
 		Headers:      event.Headers,
 		ContentType:  event.ContentType,
@@ -225,8 +215,7 @@ func (c tsCase) run(t *testing.T) (iSetup, database.Delivery, string) {
 	s := newISetup(t)
 	sink := newTSSink(t)
 
-	cfg := tsSlackConfig(t, sink.URL)
-	target := tsSeedTarget(t, s.MainDB, s.WebhookID, cfg)
+	target := tsSeedTarget(t, s.MainDB, s.WebhookID, sink.URL)
 	event := tsSeedEvent(t, s.WebhookDB, s.WebhookID)
 
 	d := iSeedDelivery(
@@ -337,8 +326,7 @@ func TestFormatSlackMessageOverTaskReconstructedEvent(
 
 	s := newISetup(t)
 
-	cfg := tsSlackConfig(t, tsUndeliverableHook)
-	target := tsSeedTarget(t, s.MainDB, s.WebhookID, cfg)
+	target := tsSeedTarget(t, s.MainDB, s.WebhookID, tsUndeliverableHook)
 	event := tsSeedEvent(t, s.WebhookDB, s.WebhookID)
 
 	d := iSeedDelivery(
@@ -409,8 +397,7 @@ func TestEventReconstructionSurvivesAReapedRow(t *testing.T) {
 
 	s := newISetup(t)
 
-	cfg := tsSlackConfig(t, tsUndeliverableHook)
-	target := tsSeedTarget(t, s.MainDB, s.WebhookID, cfg)
+	target := tsSeedTarget(t, s.MainDB, s.WebhookID, tsUndeliverableHook)
 	event := tsSeedEvent(t, s.WebhookDB, s.WebhookID)
 
 	d := iSeedDelivery(