webhook: use new json package

Signed-off-by: Hank Donnay <[email protected]>

Author: hdonnay

notifier/webhook/deliverer.go

@@ -3,6 +3,7 @@ package webhook
 import (
 	"context"
 	"errors"
+	"io"
 	"net/http"
 	"net/url"
 	"sync"
@@ -12,9 +13,9 @@ import (
 	"github.com/quay/zlog"
 
 	clairerror "github.com/quay/clair/v4/clair-error"
-	"github.com/quay/clair/v4/internal/codec"
 	"github.com/quay/clair/v4/internal/httputil"
-	"github.com/quay/clair/v4/notifier"
+	"github.com/quay/clair/v4/internal/json"
+	"github.com/quay/clair/v4/internal/json/jsontext"
 )
 
 // SignedOnce is used to print a deprecation notice, but only once per run.
@@ -67,26 +68,60 @@ func (d *Deliverer) Name() string {
 	return "webhook"
 }
 
+var options = sync.OnceValue(func() json.Options {
+	return json.WithMarshalers(json.MarshalFuncV2(marshalCallback))
+})
+
+func marshalCallback(enc *jsontext.Encoder, cb *callbackRequest, opts json.Options) error {
+	if err := enc.WriteToken(jsontext.ObjectStart); err != nil {
+		return err
+	}
+	if err := enc.WriteToken(jsontext.String(`callback`)); err != nil {
+		return err
+	}
+	if err := enc.WriteToken(jsontext.String(cb.URL.String())); err != nil {
+		return err
+	}
+	if err := enc.WriteToken(jsontext.String(`notification_id`)); err != nil {
+		return err
+	}
+	if err := enc.WriteToken(jsontext.String(cb.ID.String())); err != nil {
+		return err
+	}
+	return enc.WriteToken(jsontext.ObjectEnd)
+}
+
+type callbackRequest struct {
+	ID  *uuid.UUID
+	URL *url.URL
+}
+
 // Deliver implements the notifier.Deliverer interface.
 //
-// Deliver POSTS a webhook data structure to the configured target.
+// Deliver POSTs a webhook data structure to the configured target.
 func (d *Deliverer) Deliver(ctx context.Context, nID uuid.UUID) error {
 	ctx = zlog.ContextWithValues(ctx,
 		"component", "notifier/webhook/Deliverer.Deliver",
 		"notification_id", nID.String(),
 	)
 
-	callback, err := d.callback.Parse(nID.String())
+	url, err := d.callback.Parse(nID.String())
 	if err != nil {
 		return err
 	}
-
-	wh := notifier.Callback{
-		NotificationID: nID,
-		Callback:       *callback,
+	cb := callbackRequest{
+		ID:  &nID,
+		URL: url,
 	}
 
-	req, err := httputil.NewRequestWithContext(ctx, http.MethodPost, d.target.String(), codec.JSONReader(&wh))
+	rd, wr := io.Pipe()
+	defer rd.Close()
+	go func() {
+		err := json.MarshalWrite(wr, &cb, options())
+		wr.CloseWithError(err)
+	}()
+
+	req, err := httputil.NewRequestWithContext(ctx, http.MethodPost, d.target.String(), rd)
 	if err != nil {
 		return err
 	}
@@ -102,7 +137,7 @@ func (d *Deliverer) Deliver(ctx context.Context, nID uuid.UUID) error {
 	}
 
 	zlog.Info(ctx).
-		Stringer("callback", callback).
+		Stringer("callback", url).
 		Stringer("target", d.target).
 		Msg("dispatching webhook")
 

notifier/webhook/deliverer_test.go

@@ -7,6 +7,7 @@ import (
 	"net/http/httptest"
 	"net/url"
 	"path"
+	"strings"
 	"sync"
 	"testing"
 
@@ -15,6 +16,7 @@ import (
 	"github.com/quay/clair/config"
 	"github.com/quay/zlog"
 
+	json2 "github.com/quay/clair/v4/internal/json"
 	"github.com/quay/clair/v4/notifier"
 )
 
@@ -81,3 +83,48 @@ func TestDeliverer(t *testing.T) {
 		t.Fatalf("got: %v, wanted: %v", got, want)
 	}
 }
+
+func TestMarshal(t *testing.T) {
+	// Check that the "v0" format (no specific media type) is identical to
+	// stdlib output.
+	t.Run("V0", func(t *testing.T) {
+		var (
+			callback = "http://clair-notifier/notifier/api/v1/notification/"
+			noteID   = uuid.New()
+		)
+
+		want := func() string {
+			v := notifier.Callback{
+				NotificationID: noteID,
+			}
+			if err := v.Callback.UnmarshalBinary([]byte(callback)); err != nil {
+				t.Error(err)
+			}
+			b, err := json.Marshal(&v)
+			if err != nil {
+				t.Error(err)
+			}
+			return string(b)
+		}()
+
+		got := func() string {
+			url, err := url.Parse(callback)
+			if err != nil {
+				t.Error(err)
+			}
+			var b strings.Builder
+			cb := callbackRequest{
+				ID:  &noteID,
+				URL: url,
+			}
+			if err := json2.MarshalWrite(&b, &cb, options()); err != nil {
+				t.Error(err)
+			}
+			return b.String()
+		}()
+
+		if !cmp.Equal(got, want) {
+			t.Error(cmp.Diff(got, want))
+		}
+	})
+}