26653b196b
Refactor the webhook logic, to have the type-dependent processing happen only in one place. --- ## Current webhook flow 1. An event happens 2. It is pre-processed (depending on the webhook type) and its body is added to a task queue 3. When the task is processed, some more logic (depending on the webhook type as well) is applied to make an HTTP request This means that webhook-type dependant logic is needed in step 2 and 3. This is cumbersome and brittle to maintain. Updated webhook flow with this PR: 1. An event happens 2. It is stored as-is and added to a task queue 3. When the task is processed, the event is processed (depending on the webhook type) to make an HTTP request So the only webhook-type dependent logic happens in one place (step 3) which should be much more robust. ## Consequences of the refactor - the raw event must be stored in the hooktask (until now, the pre-processed body was stored) - to ensure that previous hooktasks are correctly sent, a `payload_version` is added (version 1: the body has already been pre-process / version 2: the body is the raw event) So future webhook additions will only have to deal with creating an http.Request based on the raw event (no need to adjust the code in multiple places, like currently). Moreover since this processing happens when fetching from the task queue, it ensures that the queuing of new events (upon a `git push` for instance) does not get slowed down by a slow webhook. As a concrete example, the PR #19307 for custom webhooks, should be substantially smaller: - no need to change `services/webhook/deliver.go` - minimal change in `services/webhook/webhook.go` (add the new webhook to the map) - no need to change all the individual webhook files (since with this refactor the `*webhook_model.Webhook` is provided as argument)
38 lines
636 B
YAML
38 lines
636 B
YAML
-
|
|
id: 1
|
|
hook_id: 1
|
|
uuid: uuid1
|
|
is_delivered: true
|
|
is_succeed: false
|
|
request_content: >
|
|
{
|
|
"url": "/matrix-delivered",
|
|
"http_method":"PUT",
|
|
"headers": {
|
|
"X-Head": "42"
|
|
},
|
|
"body": "{}"
|
|
}
|
|
|
|
-
|
|
id: 2
|
|
hook_id: 1
|
|
uuid: uuid2
|
|
is_delivered: false
|
|
|
|
-
|
|
id: 3
|
|
hook_id: 1
|
|
uuid: uuid3
|
|
is_delivered: true
|
|
is_succeed: true
|
|
payload_content: '{"key":"value"}' # legacy task, payload saved in payload_content (and not in request_content)
|
|
request_content: >
|
|
{
|
|
"url": "/matrix-success",
|
|
"http_method":"PUT",
|
|
"headers": {
|
|
"X-Head": "42"
|
|
}
|
|
}
|