Skip to content

chore: upgrade from pgx v4 to v5 #2243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: upgrade from pgx v4 to v5 #2243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions cmd/clairctl/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"regexp"

"github.com/Masterminds/semver"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/quay/claircore"
"github.com/quay/zlog"
"github.com/urfave/cli/v2"
Expand Down Expand Up @@ -152,7 +152,7 @@ func adminPre470(c *cli.Context) error {
zlog.Debug(ctx).
Msg("resizing pool to 2 connections")
pgcfg.MaxConns = 2
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
if err != nil {
return fmt.Errorf("error creating pool: %w", err)
}
Expand Down Expand Up @@ -215,7 +215,7 @@ func adminPost470(c *cli.Context) error {
zlog.Debug(ctx).
Msg("resizing pool to 2 connections")
pgcfg.MaxConns = 2
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
if err != nil {
return fmt.Errorf("error creating pool: %w", err)
}
Expand Down Expand Up @@ -277,7 +277,7 @@ func adminPre473(c *cli.Context) error {
zlog.Debug(ctx).
Msg("resizing pool to 2 connections")
pgcfg.MaxConns = 2
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
if err != nil {
return fmt.Errorf("error creating pool: %w", err)
}
Expand Down Expand Up @@ -471,7 +471,7 @@ func createConnPool(ctx context.Context, dsn string, maxConns int32) (*pgxpool.P
Int32("pool size", maxConns).
Msg("resizing pool")
pgcfg.MaxConns = int32(maxConns)
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
if err != nil {
return nil, fmt.Errorf("error creating pool: %w", err)
}
Expand Down Expand Up @@ -522,7 +522,7 @@ func adminPre480(c *cli.Context) error {
zlog.Debug(ctx).
Msg("resizing pool to 1 connections")
pgcfg.MaxConns = 1
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
if err != nil {
return fmt.Errorf("error creating pool: %w", err)
}
Expand Down Expand Up @@ -574,7 +574,7 @@ func adminPost480(c *cli.Context) error {
zlog.Debug(ctx).
Msg("resizing pool to 2 connections")
pgcfg.MaxConns = 2
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
if err != nil {
return fmt.Errorf("error creating pool: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/clairctl/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"os"
"strings"

"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/klauspost/compress/zstd"
"github.com/quay/claircore/libvuln"
"github.com/urfave/cli/v2"
Expand Down Expand Up @@ -101,7 +101,7 @@ func importAction(c *cli.Context) error {
in = dec
}

pool, err := pgxpool.Connect(ctx, cfg.Matcher.ConnString)
pool, err := pgxpool.New(ctx, cfg.Matcher.ConnString)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion config/matcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type Matcher struct {
// Deprecated: Pool size should be set through the ConnString member.
// Currently, Clair only uses the "pgxpool" package to connect to the
// database, so see
// https://pkg.go.dev/github.com/jackc/pgx/v4/pgxpool#ParseConfig for more
// https://pkg.go.dev/github.com/jackc/pgx/v5/pgxpool#ParseConfig for more
// information.
MaxConnPool int `yaml:"max_conn_pool,omitempty" json:"max_conn_pool,omitempty"`
// CacheAge controls how long clients should be hinted to cache responses
Expand Down
6 changes: 3 additions & 3 deletions contrib/cmd/quaybackstop/clair.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"github.com/quay/clair/v4/cmd"

"github.com/go-jose/go-jose/v3"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/quay/clair/config"
"github.com/rogpeppe/go-internal/lockedfile"
"golang.org/x/sync/errgroup"
Expand Down Expand Up @@ -68,7 +68,7 @@ func (a *App) SetClairConfig(s string) error {
init, done := context.WithTimeoutCause(context.Background(), 10*time.Second,
errors.New("too slow to do initial connection to Clair database"))
defer done()
return pgxpool.ConnectConfig(init, cfg)
return pgxpool.NewWithConfig(init, cfg)
})
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion contrib/cmd/quaybackstop/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (

"github.com/go-jose/go-jose/v3"
"github.com/go-jose/go-jose/v3/jwt"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/quay/clair/config"
)

Expand Down
4 changes: 2 additions & 2 deletions contrib/cmd/quaybackstop/quay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"sync"
"time"

"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5/pgxpool"
"golang.org/x/sync/errgroup"
"gopkg.in/yaml.v3"
)
Expand Down Expand Up @@ -77,7 +77,7 @@ func (a *App) SetQuayConfig(s string) error {
init, done := context.WithTimeoutCause(context.Background(), 10*time.Second,
errors.New("too slow to do initial connection to Quay database"))
defer done()
return pgxpool.ConnectConfig(init, cfg)
return pgxpool.NewWithConfig(init, cfg)
})

return nil
Expand Down
12 changes: 7 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ require (
github.com/google/go-containerregistry v0.20.5
github.com/google/uuid v1.6.0
github.com/grafana/pyroscope-go/godeltaprof v0.1.8
github.com/jackc/pgconn v1.14.3
github.com/jackc/pgx/v4 v4.18.3
github.com/jackc/pgx/v5 v5.7.4
github.com/klauspost/compress v1.18.0
github.com/prometheus/client_golang v1.22.0
github.com/quay/clair/config v1.4.2
github.com/quay/claircore v1.5.38
github.com/quay/claircore v1.5.39
github.com/quay/zlog v1.1.8
github.com/rabbitmq/amqp091-go v1.10.0
github.com/remind101/migrate v0.0.0-20170729031349-52c1edff7319
Expand Down Expand Up @@ -65,12 +64,15 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
github.com/jackc/pgconn v1.14.3 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
github.com/jackc/pgtype v1.14.2 // indirect
github.com/jackc/pgx/v4 v4.18.3 // indirect
github.com/jackc/puddle v1.3.0 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/knqyf263/go-apk-version v0.0.0-20200609155635-041fdbb8563f // indirect
github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d // indirect
github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 // indirect
Expand Down Expand Up @@ -105,7 +107,7 @@ require (
golang.org/x/mod v0.25.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/tools v0.33.0 // indirect
golang.org/x/tools v0.34.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
google.golang.org/protobuf v1.36.6 // indirect
Expand Down
17 changes: 10 additions & 7 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ github.com/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFD
github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
Expand Down Expand Up @@ -106,8 +105,8 @@ github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwX
github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
Expand All @@ -120,11 +119,15 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ
github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA=
github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg=
github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
Expand Down Expand Up @@ -193,8 +196,8 @@ github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzM
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
github.com/quay/clair/config v1.4.2 h1:6bB/3+3DJGO7pfDA4gC7WlXxA4G+Oz4X3h2nug8E4Ww=
github.com/quay/clair/config v1.4.2/go.mod h1:MyYm2qGw55+I598zEpwpFFmBq1jp5NLIhBhCigv6tRM=
github.com/quay/claircore v1.5.38 h1:0CkZo7XCpM1Sln7PPcu6HFrrQ+y/ViT3vL7QXMBh0x8=
github.com/quay/claircore v1.5.38/go.mod h1:U3zn/sn3NKOMO1a5kEGkBXmLR98w2OIPiE0eKLT5Fy4=
github.com/quay/claircore v1.5.39 h1:ZUII6rg1Opt+8lrEiRx5DMc4JJzsN8h7zmzLdHm8wlA=
github.com/quay/claircore v1.5.39/go.mod h1:7Fpv9CfIs6qS7O9/hWDjtgFWB1por/GTJST90a+cdXA=
github.com/quay/claircore/toolkit v1.0.0/go.mod h1:3ELtgf92x7o1JCTSKVOAqhcnCTXc4s5qiGaEDx62i20=
github.com/quay/claircore/toolkit v1.2.4 h1:Ld7rve32pUOrfR+7jJA9nGHeZ8nPejpEgNWkJ7OPJZM=
github.com/quay/claircore/toolkit v1.2.4/go.mod h1:m6ZRpxJClVAraNpIYyCsW/ULF/33ye7KkGTyNTMwvDY=
Expand Down Expand Up @@ -408,8 +411,8 @@ golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapK
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
12 changes: 6 additions & 6 deletions initialize/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import (
"time"

"github.com/go-jose/go-jose/v3/jwt"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/quay/clair/config"
"github.com/quay/claircore/datastore/postgres"
"github.com/quay/claircore/enricher/cvss"
"github.com/quay/claircore/libindex"
"github.com/quay/claircore/libvuln"
"github.com/quay/claircore/libvuln/driver"
"github.com/quay/claircore/pkg/ctxlock"
"github.com/quay/claircore/pkg/ctxlock/v2"
"github.com/quay/zlog"
"golang.org/x/net/publicsuffix"

Expand Down Expand Up @@ -116,7 +116,7 @@ func Services(ctx context.Context, cfg *config.Config) (*Srv, error) {
func localIndexer(ctx context.Context, cfg *config.Config) (indexer.Service, error) {
const msg = "failed to initialize indexer: "
mkErr := func(err error) *clairerror.ErrNotInitialized {
return &clairerror.ErrNotInitialized{msg + err.Error()}
return &clairerror.ErrNotInitialized{Msg: msg + err.Error()}
}

pool, err := postgres.Connect(ctx, cfg.Indexer.ConnString, "libindex")
Expand Down Expand Up @@ -194,7 +194,7 @@ func localIndexer(ctx context.Context, cfg *config.Config) (indexer.Service, err
func remoteIndexer(ctx context.Context, cfg *config.Config, addr string) (indexer.Service, error) {
const msg = "failed to initialize indexer client: "
mkErr := func(err error) *clairerror.ErrNotInitialized {
return &clairerror.ErrNotInitialized{msg + err.Error()}
return &clairerror.ErrNotInitialized{Msg: msg + err.Error()}
}
rc, err := remoteClient(ctx, cfg, intraserviceClaim, addr)
if err != nil {
Expand Down Expand Up @@ -299,7 +299,7 @@ func localMatcher(ctx context.Context, cfg *config.Config) (matcher.Service, err
func remoteMatcher(ctx context.Context, cfg *config.Config, addr string) (matcher.Service, error) {
const msg = "failed to initialize matcher client: "
mkErr := func(err error) *clairerror.ErrNotInitialized {
return &clairerror.ErrNotInitialized{msg + err.Error()}
return &clairerror.ErrNotInitialized{Msg: msg + err.Error()}
}
rc, err := remoteClient(ctx, cfg, intraserviceClaim, addr)
if err != nil {
Expand Down Expand Up @@ -335,7 +335,7 @@ func localNotifier(ctx context.Context, cfg *config.Config, i indexer.Service, m
return nil, mkErr(err)
}
}
pool, err := pgxpool.ConnectConfig(ctx, poolcfg)
pool, err := pgxpool.NewWithConfig(ctx, poolcfg)
if err != nil {
return nil, mkErr(err)
}
Expand Down
4 changes: 2 additions & 2 deletions notifier/postgres/get_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

"github.com/google/uuid"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
)
Expand Down
8 changes: 4 additions & 4 deletions notifier/postgres/notifications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"

"github.com/google/uuid"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/quay/zlog"
Expand Down Expand Up @@ -221,7 +221,7 @@ func (s *Store) PutNotifications(ctx context.Context, opts notifier.PutOpts) err
affected: putNotificationsAffected,
}

err := s.pool.BeginTxFunc(ctx, txOpt, func(tx pgx.Tx) error {
err := pgx.BeginTxFunc(ctx, s.pool, txOpt, func(tx pgx.Tx) error {
if err := txExec(ctx, metrics, tx,
`insertNotification`, insertNotification,
[]interface{}{opts.NotificationID}); err != nil {
Expand Down Expand Up @@ -347,7 +347,7 @@ func (s *Store) CollectNotifications(ctx context.Context) error {
affected: gcNotificationAffected,
}

err := s.pool.BeginTxFunc(ctx, txOpt, func(tx pgx.Tx) error {
err := pgx.BeginTxFunc(ctx, s.pool, txOpt, func(tx pgx.Tx) error {
var ok bool
if err := tx.QueryRow(ctx, tryLock, adminKeyspace, gcLock).Scan(&ok); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion notifier/postgres/notifications_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"

"github.com/google/uuid"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v5"
"github.com/quay/claircore/test"
"github.com/quay/claircore/test/integration"
"github.com/quay/zlog"
Expand Down
6 changes: 3 additions & 3 deletions notifier/postgres/receipt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"

"github.com/google/uuid"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"

Expand Down Expand Up @@ -146,7 +146,7 @@ func (s *Store) PutReceipt(ctx context.Context, updater string, r notifier.Recei
counter: putReceiptCounter,
affected: putReceiptAffected,
}
err := s.pool.BeginTxFunc(ctx, txOpt, func(tx pgx.Tx) error {
err := pgx.BeginTxFunc(ctx, s.pool, txOpt, func(tx pgx.Tx) error {
if err := txExec(ctx, metrics, tx,
`insertNotification`,
insertNotification,
Expand Down
4 changes: 2 additions & 2 deletions notifier/postgres/set_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

"github.com/google/uuid"
"github.com/jackc/pgconn"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v5/pgconn"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"

Expand Down
8 changes: 4 additions & 4 deletions notifier/postgres/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"database/sql"
"fmt"

"github.com/jackc/pgconn"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v4/stdlib"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/jackc/pgx/v5/stdlib"
"github.com/prometheus/client_golang/prometheus"
"github.com/quay/zlog"
"github.com/remind101/migrate"
Expand Down
Loading
Loading