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

satellite/metainfo: restore tests disabled to remove StreamID from

Browse Source 
BeginDeleteObject method on uplink side

Change-Id: Id10cdeb367759f9949dc557b291726fd331d38ba
This commit is contained in:
Michal Niewrzal 2020-07-21 09:34:00 +02:00 committed by Ivan Fraixedes
parent aa6afc3879
commit 18b3495248
3 changed files with 37 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
go.mod
View File

@ -41,9 +41,9 @@ require (
golang.org/x/sys v0.0.0-20200610111108-226ff32320da
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 // indirect
storj.io/common v0.0.0-20200707192119-b151d384e6c7
storj.io/common v0.0.0-20200710113903-e5030388ee6a
storj.io/drpc v0.0.13
storj.io/monkit-jaeger v0.0.0-20200518165323-80778fc3f91b
storj.io/private v0.0.0-20200605221229-3236fe879ab3
storj.io/uplink v1.1.2-0.20200616134034-15d9aa571aa7
storj.io/private v0.0.0-20200714090519-72be711b6edd
storj.io/uplink v1.1.3-0.20200720090036-c66d9eb21232
)

18
go.sum
View File

@ -710,21 +710,15 @@ honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXe
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
storj.io/common v0.0.0-20200424175742-65ac59022f4f/go.mod h1:pZyXiIE7bGETIRXtfs0nICqMwp7PM8HqnDuyUeldNA0=
storj.io/common v0.0.0-20200616122322-79b46deca70e h1:eAq23qVHALvUhH1PrtHnRPUXo7uobeh21G1DU5scz6k=
storj.io/common v0.0.0-20200616122322-79b46deca70e/go.mod h1:ZSjZI9XJNevOP527K+PL1c68j8w5M4vbHha3V2tYWdQ=
storj.io/common v0.0.0-20200707192119-b151d384e6c7 h1:TFjl6b9dbgu2c8mhJIYj79FhFG8KSpDr6ET/uKyCXnM=
storj.io/common v0.0.0-20200707192119-b151d384e6c7/go.mod h1:vMAnlNbkgW6i+w/OT1h4X8w6TajOHWAT+SvFHUFCpq0=
storj.io/common v0.0.0-20200710113903-e5030388ee6a h1:8lMuSiBcU3u6Y3YzlG53GKvyG0zwsnj5NQuuFfm63w0=
storj.io/common v0.0.0-20200710113903-e5030388ee6a/go.mod h1:vMAnlNbkgW6i+w/OT1h4X8w6TajOHWAT+SvFHUFCpq0=
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.12 h1:4ei1M4cnWlYxcQheX0Dg4+c12zCD+oJqfweVQVWarsA=
storj.io/drpc v0.0.12 h1:4ei1M4cnWlYxcQheX0Dg4+c12zCD+oJqfweVQVWarsA=
storj.io/drpc v0.0.12/go.mod h1:82nfl+6YwRwF6UG31cEWWUqv/FaKvP5SGqUvoqTxCMA=
storj.io/drpc v0.0.12/go.mod h1:82nfl+6YwRwF6UG31cEWWUqv/FaKvP5SGqUvoqTxCMA=
storj.io/drpc v0.0.13 h1:EDR3WiwVcIHtg+8M5vqBFmUAuJvmM2erVHIfqPPSAoc=
storj.io/drpc v0.0.13/go.mod h1:82nfl+6YwRwF6UG31cEWWUqv/FaKvP5SGqUvoqTxCMA=
storj.io/monkit-jaeger v0.0.0-20200518165323-80778fc3f91b h1:Bbg9JCtY6l3HrDxs3BXzT2UYnYCBLqNi6i84Y8QIPUs=
storj.io/monkit-jaeger v0.0.0-20200518165323-80778fc3f91b/go.mod h1:gj4vuCeyCRjRmH8LIrgoyU9Dc9uR6H+/GcDUXmTbf80=
storj.io/private v0.0.0-20200605221229-3236fe879ab3 h1:kUn1+iJmBwBTJopuNlN3daKAXLNe1u3F/cGDq0o3sak=
storj.io/private v0.0.0-20200605221229-3236fe879ab3/go.mod h1:iDgIudPntDcHt5vyOecd2KS7YEx3E5CD0/sxjtM7fG0=
storj.io/uplink v1.1.2-0.20200616134034-15d9aa571aa7 h1:bjAb08dbM9jVDEOrO8fHHh9mwlOe4jsFEzgc6vYReOs=
storj.io/uplink v1.1.2-0.20200616134034-15d9aa571aa7/go.mod h1:8pXGEUp+RSXhKODInQKDF0C24QcTOacPYr/Q6Pd1pZg=
storj.io/private v0.0.0-20200714090519-72be711b6edd h1:sOFBPjVrO8Bu0VKogwlLSg6+53p4X7ysYqUyYD1n0zk=
storj.io/private v0.0.0-20200714090519-72be711b6edd/go.mod h1:GrkOQzJEiq8vgIBKBAllBH0GfOEitpAgneXWxhvdVz4=
storj.io/uplink v1.1.3-0.20200720090036-c66d9eb21232 h1:gjlfGp79xvUGJ0ZOpC1p6v1GtiRPXwWvSRWVham5c54=
storj.io/uplink v1.1.3-0.20200720090036-c66d9eb21232/go.mod h1:LR8G1+bmpb4czVviWbXSpJFoLA9/i2AOlovSWkm+d6Y=

62
satellite/metainfo/metainfo_test.go
View File

@ -136,9 +136,8 @@ func TestRevokeMacaroon(t *testing.T) {
_, err = client.BeginObject(ctx, metainfo.BeginObjectParams{})
assert.True(t, errs2.IsRPC(err, rpcstatus.PermissionDenied))
// TODO uncomment when uplink client will be updated
// _, err = client.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{})
// assert.True(t, errs2.IsRPC(err, rpcstatus.PermissionDenied))
_, err = client.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{})
assert.True(t, errs2.IsRPC(err, rpcstatus.PermissionDenied))
_, err = client.ListBuckets(ctx, metainfo.ListBucketsParams{})
assert.True(t, errs2.IsRPC(err, rpcstatus.PermissionDenied))
@ -152,9 +151,8 @@ func TestRevokeMacaroon(t *testing.T) {
_, err = client.DeleteBucket(ctx, metainfo.DeleteBucketParams{})
assert.True(t, errs2.IsRPC(err, rpcstatus.PermissionDenied))
// TODO uncomment when uplink client will be updated
// _, err = client.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{})
// assert.True(t, errs2.IsRPC(err, rpcstatus.PermissionDenied))
_, err = client.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{})
assert.True(t, errs2.IsRPC(err, rpcstatus.PermissionDenied))
_, err = client.GetBucket(ctx, metainfo.GetBucketParams{})
assert.True(t, errs2.IsRPC(err, rpcstatus.PermissionDenied))
@ -232,9 +230,8 @@ func TestInvalidAPIKey(t *testing.T) {
_, err = client.BeginObject(ctx, metainfo.BeginObjectParams{})
assertInvalidArgument(t, err, false)
// TODO uncomment when uplink client will be updated
// _, err = client.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{})
// assertInvalidArgument(t, err, false)
_, err = client.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{})
assertInvalidArgument(t, err, false)
_, err = client.ListBuckets(ctx, metainfo.ListBucketsParams{})
assertInvalidArgument(t, err, false)
@ -248,9 +245,8 @@ func TestInvalidAPIKey(t *testing.T) {
_, err = client.DeleteBucket(ctx, metainfo.DeleteBucketParams{})
assertInvalidArgument(t, err, false)
// TODO uncomment when uplink client will be updated
// _, err = client.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{})
// assertInvalidArgument(t, err, false)
_, err = client.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{})
assertInvalidArgument(t, err, false)
_, err = client.GetBucket(ctx, metainfo.GetBucketParams{})
assertInvalidArgument(t, err, false)
@ -1042,18 +1038,17 @@ func TestInlineSegment(t *testing.T) {
}
{ // test deleting segments
// TODO uncomment when uplink client will be updated
// _, _, err := metainfoClient.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{
// Bucket: params.Bucket,
// EncryptedPath: params.EncryptedPath,
// })
// require.NoError(t, err)
_, err := metainfoClient.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{
Bucket: params.Bucket,
EncryptedPath: params.EncryptedPath,
})
require.NoError(t, err)
// _, err = metainfoClient.GetObject(ctx, metainfo.GetObjectParams{
// Bucket: params.Bucket,
// EncryptedPath: params.EncryptedPath,
// })
// require.Error(t, err)
_, err = metainfoClient.GetObject(ctx, metainfo.GetObjectParams{
Bucket: params.Bucket,
EncryptedPath: params.EncryptedPath,
})
require.Error(t, err)
}
})
}
@ -1110,18 +1105,17 @@ func TestRemoteSegment(t *testing.T) {
// Begin deleting object
// List objects
// TODO uncomment when uplink client will be updated
// _, _, err := metainfoClient.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{
// Bucket: []byte(expectedBucketName),
// EncryptedPath: items[0].EncryptedPath,
// })
// require.NoError(t, err)
_, err := metainfoClient.BeginDeleteObject(ctx, metainfo.BeginDeleteObjectParams{
Bucket: []byte(expectedBucketName),
EncryptedPath: items[0].EncryptedPath,
})
require.NoError(t, err)
// items, _, err = metainfoClient.ListObjects(ctx, metainfo.ListObjectsParams{
// Bucket: []byte(expectedBucketName),
// })
// require.NoError(t, err)
// require.Len(t, items, 0)
items, _, err = metainfoClient.ListObjects(ctx, metainfo.ListObjectsParams{
Bucket: []byte(expectedBucketName),
})
require.NoError(t, err)
require.Len(t, items, 0)
}
})
}