From 20dfcedd97270ad109b9c6900eecdab58ec1a284 Mon Sep 17 00:00:00 2001 From: Michal Niewrzal Date: Wed, 25 Oct 2023 16:22:23 +0200 Subject: [PATCH] satellite/metainfo: return full object on commit We never extended metainfo protocol to return committed object detailed into and this change is doing it now. Main motivation to do this now is need for providing object version after upload. Change-Id: Ib59bdfd9485e4a0091ac02458cc63427cb7159de --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- satellite/metainfo/endpoint_object.go | 11 ++++++++++- satellite/metainfo/endpoint_object_test.go | 13 +++++++++++-- testsuite/storjscan/go.mod | 10 +++++----- testsuite/storjscan/go.sum | 20 ++++++++++---------- testsuite/ui/go.mod | 10 +++++----- testsuite/ui/go.sum | 20 ++++++++++---------- 8 files changed, 66 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index f99481855..1e131857e 100644 --- a/go.mod +++ b/go.mod @@ -62,11 +62,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-20231005100446-96ee88859b9d + storj.io/common v0.0.0-20231025115457-490795610a23 storj.io/drpc v0.0.33 - storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 - storj.io/private v0.0.0-20230912093002-ca2d4ab44679 - storj.io/uplink v1.12.1 + storj.io/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c + storj.io/private v0.0.0-20231012141933-ae62725d6691 + storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d ) require ( @@ -114,7 +114,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/quic-go/qtls-go1-20 v0.3.4 // indirect - github.com/quic-go/quic-go v0.39.0 // indirect + github.com/quic-go/quic-go v0.39.2 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect diff --git a/go.sum b/go.sum index a5c8dd1c0..c13e8d8f8 100644 --- a/go.sum +++ b/go.sum @@ -462,8 +462,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= -github.com/quic-go/quic-go v0.39.0 h1:AgP40iThFMY0bj8jGxROhw3S0FMGa8ryqsmi9tBH3So= -github.com/quic-go/quic-go v0.39.0/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= +github.com/quic-go/quic-go v0.39.2 h1:hmwAf8zAHlvan0Y5PXxeeBFZEW17IW99sXLry8I2kjk= +github.com/quic-go/quic-go v0.39.2/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k= github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -1015,16 +1015,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-20231005100446-96ee88859b9d h1:/WnwZB60AaYszIRDejBrssJBj20u6pNaXJfoAE2ENsU= -storj.io/common v0.0.0-20231005100446-96ee88859b9d/go.mod h1:gwj8tuNxzTyBVdEux3qSznf4MkkugfEgFI/vWnaOtp8= +storj.io/common v0.0.0-20231025115457-490795610a23 h1:rlqQafxX6tVP5FOtXAXXG+84avcdXMkSElWtRB0vA2M= +storj.io/common v0.0.0-20231025115457-490795610a23/go.mod h1:gAwUxRl45+egUXf54Nm2bl6f2LlQjIT/2sJwSrisIfE= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33 h1:yCGZ26r66ZdMP0IcTYsj7WDAUIIjzXk6DJhbhvt9FHI= storj.io/drpc v0.0.33/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/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c h1:92Hl7mBzjfMNNkkO3uVp62ZC8yZuBNcz20EVcKNzpkQ= +storj.io/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c h1:or/DtG5uaZpzimL61ahlgAA+MTYn/U3txz4fe+XBFUg= storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c/go.mod h1:JCuc3C0gzCJHQ4J6SOx/Yjg+QTpX0D+Fvs5H46FETCk= -storj.io/private v0.0.0-20230912093002-ca2d4ab44679 h1:58rShZRrm14tDqc71bnyoFZDvdNIcJ7iBwQWEQZl60U= -storj.io/private v0.0.0-20230912093002-ca2d4ab44679/go.mod h1:6+MGr4KUXEBIOsOstFz1efPkA+8wVVfzsO8RpuAhhB4= -storj.io/uplink v1.12.1 h1:bDc2dI6Q7EXcvPJLZuH9jIOTIf2oKxvW3xKEA+Y5EI0= -storj.io/uplink v1.12.1/go.mod h1:1+czctHG25pMzcUp4Mds6QnoJ7LvbgYA5d1qlpFFexg= +storj.io/private v0.0.0-20231012141933-ae62725d6691 h1:s/TxryjR2RkyYrZg6SkM30QCAKU7mAHQJeUFUdjcQXI= +storj.io/private v0.0.0-20231012141933-ae62725d6691/go.mod h1:LuJVzguWEMXd8y/XRQZhWCUTmo5LpnYumiUgX+JAs6A= +storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d h1:960x86sn1DicnAmAkcflIJAOFDfxlU9+TeOpTSHKBeY= +storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d/go.mod h1:gEWsb17U41qDFOso1+Ubr5/k/2g9qnxQ2j5wycDfCFY= diff --git a/satellite/metainfo/endpoint_object.go b/satellite/metainfo/endpoint_object.go index 6a49606b3..a65bf1a59 100644 --- a/satellite/metainfo/endpoint_object.go +++ b/satellite/metainfo/endpoint_object.go @@ -324,9 +324,17 @@ func (endpoint *Endpoint) CommitObject(ctx context.Context, req *pb.ObjectCommit } committedObject = &object + pbObject, err := endpoint.objectToProto(ctx, object, nil) + if err != nil { + endpoint.log.Error("unable to convert metabase object", zap.Error(err)) + return nil, rpcstatus.Error(rpcstatus.Internal, "internal error") + } + mon.Meter("req_commit_object").Mark(1) - return &pb.ObjectCommitResponse{}, nil + return &pb.ObjectCommitResponse{ + Object: pbObject, + }, nil } // GetObject gets single object metadata. @@ -1551,6 +1559,7 @@ func (endpoint *Endpoint) objectToProto(ctx context.Context, object metabase.Obj Bucket: []byte(object.BucketName), EncryptedObjectKey: []byte(object.ObjectKey), Version: int32(object.Version), // TODO incompatible types + ObjectVersion: object.Version.Encode(), StreamId: streamID, ExpiresAt: expires, CreatedAt: object.CreatedAt, diff --git a/satellite/metainfo/endpoint_object_test.go b/satellite/metainfo/endpoint_object_test.go index 10f345fa6..fab18c440 100644 --- a/satellite/metainfo/endpoint_object_test.go +++ b/satellite/metainfo/endpoint_object_test.go @@ -1441,13 +1441,22 @@ func TestEndpoint_Object_With_StorageNodes(t *testing.T) { NumberOfSegments: 1, }) require.NoError(t, err) - err = metainfoClient.CommitObject(ctx, metaclient.CommitObjectParams{ - StreamID: beginObjectResponse.StreamID, + + endpoint := planet.Satellites[0].Metainfo.Endpoint + coResponse, err := endpoint.CommitObject(ctx, &pb.CommitObjectRequest{ + Header: &pb.RequestHeader{ + ApiKey: apiKey.SerializeRaw(), + }, + StreamId: beginObjectResponse.StreamID, EncryptedMetadata: metadata, EncryptedMetadataNonce: testrand.Nonce(), EncryptedMetadataEncryptedKey: randomEncryptedKey, }) require.NoError(t, err) + require.NotNil(t, coResponse.Object) + require.NotEmpty(t, coResponse.Object.ObjectVersion) + + // TODO(ver): add tests more detailed tests for returning object on commit, including returned version objects, _, err := metainfoClient.ListObjects(ctx, metaclient.ListObjectsParams{ Bucket: []byte(bucket.Name), diff --git a/testsuite/storjscan/go.mod b/testsuite/storjscan/go.mod index ef8cd642c..8872d463c 100644 --- a/testsuite/storjscan/go.mod +++ b/testsuite/storjscan/go.mod @@ -9,11 +9,11 @@ require ( github.com/zeebo/errs v1.3.0 go.uber.org/zap v1.21.0 golang.org/x/sync v0.3.0 - storj.io/common v0.0.0-20231005100446-96ee88859b9d - storj.io/private v0.0.0-20230912093002-ca2d4ab44679 + storj.io/common v0.0.0-20231025115457-490795610a23 + storj.io/private v0.0.0-20231012141933-ae62725d6691 storj.io/storj v1.63.1 storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 - storj.io/uplink v1.12.1 + storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d ) require ( @@ -103,7 +103,7 @@ require ( github.com/pquerna/otp v1.3.0 // indirect github.com/prometheus/tsdb v0.7.1 // indirect github.com/quic-go/qtls-go1-20 v0.3.4 // indirect - github.com/quic-go/quic-go v0.39.0 // indirect + github.com/quic-go/quic-go v0.39.2 // indirect github.com/redis/go-redis/v9 v9.0.3 // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rjeczalik/notify v0.9.1 // indirect @@ -158,6 +158,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect storj.io/drpc v0.0.33 // indirect - storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect + storj.io/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c // indirect storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c // indirect ) diff --git a/testsuite/storjscan/go.sum b/testsuite/storjscan/go.sum index 2c88ec5dd..2bb10436b 100644 --- a/testsuite/storjscan/go.sum +++ b/testsuite/storjscan/go.sum @@ -647,8 +647,8 @@ github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= -github.com/quic-go/quic-go v0.39.0 h1:AgP40iThFMY0bj8jGxROhw3S0FMGa8ryqsmi9tBH3So= -github.com/quic-go/quic-go v0.39.0/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= +github.com/quic-go/quic-go v0.39.2 h1:hmwAf8zAHlvan0Y5PXxeeBFZEW17IW99sXLry8I2kjk= +github.com/quic-go/quic-go v0.39.2/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= github.com/redis/go-redis/v9 v9.0.3 h1:+7mmR26M0IvyLxGZUHxu4GiBkJkVDid0Un+j4ScYu4k= github.com/redis/go-redis/v9 v9.0.3/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= @@ -1257,18 +1257,18 @@ 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-20231005100446-96ee88859b9d h1:/WnwZB60AaYszIRDejBrssJBj20u6pNaXJfoAE2ENsU= -storj.io/common v0.0.0-20231005100446-96ee88859b9d/go.mod h1:gwj8tuNxzTyBVdEux3qSznf4MkkugfEgFI/vWnaOtp8= +storj.io/common v0.0.0-20231025115457-490795610a23 h1:rlqQafxX6tVP5FOtXAXXG+84avcdXMkSElWtRB0vA2M= +storj.io/common v0.0.0-20231025115457-490795610a23/go.mod h1:gAwUxRl45+egUXf54Nm2bl6f2LlQjIT/2sJwSrisIfE= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.33 h1:yCGZ26r66ZdMP0IcTYsj7WDAUIIjzXk6DJhbhvt9FHI= storj.io/drpc v0.0.33/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/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c h1:92Hl7mBzjfMNNkkO3uVp62ZC8yZuBNcz20EVcKNzpkQ= +storj.io/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c h1:or/DtG5uaZpzimL61ahlgAA+MTYn/U3txz4fe+XBFUg= storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c/go.mod h1:JCuc3C0gzCJHQ4J6SOx/Yjg+QTpX0D+Fvs5H46FETCk= -storj.io/private v0.0.0-20230912093002-ca2d4ab44679 h1:58rShZRrm14tDqc71bnyoFZDvdNIcJ7iBwQWEQZl60U= -storj.io/private v0.0.0-20230912093002-ca2d4ab44679/go.mod h1:6+MGr4KUXEBIOsOstFz1efPkA+8wVVfzsO8RpuAhhB4= +storj.io/private v0.0.0-20231012141933-ae62725d6691 h1:s/TxryjR2RkyYrZg6SkM30QCAKU7mAHQJeUFUdjcQXI= +storj.io/private v0.0.0-20231012141933-ae62725d6691/go.mod h1:LuJVzguWEMXd8y/XRQZhWCUTmo5LpnYumiUgX+JAs6A= 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.12.1 h1:bDc2dI6Q7EXcvPJLZuH9jIOTIf2oKxvW3xKEA+Y5EI0= -storj.io/uplink v1.12.1/go.mod h1:1+czctHG25pMzcUp4Mds6QnoJ7LvbgYA5d1qlpFFexg= +storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d h1:960x86sn1DicnAmAkcflIJAOFDfxlU9+TeOpTSHKBeY= +storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d/go.mod h1:gEWsb17U41qDFOso1+Ubr5/k/2g9qnxQ2j5wycDfCFY= diff --git a/testsuite/ui/go.mod b/testsuite/ui/go.mod index 02c050cae..57c503dd9 100644 --- a/testsuite/ui/go.mod +++ b/testsuite/ui/go.mod @@ -10,9 +10,9 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.23.0 - storj.io/common v0.0.0-20231005100446-96ee88859b9d + storj.io/common v0.0.0-20231025115457-490795610a23 storj.io/gateway-mt v1.51.1-0.20230417204402-7d9bb25bc297 - storj.io/private v0.0.0-20230912093002-ca2d4ab44679 + storj.io/private v0.0.0-20231012141933-ae62725d6691 storj.io/storj v0.12.1-0.20221125175451-ef4b564b82f7 ) @@ -152,7 +152,7 @@ require ( github.com/prometheus/common v0.14.0 // indirect github.com/prometheus/procfs v0.6.0 // indirect github.com/quic-go/qtls-go1-20 v0.3.4 // indirect - github.com/quic-go/quic-go v0.39.0 // indirect + github.com/quic-go/quic-go v0.39.2 // indirect github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect github.com/redis/go-redis/v9 v9.0.3 // indirect github.com/rivo/uniseg v0.4.4 // indirect @@ -231,7 +231,7 @@ require ( storj.io/drpc v0.0.33 // indirect storj.io/gateway v1.8.4-0.20230411184137-387420cf640f // indirect storj.io/minio v0.0.0-20230118205046-c025fcc9eef3 // indirect - storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect + storj.io/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c // indirect storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c // indirect - storj.io/uplink v1.12.1 // indirect + storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d // indirect ) diff --git a/testsuite/ui/go.sum b/testsuite/ui/go.sum index ab8d4466f..2ef55e181 100644 --- a/testsuite/ui/go.sum +++ b/testsuite/ui/go.sum @@ -976,8 +976,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= -github.com/quic-go/quic-go v0.39.0 h1:AgP40iThFMY0bj8jGxROhw3S0FMGa8ryqsmi9tBH3So= -github.com/quic-go/quic-go v0.39.0/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= +github.com/quic-go/quic-go v0.39.2 h1:hmwAf8zAHlvan0Y5PXxeeBFZEW17IW99sXLry8I2kjk= +github.com/quic-go/quic-go v0.39.2/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -1972,8 +1972,8 @@ 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-20231005100446-96ee88859b9d h1:/WnwZB60AaYszIRDejBrssJBj20u6pNaXJfoAE2ENsU= -storj.io/common v0.0.0-20231005100446-96ee88859b9d/go.mod h1:gwj8tuNxzTyBVdEux3qSznf4MkkugfEgFI/vWnaOtp8= +storj.io/common v0.0.0-20231025115457-490795610a23 h1:rlqQafxX6tVP5FOtXAXXG+84avcdXMkSElWtRB0vA2M= +storj.io/common v0.0.0-20231025115457-490795610a23/go.mod h1:gAwUxRl45+egUXf54Nm2bl6f2LlQjIT/2sJwSrisIfE= 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 h1:yCGZ26r66ZdMP0IcTYsj7WDAUIIjzXk6DJhbhvt9FHI= @@ -1984,12 +1984,12 @@ storj.io/gateway-mt v1.51.1-0.20230417204402-7d9bb25bc297 h1:SEH4Tp23hGOGeddAOMj storj.io/gateway-mt v1.51.1-0.20230417204402-7d9bb25bc297/go.mod h1:eI35NSRCW2VjhdzcnBmDxIiAG8vxHptd8EVTUohwt5c= storj.io/minio v0.0.0-20230118205046-c025fcc9eef3 h1:FT3ChvMha2DIwCQE49Pbkj+k+oQ2o6UfL0Omt/uyis0= storj.io/minio v0.0.0-20230118205046-c025fcc9eef3/go.mod h1:3knaZE6oHV2TQA/H2hQ00llsP3cJixUALYznzkP3enY= -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/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c h1:92Hl7mBzjfMNNkkO3uVp62ZC8yZuBNcz20EVcKNzpkQ= +storj.io/monkit-jaeger v0.0.0-20230707083646-f15e6e8b7e8c/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c h1:or/DtG5uaZpzimL61ahlgAA+MTYn/U3txz4fe+XBFUg= storj.io/picobuf v0.0.2-0.20230906122608-c4ba17033c6c/go.mod h1:JCuc3C0gzCJHQ4J6SOx/Yjg+QTpX0D+Fvs5H46FETCk= -storj.io/private v0.0.0-20230912093002-ca2d4ab44679 h1:58rShZRrm14tDqc71bnyoFZDvdNIcJ7iBwQWEQZl60U= -storj.io/private v0.0.0-20230912093002-ca2d4ab44679/go.mod h1:6+MGr4KUXEBIOsOstFz1efPkA+8wVVfzsO8RpuAhhB4= -storj.io/uplink v1.12.1 h1:bDc2dI6Q7EXcvPJLZuH9jIOTIf2oKxvW3xKEA+Y5EI0= -storj.io/uplink v1.12.1/go.mod h1:1+czctHG25pMzcUp4Mds6QnoJ7LvbgYA5d1qlpFFexg= +storj.io/private v0.0.0-20231012141933-ae62725d6691 h1:s/TxryjR2RkyYrZg6SkM30QCAKU7mAHQJeUFUdjcQXI= +storj.io/private v0.0.0-20231012141933-ae62725d6691/go.mod h1:LuJVzguWEMXd8y/XRQZhWCUTmo5LpnYumiUgX+JAs6A= +storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d h1:960x86sn1DicnAmAkcflIJAOFDfxlU9+TeOpTSHKBeY= +storj.io/uplink v1.12.2-0.20231020093444-f991cbc7f64d/go.mod h1:gEWsb17U41qDFOso1+Ubr5/k/2g9qnxQ2j5wycDfCFY= storj.io/zipper v0.0.0-20220124122551-2ac2d53a46f6 h1:vJQmb+uAiYn8hVfkhMl6OqjnUyMWSCPnkzW8IsjF8vE=