updated all webhook.Register references to Register

Author: maurafortino

internalWebhook.go

@@ -45,7 +45,7 @@ func (v2 RegistryV2) GetUntil() time.Time {
 	return v2.Registration.Expires
 }
 
-func InternalWebhookToItem(now func() time.Time, iw webhook.Register) (model.Item, error) {
+func InternalWebhookToItem(now func() time.Time, iw Register) (model.Item, error) {
 	encodedWebhook, err := json.Marshal(iw)
 	if err != nil {
 		return model.Item{}, err
@@ -69,7 +69,7 @@ func InternalWebhookToItem(now func() time.Time, iw webhook.Register) (model.Ite
 	}, nil
 }
 
-func ItemToInternalWebhook(i model.Item) (r webhook.Register, e error) {
+func ItemToInternalWebhook(i model.Item) (r Register, e error) {
 	var v1 RegistryV1
 	var v2 RegistryV2
 	encodedWebhook, e := json.Marshal(i.Data)
@@ -98,8 +98,8 @@ func ItemToInternalWebhook(i model.Item) (r webhook.Register, e error) {
 	return nil, fmt.Errorf("could not unmarshal data into either RegistryV1 or RegistryV2")
 }
 
-func ItemsToInternalWebhooks(items []model.Item) ([]webhook.Register, error) {
-	iws := []webhook.Register{}
+func ItemsToInternalWebhooks(items []model.Item) ([]Register, error) {
+	iws := []Register{}
 	for _, item := range items {
 		iw, err := ItemToInternalWebhook(item)
 		if err != nil {
@@ -110,7 +110,7 @@ func ItemsToInternalWebhooks(items []model.Item) ([]webhook.Register, error) {
 	return iws, nil
 }
 
-func InternalWebhooksToWebhooks(iws []webhook.Register) []any {
+func InternalWebhooksToWebhooks(iws []Register) []any {
 	w := make([]any, 0, len(iws))
 	for _, iw := range iws {
 		switch r := iw.(type) {

transport.go

@@ -50,11 +50,11 @@ type transportConfig struct {
 
 type addWebhookRequest struct {
 	owner          string
-	internalWebook webhook.Register
+	internalWebook Register
 }
 
 func encodeGetAllWebhooksResponse(ctx context.Context, rw http.ResponseWriter, response interface{}) error {
-	iws := response.([]webhook.Register)
+	iws := response.([]Register)
 	webhooks := InternalWebhooksToWebhooks(iws)
 	if webhooks == nil {
 		// prefer JSON output to be "[]" instead of "<nil>"

watch.go

@@ -5,24 +5,23 @@ package ancla
 
 import (
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/xmidt-org/webhook-schema"
 )
 
 // Watch is the interface for listening for webhook subcription updates.
 // Updates represent the latest known list of subscriptions.
 type Watch interface {
-	Update([]webhook.Register)
+	Update([]Register)
 }
 
 // WatchFunc allows bare functions to pass as Watches.
-type WatchFunc func([]webhook.Register)
+type WatchFunc func([]Register)
 
-func (f WatchFunc) Update(update []webhook.Register) {
+func (f WatchFunc) Update(update []Register) {
 	f(update)
 }
 
 func webhookListSizeWatch(s prometheus.Gauge) Watch {
-	return WatchFunc(func(webhooks []webhook.Register) {
+	return WatchFunc(func(webhooks []Register) {
 		s.Set(float64(len(webhooks)))
 	})
 }

watch_test.go

@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/xmidt-org/webhook-schema"
 )
 
 func TestWebhookListSizeWatch(t *testing.T) {
@@ -17,7 +16,7 @@ func TestWebhookListSizeWatch(t *testing.T) {
 	require.NotNil(watch)
 	// nolint:typecheck
 	gauge.On("Set", float64(2))
-	watch.Update([]webhook.Register{})
+	watch.Update([]Register{})
 	// nolint:typecheck
 	gauge.AssertExpectations(t)
 }