address code review comments

Author: benjlevesque

pkg/handler/handler.go

@@ -35,6 +35,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 func (h *Handler) parse(r *http.Request) (hooks.PushEvent, error) {
 	h.log.Info("processing hook request")
+	// TODO: LimitReader
 	data, err := ioutil.ReadAll(r.Body)
 	if err != nil {
 		h.log.Error(err, "failed to read request body")

pkg/hooks/docker/hook_test.go

@@ -13,7 +13,7 @@ var _ hooks.PushEvent = (*Webhook)(nil)
 var _ hooks.PushEventParser = Parse
 
 func TestParse(t *testing.T) {
-	req := makeHookRequest(t, "testdata/push_event.json")
+	req := readFixture(t, "testdata/push_event.json")
 
 	hook, err := Parse(req)
 	if err != nil {
@@ -83,7 +83,7 @@ func TestRepository(t *testing.T) {
 	}
 }
 
-func makeHookRequest(t *testing.T, fixture string) []byte {
+func readFixture(t *testing.T, fixture string) []byte {
 	t.Helper()
 	b, err := ioutil.ReadFile(fixture)
 	if err != nil {

pkg/hooks/gcr/hook.go

@@ -2,7 +2,7 @@ package gcr
 
 import (
 	"encoding/json"
-	"fmt"
+	"errors"
 	"strings"
 
 	"github.com/gitops-tools/image-updater/pkg/hooks"
@@ -40,7 +40,7 @@ func Parse(payload []byte) (hooks.PushEvent, error) {
 	}
 
 	if msg.Tag == "" {
-		return nil, fmt.Errorf("Tag is empty")
+		return nil, errors.New("tag is empty")
 	}
 
 	return msg, nil

pkg/hooks/gcr/hook_test.go

@@ -13,9 +13,9 @@ var _ hooks.PushEvent = (*PushMessage)(nil)
 var _ hooks.PushEventParser = Parse
 
 func TestParse(t *testing.T) {
-	req := makeHookRequest(t, "testdata/push_event.json")
+	event := readFixture(t, "testdata/push_event.json")
 
-	hook, err := Parse(req)
+	hook, err := Parse(event)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -56,22 +56,11 @@ func TestRepository(t *testing.T) {
 	}
 }
 
-func makeHookRequest(t *testing.T, fixture string) []byte {
+func readFixture(t *testing.T, fixture string) []byte {
 	t.Helper()
 	b, err := ioutil.ReadFile(fixture)
 	if err != nil {
 		t.Fatalf("failed to read %s: %s", fixture, err)
 	}
 	return b
 }
-
-type failingReader struct {
-	err error
-}
-
-func (f failingReader) Read(p []byte) (n int, err error) {
-	return 0, f.err
-}
-func (f failingReader) Close() error {
-	return f.err
-}

pkg/hooks/quay/hook_test.go

@@ -12,7 +12,7 @@ var _ hooks.PushEvent = (*RepositoryPushHook)(nil)
 var _ hooks.PushEventParser = Parse
 
 func TestParse(t *testing.T) {
-	req := makeHookRequest(t, "testdata/push_hook.json")
+	req := readFixture(t, "testdata/push_hook.json")
 
 	hook, err := Parse(req)
 	if err != nil {
@@ -73,22 +73,11 @@ func TestEventTag(t *testing.T) {
 	}
 }
 
-func makeHookRequest(t *testing.T, fixture string) []byte {
+func readFixture(t *testing.T, fixture string) []byte {
 	t.Helper()
 	b, err := ioutil.ReadFile(fixture)
 	if err != nil {
 		t.Fatalf("failed to read %s: %s", fixture, err)
 	}
 	return b
 }
-
-type failingReader struct {
-	err error
-}
-
-func (f failingReader) Read(p []byte) (n int, err error) {
-	return 0, f.err
-}
-func (f failingReader) Close() error {
-	return f.err
-}

pkg/pubsubhandler/handler_test.go

@@ -34,7 +34,7 @@ func TestHandler(t *testing.T) {
 
 	h := New(logger, applier, gcr.Parse)
 
-	msg := makeHookMessage(t, "testdata/push_event.json")
+	msg := readFixture(t, "testdata/push_event.json")
 
 	h.Handle(context.TODO(), msg)
 
@@ -46,7 +46,7 @@ func TestHandler(t *testing.T) {
 	})
 }
 
-func makeHookMessage(t *testing.T, fixture string) *stubMessage {
+func readFixture(t *testing.T, fixture string) *stubMessage {
 	t.Helper()
 	b, err := ioutil.ReadFile(fixture)
 	if err != nil {