diff --git a/cmd/tools/metabase-orphaned-segments/main.go b/cmd/tools/metabase-orphaned-segments/main.go index 6329a2371..51850a30b 100644 --- a/cmd/tools/metabase-orphaned-segments/main.go +++ b/cmd/tools/metabase-orphaned-segments/main.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/spacemonkeygo/monkit/v3" "github.com/spf13/cobra" flag "github.com/spf13/pflag" diff --git a/cmd/tools/migrate-public-ids/main.go b/cmd/tools/migrate-public-ids/main.go index 36f7a5b18..ed98a5f97 100644 --- a/cmd/tools/migrate-public-ids/main.go +++ b/cmd/tools/migrate-public-ids/main.go @@ -7,7 +7,7 @@ import ( "context" "errors" - pgx "github.com/jackc/pgx/v4" + pgx "github.com/jackc/pgx/v5" "github.com/spacemonkeygo/monkit/v3" "github.com/spf13/cobra" flag "github.com/spf13/pflag" diff --git a/cmd/tools/migrate-public-ids/main_test.go b/cmd/tools/migrate-public-ids/main_test.go index a69f85918..23f2d3076 100644 --- a/cmd/tools/migrate-public-ids/main_test.go +++ b/cmd/tools/migrate-public-ids/main_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - pgx "github.com/jackc/pgx/v4" + pgx "github.com/jackc/pgx/v5" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zaptest" diff --git a/cmd/tools/migrate-public-ids/migrations.go b/cmd/tools/migrate-public-ids/migrations.go index 9c8d9a852..813c6036b 100644 --- a/cmd/tools/migrate-public-ids/migrations.go +++ b/cmd/tools/migrate-public-ids/migrations.go @@ -6,7 +6,7 @@ package main import ( "context" - pgx "github.com/jackc/pgx/v4" + pgx "github.com/jackc/pgx/v5" "github.com/zeebo/errs" "go.uber.org/zap" diff --git a/go.mod b/go.mod index 7d4d0b1cd..f3f963bb1 100644 --- a/go.mod +++ b/go.mod @@ -17,10 +17,9 @@ require ( github.com/gorilla/mux v1.8.0 github.com/gorilla/schema v1.2.0 github.com/graphql-go/graphql v0.7.9 - github.com/jackc/pgconn v1.11.0 github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 - github.com/jackc/pgtype v1.10.0 - github.com/jackc/pgx/v4 v4.15.0 + github.com/jackc/pgtype v1.14.0 + github.com/jackc/pgx/v5 v5.3.1 github.com/jtolds/monkit-hw/v2 v2.0.0-20191108235325-141a0da276b3 github.com/jtolio/eventkit v0.0.0-20230607152326-4668f79ff72d github.com/jtolio/noiseconn v0.0.0-20230301220541-88105e6c8ac6 @@ -63,7 +62,7 @@ require ( storj.io/common v0.0.0-20230602145716-d6ea82d58b3d storj.io/drpc v0.0.33 storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 - storj.io/private v0.0.0-20230612081536-17668e341c5e + storj.io/private v0.0.0-20230614131149-2ffd1635adea storj.io/uplink v1.10.1-0.20230607180240-72bcffbeac33 ) @@ -94,11 +93,11 @@ require ( github.com/googleapis/gax-go/v2 v2.8.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.11.0 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.2.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jtolds/tracetagger/v2 v2.0.0-rc5 // indirect github.com/klauspost/compress v1.15.10 // indirect github.com/klauspost/cpuid/v2 v2.0.12 // indirect diff --git a/go.sum b/go.sum index ba81f042d..65a4e77ce 100644 --- a/go.sum +++ b/go.sum @@ -32,7 +32,6 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow= @@ -94,7 +93,6 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -151,7 +149,6 @@ github.com/go-session/session v3.1.2+incompatible/go.mod h1:8B3iivBQjrz/JtC68Np2 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -265,6 +262,7 @@ github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -283,7 +281,6 @@ github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= -github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= @@ -294,26 +291,27 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5ns= -github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/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-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/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= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38= -github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w= -github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw= +github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU= +github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8= 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.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -1024,7 +1022,7 @@ storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1Aml storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= storj.io/picobuf v0.0.1 h1:ekEvxSQCbEjTVIi/qxj2za13SJyfRE37yE30IBkZeT0= storj.io/picobuf v0.0.1/go.mod h1:7ZTAMs6VesgTHbbhFU79oQ9hDaJ+MD4uoFQZ1P4SEz0= -storj.io/private v0.0.0-20230612081536-17668e341c5e h1:WTqsScX5ICr76a2W0KoE0o4YhjWhbmkVPatI2/N/0SA= -storj.io/private v0.0.0-20230612081536-17668e341c5e/go.mod h1:jpqGrKyROOA5ywQdtmQVKv8dj6epx03yybki+9iXpTc= +storj.io/private v0.0.0-20230614131149-2ffd1635adea h1:/dv0bYRPgCFvoXF0S14Ien41i12sj9+s4aKhCrFzXHg= +storj.io/private v0.0.0-20230614131149-2ffd1635adea/go.mod h1:mfdHEaAcTARpd4/Hc6N5uxwB1ZG3jtPdVlle57xzQxQ= storj.io/uplink v1.10.1-0.20230607180240-72bcffbeac33 h1:A6z1FOmqqh44BI/UOPwTi0qaM+/Hdpiwk3QAuvWf03g= storj.io/uplink v1.10.1-0.20230607180240-72bcffbeac33/go.mod h1:cDlpDWGJykXfYE7NtO1EeArGFy12K5Xj8pV8ufpUCKE= diff --git a/multinode/multinodedb/dbx/multinodedb.dbx.go b/multinode/multinodedb/dbx/multinodedb.dbx.go index a0d3209d8..82fe8f440 100644 --- a/multinode/multinodedb/dbx/multinodedb.dbx.go +++ b/multinode/multinodedb/dbx/multinodedb.dbx.go @@ -18,14 +18,14 @@ import ( "time" "unicode" - "github.com/jackc/pgconn" - _ "github.com/jackc/pgx/v4/stdlib" + "github.com/jackc/pgx/v5/pgconn" + _ "github.com/jackc/pgx/v5/stdlib" "github.com/mattn/go-sqlite3" "storj.io/private/tagsql" ) -// Prevent conditional imports from causing build failures +// Prevent conditional imports from causing build failures. var _ = strconv.Itoa var _ = strings.LastIndex var _ = fmt.Sprint @@ -70,6 +70,10 @@ func (e *Error) Error() string { return e.Err.Error() } +func (e *Error) Unwrap() error { + return e.Err +} + func wrapErr(e *Error) error { if WrapErr == nil { return e @@ -157,7 +161,7 @@ func Open(driver, source string) (db *DB, err error) { } defer func(sql_db *sql.DB) { if err != nil { - sql_db.Close() + _ = sql_db.Close() } }(sql_db) @@ -524,6 +528,7 @@ type __sqlbundle_SQL interface { } type __sqlbundle_Dialect interface { + // Rebind gives the opportunity to rewrite provided SQL into a SQL dialect. Rebind(sql string) string } @@ -608,6 +613,30 @@ func __sqlbundle_flattenSQL(x string) string { return x } +// this type is specially named to match up with the name returned by the +// dialect impl in the sql package. +type __sqlbundle_cockroach struct{} + +func (p __sqlbundle_cockroach) Rebind(sql string) string { + return __sqlbundle_postgres{}.Rebind(sql) +} + +// this type is specially named to match up with the name returned by the +// dialect impl in the sql package. +type __sqlbundle_pgx struct{} + +func (p __sqlbundle_pgx) Rebind(sql string) string { + return __sqlbundle_postgres{}.Rebind(sql) +} + +// this type is specially named to match up with the name returned by the +// dialect impl in the sql package. +type __sqlbundle_pgxcockroach struct{} + +func (p __sqlbundle_pgxcockroach) Rebind(sql string) string { + return __sqlbundle_postgres{}.Rebind(sql) +} + // this type is specially named to match up with the name returned by the // dialect impl in the sql package. type __sqlbundle_postgres struct{} @@ -672,174 +701,6 @@ func (s __sqlbundle_sqlite3) Rebind(sql string) string { return sql } -// this type is specially named to match up with the name returned by the -// dialect impl in the sql package. -type __sqlbundle_cockroach struct{} - -func (p __sqlbundle_cockroach) Rebind(sql string) string { - type sqlParseState int - const ( - sqlParseStart sqlParseState = iota - sqlParseInStringLiteral - sqlParseInQuotedIdentifier - sqlParseInComment - ) - - out := make([]byte, 0, len(sql)+10) - - j := 1 - state := sqlParseStart - for i := 0; i < len(sql); i++ { - ch := sql[i] - switch state { - case sqlParseStart: - switch ch { - case '?': - out = append(out, '$') - out = append(out, strconv.Itoa(j)...) - state = sqlParseStart - j++ - continue - case '-': - if i+1 < len(sql) && sql[i+1] == '-' { - state = sqlParseInComment - } - case '"': - state = sqlParseInQuotedIdentifier - case '\'': - state = sqlParseInStringLiteral - } - case sqlParseInStringLiteral: - if ch == '\'' { - state = sqlParseStart - } - case sqlParseInQuotedIdentifier: - if ch == '"' { - state = sqlParseStart - } - case sqlParseInComment: - if ch == '\n' { - state = sqlParseStart - } - } - out = append(out, ch) - } - - return string(out) -} - -// this type is specially named to match up with the name returned by the -// dialect impl in the sql package. -type __sqlbundle_pgx struct{} - -func (p __sqlbundle_pgx) Rebind(sql string) string { - type sqlParseState int - const ( - sqlParseStart sqlParseState = iota - sqlParseInStringLiteral - sqlParseInQuotedIdentifier - sqlParseInComment - ) - - out := make([]byte, 0, len(sql)+10) - - j := 1 - state := sqlParseStart - for i := 0; i < len(sql); i++ { - ch := sql[i] - switch state { - case sqlParseStart: - switch ch { - case '?': - out = append(out, '$') - out = append(out, strconv.Itoa(j)...) - state = sqlParseStart - j++ - continue - case '-': - if i+1 < len(sql) && sql[i+1] == '-' { - state = sqlParseInComment - } - case '"': - state = sqlParseInQuotedIdentifier - case '\'': - state = sqlParseInStringLiteral - } - case sqlParseInStringLiteral: - if ch == '\'' { - state = sqlParseStart - } - case sqlParseInQuotedIdentifier: - if ch == '"' { - state = sqlParseStart - } - case sqlParseInComment: - if ch == '\n' { - state = sqlParseStart - } - } - out = append(out, ch) - } - - return string(out) -} - -// this type is specially named to match up with the name returned by the -// dialect impl in the sql package. -type __sqlbundle_pgxcockroach struct{} - -func (p __sqlbundle_pgxcockroach) Rebind(sql string) string { - type sqlParseState int - const ( - sqlParseStart sqlParseState = iota - sqlParseInStringLiteral - sqlParseInQuotedIdentifier - sqlParseInComment - ) - - out := make([]byte, 0, len(sql)+10) - - j := 1 - state := sqlParseStart - for i := 0; i < len(sql); i++ { - ch := sql[i] - switch state { - case sqlParseStart: - switch ch { - case '?': - out = append(out, '$') - out = append(out, strconv.Itoa(j)...) - state = sqlParseStart - j++ - continue - case '-': - if i+1 < len(sql) && sql[i+1] == '-' { - state = sqlParseInComment - } - case '"': - state = sqlParseInQuotedIdentifier - case '\'': - state = sqlParseInStringLiteral - } - case sqlParseInStringLiteral: - if ch == '\'' { - state = sqlParseStart - } - case sqlParseInQuotedIdentifier: - if ch == '"' { - state = sqlParseStart - } - case sqlParseInComment: - if ch == '\n' { - state = sqlParseStart - } - } - out = append(out, ch) - } - - return string(out) -} - type __sqlbundle_Literal string func (__sqlbundle_Literal) private() {} diff --git a/private/migrate/create_test.go b/private/migrate/create_test.go index cbae94f29..dac284b5f 100644 --- a/private/migrate/create_test.go +++ b/private/migrate/create_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - _ "github.com/jackc/pgx/v4/stdlib" + _ "github.com/jackc/pgx/v5/stdlib" _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/satellite/metabase/db.go b/satellite/metabase/db.go index 48cc1d5c6..27c6688b1 100644 --- a/satellite/metabase/db.go +++ b/satellite/metabase/db.go @@ -10,8 +10,8 @@ import ( "strconv" "time" - _ "github.com/jackc/pgx/v4" // registers pgx as a tagsql driver. - _ "github.com/jackc/pgx/v4/stdlib" // registers pgx as a tagsql driver. + _ "github.com/jackc/pgx/v5" // registers pgx as a tagsql driver. + _ "github.com/jackc/pgx/v5/stdlib" // registers pgx as a tagsql driver. "github.com/spacemonkeygo/monkit/v3" "github.com/zeebo/errs" "go.uber.org/zap" diff --git a/satellite/metabase/delete_objects.go b/satellite/metabase/delete_objects.go index e963b4d49..e0cbef07b 100644 --- a/satellite/metabase/delete_objects.go +++ b/satellite/metabase/delete_objects.go @@ -8,7 +8,7 @@ import ( "encoding/hex" "time" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/zeebo/errs" "go.uber.org/zap" diff --git a/satellite/satellitedb/dbx/gen/main.go b/satellite/satellitedb/dbx/gen/main.go index aa9e1e2cc..43c27c145 100644 --- a/satellite/satellitedb/dbx/gen/main.go +++ b/satellite/satellitedb/dbx/gen/main.go @@ -49,9 +49,7 @@ func main() { replacer := strings.NewReplacer( "*sql.Tx", "tagsql.Tx", "*sql.Rows", "tagsql.Rows", - `_ "github.com/jackc/pgx/v4/stdlib"`, `"storj.io/private/tagsql"`, `_ "github.com/jackc/pgx/v5/stdlib"`, `"storj.io/private/tagsql"`, - `"github.com/jackc/pgx/v5/pgconn"`, `"github.com/jackc/pgconn"`, "type DB struct {\n\t*sql.DB", "type DB struct {\n\ttagsql.DB", "db = &DB{\n\t\tDB: sql_db", "db = &DB{\n\t\tDB: tagsql.Wrap(sql_db)", ) diff --git a/satellite/satellitedb/dbx/satellitedb.dbx.go b/satellite/satellitedb/dbx/satellitedb.dbx.go index 3c922980e..b3cd6323e 100644 --- a/satellite/satellitedb/dbx/satellitedb.dbx.go +++ b/satellite/satellitedb/dbx/satellitedb.dbx.go @@ -17,7 +17,7 @@ import ( "time" "unicode" - "github.com/jackc/pgconn" + "github.com/jackc/pgx/v5/pgconn" "storj.io/private/tagsql" ) @@ -11513,6 +11513,7 @@ type __sqlbundle_SQL interface { } type __sqlbundle_Dialect interface { + // Rebind gives the opportunity to rewrite provided SQL into a SQL dialect. Rebind(sql string) string } @@ -11597,6 +11598,30 @@ func __sqlbundle_flattenSQL(x string) string { return x } +// this type is specially named to match up with the name returned by the +// dialect impl in the sql package. +type __sqlbundle_cockroach struct{} + +func (p __sqlbundle_cockroach) Rebind(sql string) string { + return __sqlbundle_postgres{}.Rebind(sql) +} + +// this type is specially named to match up with the name returned by the +// dialect impl in the sql package. +type __sqlbundle_pgx struct{} + +func (p __sqlbundle_pgx) Rebind(sql string) string { + return __sqlbundle_postgres{}.Rebind(sql) +} + +// this type is specially named to match up with the name returned by the +// dialect impl in the sql package. +type __sqlbundle_pgxcockroach struct{} + +func (p __sqlbundle_pgxcockroach) Rebind(sql string) string { + return __sqlbundle_postgres{}.Rebind(sql) +} + // this type is specially named to match up with the name returned by the // dialect impl in the sql package. type __sqlbundle_postgres struct{} @@ -11661,174 +11686,6 @@ func (s __sqlbundle_sqlite3) Rebind(sql string) string { return sql } -// this type is specially named to match up with the name returned by the -// dialect impl in the sql package. -type __sqlbundle_cockroach struct{} - -func (p __sqlbundle_cockroach) Rebind(sql string) string { - type sqlParseState int - const ( - sqlParseStart sqlParseState = iota - sqlParseInStringLiteral - sqlParseInQuotedIdentifier - sqlParseInComment - ) - - out := make([]byte, 0, len(sql)+10) - - j := 1 - state := sqlParseStart - for i := 0; i < len(sql); i++ { - ch := sql[i] - switch state { - case sqlParseStart: - switch ch { - case '?': - out = append(out, '$') - out = append(out, strconv.Itoa(j)...) - state = sqlParseStart - j++ - continue - case '-': - if i+1 < len(sql) && sql[i+1] == '-' { - state = sqlParseInComment - } - case '"': - state = sqlParseInQuotedIdentifier - case '\'': - state = sqlParseInStringLiteral - } - case sqlParseInStringLiteral: - if ch == '\'' { - state = sqlParseStart - } - case sqlParseInQuotedIdentifier: - if ch == '"' { - state = sqlParseStart - } - case sqlParseInComment: - if ch == '\n' { - state = sqlParseStart - } - } - out = append(out, ch) - } - - return string(out) -} - -// this type is specially named to match up with the name returned by the -// dialect impl in the sql package. -type __sqlbundle_pgx struct{} - -func (p __sqlbundle_pgx) Rebind(sql string) string { - type sqlParseState int - const ( - sqlParseStart sqlParseState = iota - sqlParseInStringLiteral - sqlParseInQuotedIdentifier - sqlParseInComment - ) - - out := make([]byte, 0, len(sql)+10) - - j := 1 - state := sqlParseStart - for i := 0; i < len(sql); i++ { - ch := sql[i] - switch state { - case sqlParseStart: - switch ch { - case '?': - out = append(out, '$') - out = append(out, strconv.Itoa(j)...) - state = sqlParseStart - j++ - continue - case '-': - if i+1 < len(sql) && sql[i+1] == '-' { - state = sqlParseInComment - } - case '"': - state = sqlParseInQuotedIdentifier - case '\'': - state = sqlParseInStringLiteral - } - case sqlParseInStringLiteral: - if ch == '\'' { - state = sqlParseStart - } - case sqlParseInQuotedIdentifier: - if ch == '"' { - state = sqlParseStart - } - case sqlParseInComment: - if ch == '\n' { - state = sqlParseStart - } - } - out = append(out, ch) - } - - return string(out) -} - -// this type is specially named to match up with the name returned by the -// dialect impl in the sql package. -type __sqlbundle_pgxcockroach struct{} - -func (p __sqlbundle_pgxcockroach) Rebind(sql string) string { - type sqlParseState int - const ( - sqlParseStart sqlParseState = iota - sqlParseInStringLiteral - sqlParseInQuotedIdentifier - sqlParseInComment - ) - - out := make([]byte, 0, len(sql)+10) - - j := 1 - state := sqlParseStart - for i := 0; i < len(sql); i++ { - ch := sql[i] - switch state { - case sqlParseStart: - switch ch { - case '?': - out = append(out, '$') - out = append(out, strconv.Itoa(j)...) - state = sqlParseStart - j++ - continue - case '-': - if i+1 < len(sql) && sql[i+1] == '-' { - state = sqlParseInComment - } - case '"': - state = sqlParseInQuotedIdentifier - case '\'': - state = sqlParseInStringLiteral - } - case sqlParseInStringLiteral: - if ch == '\'' { - state = sqlParseStart - } - case sqlParseInQuotedIdentifier: - if ch == '"' { - state = sqlParseStart - } - case sqlParseInComment: - if ch == '\n' { - state = sqlParseStart - } - } - out = append(out, ch) - } - - return string(out) -} - type __sqlbundle_Literal string func (__sqlbundle_Literal) private() {} diff --git a/satellite/satellitedb/migrate_test.go b/satellite/satellitedb/migrate_test.go index 587ed9997..26eba0fc2 100644 --- a/satellite/satellitedb/migrate_test.go +++ b/satellite/satellitedb/migrate_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/jackc/pgconn" + "github.com/jackc/pgx/v5/pgconn" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/zeebo/errs" diff --git a/satellite/satellitedb/orders.go b/satellite/satellitedb/orders.go index 9bfa631ed..9a65e17fe 100644 --- a/satellite/satellitedb/orders.go +++ b/satellite/satellitedb/orders.go @@ -11,7 +11,7 @@ import ( "sort" "time" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/zeebo/errs" "storj.io/common/pb" diff --git a/satellite/satellitedb/projectaccounting.go b/satellite/satellitedb/projectaccounting.go index dcf7a3b28..0ea9ba85b 100644 --- a/satellite/satellitedb/projectaccounting.go +++ b/satellite/satellitedb/projectaccounting.go @@ -11,7 +11,7 @@ import ( "time" pgxerrcode "github.com/jackc/pgerrcode" - "github.com/jackc/pgx/v4" + "github.com/jackc/pgx/v5" "github.com/zeebo/errs" "storj.io/common/memory" diff --git a/testsuite/storjscan/go.mod b/testsuite/storjscan/go.mod index 58ba1b2e8..46642080b 100644 --- a/testsuite/storjscan/go.mod +++ b/testsuite/storjscan/go.mod @@ -10,7 +10,7 @@ require ( go.uber.org/zap v1.21.0 golang.org/x/sync v0.1.0 storj.io/common v0.0.0-20230602145716-d6ea82d58b3d - storj.io/private v0.0.0-20230612081536-17668e341c5e + storj.io/private v0.0.0-20230614131149-2ffd1635adea storj.io/storj v1.63.1 storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 storj.io/uplink v1.10.1-0.20230607180240-72bcffbeac33 @@ -70,10 +70,11 @@ require ( github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.2.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect - github.com/jackc/pgtype v1.10.0 // indirect + github.com/jackc/pgproto3/v2 v2.3.2 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgtype v1.14.0 // indirect github.com/jackc/pgx/v4 v4.15.0 // indirect + github.com/jackc/pgx/v5 v5.3.1 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jtolds/monkit-hw/v2 v2.0.0-20191108235325-141a0da276b3 // indirect github.com/jtolds/tracetagger/v2 v2.0.0-rc5 // indirect diff --git a/testsuite/storjscan/go.sum b/testsuite/storjscan/go.sum index 4bfeca3e4..889c8d5d9 100644 --- a/testsuite/storjscan/go.sum +++ b/testsuite/storjscan/go.sum @@ -408,22 +408,27 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5ns= github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= +github.com/jackc/pgproto3/v2 v2.3.2/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-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/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= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38= github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w= github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw= +github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU= +github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8= 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= @@ -1250,8 +1255,8 @@ storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1Aml storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= storj.io/picobuf v0.0.1 h1:ekEvxSQCbEjTVIi/qxj2za13SJyfRE37yE30IBkZeT0= storj.io/picobuf v0.0.1/go.mod h1:7ZTAMs6VesgTHbbhFU79oQ9hDaJ+MD4uoFQZ1P4SEz0= -storj.io/private v0.0.0-20230612081536-17668e341c5e h1:WTqsScX5ICr76a2W0KoE0o4YhjWhbmkVPatI2/N/0SA= -storj.io/private v0.0.0-20230612081536-17668e341c5e/go.mod h1:jpqGrKyROOA5ywQdtmQVKv8dj6epx03yybki+9iXpTc= +storj.io/private v0.0.0-20230614131149-2ffd1635adea h1:/dv0bYRPgCFvoXF0S14Ien41i12sj9+s4aKhCrFzXHg= +storj.io/private v0.0.0-20230614131149-2ffd1635adea/go.mod h1:mfdHEaAcTARpd4/Hc6N5uxwB1ZG3jtPdVlle57xzQxQ= storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 h1:pSfGf9E9OlUd17W7LSpL4tTONIyFji6dz8I2iTDd8BY= storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0/go.mod h1:5nLgAOl1KTDVyqORAhvrp+167PtShEuS1L3pJgXPjwo= storj.io/uplink v1.10.1-0.20230607180240-72bcffbeac33 h1:A6z1FOmqqh44BI/UOPwTi0qaM+/Hdpiwk3QAuvWf03g= diff --git a/testsuite/ui/go.mod b/testsuite/ui/go.mod index 496da5097..50e08884d 100644 --- a/testsuite/ui/go.mod +++ b/testsuite/ui/go.mod @@ -12,7 +12,7 @@ require ( go.uber.org/zap v1.23.0 storj.io/common v0.0.0-20230602145716-d6ea82d58b3d storj.io/gateway-mt v1.51.1-0.20230417204402-7d9bb25bc297 - storj.io/private v0.0.0-20230612081536-17668e341c5e + storj.io/private v0.0.0-20230614131149-2ffd1635adea storj.io/storj v0.12.1-0.20221125175451-ef4b564b82f7 ) @@ -83,15 +83,12 @@ require ( github.com/graphql-go/graphql v0.7.9 // indirect github.com/hashicorp/go-uuid v1.0.2 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.11.0 // indirect github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.2.0 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect - github.com/jackc/pgtype v1.10.0 // indirect - github.com/jackc/pgx/v4 v4.15.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgtype v1.14.0 // indirect + github.com/jackc/pgx/v5 v5.3.1 // indirect github.com/jcmturner/gofork v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.10 // indirect diff --git a/testsuite/ui/go.sum b/testsuite/ui/go.sum index eb5b9e45c..5e9864b3a 100644 --- a/testsuite/ui/go.sum +++ b/testsuite/ui/go.sum @@ -213,7 +213,6 @@ github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzS github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -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/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -311,7 +310,6 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= @@ -428,7 +426,6 @@ github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -622,6 +619,7 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -633,17 +631,16 @@ github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfG github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= github.com/jackc/pgconn v1.11.0 h1:HiHArx4yFbwl91X3qqIHtUFoiIfLNJXCQRsnzkiwwaQ= -github.com/jackc/pgconn v1.11.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451 h1:WAvSpGf7MsFuzAtK4Vk7R4EVe+liW4x83r4oWu0WHKw= github.com/jackc/pgerrcode v0.0.0-20201024163028-a0d42d470451/go.mod h1:a/s9Lp5W7n/DD0VrVoyJ00FbP2ytTPDVOivvn2bMlds= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= -github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= @@ -651,26 +648,26 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5ns= -github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= -github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/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= github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= -github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38= -github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= +github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w= -github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw= +github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU= +github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8= 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.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= @@ -1976,8 +1973,8 @@ storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1Aml storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= storj.io/picobuf v0.0.1 h1:ekEvxSQCbEjTVIi/qxj2za13SJyfRE37yE30IBkZeT0= storj.io/picobuf v0.0.1/go.mod h1:7ZTAMs6VesgTHbbhFU79oQ9hDaJ+MD4uoFQZ1P4SEz0= -storj.io/private v0.0.0-20230612081536-17668e341c5e h1:WTqsScX5ICr76a2W0KoE0o4YhjWhbmkVPatI2/N/0SA= -storj.io/private v0.0.0-20230612081536-17668e341c5e/go.mod h1:jpqGrKyROOA5ywQdtmQVKv8dj6epx03yybki+9iXpTc= +storj.io/private v0.0.0-20230614131149-2ffd1635adea h1:/dv0bYRPgCFvoXF0S14Ien41i12sj9+s4aKhCrFzXHg= +storj.io/private v0.0.0-20230614131149-2ffd1635adea/go.mod h1:mfdHEaAcTARpd4/Hc6N5uxwB1ZG3jtPdVlle57xzQxQ= storj.io/uplink v1.10.1-0.20230607180240-72bcffbeac33 h1:A6z1FOmqqh44BI/UOPwTi0qaM+/Hdpiwk3QAuvWf03g= storj.io/uplink v1.10.1-0.20230607180240-72bcffbeac33/go.mod h1:cDlpDWGJykXfYE7NtO1EeArGFy12K5Xj8pV8ufpUCKE= storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6 h1:vJQmb+uAiYn8hVfkhMl6OqjnUyMWSCPnkzW8IsjF8vE=