JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all: bump storj.io/{common,uplink,drpc}

Browse Source 
Change-Id: Ie98a7eacc11a492a20c76636f8044c81b7ed580d
This commit is contained in:
Jeff Wendling 2023-04-17 13:43:48 -04:00 committed by Storj Robot
parent 22970403af
commit df9cc4d10f
14 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile.verify
View File

@ -135,9 +135,11 @@ pipeline {
sh './scripts/check-package-lock.sh'
dir("testsuite/ui") {
sh 'go vet ./...'
}
// TODO temporary disable UI vetting until gateway-mt will be
// adjusted to latest common
// dir("testsuite/ui") {
// sh 'go vet ./...'
// }
dir("testsuite/storjscan") {
sh 'go vet ./...'
}

6
go.mod
View File

@ -59,11 +59,11 @@ require (
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
gopkg.in/segmentio/analytics-go.v3 v3.1.0
gopkg.in/yaml.v3 v3.0.1
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2
storj.io/common v0.0.0-20230417173225-d1152ea3099a
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41
storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8
storj.io/uplink v1.10.1-0.20230406095800-66d57268466a
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e
)
require (

12
go.sum
View File

@ -974,16 +974,16 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ=
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f h1:fR5zrhISJnu69erKyDZbNTqiZn047fVhYpKHEvLyonY=
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f/go.mod h1:mYWledc0VY1J4+merC3LIFZr0Wa4FaB/hg0ucMdYnzA=
storj.io/common v0.0.0-20230417173225-d1152ea3099a h1:B5AVXKsrqcynZdxznewcXU57VARFeRXSDpCmGnNwFtE=
storj.io/common v0.0.0-20230417173225-d1152ea3099a/go.mod h1:j5YdcshmpJL+oW1+3IyBnCsv/HGbFkbzNDtuZg24KF0=
storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2 h1:bwj32XFRYPb7LqNxAmP7kqcsxmXla7iygazXDPtzKbU=
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4=
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5 h1:4iOQovjXb6oAMLrjf0Qc4MuRRLd9hXC7+CWqOt+AzCw=
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4=
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1AmlVLitdGXTVrvmbzN4Z9C9Ms40=
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-20230405095015-9e5bbc1c7ca8 h1:bUSNdChb1E5a/IFAy1l5zq+oZIYR5WPJ1JC71GC12dA=
storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8/go.mod h1:JxBlgPwo+P0OOJDSPJLwBJWUPnhnvrHOlKAN0aV/bhY=
storj.io/uplink v1.10.1-0.20230406095800-66d57268466a h1:+YdRBhQtRHfK92yuZHrAOdl471oGrnTj239mIwBEvbM=
storj.io/uplink v1.10.1-0.20230406095800-66d57268466a/go.mod h1:x6XS4VpmVMU2N/VXm7QGS2M4Ar1+FmWa0lZGYfhMCww=
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e h1:y6CSddIrAAZ5tSeSLNlXRjo81NT0f4+vEJ5spS2YxuA=
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e/go.mod h1:x6XS4VpmVMU2N/VXm7QGS2M4Ar1+FmWa0lZGYfhMCww=

2
satellite/accounting/projectlimitcache.go
View File

@ -68,7 +68,7 @@ func (c *ProjectLimitCache) GetLimits(ctx context.Context, projectID uuid.UUID)
fn := func() (interface{}, error) {
return c.getProjectLimits(ctx, projectID)
}
projectLimits, err := c.state.Get(projectID.String(), fn)
projectLimits, err := c.state.Get(ctx, projectID.String(), fn)
if err != nil {
return ProjectLimits{}, ErrGetProjectLimitCache.Wrap(err)
}

2
satellite/contact/endpoint.go
View File

@ -61,7 +61,7 @@ func (endpoint *Endpoint) CheckIn(ctx context.Context, req *pb.CheckInRequest) (
// we need a string as a key for the limiter, but nodeID.String() has base58 encoding overhead
nodeIDBytesAsString := string(nodeID.Bytes())
if !endpoint.service.idLimiter.IsAllowed(nodeIDBytesAsString) {
if !endpoint.service.idLimiter.IsAllowed(ctx, nodeIDBytesAsString) {
endpoint.log.Info("node rate limited by id", zap.String("node address", req.Address), zap.Stringer("Node ID", nodeID))
return nil, rpcstatus.Error(rpcstatus.ResourceExhausted, errCheckInRateLimit.New("node rate limited by id").Error())
}

5
satellite/contact/ratelimit.go
View File

@ -4,6 +4,7 @@
package contact
import (
"context"
"fmt"
"time"
@ -33,8 +34,8 @@ func NewRateLimiter(interval time.Duration, burst, numLimits int) *RateLimiter {
}
// IsAllowed indicates if event is allowed to happen.
func (rateLimiter *RateLimiter) IsAllowed(key string) bool {
limiter, err := rateLimiter.limiters.Get(key, func() (interface{}, error) {
func (rateLimiter *RateLimiter) IsAllowed(ctx context.Context, key string) bool {
limiter, err := rateLimiter.limiters.Get(ctx, key, func() (interface{}, error) {
return rate.NewLimiter(
rate.Limit(time.Second)/rate.Limit(rateLimiter.interval),
rateLimiter.burst,

2
satellite/metainfo/endpoint_object.go
View File

@ -80,7 +80,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
return nil, err
}
if err := endpoint.checkObjectUploadRate(keyInfo.ProjectID, req.Bucket, req.EncryptedObjectKey); err != nil {
if err := endpoint.checkObjectUploadRate(ctx, keyInfo.ProjectID, req.Bucket, req.EncryptedObjectKey); err != nil {
return nil, err
}

6
satellite/metainfo/validation.go
View File

@ -210,7 +210,7 @@ func (endpoint *Endpoint) checkRate(ctx context.Context, projectID uuid.UUID) (e
if !endpoint.config.RateLimiter.Enabled {
return nil
}
limiter, err := endpoint.limiterCache.Get(projectID.String(), func() (interface{}, error) {
limiter, err := endpoint.limiterCache.Get(ctx, projectID.String(), func() (interface{}, error) {
rateLimit := rate.Limit(endpoint.config.RateLimiter.Rate)
burstLimit := int(endpoint.config.RateLimiter.Rate)
@ -495,7 +495,7 @@ func (endpoint *Endpoint) checkEncryptedMetadataSize(encryptedMetadata, encrypte
return nil
}
func (endpoint *Endpoint) checkObjectUploadRate(projectID uuid.UUID, bucketName []byte, objectKey []byte) error {
func (endpoint *Endpoint) checkObjectUploadRate(ctx context.Context, projectID uuid.UUID, bucketName []byte, objectKey []byte) error {
if !endpoint.config.UploadLimiter.Enabled {
return nil
}
@ -504,7 +504,7 @@ func (endpoint *Endpoint) checkObjectUploadRate(projectID uuid.UUID, bucketName
// if object location is in cache it means that we won't allow to upload yet here,
// if it's not or internally key expired we are good to go
key := strings.Join([]string{string(projectID[:]), string(bucketName), string(objectKey)}, "/")
_, _ = endpoint.singleObjectLimitCache.Get(key, func() (interface{}, error) {
_, _ = endpoint.singleObjectLimitCache.Get(ctx, key, func() (interface{}, error) {
limited = false
return struct{}{}, nil
})

2
satellite/satellitedb/apikeys.go
View File

@ -139,7 +139,7 @@ func (keys *apikeys) Get(ctx context.Context, id uuid.UUID) (_ *console.APIKeyIn
func (keys *apikeys) GetByHead(ctx context.Context, head []byte) (_ *console.APIKeyInfo, err error) {
defer mon.Task()(&ctx)(&err)
dbKeyI, err := keys.lru.Get(string(head), func() (interface{}, error) {
dbKeyI, err := keys.lru.Get(ctx, string(head), func() (interface{}, error) {
return keys.methods.Get_ApiKey_By_Head(ctx, dbx.ApiKey_Head(head))
})
if err != nil {

2
satellite/satellitedb/revocation.go
View File

@ -37,7 +37,7 @@ func (db *revocationDB) Check(ctx context.Context, tails [][]byte) (bool, error)
// again.
finalTail := tails[numTails-1]
val, err := db.lru.Get(string(finalTail), func() (interface{}, error) {
val, err := db.lru.Get(ctx, string(finalTail), func() (interface{}, error) {
const query = "SELECT EXISTS(SELECT 1 FROM revocations WHERE revoked IN (%s))"
var (

6
testsuite/storjscan/go.mod
View File

@ -9,11 +9,11 @@ require (
github.com/zeebo/errs v1.3.0
go.uber.org/zap v1.21.0
golang.org/x/sync v0.1.0
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f
storj.io/common v0.0.0-20230417173225-d1152ea3099a
storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8
storj.io/storj v1.63.1
storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0
storj.io/uplink v1.10.1-0.20230406095800-66d57268466a
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e
)
require (
@ -145,7 +145,7 @@ require (
gopkg.in/urfave/cli.v1 v1.20.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2 // indirect
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5 // indirect
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect
storj.io/picobuf v0.0.1 // indirect
)

12
testsuite/storjscan/go.sum
View File

@ -1229,11 +1229,11 @@ rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ=
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f h1:fR5zrhISJnu69erKyDZbNTqiZn047fVhYpKHEvLyonY=
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f/go.mod h1:mYWledc0VY1J4+merC3LIFZr0Wa4FaB/hg0ucMdYnzA=
storj.io/common v0.0.0-20230417173225-d1152ea3099a h1:B5AVXKsrqcynZdxznewcXU57VARFeRXSDpCmGnNwFtE=
storj.io/common v0.0.0-20230417173225-d1152ea3099a/go.mod h1:j5YdcshmpJL+oW1+3IyBnCsv/HGbFkbzNDtuZg24KF0=
storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2 h1:bwj32XFRYPb7LqNxAmP7kqcsxmXla7iygazXDPtzKbU=
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4=
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5 h1:4iOQovjXb6oAMLrjf0Qc4MuRRLd9hXC7+CWqOt+AzCw=
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4=
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1AmlVLitdGXTVrvmbzN4Z9C9Ms40=
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs=
storj.io/picobuf v0.0.1 h1:ekEvxSQCbEjTVIi/qxj2za13SJyfRE37yE30IBkZeT0=
@ -1242,5 +1242,5 @@ storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8 h1:bUSNdChb1E5a/IFAy1l5zq+oZ
storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8/go.mod h1:JxBlgPwo+P0OOJDSPJLwBJWUPnhnvrHOlKAN0aV/bhY=
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.20230406095800-66d57268466a h1:+YdRBhQtRHfK92yuZHrAOdl471oGrnTj239mIwBEvbM=
storj.io/uplink v1.10.1-0.20230406095800-66d57268466a/go.mod h1:x6XS4VpmVMU2N/VXm7QGS2M4Ar1+FmWa0lZGYfhMCww=
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e h1:y6CSddIrAAZ5tSeSLNlXRjo81NT0f4+vEJ5spS2YxuA=
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e/go.mod h1:x6XS4VpmVMU2N/VXm7QGS2M4Ar1+FmWa0lZGYfhMCww=

6
testsuite/ui/go.mod
View File

@ -10,7 +10,7 @@ require (
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.2
go.uber.org/zap v1.23.0
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f
storj.io/common v0.0.0-20230417173225-d1152ea3099a
storj.io/gateway-mt v1.49.0
storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8
storj.io/storj v0.12.1-0.20221125175451-ef4b564b82f7
@ -218,10 +218,10 @@ require (
gopkg.in/webhelp.v1 v1.0.0-20170530084242-3f30213e4c49 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2 // indirect
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5 // indirect
storj.io/gateway v1.8.4-0.20230306203023-8b133c0994f0 // indirect
storj.io/minio v0.0.0-20230118205046-c025fcc9eef3 // indirect
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect
storj.io/picobuf v0.0.1 // indirect
storj.io/uplink v1.10.1-0.20230406095800-66d57268466a // indirect
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e // indirect
)

12
testsuite/ui/go.sum
View File

@ -1933,12 +1933,12 @@ sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1
sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ=
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f h1:fR5zrhISJnu69erKyDZbNTqiZn047fVhYpKHEvLyonY=
storj.io/common v0.0.0-20230403133453-c41ac89d0a5f/go.mod h1:mYWledc0VY1J4+merC3LIFZr0Wa4FaB/hg0ucMdYnzA=
storj.io/common v0.0.0-20230417173225-d1152ea3099a h1:B5AVXKsrqcynZdxznewcXU57VARFeRXSDpCmGnNwFtE=
storj.io/common v0.0.0-20230417173225-d1152ea3099a/go.mod h1:j5YdcshmpJL+oW1+3IyBnCsv/HGbFkbzNDtuZg24KF0=
storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840 h1:oqMwoF6vaOrCe92SKRyr8cc2WSjLYAd8fjpAHA7rNqY=
storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2 h1:bwj32XFRYPb7LqNxAmP7kqcsxmXla7iygazXDPtzKbU=
storj.io/drpc v0.0.33-0.20230329154546-1af8c33020a2/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4=
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5 h1:4iOQovjXb6oAMLrjf0Qc4MuRRLd9hXC7+CWqOt+AzCw=
storj.io/drpc v0.0.33-0.20230417171205-2ca712ef4ab5/go.mod h1:vR804UNzhBa49NOJ6HeLjd2H3MakC1j5Gv8bsOQT6N4=
storj.io/gateway v1.8.4-0.20230306203023-8b133c0994f0 h1:OIg2UT9OnaYWAKHuEzw5qTgp3bTlCuQ/PMhi8kVi3zA=
storj.io/gateway v1.8.4-0.20230306203023-8b133c0994f0/go.mod h1:FPMhOUqTJgqi+FFY2pmUZkBeAt7QzQa16gVAE7NawEc=
storj.io/gateway-mt v1.49.0 h1:x96aKPj5Qx5TRMjgtg0BLolmhUtb5gGFHuriOyafs80=
@ -1951,6 +1951,6 @@ 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-20230405095015-9e5bbc1c7ca8 h1:bUSNdChb1E5a/IFAy1l5zq+oZIYR5WPJ1JC71GC12dA=
storj.io/private v0.0.0-20230405095015-9e5bbc1c7ca8/go.mod h1:JxBlgPwo+P0OOJDSPJLwBJWUPnhnvrHOlKAN0aV/bhY=
storj.io/uplink v1.10.1-0.20230406095800-66d57268466a h1:+YdRBhQtRHfK92yuZHrAOdl471oGrnTj239mIwBEvbM=
storj.io/uplink v1.10.1-0.20230406095800-66d57268466a/go.mod h1:x6XS4VpmVMU2N/VXm7QGS2M4Ar1+FmWa0lZGYfhMCww=
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e h1:y6CSddIrAAZ5tSeSLNlXRjo81NT0f4+vEJ5spS2YxuA=
storj.io/uplink v1.10.1-0.20230413192940-d37f89e8219e/go.mod h1:x6XS4VpmVMU2N/VXm7QGS2M4Ar1+FmWa0lZGYfhMCww=
storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6 h1:vJQmb+uAiYn8hVfkhMl6OqjnUyMWSCPnkzW8IsjF8vE=