go.mod: update claircore version

Signed-off-by: Hank Donnay <hdonnay@redhat.com>

go.mod

@@ -4,18 +4,20 @@ go 1.13
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/docker/docker v1.13.1 // indirect
 	github.com/go-stomp/stomp v2.0.6+incompatible
+	github.com/golang/mock v1.4.4 // indirect
 	github.com/google/go-cmp v0.4.0
 	github.com/google/go-containerregistry v0.0.0-20191206185556-eb7c14b719c6
 	github.com/google/uuid v1.1.1
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
-	github.com/jackc/pgx/v4 v4.0.0
+	github.com/jackc/pgx/v4 v4.7.1
 	github.com/jmoiron/sqlx v1.2.0
-	github.com/klauspost/compress v1.9.4
+	github.com/klauspost/compress v1.10.6
 	github.com/mattn/go-sqlite3 v1.11.0 // indirect
 	github.com/prometheus/client_golang v0.9.4 // indirect
 	github.com/prometheus/procfs v0.0.8 // indirect
-	github.com/quay/claircore v0.0.25
+	github.com/quay/claircore v0.1.1
 	github.com/remind101/migrate v0.0.0-20170729031349-52c1edff7319
 	github.com/rs/zerolog v1.16.0
 	github.com/streadway/amqp v1.0.0
@@ -24,8 +26,8 @@ require (
 	go.opentelemetry.io/otel v0.2.1
 	go.opentelemetry.io/otel/exporter/metric/prometheus v0.2.2-0.20200111012159-d85178b63b15
 	go.opentelemetry.io/otel/exporter/trace/jaeger v0.2.1
-	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
-	golang.org/x/tools v0.0.0-20191210200704-1bcf67c9cb49 // indirect
+	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
+	golang.org/x/tools v0.0.0-20200828013309-97019fc2e64b // indirect
 	gopkg.in/square/go-jose.v2 v2.4.1
 	gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86
 )

httptransport/server_test.go

@@ -63,7 +63,8 @@ func TestUpdateEndpoints(t *testing.T) {
 		ServeMux: http.NewServeMux(),
 		traceOpt: othttp.WithTracer(global.TraceProvider().Tracer("clair")),
 	}
-	ctx := log.TestLogger(context.Background(), t)
+	ctx, done := log.TestLogger(context.Background(), t)
+	defer done()
 	if err := s.configureMatcherMode(ctx); err != nil {
 		t.Error(err)
 	}

notifier/postgres/keystore_test.go

@@ -10,11 +10,12 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+	"github.com/quay/claircore/test/integration"
+	"github.com/quay/claircore/test/log"
+
 	clairerror "github.com/quay/clair/v4/clair-error"
 	"github.com/quay/clair/v4/notifier/keymanager"
 	"github.com/quay/clair/v4/notifier/postgres"
-	"github.com/quay/claircore/test/integration"
-	"github.com/quay/claircore/test/log"
 )
 
 func genKeyPair(t *testing.T, n int) (kps []keymanager.KeyPair) {
@@ -51,7 +52,8 @@ func TestKeyStore(t *testing.T) {
 func testKeyStoreGC(t *testing.T) {
 	integration.Skip(t)
 	t.Parallel()
-	ctx := log.TestLogger(context.Background(), t)
+	ctx, done := log.TestLogger(context.Background(), t)
+	defer done()
 	db, _, keystore, teardown := postgres.TestStore(ctx, t)
 	defer teardown()
 
@@ -104,7 +106,8 @@ func testKeyStoreGC(t *testing.T) {
 func testKeyStore(t *testing.T) {
 	integration.Skip(t)
 	t.Parallel()
-	ctx := log.TestLogger(context.Background(), t)
+	ctx, done := log.TestLogger(context.Background(), t)
+	defer done()
 	_, _, keystore, teardown := postgres.TestStore(ctx, t)
 	defer teardown()
 

notifier/postgres/notification_pagination_test.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"testing"
 
-	"github.com/quay/claircore/test/log"
-
 	"github.com/google/uuid"
-	"github.com/quay/clair/v4/notifier"
 	"github.com/quay/claircore"
 	"github.com/quay/claircore/test/integration"
+	"github.com/quay/claircore/test/log"
+
+	"github.com/quay/clair/v4/notifier"
 )
 
 // TestNotePagination confirms paginating notifications
@@ -72,8 +72,9 @@ func TestNotePagination(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			ctx := context.Background()
+			ctx, done := log.TestLogger(ctx, t)
+			defer done()
 			_, store, _, _ := TestStore(ctx, t)
-			ctx = log.TestLogger(ctx, t)
 
 			noteID := uuid.New()
 			updateID := uuid.New()

notifier/stomp/deliverer_integration_test.go

@@ -20,7 +20,8 @@ const (
 // callback is successfully delivered to the stomp broker.
 func TestDeliverer(t *testing.T) {
 	integration.Skip(t)
-	ctx := log.TestLogger(context.Background(), t)
+	ctx, done := log.TestLogger(context.Background(), t)
+	defer done()
 	const (
 		callback = "http://clair-notifier/api/v1/notifications"
 	)

notifier/stomp/directdeliverer_integration_test.go

@@ -7,11 +7,12 @@ import (
 	"testing"
 
 	"github.com/google/uuid"
-	"github.com/quay/clair/v4/notifier"
 	"github.com/quay/claircore"
 	"github.com/quay/claircore/test/integration"
 	"github.com/quay/claircore/test/log"
 	"golang.org/x/sync/errgroup"
+
+	"github.com/quay/clair/v4/notifier"
 )
 
 // TestDirectDeliverer confirms delivery of notifications directly
@@ -67,7 +68,8 @@ func TestDirectDeliverer(t *testing.T) {
 	}
 	for _, tt := range table {
 		t.Run(tt.name, func(t *testing.T) {
-			ctx := log.TestLogger(context.Background(), t)
+			ctx, done := log.TestLogger(context.Background(), t)
+			defer done()
 			// deliverer test
 			conf := Config{
 				Direct:      true,

notifier/webhook/deliverer_test.go

@@ -16,11 +16,12 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/uuid"
-	"github.com/quay/clair/v4/notifier"
-	"github.com/quay/clair/v4/notifier/keymanager"
 	"github.com/quay/claircore/test/log"
 	"gopkg.in/square/go-jose.v2"
 	"gopkg.in/square/go-jose.v2/jwt"
+
+	"github.com/quay/clair/v4/notifier"
+	"github.com/quay/clair/v4/notifier/keymanager"
 )
 
 var (
@@ -50,7 +51,8 @@ func testSign(t *testing.T) {
 		t.Fatalf("failed to create request: %v", err)
 	}
 
-	ctx := log.TestLogger(context.Background(), t)
+	ctx, done := log.TestLogger(context.Background(), t)
+	defer done()
 	err = d.sign(ctx, req, kp)
 	if err != nil {
 		t.Fatalf("failed to sign request: %v", err)
@@ -125,7 +127,8 @@ func testDeliverer(t *testing.T) {
 			return
 		},
 	))
-	ctx := log.TestLogger(context.Background(), t)
+	ctx, done := log.TestLogger(context.Background(), t)
+	defer done()
 	conf := Config{
 		Callback: callback,
 		Target:   server.URL,