A target's settings move from the per-type JSON string in targets.config to columns: url, headers, timeout_seconds, forward_query, archive_expiry and archive_rotation. A column a type does not use stays empty. headers holds the header map as JSON text through GORM's JSON serializer, and archive_expiry holds a time.Duration, 0 meaning never. The forms check each setting once, with the same refusals and messages, and the edit form is filled from the columns, so the per-type config structs, their parsers and the "could not be read" branches are gone. A delivery task carries the six settings in place of the JSON string; tests check that each copy into a task, and back out of one, keeps all six. Model: opus-5-5
This commit was merged in pull request #554.
This commit is contained in:
@@ -56,7 +56,7 @@ func recoverySetup(t *testing.T) (iSetup, string) {
|
||||
iCreateTarget(
|
||||
t, s.MainDB, targetID, s.WebhookID, "recovery",
|
||||
database.TargetTypeHTTP,
|
||||
iHTTPConfig("http://example.com/hook"), 20,
|
||||
"http://example.com/hook", 20,
|
||||
)
|
||||
|
||||
return s, targetID
|
||||
@@ -205,6 +205,55 @@ func TestRecovery_PendingOlderThanTheAgeBound(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestRecovery_TaskCarriesEveryTargetSetting: the task the recovery
|
||||
// routine queues carries every one of the target's settings, all six
|
||||
// set here.
|
||||
// They are copied into the task one field at a time, and a field left
|
||||
// out is sent empty without any error.
|
||||
func TestRecovery_TaskCarriesEveryTargetSetting(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
for _, run := range recoveryRuns() {
|
||||
t.Run(run.name, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
s := newISetup(t)
|
||||
iCreateWebhook(t, s.MainDB, s.WebhookID, "recovery")
|
||||
|
||||
target := database.Target{
|
||||
WebhookID: s.WebhookID,
|
||||
Name: "recovery",
|
||||
Type: database.TargetTypeHTTP,
|
||||
Active: true,
|
||||
URL: "http://example.com/hook",
|
||||
Headers: map[string]string{headerAuthorization: "Bearer t"},
|
||||
TimeoutSeconds: 7,
|
||||
ForwardQuery: true,
|
||||
ArchiveExpiry: time.Hour,
|
||||
ArchiveRotation: "daily",
|
||||
MaxAttempts: 1,
|
||||
}
|
||||
require.NoError(t, s.MainDB.Create(&target).Error)
|
||||
|
||||
id := seedRecoveryDelivery(
|
||||
t, s, target.ID, database.DeliveryStatusPending, 0, false,
|
||||
)
|
||||
rAgePending(t, s.WebhookDB, id)
|
||||
|
||||
s.Engine.ExportRecoverDeliveries(context.Background(), run.atStart)
|
||||
|
||||
task := requireQueued(t, s.Engine.ExportDeliveryCh())
|
||||
assert.Equal(t, target.ID, task.TargetID)
|
||||
assert.Equal(t, target.URL, task.TargetURL)
|
||||
assert.Equal(t, target.Headers, task.TargetHeaders)
|
||||
assert.Equal(t, target.TimeoutSeconds, task.TimeoutSeconds)
|
||||
assert.Equal(t, target.ForwardQuery, task.ForwardQuery)
|
||||
assert.Equal(t, target.ArchiveExpiry, task.ArchiveExpiry)
|
||||
assert.Equal(t, target.ArchiveRotation, task.ArchiveRotation)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestRecovery_PendingYoungerThanTheAgeBound: a pending delivery touched
|
||||
// a moment ago, as one a stop cut off is, is sent at start, which is how
|
||||
// it reaches its target on the next start
|
||||
|
||||
Reference in New Issue
Block a user