MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-12 15:33:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

gateway s3:Make sure to convert s3 errors to ObjectLayer errors (#6717)

Browse Source
This commit is contained in:
poornas 2018-10-28 22:11:20 -07:00 committed by kannappanr
parent 8491a29ec3
commit bd8dc17b7a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/gateway/s3/gateway-s3.go
View File

@ -341,13 +341,13 @@ func (l *s3Objects) GetObjectNInfo(ctx context.Context, bucket, object string, r
var objInfo minio.ObjectInfo var objInfo minio.ObjectInfo
objInfo, err = l.GetObjectInfo(ctx, bucket, object, opts) objInfo, err = l.GetObjectInfo(ctx, bucket, object, opts)
if err != nil { if err != nil {
return nil, err return nil, minio.ErrorRespToObjectError(err, bucket, object)
} }
var startOffset, length int64 var startOffset, length int64
startOffset, length, err = rs.GetOffsetLength(objInfo.Size) startOffset, length, err = rs.GetOffsetLength(objInfo.Size)
if err != nil { if err != nil {
return nil, err return nil, minio.ErrorRespToObjectError(err, bucket, object)
} }
pr, pw := io.Pipe() pr, pw := io.Pipe()
@ -492,7 +492,7 @@ func (l *s3Objects) CopyObjectPart(ctx context.Context, srcBucket, srcObject, de
func (l *s3Objects) ListObjectParts(ctx context.Context, bucket string, object string, uploadID string, partNumberMarker int, maxParts int) (lpi minio.ListPartsInfo, e error) { func (l *s3Objects) ListObjectParts(ctx context.Context, bucket string, object string, uploadID string, partNumberMarker int, maxParts int) (lpi minio.ListPartsInfo, e error) {
result, err := l.Client.ListObjectParts(bucket, object, uploadID, partNumberMarker, maxParts) result, err := l.Client.ListObjectParts(bucket, object, uploadID, partNumberMarker, maxParts)
if err != nil { if err != nil {
return lpi, err return lpi, minio.ErrorRespToObjectError(err, bucket, object)
} }
return minio.FromMinioClientListPartsInfo(result), nil return minio.FromMinioClientListPartsInfo(result), nil