From 2a24b0ad5fa3583686086e58744184fe07e3e657 Mon Sep 17 00:00:00 2001
From: Gareth George <garethgeorge97@gmail.com>
Date: Tue, 1 Apr 2025 19:37:01 -0700
Subject: [PATCH] fix: update healthchecks hook to construct urls such that
 query parameters are preserved

---
 internal/hook/types/healthchecks.go | 41 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/internal/hook/types/healthchecks.go b/internal/hook/types/healthchecks.go
index 63a131bc..985a3c0a 100644
--- a/internal/hook/types/healthchecks.go
+++ b/internal/hook/types/healthchecks.go
@@ -4,6 +4,8 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"net/url"
+	"path"
 	"reflect"
 
 	v1 "github.com/garethgeorge/backrest/gen/go/v1"
@@ -28,27 +30,26 @@ func (healthchecksHandler) Execute(ctx context.Context, cmd *v1.Hook, vars inter
 	l := runner.Logger(ctx)
 	l.Sugar().Infof("Sending healthchecks message to %s", cmd.GetActionHealthchecks().GetWebhookUrl())
 	l.Debug("Sending healthchecks message", zap.String("payload", payload))
-
-	PingUrl := cmd.GetActionHealthchecks().GetWebhookUrl()
-
-	// Send a "start" signal to healthchecks.io when the hook is starting.
-	if protoutil.IsStartCondition(event) {
-		PingUrl += "/start"
-	}
-
-	// Send a "fail" signal to healthchecks.io when the hook is failing.
-	if protoutil.IsErrorCondition(event) {
-		PingUrl += "/fail"
-	}
-
-	// Send a "log" signal to healthchecks.io when the hook is ending.
-	if protoutil.IsLogCondition(event) {
-		PingUrl += "/log"
-	}
-
-	body, err := hookutil.PostRequest(PingUrl, "text/plain", bytes.NewBufferString(payload))
+	baseURL := cmd.GetActionHealthchecks().GetWebhookUrl()
+	u, err := url.Parse(baseURL)
 	if err != nil {
-		return fmt.Errorf("sending healthchecks message to %q: %w", PingUrl, err)
+		return fmt.Errorf("parsing webhook URL: %w", err)
+	}
+
+	switch {
+	case protoutil.IsStartCondition(event):
+		u.Path = path.Join(u.Path, "start")
+	case protoutil.IsErrorCondition(event):
+		u.Path = path.Join(u.Path, "fail")
+	case protoutil.IsLogCondition(event):
+		u.Path = path.Join(u.Path, "log")
+	}
+
+	pingUrl := u.String()
+
+	body, err := hookutil.PostRequest(pingUrl, "text/plain", bytes.NewBufferString(payload))
+	if err != nil {
+		return fmt.Errorf("sending healthchecks message to %q: %w", pingUrl, err)
 	}
 
 	l.Debug("Healthchecks response", zap.String("body", body))