Merge pull request #239 from Rested/master

Fixes handling of invalid urls in webhooks

cmd/git-sync/webhook.go

@@ -72,10 +72,10 @@ func (w *Webhook) Send(hash string) {
 
 func (w *Webhook) Do(hash string) error {
 	req, err := http.NewRequest(w.Method, w.URL, nil)
-	req.Header.Set("Gitsync-Hash", hash)
 	if err != nil {
 		return err
 	}
+	req.Header.Set("Gitsync-Hash", hash)
 
 	ctx, cancel := context.WithTimeout(context.Background(), w.Timeout)
 	defer cancel()

cmd/git-sync/webhook_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"testing"
+	"time"
 )
 
 const (
@@ -62,3 +63,20 @@ func TestWebhookData(t *testing.T) {
 		}
 	})
 }
+
+func TestDo(t *testing.T) {
+	t.Run("test invalid urls are handled", func(t *testing.T) {
+		wh := Webhook{
+			URL:     ":http://localhost:601426/hooks/webhook",
+			Method:  "POST",
+			Success: 200,
+			Timeout: time.Second,
+			Backoff: time.Second * 3,
+			Data:    NewWebhookData(),
+		}
+		err := wh.Do("hash")
+		if err == nil {
+			t.Fatalf("expected error for invalid url but got none")
+		}
+	})
+}