Skip to content

Commit b6577f9

Browse files
crozzycrozzy
committed
chore: upgrade from pgx v4 to v5
In July 2025 v4 will reach end of life. This change updates claircore to use v5. Signed-off-by: crozzy <[email protected]>
1 parent a166f61 commit b6577f9

File tree

16 files changed

+72
-55
lines changed

16 files changed

+72
-55
lines changed

‎cmd/clairctl/admin.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ import (
88
"regexp"
99

1010
"github.com/Masterminds/semver"
11-
"github.com/jackc/pgx/v4"
12-
"github.com/jackc/pgx/v4/pgxpool"
13-
"github.com/quay/claircore"
11+
"github.com/jackc/pgx/v5"
12+
"github.com/jackc/pgx/v5/pgxpool"
1413
"github.com/quay/zlog"
1514
"github.com/urfave/cli/v2"
15+
16+
"github.com/quay/claircore"
1617
)
1718

1819
// AdminCmd is the "admin" subcommand.
@@ -152,7 +153,7 @@ func adminPre470(c *cli.Context) error {
152153
zlog.Debug(ctx).
153154
Msg("resizing pool to 2 connections")
154155
pgcfg.MaxConns = 2
155-
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
156+
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
156157
if err != nil {
157158
return fmt.Errorf("error creating pool: %w", err)
158159
}
@@ -215,7 +216,7 @@ func adminPost470(c *cli.Context) error {
215216
zlog.Debug(ctx).
216217
Msg("resizing pool to 2 connections")
217218
pgcfg.MaxConns = 2
218-
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
219+
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
219220
if err != nil {
220221
return fmt.Errorf("error creating pool: %w", err)
221222
}
@@ -277,7 +278,7 @@ func adminPre473(c *cli.Context) error {
277278
zlog.Debug(ctx).
278279
Msg("resizing pool to 2 connections")
279280
pgcfg.MaxConns = 2
280-
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
281+
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
281282
if err != nil {
282283
return fmt.Errorf("error creating pool: %w", err)
283284
}
@@ -471,7 +472,7 @@ func createConnPool(ctx context.Context, dsn string, maxConns int32) (*pgxpool.P
471472
Int32("pool size", maxConns).
472473
Msg("resizing pool")
473474
pgcfg.MaxConns = int32(maxConns)
474-
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
475+
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
475476
if err != nil {
476477
return nil, fmt.Errorf("error creating pool: %w", err)
477478
}
@@ -522,7 +523,7 @@ func adminPre480(c *cli.Context) error {
522523
zlog.Debug(ctx).
523524
Msg("resizing pool to 1 connections")
524525
pgcfg.MaxConns = 1
525-
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
526+
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
526527
if err != nil {
527528
return fmt.Errorf("error creating pool: %w", err)
528529
}
@@ -574,7 +575,7 @@ func adminPost480(c *cli.Context) error {
574575
zlog.Debug(ctx).
575576
Msg("resizing pool to 2 connections")
576577
pgcfg.MaxConns = 2
577-
pool, err := pgxpool.ConnectConfig(ctx, pgcfg)
578+
pool, err := pgxpool.NewWithConfig(ctx, pgcfg)
578579
if err != nil {
579580
return fmt.Errorf("error creating pool: %w", err)
580581
}

‎cmd/clairctl/import.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@ import (
1111
"os"
1212
"strings"
1313

14-
"github.com/jackc/pgx/v4/pgxpool"
14+
"github.com/jackc/pgx/v5/pgxpool"
1515
"github.com/klauspost/compress/zstd"
16-
"github.com/quay/claircore/libvuln"
1716
"github.com/urfave/cli/v2"
1817

18+
"github.com/quay/claircore/libvuln"
19+
1920
"github.com/quay/clair/v4/internal/httputil"
2021
)
2122

@@ -101,7 +102,7 @@ func importAction(c *cli.Context) error {
101102
in = dec
102103
}
103104

104-
pool, err := pgxpool.Connect(ctx, cfg.Matcher.ConnString)
105+
pool, err := pgxpool.New(ctx, cfg.Matcher.ConnString)
105106
if err != nil {
106107
return err
107108
}

‎config/matcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type Matcher struct {
3939
// Deprecated: Pool size should be set through the ConnString member.
4040
// Currently, Clair only uses the "pgxpool" package to connect to the
4141
// database, so see
42-
// https://pkg.go.dev/github.com/jackc/pgx/v4/pgxpool#ParseConfig for more
42+
// https://pkg.go.dev/github.com/jackc/pgx/v5/pgxpool#ParseConfig for more
4343
// information.
4444
MaxConnPool int `yaml:"max_conn_pool,omitempty" json:"max_conn_pool,omitempty"`
4545
// CacheAge controls how long clients should be hinted to cache responses

‎contrib/cmd/quaybackstop/clair.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"github.com/quay/clair/v4/cmd"
2323

2424
"github.com/go-jose/go-jose/v3"
25-
"github.com/jackc/pgx/v4"
26-
"github.com/jackc/pgx/v4/pgxpool"
25+
"github.com/jackc/pgx/v5"
26+
"github.com/jackc/pgx/v5/pgxpool"
2727
"github.com/quay/clair/config"
2828
"github.com/rogpeppe/go-internal/lockedfile"
2929
"golang.org/x/sync/errgroup"
@@ -68,7 +68,7 @@ func (a *App) SetClairConfig(s string) error {
6868
init, done := context.WithTimeoutCause(context.Background(), 10*time.Second,
6969
errors.New("too slow to do initial connection to Clair database"))
7070
defer done()
71-
return pgxpool.ConnectConfig(init, cfg)
71+
return pgxpool.NewWithConfig(init, cfg)
7272
})
7373
return nil
7474
}

‎contrib/cmd/quaybackstop/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636

3737
"github.com/go-jose/go-jose/v3"
3838
"github.com/go-jose/go-jose/v3/jwt"
39-
"github.com/jackc/pgx/v4/pgxpool"
39+
"github.com/jackc/pgx/v5/pgxpool"
4040
"github.com/quay/clair/config"
4141
)
4242

‎contrib/cmd/quaybackstop/quay.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"sync"
1919
"time"
2020

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

8383
return nil

‎go.mod

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ require (
1313
github.com/google/go-containerregistry v0.20.2
1414
github.com/google/uuid v1.6.0
1515
github.com/grafana/pyroscope-go/godeltaprof v0.1.8
16-
github.com/jackc/pgconn v1.14.3
17-
github.com/jackc/pgx/v4 v4.18.3
16+
github.com/jackc/pgx/v5 v5.7.4
1817
github.com/klauspost/compress v1.18.0
1918
github.com/prometheus/client_golang v1.22.0
2019
github.com/quay/clair/config v1.4.2
@@ -65,12 +64,15 @@ require (
6564
github.com/go-logr/stdr v1.2.2 // indirect
6665
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
6766
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
67+
github.com/jackc/pgconn v1.14.3 // indirect
6868
github.com/jackc/pgio v1.0.0 // indirect
6969
github.com/jackc/pgpassfile v1.0.0 // indirect
7070
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
71-
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
71+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
7272
github.com/jackc/pgtype v1.14.2 // indirect
73+
github.com/jackc/pgx/v4 v4.18.3 // indirect
7374
github.com/jackc/puddle v1.3.0 // indirect
75+
github.com/jackc/puddle/v2 v2.2.2 // indirect
7476
github.com/knqyf263/go-apk-version v0.0.0-20200609155635-041fdbb8563f // indirect
7577
github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d // indirect
7678
github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 // indirect

‎go.sum

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwX
108108
github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
109109
github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
110110
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
111-
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
112-
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
111+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
112+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
113113
github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
114114
github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
115115
github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
@@ -122,11 +122,15 @@ github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQ
122122
github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
123123
github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA=
124124
github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
125+
github.com/jackc/pgx/v5 v5.7.4 h1:9wKznZrhWa2QiHL+NjTSPP6yjl3451BX3imWDnokYlg=
126+
github.com/jackc/pgx/v5 v5.7.4/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
125127
github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
126128
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
127129
github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
128130
github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
129131
github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
132+
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
133+
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
130134
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
131135
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
132136
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=

‎initialize/services.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ import (
1010
"time"
1111

1212
"github.com/go-jose/go-jose/v3/jwt"
13-
"github.com/jackc/pgx/v4/pgxpool"
13+
"github.com/jackc/pgx/v5/pgxpool"
1414
"github.com/quay/clair/config"
15+
"github.com/quay/zlog"
16+
"golang.org/x/net/publicsuffix"
17+
1518
"github.com/quay/claircore/datastore/postgres"
1619
"github.com/quay/claircore/enricher/cvss"
1720
"github.com/quay/claircore/libindex"
1821
"github.com/quay/claircore/libvuln"
1922
"github.com/quay/claircore/libvuln/driver"
2023
"github.com/quay/claircore/pkg/ctxlock"
21-
"github.com/quay/zlog"
22-
"golang.org/x/net/publicsuffix"
2324

2425
clairerror "github.com/quay/clair/v4/clair-error"
2526
"github.com/quay/clair/v4/httptransport"
@@ -116,7 +117,7 @@ func Services(ctx context.Context, cfg *config.Config) (*Srv, error) {
116117
func localIndexer(ctx context.Context, cfg *config.Config) (indexer.Service, error) {
117118
const msg = "failed to initialize indexer: "
118119
mkErr := func(err error) *clairerror.ErrNotInitialized {
119-
return &clairerror.ErrNotInitialized{msg + err.Error()}
120+
return &clairerror.ErrNotInitialized{Msg: msg + err.Error()}
120121
}
121122

122123
pool, err := postgres.Connect(ctx, cfg.Indexer.ConnString, "libindex")
@@ -194,7 +195,7 @@ func localIndexer(ctx context.Context, cfg *config.Config) (indexer.Service, err
194195
func remoteIndexer(ctx context.Context, cfg *config.Config, addr string) (indexer.Service, error) {
195196
const msg = "failed to initialize indexer client: "
196197
mkErr := func(err error) *clairerror.ErrNotInitialized {
197-
return &clairerror.ErrNotInitialized{msg + err.Error()}
198+
return &clairerror.ErrNotInitialized{Msg: msg + err.Error()}
198199
}
199200
rc, err := remoteClient(ctx, cfg, intraserviceClaim, addr)
200201
if err != nil {
@@ -299,7 +300,7 @@ func localMatcher(ctx context.Context, cfg *config.Config) (matcher.Service, err
299300
func remoteMatcher(ctx context.Context, cfg *config.Config, addr string) (matcher.Service, error) {
300301
const msg = "failed to initialize matcher client: "
301302
mkErr := func(err error) *clairerror.ErrNotInitialized {
302-
return &clairerror.ErrNotInitialized{msg + err.Error()}
303+
return &clairerror.ErrNotInitialized{Msg: msg + err.Error()}
303304
}
304305
rc, err := remoteClient(ctx, cfg, intraserviceClaim, addr)
305306
if err != nil {
@@ -335,7 +336,7 @@ func localNotifier(ctx context.Context, cfg *config.Config, i indexer.Service, m
335336
return nil, mkErr(err)
336337
}
337338
}
338-
pool, err := pgxpool.ConnectConfig(ctx, poolcfg)
339+
pool, err := pgxpool.NewWithConfig(ctx, poolcfg)
339340
if err != nil {
340341
return nil, mkErr(err)
341342
}

‎notifier/postgres/get_status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55

66
"github.com/google/uuid"
7-
"github.com/jackc/pgx/v4"
8-
"github.com/jackc/pgx/v4/pgxpool"
7+
"github.com/jackc/pgx/v5"
8+
"github.com/jackc/pgx/v5/pgxpool"
99
"github.com/prometheus/client_golang/prometheus"
1010
"github.com/prometheus/client_golang/prometheus/promauto"
1111
)

‎notifier/postgres/notifications.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"fmt"
88

99
"github.com/google/uuid"
10-
"github.com/jackc/pgx/v4"
11-
"github.com/jackc/pgx/v4/pgxpool"
10+
"github.com/jackc/pgx/v5"
11+
"github.com/jackc/pgx/v5/pgxpool"
1212
"github.com/prometheus/client_golang/prometheus"
1313
"github.com/prometheus/client_golang/prometheus/promauto"
1414
"github.com/quay/zlog"
@@ -221,7 +221,7 @@ func (s *Store) PutNotifications(ctx context.Context, opts notifier.PutOpts) err
221221
affected: putNotificationsAffected,
222222
}
223223

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

350-
err := s.pool.BeginTxFunc(ctx, txOpt, func(tx pgx.Tx) error {
350+
err := pgx.BeginTxFunc(ctx, s.pool, txOpt, func(tx pgx.Tx) error {
351351
var ok bool
352352
if err := tx.QueryRow(ctx, tryLock, adminKeyspace, gcLock).Scan(&ok); err != nil {
353353
return err

‎notifier/postgres/notifications_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ import (
88
"testing"
99

1010
"github.com/google/uuid"
11-
"github.com/jackc/pgx/v4"
11+
"github.com/jackc/pgx/v5"
12+
"github.com/quay/zlog"
13+
1214
"github.com/quay/claircore/test"
1315
"github.com/quay/claircore/test/integration"
14-
"github.com/quay/zlog"
1516

1617
"github.com/quay/clair/v4/notifier"
1718
)

‎notifier/postgres/receipt.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"errors"
66

77
"github.com/google/uuid"
8-
"github.com/jackc/pgx/v4"
9-
"github.com/jackc/pgx/v4/pgxpool"
8+
"github.com/jackc/pgx/v5"
9+
"github.com/jackc/pgx/v5/pgxpool"
1010
"github.com/prometheus/client_golang/prometheus"
1111
"github.com/prometheus/client_golang/prometheus/promauto"
1212

@@ -146,7 +146,7 @@ func (s *Store) PutReceipt(ctx context.Context, updater string, r notifier.Recei
146146
counter: putReceiptCounter,
147147
affected: putReceiptAffected,
148148
}
149-
err := s.pool.BeginTxFunc(ctx, txOpt, func(tx pgx.Tx) error {
149+
err := pgx.BeginTxFunc(ctx, s.pool, txOpt, func(tx pgx.Tx) error {
150150
if err := txExec(ctx, metrics, tx,
151151
`insertNotification`,
152152
insertNotification,

‎notifier/postgres/set_status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55

66
"github.com/google/uuid"
7-
"github.com/jackc/pgconn"
8-
"github.com/jackc/pgx/v4/pgxpool"
7+
"github.com/jackc/pgx/v5/pgconn"
8+
"github.com/jackc/pgx/v5/pgxpool"
99
"github.com/prometheus/client_golang/prometheus"
1010
"github.com/prometheus/client_golang/prometheus/promauto"
1111

‎notifier/postgres/store.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"database/sql"
66
"fmt"
77

8-
"github.com/jackc/pgconn"
9-
"github.com/jackc/pgx/v4"
10-
"github.com/jackc/pgx/v4/pgxpool"
11-
"github.com/jackc/pgx/v4/stdlib"
8+
"github.com/jackc/pgx/v5"
9+
"github.com/jackc/pgx/v5/pgconn"
10+
"github.com/jackc/pgx/v5/pgxpool"
11+
"github.com/jackc/pgx/v5/stdlib"
1212
"github.com/prometheus/client_golang/prometheus"
1313
"github.com/quay/zlog"
1414
"github.com/remind101/migrate"

0 commit comments

Comments
 (0)