Upstream versity/versitygw state of the touched files before daa25ed6bc

backend/mp-lister.go

@@ -126,9 +126,8 @@ func (l *MultipartUploadLister) Run() (*ListMultipartUploadsPage, error) {
 						if out.IsTruncated {
 							out.NextKeyMarker = lastKey
 							out.NextUploadIDMarker = up.UploadID
-							return out, nil
 						}
-						break
+						return out, nil
 					}
 				}
 				continue
@@ -140,18 +139,9 @@ func (l *MultipartUploadLister) Run() (*ListMultipartUploadsPage, error) {
 			if out.IsTruncated {
 				out.NextKeyMarker = lastKey
 				out.NextUploadIDMarker = up.UploadID
+			}
 			return out, nil
 		}
-			break
-		}
-	}
-
-	// a listing that is not truncated still reports its last upload
-	// in the next markers
-	if len(out.Uploads) != 0 {
-		last := out.Uploads[len(out.Uploads)-1]
-		out.NextKeyMarker = last.Key
-		out.NextUploadIDMarker = last.UploadID
 	}
 
 	return out, nil

tests/integration/ListMultipartUploads.go

@@ -206,9 +206,6 @@ func ListMultipartUploads_ignore_upload_id_marker(s *S3Conf) error {
 			return fmt.Errorf("expected multipart uploads to be %v, instead got %v",
 				uploads, out.Uploads)
 		}
-		if getString(out.UploadIdMarker) != "" {
-			return fmt.Errorf("expected empty upload id marker, instead got %s", getString(out.UploadIdMarker))
-		}
 
 		// should ignore invalid uploaId marker
 		ctx, cancel = context.WithTimeout(context.Background(), shortTimeout)
@@ -224,9 +221,6 @@ func ListMultipartUploads_ignore_upload_id_marker(s *S3Conf) error {
 			return fmt.Errorf("expected multipart uploads to be %v, instead got %v",
 				uploads, out.Uploads)
 		}
-		if getString(out.UploadIdMarker) != "" {
-			return fmt.Errorf("expected empty upload id marker, instead got %s", getString(out.UploadIdMarker))
-		}
 
 		return nil
 	})

tests/integration/group-tests.go

@@ -542,7 +542,6 @@ func TestListMultipartUploads(ts *TestState) {
 	ts.Run(ListMultipartUploads_empty_result)
 	ts.Run(ListMultipartUploads_invalid_max_uploads)
 	ts.Run(ListMultipartUploads_max_uploads)
-	ts.Run(ListMultipartUploads_next_markers_not_truncated)
 	ts.Run(ListMultipartUploads_exceeding_max_uploads)
 	ts.Run(ListMultipartUploads_ignore_upload_id_marker)
 	ts.Run(ListMultipartUploads_invalid_uploadId_marker)
@@ -3251,7 +3250,6 @@ func GetIntTests() IntTests {
 		"ListMultipartUploads_empty_result":                                                ListMultipartUploads_empty_result,
 		"ListMultipartUploads_invalid_max_uploads":                                         ListMultipartUploads_invalid_max_uploads,
 		"ListMultipartUploads_max_uploads":                                                 ListMultipartUploads_max_uploads,
-		"ListMultipartUploads_next_markers_not_truncated":                                  ListMultipartUploads_next_markers_not_truncated,
 		"ListMultipartUploads_exceeding_max_uploads":                                       ListMultipartUploads_exceeding_max_uploads,
 		"ListMultipartUploads_ignore_upload_id_marker":                                     ListMultipartUploads_ignore_upload_id_marker,
 		"ListMultipartUploads_invalid_uploadId_marker":                                     ListMultipartUploads_invalid_uploadId_marker,

tests/test_rest_list_multipart_uploads.sh

@@ -50,6 +50,9 @@ source ./tests/setup.sh
 
 # tags: curl,ListMultipartUploads,multipart,uploadId,next-key-marker,next-upload-id-marker
 @test "REST - ListMultipartUploads - NextKeyMarker and NextUploadIdMarker set to last item" {
+  if [ "$DIRECT" != "true" ]; then
+    skip "https://github.com/versity/versitygw/issues/2144"
+  fi
   run setup_bucket_and_files_v3 "$BUCKET_ONE_NAME" 2
   assert_success
   read -r bucket_name test_file_one test_file_two <<< "$output"