From bd8dc17b7afcc83c33befa046580cd84471b907c Mon Sep 17 00:00:00 2001 From: poornas Date: Sun, 28 Oct 2018 22:11:20 -0700 Subject: [PATCH] gateway s3:Make sure to convert s3 errors to ObjectLayer errors (#6717) --- cmd/gateway/s3/gateway-s3.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/gateway/s3/gateway-s3.go b/cmd/gateway/s3/gateway-s3.go index f3cdaa160..845a74655 100644 --- a/cmd/gateway/s3/gateway-s3.go +++ b/cmd/gateway/s3/gateway-s3.go @@ -341,13 +341,13 @@ func (l *s3Objects) GetObjectNInfo(ctx context.Context, bucket, object string, r var objInfo minio.ObjectInfo objInfo, err = l.GetObjectInfo(ctx, bucket, object, opts) if err != nil { - return nil, err + return nil, minio.ErrorRespToObjectError(err, bucket, object) } var startOffset, length int64 startOffset, length, err = rs.GetOffsetLength(objInfo.Size) if err != nil { - return nil, err + return nil, minio.ErrorRespToObjectError(err, bucket, object) } 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) { result, err := l.Client.ListObjectParts(bucket, object, uploadID, partNumberMarker, maxParts) if err != nil { - return lpi, err + return lpi, minio.ErrorRespToObjectError(err, bucket, object) } return minio.FromMinioClientListPartsInfo(result), nil