remove pager package

this commit removes pager package infavor of keeping the page structure
local to the notifier package.

Signed-off-by: ldelossa <ldelossa@redhat.com>

httptransport/notificationshandler.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/quay/clair/v4/notifier"
 	"github.com/quay/clair/v4/notifier/service"
-	"github.com/quay/clair/v4/pkg/pager"
 	je "github.com/quay/claircore/pkg/jsonerr"
 	"github.com/rs/zerolog"
 )
@@ -21,7 +20,7 @@ const (
 )
 
 type Response struct {
-	Page          pager.Page              `json:"page"`
+	Page          notifier.Page           `json:"page"`
 	Notifications []notifier.Notification `json:"notifications"`
 }
 
@@ -131,7 +130,7 @@ func (h *NotifHandler) Get(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	inP := &pager.Page{
+	inP := &notifier.Page{
 		Size: pageSize,
 		Next: next,
 	}

httptransport/notificationshandler_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/quay/clair/v4/notifier"
 	"github.com/quay/clair/v4/notifier/service"
-	"github.com/quay/clair/v4/pkg/pager"
 )
 
 // TestUpdateOperationHandler is a parallel harness for testing a UpdateOperation handler.
@@ -60,25 +59,25 @@ func testNotificationHandlerGet(t *testing.T) {
 	t.Parallel()
 	var (
 		nextID     = uuid.New()
-		inPageWant = pager.Page{
+		inPageWant = notifier.Page{
 			Size: 500,
 		}
 		noteID      = uuid.New()
-		outPageWant = pager.Page{
+		outPageWant = notifier.Page{
 			Size: 500,
 			Next: &nextID,
 		}
 	)
 
 	nm := &service.Mock{
-		Notifications_: func(ctx context.Context, id uuid.UUID, page *pager.Page) ([]notifier.Notification, pager.Page, error) {
+		Notifications_: func(ctx context.Context, id uuid.UUID, page *notifier.Page) ([]notifier.Notification, notifier.Page, error) {
 			if !cmp.Equal(id, noteID) {
 				t.Fatalf("got: %v, wanted: %v", id, noteID)
 			}
 			if !cmp.Equal(page, &inPageWant) {
 				t.Fatalf("got: %v, wanted: %v", page, inPageWant)
 			}
-			return []notifier.Notification{}, pager.Page{
+			return []notifier.Notification{}, notifier.Page{
 				Size: inPageWant.Size,
 				Next: &nextID,
 			}, nil
@@ -119,25 +118,25 @@ func testNotificationHandlerGetParams(t *testing.T) {
 	)
 	var (
 		nextID     = uuid.New()
-		inPageWant = pager.Page{
+		inPageWant = notifier.Page{
 			Size: 100,
 		}
 		noteID      = uuid.New()
-		outPageWant = pager.Page{
+		outPageWant = notifier.Page{
 			Size: 100,
 			Next: &nextID,
 		}
 	)
 
 	nm := &service.Mock{
-		Notifications_: func(ctx context.Context, id uuid.UUID, page *pager.Page) ([]notifier.Notification, pager.Page, error) {
+		Notifications_: func(ctx context.Context, id uuid.UUID, page *notifier.Page) ([]notifier.Notification, notifier.Page, error) {
 			if !cmp.Equal(id, noteID) {
 				t.Fatalf("got: %v, wanted: %v", id, noteID)
 			}
 			if !cmp.Equal(page, &inPageWant) {
 				t.Fatalf("got: %v, wanted: %v", page, inPageWant)
 			}
-			return []notifier.Notification{}, pager.Page{
+			return []notifier.Notification{}, notifier.Page{
 				Size: inPageWant.Size,
 				Next: &nextID,
 			}, nil

notifier/mockstore.go

@@ -4,12 +4,11 @@ import (
 	"context"
 
 	"github.com/google/uuid"
-	"github.com/quay/clair/v4/pkg/pager"
 )
 
 // MockStore implements a mock Store.
 type MockStore struct {
-	Notifications_        func(ctx context.Context, id uuid.UUID, page *pager.Page) ([]Notification, pager.Page, error)
+	Notifications_        func(ctx context.Context, id uuid.UUID, page *Page) ([]Notification, Page, error)
 	PutNotifications_     func(ctx context.Context, opts PutOpts) error
 	DeleteNotitfications_ func(ctx context.Context, id uuid.UUID) error
 	Receipt_              func(ctx context.Context, id uuid.UUID) (Receipt, error)
@@ -24,7 +23,7 @@ type MockStore struct {
 
 // Notifications retrieves the list of notifications associated with a
 // notification id
-func (m *MockStore) Notifications(ctx context.Context, id uuid.UUID, page *pager.Page) ([]Notification, pager.Page, error) {
+func (m *MockStore) Notifications(ctx context.Context, id uuid.UUID, page *Page) ([]Notification, Page, error) {
 	return m.Notifications_(ctx, id, page)
 }
 

pkg/pager/pager.go → notifier/pager.go

@@ -1,4 +1,4 @@
-package pager
+package notifier
 
 import (
 	"github.com/google/uuid"

notifier/postgres/notification_pagination_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/quay/clair/v4/notifier"
-	"github.com/quay/clair/v4/pkg/pager"
 	"github.com/quay/claircore"
 	"github.com/quay/claircore/test/integration"
 )
@@ -98,7 +97,7 @@ func TestNotePagination(t *testing.T) {
 				t.Fatalf("failed to insert notifications: %v", err)
 			}
 
-			var inPage = pager.Page{
+			var inPage = notifier.Page{
 				Size: tt.pageSize,
 			}
 

notifier/postgres/notifications.go

@@ -7,11 +7,10 @@ import (
 	"github.com/jackc/pgx/v4/pgxpool"
 	clairerror "github.com/quay/clair/v4/clair-error"
 	"github.com/quay/clair/v4/notifier"
-	"github.com/quay/clair/v4/pkg/pager"
 	"github.com/rs/zerolog"
 )
 
-func notifications(ctx context.Context, pool *pgxpool.Pool, id uuid.UUID, page *pager.Page) ([]notifier.Notification, pager.Page, error) {
+func notifications(ctx context.Context, pool *pgxpool.Pool, id uuid.UUID, page *notifier.Page) ([]notifier.Notification, notifier.Page, error) {
 	const (
 		query      = "SELECT id, body FROM notification_body WHERE notification_id = $1"
 		pagedQuery = "SELECT id, body FROM notification_body WHERE notification_id = $1 AND id > $2 ORDER BY id ASC LIMIT $3"
@@ -23,7 +22,7 @@ func notifications(ctx context.Context, pool *pgxpool.Pool, id uuid.UUID, page *
 
 	// if no page argument early return all notifications
 	if page == nil {
-		p := pager.Page{}
+		p := notifier.Page{}
 		notifications := make([]notifier.Notification, 0, 0)
 		rows, _ := pool.Query(ctx, query, id.String())
 		defer rows.Close()
@@ -39,7 +38,7 @@ func notifications(ctx context.Context, pool *pgxpool.Pool, id uuid.UUID, page *
 	}
 
 	// page to return to client
-	outPage := pager.Page{
+	outPage := notifier.Page{
 		Size: page.Size,
 	}
 
@@ -60,7 +59,7 @@ func notifications(ctx context.Context, pool *pgxpool.Pool, id uuid.UUID, page *
 		var n notifier.Notification
 		err := rows.Scan(&n.ID, &n)
 		if err != nil {
-			return nil, pager.Page{}, clairerror.ErrBadNotification{id, err}
+			return nil, notifier.Page{}, clairerror.ErrBadNotification{id, err}
 		}
 		notifications = append(notifications, n)
 	}

notifier/postgres/store.go

@@ -6,7 +6,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/quay/clair/v4/notifier"
-	"github.com/quay/clair/v4/pkg/pager"
 )
 
 // Store implements the notifier.Store interface
@@ -20,7 +19,7 @@ func NewStore(pool *pgxpool.Pool) *Store {
 
 // Notifications retrieves the list of notifications associated with a
 // notification id
-func (s *Store) Notifications(ctx context.Context, id uuid.UUID, page *pager.Page) ([]notifier.Notification, pager.Page, error) {
+func (s *Store) Notifications(ctx context.Context, id uuid.UUID, page *notifier.Page) ([]notifier.Notification, notifier.Page, error) {
 	return notifications(ctx, s.pool, id, page)
 }
 

notifier/service/mock.go

@@ -6,20 +6,19 @@ import (
 	"github.com/google/uuid"
 	"github.com/quay/clair/v4/notifier"
 	"github.com/quay/clair/v4/notifier/keymanager"
-	"github.com/quay/clair/v4/pkg/pager"
 )
 
 var _ Service = (*Mock)(nil)
 
 // Mock implements a mock notifier service
 type Mock struct {
-	Notifications_       func(ctx context.Context, id uuid.UUID, page *pager.Page) ([]notifier.Notification, pager.Page, error)
+	Notifications_       func(ctx context.Context, id uuid.UUID, page *notifier.Page) ([]notifier.Notification, notifier.Page, error)
 	DeleteNotifications_ func(ctx context.Context, id uuid.UUID) error
 	KeyStore_            func(ctx context.Context) notifier.KeyStore
 	KeyManager_          func(ctx context.Context) *keymanager.Manager
 }
 
-func (m *Mock) Notifications(ctx context.Context, id uuid.UUID, page *pager.Page) ([]notifier.Notification, pager.Page, error) {
+func (m *Mock) Notifications(ctx context.Context, id uuid.UUID, page *notifier.Page) ([]notifier.Notification, notifier.Page, error) {
 	return m.Notifications_(ctx, id, page)
 }
 

notifier/service/service.go

@@ -17,7 +17,6 @@ import (
 	"github.com/quay/clair/v4/notifier/postgres"
 	"github.com/quay/clair/v4/notifier/stomp"
 	"github.com/quay/clair/v4/notifier/webhook"
-	"github.com/quay/clair/v4/pkg/pager"
 	pgdl "github.com/quay/claircore/pkg/distlock/postgres"
 	"github.com/remind101/migrate"
 	"github.com/rs/zerolog"
@@ -33,7 +32,7 @@ const (
 // This remains an interface so remote clients may implement as well.
 type Service interface {
 	// Retrieves an optional paginated set of notifications given an notification id
-	Notifications(ctx context.Context, id uuid.UUID, page *pager.Page) ([]notifier.Notification, pager.Page, error)
+	Notifications(ctx context.Context, id uuid.UUID, page *notifier.Page) ([]notifier.Notification, notifier.Page, error)
 	// Deletes the provided notification id
 	DeleteNotifications(ctx context.Context, id uuid.UUID) error
 	// KeyStore returns the notifier's KeyStore.
@@ -51,7 +50,7 @@ type service struct {
 	keymanager *keymanager.Manager
 }
 
-func (s *service) Notifications(ctx context.Context, id uuid.UUID, page *pager.Page) ([]notifier.Notification, pager.Page, error) {
+func (s *service) Notifications(ctx context.Context, id uuid.UUID, page *notifier.Page) ([]notifier.Notification, notifier.Page, error) {
 	return s.store.Notifications(ctx, id, page)
 }
 

notifier/store.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	"github.com/google/uuid"
-	"github.com/quay/clair/v4/pkg/pager"
 )
 
 // PutOpts is provided to Notificationer.Put
@@ -42,7 +41,7 @@ type Notificationer interface {
 	// paging has been exhausted.
 	//
 	// Page maybe nil to receive all notifications.
-	Notifications(ctx context.Context, id uuid.UUID, page *pager.Page) ([]Notification, pager.Page, error)
+	Notifications(ctx context.Context, id uuid.UUID, page *Page) ([]Notification, Page, error)
 	// PutNotifications persists the provided notifications and associates
 	// them with the provided notification id
 	//