8422 list multipart uploads

esti/s3_gateway_test.go

@@ -291,6 +291,9 @@ func TestS3IfNoneMatch(t *testing.T) {
 
 func TestListMultipartUploads(t *testing.T) {
 	blockStoreType := viper.GetString(ViperBlockstoreType)
+	if blockStoreType != "s3" {
+		return
+	}
 	ctx, logger, repo := setupTest(t)
 	defer tearDownTest(repo)
 	s3Endpoint := viper.GetString("s3_endpoint")
@@ -333,10 +336,6 @@ func TestListMultipartUploads(t *testing.T) {
 	}
 	// check first mpu appears
 	output, err := s3Client.ListMultipartUploads(ctx, &s3.ListMultipartUploadsInput{Bucket: resp1.Bucket})
-	if blockStoreType != "s3" {
-		require.Contains(t, err.Error(), "NotImplemented")
-		return
-	}
 	require.NoError(t, err, "error listing multiparts")
 	keys := extractUploadKeys(output)
 	require.Contains(t, keys, obj1)

pkg/block/adapter.go

@@ -128,6 +128,7 @@ type ListMultipartUploadsResponse struct {
 	NextUploadIDMarker *string
 	NextKeyMarker      *string
 	IsTruncated        bool
+	MaxUploads         *int32
 }
 
 // CreateMultiPartUploadOpts contains optional arguments for

pkg/block/s3/adapter.go

@@ -882,6 +882,7 @@ func (a *Adapter) ListMultipartUploads(ctx context.Context, obj block.ObjectPoin
 		NextUploadIDMarker: resp.NextUploadIdMarker,
 		NextKeyMarker:      resp.NextKeyMarker,
 		IsTruncated:        aws.ToBool(resp.IsTruncated),
+		MaxUploads:         resp.MaxUploads,
 	}
 	return &mpuResp, nil
 }

pkg/gateway/errors/errors.go

@@ -60,7 +60,6 @@ const (
 	ErrInternalError
 	ErrInvalidAccessKeyID
 	ErrInvalidBucketName
-	ErrInvalidArgument
 	ErrInvalidDigest
 	ErrInvalidRange
 	ErrInvalidCopyPartRange

pkg/gateway/operations/listobjects.go

@@ -21,8 +21,9 @@ import (
 
 const (
 	ListObjectMaxKeys = 1000
-	maxUploadsRange   = 2147483647
-	minUploadsRange   = 0
+	maxUploadsListMPU = 2147483647
+	minUploadsListMPU = 0
+
 	// defaultBucketLocation used to identify if we need to specify the location constraint
 	defaultBucketLocation    = "us-east-1"
 	QueryParamMaxUploads     = "max-uploads"
@@ -425,13 +426,11 @@ func handleListMultipartUploads(w http.ResponseWriter, req *http.Request, o *Rep
 	opts := block.ListMultipartUploadsOpts{}
 	if maxUploadsStr != "" {
 		maxUploads, err := strconv.ParseInt(maxUploadsStr, 10, 32)
-		if err != nil || maxUploads < minUploadsRange || maxUploads > maxUploadsRange {
-			o.Log(req).WithField("maxUploadsStr", maxUploadsStr).
-				WithError(err).Error("malformed query parameter 'maxUploadsStr'")
+		maxUploads32 := int32(maxUploads)
+		if err != nil || maxUploads < minUploadsListMPU || maxUploads > maxUploadsListMPU {
 			_ = o.EncodeError(w, req, err, gatewayerrors.Codes.ToAPIErr(gatewayerrors.ErrInvalidMaxUploads))
 			return
 		}
-		maxUploads32 := int32(maxUploads)
 		opts.MaxUploads = &maxUploads32
 	}
 	if uploadIDMarker != "" {
@@ -476,6 +475,7 @@ func handleListMultipartUploads(w http.ResponseWriter, req *http.Request, o *Rep
 		NextKeyMarker:      aws.StringValue(mpuResp.NextKeyMarker),
 		NextUploadIDMarker: aws.StringValue(mpuResp.NextUploadIDMarker),
 		IsTruncated:        mpuResp.IsTruncated,
+		MaxUploads:         aws.Int32Value(mpuResp.MaxUploads),
 	}
 	o.EncodeResponse(w, req, resp, http.StatusOK)
 }

pkg/gateway/serde/xml.go

@@ -171,6 +171,7 @@ type ListMultipartUploadsOutput struct {
 	NextKeyMarker      string   `xml:"NextKeyMarker,omitempty"`
 	NextUploadIDMarker string   `xml:"NextUploadIDMarker,omitempty"`
 	IsTruncated        bool     `xml:"IsTruncated,omitempty"`
+	MaxUploads         int32    `xml:"MaxUploads,omitempty"`
 }
 
 type VersioningConfiguration struct {