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

mod: bump dependencies

Browse Source 
* storj/common
* storj/private

Latests common version requires small refactoring for names and types
used by metainfo code.

Change-Id: I224fe93b4751c996ba6e846be0e5677252cf830f
This commit is contained in:
Michal Niewrzal 2022-11-23 13:15:52 +01:00 committed by Storj Robot
parent e617db832e
commit 47125300dc
8 changed files with 84 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
go.mod
View File

@ -52,11 +52,11 @@ require (
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
gopkg.in/segmentio/analytics-go.v3 v3.1.0 gopkg.in/segmentio/analytics-go.v3 v3.1.0
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
storj.io/common v0.0.0-20221024150824-a2a5c611dacf storj.io/common v0.0.0-20221123115229-fed3e6651b63
storj.io/drpc v0.0.32 storj.io/drpc v0.0.32
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41
storj.io/private v0.0.0-20221011183246-586e5f48357a storj.io/private v0.0.0-20221108123115-3a27297f0b78
storj.io/uplink v1.9.1-0.20221103133433-65947dace243 storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0
) )
require ( require (

13
go.sum
View File

@ -957,14 +957,13 @@ sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= 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-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ=
storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/common v0.0.0-20221018143517-9eb8213fe465/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20221123115229-fed3e6651b63 h1:OuleF/3FvZe3Nnu6NdwVr+FvCXjfD4iNNdgfI2kcs3k=
storj.io/common v0.0.0-20221024150824-a2a5c611dacf h1:nHQpBDiyH62mO5W/tGBRYxLIWuTA6q14pSvx3BehU8Q= storj.io/common v0.0.0-20221123115229-fed3e6651b63/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/common v0.0.0-20221024150824-a2a5c611dacf/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI= storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI=
storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1AmlVLitdGXTVrvmbzN4Z9C9Ms40= 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-20220915074555-d100d7589f41/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs=
storj.io/private v0.0.0-20221011183246-586e5f48357a h1:zF1LgUhKQZgbdrnm86dclK6fl4ROkZdT9BupbiQYKKs= storj.io/private v0.0.0-20221108123115-3a27297f0b78 h1:kHJEx5AAASp+zGaBPwBJyqZ5zFkde6nLyELGlxdZmiM=
storj.io/private v0.0.0-20221011183246-586e5f48357a/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI= storj.io/private v0.0.0-20221108123115-3a27297f0b78/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI=
storj.io/uplink v1.9.1-0.20221103133433-65947dace243 h1:WbUKIKMNnvBzRv5A6FL1x3Sz9jlafJOH7zSkMccjl7M= storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0 h1:7HtzzwvbfMfFMynCNYj1/ib3aukGFb6i8QKdyb5frCo=
storj.io/uplink v1.9.1-0.20221103133433-65947dace243/go.mod h1:GFXg/hWi64mk1BG/oE8rPIlzk5iwbEg+TVyb37DxUtA= storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0/go.mod h1:gJIQumB8T3tBHPRive51AVpbc+v2xe+P/goFNMSRLG4=

68
satellite/metainfo/endpoint_object.go
View File

@ -40,7 +40,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
action: macaroon.Action{ action: macaroon.Action{
Op: macaroon.ActionWrite, Op: macaroon.ActionWrite,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
}, },
@ -48,7 +48,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
action: macaroon.Action{ action: macaroon.Action{
Op: macaroon.ActionDelete, Op: macaroon.ActionDelete,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
actionPermitted: &canDelete, actionPermitted: &canDelete,
@ -68,7 +68,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
return nil, rpcstatus.Error(rpcstatus.InvalidArgument, err.Error()) return nil, rpcstatus.Error(rpcstatus.InvalidArgument, err.Error())
} }
objectKeyLength := len(req.EncryptedPath) objectKeyLength := len(req.EncryptedObjectKey)
if objectKeyLength > endpoint.config.MaxEncryptedObjectKeyLength { if objectKeyLength > endpoint.config.MaxEncryptedObjectKeyLength {
return nil, rpcstatus.Error(rpcstatus.InvalidArgument, fmt.Sprintf("key length is too big, got %v, maximum allowed is %v", objectKeyLength, endpoint.config.MaxEncryptedObjectKeyLength)) return nil, rpcstatus.Error(rpcstatus.InvalidArgument, fmt.Sprintf("key length is too big, got %v, maximum allowed is %v", objectKeyLength, endpoint.config.MaxEncryptedObjectKeyLength))
} }
@ -93,7 +93,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
_, err = endpoint.DeleteObjectAnyStatus(ctx, metabase.ObjectLocation{ _, err = endpoint.DeleteObjectAnyStatus(ctx, metabase.ObjectLocation{
ProjectID: keyInfo.ProjectID, ProjectID: keyInfo.ProjectID,
BucketName: string(req.Bucket), BucketName: string(req.Bucket),
ObjectKey: metabase.ObjectKey(req.EncryptedPath), ObjectKey: metabase.ObjectKey(req.EncryptedObjectKey),
}) })
if err != nil && !storj.ErrObjectNotFound.Has(err) { if err != nil && !storj.ErrObjectNotFound.Has(err) {
return nil, err return nil, err
@ -103,7 +103,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
ObjectLocation: metabase.ObjectLocation{ ObjectLocation: metabase.ObjectLocation{
ProjectID: keyInfo.ProjectID, ProjectID: keyInfo.ProjectID,
BucketName: string(req.Bucket), BucketName: string(req.Bucket),
ObjectKey: metabase.ObjectKey(req.EncryptedPath), ObjectKey: metabase.ObjectKey(req.EncryptedObjectKey),
}, },
}) })
if err == nil { if err == nil {
@ -147,7 +147,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
ObjectStream: metabase.ObjectStream{ ObjectStream: metabase.ObjectStream{
ProjectID: keyInfo.ProjectID, ProjectID: keyInfo.ProjectID,
BucketName: string(req.Bucket), BucketName: string(req.Bucket),
ObjectKey: metabase.ObjectKey(req.EncryptedPath), ObjectKey: metabase.ObjectKey(req.EncryptedObjectKey),
StreamID: streamID, StreamID: streamID,
Version: metabase.NextVersion, Version: metabase.NextVersion,
}, },
@ -163,7 +163,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
ObjectStream: metabase.ObjectStream{ ObjectStream: metabase.ObjectStream{
ProjectID: keyInfo.ProjectID, ProjectID: keyInfo.ProjectID,
BucketName: string(req.Bucket), BucketName: string(req.Bucket),
ObjectKey: metabase.ObjectKey(req.EncryptedPath), ObjectKey: metabase.ObjectKey(req.EncryptedObjectKey),
StreamID: streamID, StreamID: streamID,
Version: metabase.DefaultVersion, Version: metabase.DefaultVersion,
}, },
@ -199,11 +199,11 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe
mon.Meter("req_put_object").Mark(1) mon.Meter("req_put_object").Mark(1)
return &pb.ObjectBeginResponse{ return &pb.ObjectBeginResponse{
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedObjectKey: req.EncryptedObjectKey,
Version: req.Version, Version: req.Version,
StreamId: satStreamID, StreamId: satStreamID,
RedundancyScheme: endpoint.defaultRS, RedundancyScheme: endpoint.defaultRS,
}, nil }, nil
} }
@ -315,13 +315,13 @@ func (endpoint *Endpoint) GetObject(ctx context.Context, req *pb.ObjectGetReques
macaroon.Action{ macaroon.Action{
Op: macaroon.ActionRead, Op: macaroon.ActionRead,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
macaroon.Action{ macaroon.Action{
Op: macaroon.ActionList, Op: macaroon.ActionList,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
) )
@ -338,7 +338,7 @@ func (endpoint *Endpoint) GetObject(ctx context.Context, req *pb.ObjectGetReques
ObjectLocation: metabase.ObjectLocation{ ObjectLocation: metabase.ObjectLocation{
ProjectID: keyInfo.ProjectID, ProjectID: keyInfo.ProjectID,
BucketName: string(req.Bucket), BucketName: string(req.Bucket),
ObjectKey: metabase.ObjectKey(req.EncryptedPath), ObjectKey: metabase.ObjectKey(req.EncryptedObjectKey),
}, },
}) })
if err != nil { if err != nil {
@ -890,7 +890,7 @@ func (endpoint *Endpoint) ListPendingObjectStreams(ctx context.Context, req *pb.
keyInfo, err := endpoint.validateAuth(ctx, req.Header, macaroon.Action{ keyInfo, err := endpoint.validateAuth(ctx, req.Header, macaroon.Action{
Op: macaroon.ActionList, Op: macaroon.ActionList,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: time.Now(), Time: time.Now(),
}) })
if err != nil { if err != nil {
@ -937,7 +937,7 @@ func (endpoint *Endpoint) ListPendingObjectStreams(ctx context.Context, req *pb.
ObjectLocation: metabase.ObjectLocation{ ObjectLocation: metabase.ObjectLocation{
ProjectID: keyInfo.ProjectID, ProjectID: keyInfo.ProjectID,
BucketName: string(req.Bucket), BucketName: string(req.Bucket),
ObjectKey: metabase.ObjectKey(req.EncryptedPath), ObjectKey: metabase.ObjectKey(req.EncryptedObjectKey),
}, },
BatchSize: limit + 1, BatchSize: limit + 1,
Cursor: cursor, Cursor: cursor,
@ -980,7 +980,7 @@ func (endpoint *Endpoint) BeginDeleteObject(ctx context.Context, req *pb.ObjectB
action: macaroon.Action{ action: macaroon.Action{
Op: macaroon.ActionDelete, Op: macaroon.ActionDelete,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
}, },
@ -988,7 +988,7 @@ func (endpoint *Endpoint) BeginDeleteObject(ctx context.Context, req *pb.ObjectB
action: macaroon.Action{ action: macaroon.Action{
Op: macaroon.ActionRead, Op: macaroon.ActionRead,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
actionPermitted: &canRead, actionPermitted: &canRead,
@ -998,7 +998,7 @@ func (endpoint *Endpoint) BeginDeleteObject(ctx context.Context, req *pb.ObjectB
action: macaroon.Action{ action: macaroon.Action{
Op: macaroon.ActionList, Op: macaroon.ActionList,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
actionPermitted: &canList, actionPermitted: &canList,
@ -1037,7 +1037,7 @@ func (endpoint *Endpoint) BeginDeleteObject(ctx context.Context, req *pb.ObjectB
} }
} }
} else { } else {
deletedObjects, err = endpoint.DeleteCommittedObject(ctx, keyInfo.ProjectID, string(req.Bucket), metabase.ObjectKey(req.EncryptedPath)) deletedObjects, err = endpoint.DeleteCommittedObject(ctx, keyInfo.ProjectID, string(req.Bucket), metabase.ObjectKey(req.EncryptedObjectKey))
} }
if err != nil { if err != nil {
if !canRead && !canList { if !canRead && !canList {
@ -1054,7 +1054,7 @@ func (endpoint *Endpoint) BeginDeleteObject(ctx context.Context, req *pb.ObjectB
endpoint.log.Error("failed to construct deleted object information", endpoint.log.Error("failed to construct deleted object information",
zap.Stringer("Project ID", keyInfo.ProjectID), zap.Stringer("Project ID", keyInfo.ProjectID),
zap.String("Bucket", string(req.Bucket)), zap.String("Bucket", string(req.Bucket)),
zap.String("Encrypted Path", string(req.EncryptedPath)), zap.String("Encrypted Path", string(req.EncryptedObjectKey)),
zap.Error(err), zap.Error(err),
) )
} }
@ -1083,13 +1083,13 @@ func (endpoint *Endpoint) GetObjectIPs(ctx context.Context, req *pb.ObjectGetIPs
macaroon.Action{ macaroon.Action{
Op: macaroon.ActionRead, Op: macaroon.ActionRead,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
macaroon.Action{ macaroon.Action{
Op: macaroon.ActionList, Op: macaroon.ActionList,
Bucket: req.Bucket, Bucket: req.Bucket,
EncryptedPath: req.EncryptedPath, EncryptedPath: req.EncryptedObjectKey,
Time: now, Time: now,
}, },
) )
@ -1107,7 +1107,7 @@ func (endpoint *Endpoint) GetObjectIPs(ctx context.Context, req *pb.ObjectGetIPs
ObjectLocation: metabase.ObjectLocation{ ObjectLocation: metabase.ObjectLocation{
ProjectID: keyInfo.ProjectID, ProjectID: keyInfo.ProjectID,
BucketName: string(req.Bucket), BucketName: string(req.Bucket),
ObjectKey: metabase.ObjectKey(req.EncryptedPath), ObjectKey: metabase.ObjectKey(req.EncryptedObjectKey),
}, },
}) })
if err != nil { if err != nil {
@ -1276,12 +1276,12 @@ func (endpoint *Endpoint) objectToProto(ctx context.Context, object metabase.Obj
} }
result := &pb.Object{ result := &pb.Object{
Bucket: []byte(object.BucketName), Bucket: []byte(object.BucketName),
EncryptedPath: []byte(object.ObjectKey), EncryptedObjectKey: []byte(object.ObjectKey),
Version: int32(object.Version), // TODO incompatible types Version: int32(object.Version), // TODO incompatible types
StreamId: streamID, StreamId: streamID,
ExpiresAt: expires, ExpiresAt: expires,
CreatedAt: object.CreatedAt, CreatedAt: object.CreatedAt,
TotalSize: object.TotalEncryptedSize, TotalSize: object.TotalEncryptedSize,
PlainSize: object.TotalPlainSize, PlainSize: object.TotalPlainSize,
@ -1305,9 +1305,9 @@ func (endpoint *Endpoint) objectEntryToProtoListItem(ctx context.Context, bucket
includeSystem, includeMetadata bool, placement storj.PlacementConstraint) (item *pb.ObjectListItem, err error) { includeSystem, includeMetadata bool, placement storj.PlacementConstraint) (item *pb.ObjectListItem, err error) {
item = &pb.ObjectListItem{ item = &pb.ObjectListItem{
EncryptedPath: []byte(entry.ObjectKey), EncryptedObjectKey: []byte(entry.ObjectKey),
Version: int32(entry.Version), // TODO incompatible types Version: int32(entry.Version), // TODO incompatible types
Status: pb.Object_Status(entry.Status), Status: pb.Object_Status(entry.Status),
} }
expiresAt := time.Time{} expiresAt := time.Time{}

44
satellite/metainfo/endpoint_object_test.go
View File

@ -147,7 +147,7 @@ func TestEndpoint_Object_No_StorageNodes(t *testing.T) {
} }
require.NoError(t, objects.Err()) require.NoError(t, objects.Err())
expected := []storj.Object{ expected := []metaclient.Object{
{Path: "müsic"}, {Path: "müsic"},
{Path: "müsic/album/söng3.mp3"}, {Path: "müsic/album/söng3.mp3"},
{Path: "müsic/söng1.mp3"}, {Path: "müsic/söng1.mp3"},
@ -176,7 +176,7 @@ func TestEndpoint_Object_No_StorageNodes(t *testing.T) {
} }
require.NoError(t, objects.Err()) require.NoError(t, objects.Err())
expected = []storj.Object{ expected = []metaclient.Object{
{Path: "müsic"}, {Path: "müsic"},
{Path: "müsic/", IsPrefix: true}, {Path: "müsic/", IsPrefix: true},
{Path: "sample.😶"}, {Path: "sample.😶"},
@ -268,8 +268,8 @@ func TestEndpoint_Object_No_StorageNodes(t *testing.T) {
Header: &pb.RequestHeader{ Header: &pb.RequestHeader{
ApiKey: apiKey.SerializeRaw(), ApiKey: apiKey.SerializeRaw(),
}, },
Bucket: []byte("testbucket"), Bucket: []byte("testbucket"),
EncryptedPath: []byte(objects[0].ObjectKey), EncryptedObjectKey: []byte(objects[0].ObjectKey),
}) })
require.NoError(t, err) require.NoError(t, err)
@ -283,7 +283,7 @@ func TestEndpoint_Object_No_StorageNodes(t *testing.T) {
ApiKey: apiKey.SerializeRaw(), ApiKey: apiKey.SerializeRaw(),
}, },
Bucket: getResp.Object.Bucket, Bucket: getResp.Object.Bucket,
EncryptedObjectKey: getResp.Object.EncryptedPath, EncryptedObjectKey: getResp.Object.EncryptedObjectKey,
Version: getResp.Object.Version, Version: getResp.Object.Version,
StreamId: getResp.Object.StreamId, StreamId: getResp.Object.StreamId,
EncryptedMetadataNonce: testEncryptedMetadataNonce, EncryptedMetadataNonce: testEncryptedMetadataNonce,
@ -527,14 +527,14 @@ func TestEndpoint_Object_No_StorageNodes(t *testing.T) {
require.Equal(t, committedObject.Version+1, pendingObject.Version) require.Equal(t, committedObject.Version+1, pendingObject.Version)
getObjectResponse, err := satellite.API.Metainfo.Endpoint.GetObject(ctx, &pb.ObjectGetRequest{ getObjectResponse, err := satellite.API.Metainfo.Endpoint.GetObject(ctx, &pb.ObjectGetRequest{
Header: &pb.RequestHeader{ApiKey: apiKey.SerializeRaw()}, Header: &pb.RequestHeader{ApiKey: apiKey.SerializeRaw()},
Bucket: []byte("testbucket"), Bucket: []byte("testbucket"),
EncryptedPath: []byte(committedObject.ObjectKey), EncryptedObjectKey: []byte(committedObject.ObjectKey),
Version: int32(committedObject.Version), Version: int32(committedObject.Version),
}) })
require.NoError(t, err) require.NoError(t, err)
require.EqualValues(t, committedObject.BucketName, getObjectResponse.Object.Bucket) require.EqualValues(t, committedObject.BucketName, getObjectResponse.Object.Bucket)
require.EqualValues(t, committedObject.ObjectKey, getObjectResponse.Object.EncryptedPath) require.EqualValues(t, committedObject.ObjectKey, getObjectResponse.Object.EncryptedObjectKey)
require.EqualValues(t, committedObject.Version, getObjectResponse.Object.Version) require.EqualValues(t, committedObject.Version, getObjectResponse.Object.Version)
}) })
@ -568,7 +568,7 @@ func TestEndpoint_Object_No_StorageNodes(t *testing.T) {
}) })
require.NoError(t, err) require.NoError(t, err)
require.EqualValues(t, committedObject.BucketName, downloadObjectResponse.Object.Bucket) require.EqualValues(t, committedObject.BucketName, downloadObjectResponse.Object.Bucket)
require.EqualValues(t, committedObject.ObjectKey, downloadObjectResponse.Object.EncryptedPath) require.EqualValues(t, committedObject.ObjectKey, downloadObjectResponse.Object.EncryptedObjectKey)
require.EqualValues(t, committedObject.Version, downloadObjectResponse.Object.Version) require.EqualValues(t, committedObject.Version, downloadObjectResponse.Object.Version)
}) })
@ -694,7 +694,7 @@ func TestEndpoint_Object_No_StorageNodes_TestListingQuery(t *testing.T) {
} }
require.NoError(t, objects.Err()) require.NoError(t, objects.Err())
expected := []storj.Object{ expected := []metaclient.Object{
{Path: "müsic"}, {Path: "müsic"},
{Path: "müsic/album/söng3.mp3"}, {Path: "müsic/album/söng3.mp3"},
{Path: "müsic/söng1.mp3"}, {Path: "müsic/söng1.mp3"},
@ -723,7 +723,7 @@ func TestEndpoint_Object_No_StorageNodes_TestListingQuery(t *testing.T) {
} }
require.NoError(t, objects.Err()) require.NoError(t, objects.Err())
expected = []storj.Object{ expected = []metaclient.Object{
{Path: "müsic"}, {Path: "müsic"},
{Path: "müsic/", IsPrefix: true}, {Path: "müsic/", IsPrefix: true},
{Path: "sample.😶"}, {Path: "sample.😶"},
@ -1582,8 +1582,8 @@ func TestEndpoint_CopyObject(t *testing.T) {
Header: &pb.RequestHeader{ Header: &pb.RequestHeader{
ApiKey: apiKey.SerializeRaw(), ApiKey: apiKey.SerializeRaw(),
}, },
Bucket: []byte("testbucket"), Bucket: []byte("testbucket"),
EncryptedPath: []byte(objects[0].ObjectKey), EncryptedObjectKey: []byte(objects[0].ObjectKey),
}) })
require.NoError(t, err) require.NoError(t, err)
@ -1594,7 +1594,7 @@ func TestEndpoint_CopyObject(t *testing.T) {
ApiKey: apiKey.SerializeRaw(), ApiKey: apiKey.SerializeRaw(),
}, },
Bucket: getResp.Object.Bucket, Bucket: getResp.Object.Bucket,
EncryptedObjectKey: getResp.Object.EncryptedPath, EncryptedObjectKey: getResp.Object.EncryptedObjectKey,
NewBucket: []byte("testbucket"), NewBucket: []byte("testbucket"),
NewEncryptedObjectKey: []byte("newencryptedkey"), NewEncryptedObjectKey: []byte("newencryptedkey"),
}) })
@ -1662,8 +1662,8 @@ func TestEndpoint_CopyObject(t *testing.T) {
Header: &pb.RequestHeader{ Header: &pb.RequestHeader{
ApiKey: apiKey.SerializeRaw(), ApiKey: apiKey.SerializeRaw(),
}, },
Bucket: []byte("testbucket"), Bucket: []byte("testbucket"),
EncryptedPath: []byte("newobjectkey"), EncryptedObjectKey: []byte("newobjectkey"),
}) })
require.NoError(t, err, objectsAfterCopy[1]) require.NoError(t, err, objectsAfterCopy[1])
require.NotEqual(t, getResp.Object.StreamId, getCopyResp.Object.StreamId) require.NotEqual(t, getResp.Object.StreamId, getCopyResp.Object.StreamId)
@ -1925,10 +1925,10 @@ func TestEndpoint_UpdateObjectMetadata(t *testing.T) {
validKey := randomEncryptedKey validKey := randomEncryptedKey
getObjectResponse, err := satellite.API.Metainfo.Endpoint.GetObject(ctx, &pb.ObjectGetRequest{ getObjectResponse, err := satellite.API.Metainfo.Endpoint.GetObject(ctx, &pb.ObjectGetRequest{
Header: &pb.RequestHeader{ApiKey: apiKey}, Header: &pb.RequestHeader{ApiKey: apiKey},
Bucket: []byte("testbucket"), Bucket: []byte("testbucket"),
EncryptedPath: []byte(objects[0].ObjectKey), EncryptedObjectKey: []byte(objects[0].ObjectKey),
Version: int32(objects[0].Version), Version: int32(objects[0].Version),
}) })
require.NoError(t, err) require.NoError(t, err)

6
testsuite/storjscan/go.mod
View File

@ -10,11 +10,11 @@ require (
github.com/zeebo/errs v1.3.0 github.com/zeebo/errs v1.3.0
go.uber.org/zap v1.21.0 go.uber.org/zap v1.21.0
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
storj.io/common v0.0.0-20221024150824-a2a5c611dacf storj.io/common v0.0.0-20221123115229-fed3e6651b63
storj.io/private v0.0.0-20221011183246-586e5f48357a storj.io/private v0.0.0-20221108123115-3a27297f0b78
storj.io/storj v1.63.1 storj.io/storj v1.63.1
storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0
storj.io/uplink v1.9.1-0.20221103133433-65947dace243 storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0
) )
require ( require (

13
testsuite/storjscan/go.sum
View File

@ -1262,18 +1262,17 @@ storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5
storj.io/common v0.0.0-20220802175255-aae0c09ec9d4/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20220802175255-aae0c09ec9d4/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/common v0.0.0-20220829171748-14b0a3c9565e/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20220829171748-14b0a3c9565e/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/common v0.0.0-20221018143517-9eb8213fe465/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20221123115229-fed3e6651b63 h1:OuleF/3FvZe3Nnu6NdwVr+FvCXjfD4iNNdgfI2kcs3k=
storj.io/common v0.0.0-20221024150824-a2a5c611dacf h1:nHQpBDiyH62mO5W/tGBRYxLIWuTA6q14pSvx3BehU8Q= storj.io/common v0.0.0-20221123115229-fed3e6651b63/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/common v0.0.0-20221024150824-a2a5c611dacf/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI= storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI=
storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
storj.io/monkit-jaeger v0.0.0-20220726162929-c3a9898b5bca/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs= storj.io/monkit-jaeger v0.0.0-20220726162929-c3a9898b5bca/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs=
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1AmlVLitdGXTVrvmbzN4Z9C9Ms40= 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-20220915074555-d100d7589f41/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs=
storj.io/private v0.0.0-20220823161836-79135887c9be/go.mod h1:GbCItLcLLzsrMClBAa2aaj8xlawtHXWrqhr3D1I3NPM= storj.io/private v0.0.0-20220823161836-79135887c9be/go.mod h1:GbCItLcLLzsrMClBAa2aaj8xlawtHXWrqhr3D1I3NPM=
storj.io/private v0.0.0-20221011183246-586e5f48357a h1:zF1LgUhKQZgbdrnm86dclK6fl4ROkZdT9BupbiQYKKs= storj.io/private v0.0.0-20221108123115-3a27297f0b78 h1:kHJEx5AAASp+zGaBPwBJyqZ5zFkde6nLyELGlxdZmiM=
storj.io/private v0.0.0-20221011183246-586e5f48357a/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI= storj.io/private v0.0.0-20221108123115-3a27297f0b78/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI=
storj.io/storjscan v0.0.0-20220926140643-1623c3b391b0 h1:pSfGf9E9OlUd17W7LSpL4tTONIyFji6dz8I2iTDd8BY= 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/storjscan v0.0.0-20220926140643-1623c3b391b0/go.mod h1:5nLgAOl1KTDVyqORAhvrp+167PtShEuS1L3pJgXPjwo=
storj.io/uplink v1.9.1-0.20221103133433-65947dace243 h1:WbUKIKMNnvBzRv5A6FL1x3Sz9jlafJOH7zSkMccjl7M= storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0 h1:7HtzzwvbfMfFMynCNYj1/ib3aukGFb6i8QKdyb5frCo=
storj.io/uplink v1.9.1-0.20221103133433-65947dace243/go.mod h1:GFXg/hWi64mk1BG/oE8rPIlzk5iwbEg+TVyb37DxUtA= storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0/go.mod h1:gJIQumB8T3tBHPRive51AVpbc+v2xe+P/goFNMSRLG4=

8
testsuite/ui/go.mod
View File

@ -10,10 +10,10 @@ require (
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0 github.com/stretchr/testify v1.7.0
go.uber.org/zap v1.17.0 go.uber.org/zap v1.17.0
storj.io/common v0.0.0-20221024150824-a2a5c611dacf storj.io/common v0.0.0-20221123115229-fed3e6651b63
storj.io/gateway-mt v1.18.1-0.20211210081136-cada9a567d31 storj.io/gateway-mt v1.18.1-0.20211210081136-cada9a567d31
storj.io/private v0.0.0-20221011183246-586e5f48357a storj.io/private v0.0.0-20221108123115-3a27297f0b78
storj.io/storj v0.12.1-0.20220705102727-0f626a59c103 storj.io/storj v0.12.1-0.20221125175451-ef4b564b82f7
) )
require ( require (
@ -228,5 +228,5 @@ require (
storj.io/gateway v1.4.1 // indirect storj.io/gateway v1.4.1 // indirect
storj.io/minio v0.0.0-20211007171754-df6c27823c8a // indirect storj.io/minio v0.0.0-20211007171754-df6c27823c8a // indirect
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 // indirect
storj.io/uplink v1.9.1-0.20221103133433-65947dace243 // indirect storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0 // indirect
) )

13
testsuite/ui/go.sum
View File

@ -1501,9 +1501,8 @@ storj.io/common v0.0.0-20210916151047-6aaeb34bb916/go.mod h1:objobGrIWQwhmTSpSm6
storj.io/common v0.0.0-20211102144601-401a79f0706a/go.mod h1:a2Kw7Uipu929OFANfWKLHRoD0JfhgssikEvimd6hbSQ= storj.io/common v0.0.0-20211102144601-401a79f0706a/go.mod h1:a2Kw7Uipu929OFANfWKLHRoD0JfhgssikEvimd6hbSQ=
storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ= storj.io/common v0.0.0-20220719163320-cd2ef8e1b9b0/go.mod h1:mCYV6Ud5+cdbuaxdPD5Zht/HYaIn0sffnnws9ErkrMQ=
storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20220915180246-7826900e2b06/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/common v0.0.0-20221018143517-9eb8213fe465/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys= storj.io/common v0.0.0-20221123115229-fed3e6651b63 h1:OuleF/3FvZe3Nnu6NdwVr+FvCXjfD4iNNdgfI2kcs3k=
storj.io/common v0.0.0-20221024150824-a2a5c611dacf h1:nHQpBDiyH62mO5W/tGBRYxLIWuTA6q14pSvx3BehU8Q= storj.io/common v0.0.0-20221123115229-fed3e6651b63/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/common v0.0.0-20221024150824-a2a5c611dacf/go.mod h1:+gF7jbVvpjVIVHhK+EJFhfPbudX395lnPq/dKkj/Qys=
storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840/go.mod h1:KU9YvEgRrMMiWLvH8pzn1UkoCoxggKIPvQxmNdx7aXQ= storj.io/dotworld v0.0.0-20210324183515-0d11aeccd840/go.mod h1:KU9YvEgRrMMiWLvH8pzn1UkoCoxggKIPvQxmNdx7aXQ=
storj.io/drpc v0.0.11/go.mod h1:TiFc2obNjL9/3isMW1Rpxjy8V9uE0B2HMeMFGiiI7Iw= storj.io/drpc v0.0.11/go.mod h1:TiFc2obNjL9/3isMW1Rpxjy8V9uE0B2HMeMFGiiI7Iw=
storj.io/drpc v0.0.24/go.mod h1:ofQUDPQbbIymRDKE0tms48k8bLP5Y+dsI9CbXGv3gko= storj.io/drpc v0.0.24/go.mod h1:ofQUDPQbbIymRDKE0tms48k8bLP5Y+dsI9CbXGv3gko=
@ -1520,9 +1519,9 @@ storj.io/monkit-jaeger v0.0.0-20210225162224-66fb37637bf6/go.mod h1:gj4vuCeyCRjR
storj.io/monkit-jaeger v0.0.0-20220915074555-d100d7589f41 h1:SVuEocEhZfFc13J1AmlVLitdGXTVrvmbzN4Z9C9Ms40= 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-20220915074555-d100d7589f41/go.mod h1:iK+dmHZZXQlW7ahKdNSOo+raMk5BDL2wbD62FIeXLWs=
storj.io/private v0.0.0-20210810102517-434aeab3f17d/go.mod h1:wvudoWSyOyB2daZNaMykjjqsSUad/ttFlUwgelg9+qg= storj.io/private v0.0.0-20210810102517-434aeab3f17d/go.mod h1:wvudoWSyOyB2daZNaMykjjqsSUad/ttFlUwgelg9+qg=
storj.io/private v0.0.0-20221011183246-586e5f48357a h1:zF1LgUhKQZgbdrnm86dclK6fl4ROkZdT9BupbiQYKKs= storj.io/private v0.0.0-20221108123115-3a27297f0b78 h1:kHJEx5AAASp+zGaBPwBJyqZ5zFkde6nLyELGlxdZmiM=
storj.io/private v0.0.0-20221011183246-586e5f48357a/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI= storj.io/private v0.0.0-20221108123115-3a27297f0b78/go.mod h1:hc63X333SVJ3UrOxXpGN4VnwqnmbWgAHln3wYJ8AroI=
storj.io/uplink v1.7.0/go.mod h1:zqj/LFDxa6RMaSRSHOmukg3mMgesOry0iHSjNldDMGo= storj.io/uplink v1.7.0/go.mod h1:zqj/LFDxa6RMaSRSHOmukg3mMgesOry0iHSjNldDMGo=
storj.io/uplink v1.7.1-0.20211103104100-a785482780d8/go.mod h1:pKqsMpNMIAz//2TXzUGOR6tpu3iyabvXV4VWINj4jaY= storj.io/uplink v1.7.1-0.20211103104100-a785482780d8/go.mod h1:pKqsMpNMIAz//2TXzUGOR6tpu3iyabvXV4VWINj4jaY=
storj.io/uplink v1.9.1-0.20221103133433-65947dace243 h1:WbUKIKMNnvBzRv5A6FL1x3Sz9jlafJOH7zSkMccjl7M= storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0 h1:7HtzzwvbfMfFMynCNYj1/ib3aukGFb6i8QKdyb5frCo=
storj.io/uplink v1.9.1-0.20221103133433-65947dace243/go.mod h1:GFXg/hWi64mk1BG/oE8rPIlzk5iwbEg+TVyb37DxUtA= storj.io/uplink v1.9.1-0.20221123134449-bf3a9813b6e0/go.mod h1:gJIQumB8T3tBHPRive51AVpbc+v2xe+P/goFNMSRLG4=