From 42b0f0ba77fb34a68102f716c76c2e4ca82032c1 Mon Sep 17 00:00:00 2001
From: kolaente <k@knt.li>
Date: Thu, 9 Apr 2026 10:06:53 +0200
Subject: [PATCH] fix(webhook): return error from sendWebhookPayload on non-2xx
 responses

Previously the HTTP response status was only logged, so retries never
triggered for failing webhooks and downstream fan-out bugs (#2569) were
impossible to exercise via tests. Returning an error lets the watermill
retry middleware do its job.
---
 pkg/models/webhooks.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/models/webhooks.go b/pkg/models/webhooks.go
index dfd978818..d7e3787d4 100644
--- a/pkg/models/webhooks.go
+++ b/pkg/models/webhooks.go
@@ -24,6 +24,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"sort"
@@ -337,12 +338,13 @@ func (w *Webhook) sendWebhookPayload(p *WebhookPayload) (err error) {
 	defer res.Body.Close()
 
 	if res.StatusCode > 399 {
-		responseBody, err := io.ReadAll(res.Body)
-		if err != nil {
-			return err
+		responseBody, readErr := io.ReadAll(res.Body)
+		if readErr != nil {
+			return fmt.Errorf("webhook %d returned status %d and reading its body failed: %w", w.ID, res.StatusCode, readErr)
 		}
 
 		log.Errorf("Got response with status %d from webhook %d: %s", res.StatusCode, w.ID, responseBody)
+		return fmt.Errorf("webhook %d returned non-success status %d", w.ID, res.StatusCode)
 	}
 
 	log.Debugf("Sent webhook payload for webhook %d for event %s", w.ID, p.EventName)