From b3860b366246b14e0844cb5eef38b5e47ec85412 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 2 Nov 2021 14:18:31 -0400 Subject: [PATCH] rgw: fix ListBucketMultiparts response with common prefixes see documentation and examples in https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListMultipartUploads.html that use Prefix directly Fixes: https://tracker.ceph.com/issues/47527 Signed-off-by: Casey Bodley --- src/rgw/rgw_rest_s3.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 73f3ed5729a3f..f1786351a692e 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -3876,7 +3876,7 @@ void RGWListBucketMultiparts_ObjStore_S3::send_response() s->formatter->dump_string("Tenant", s->bucket_tenant); s->formatter->dump_string("Bucket", s->bucket_name); if (!prefix.empty()) - s->formatter->dump_string("ListMultipartUploadsResult.Prefix", prefix); + s->formatter->dump_string("Prefix", prefix); if (!marker_key.empty()) s->formatter->dump_string("KeyMarker", marker_key); if (!marker_upload_id.empty()) @@ -3911,10 +3911,9 @@ void RGWListBucketMultiparts_ObjStore_S3::send_response() s->formatter->open_array_section("CommonPrefixes"); for (const auto& kv : common_prefixes) { if (encode_url) { - s->formatter->dump_string("CommonPrefixes.Prefix", - url_encode(kv.first, false)); + s->formatter->dump_string("Prefix", url_encode(kv.first, false)); } else { - s->formatter->dump_string("CommonPrefixes.Prefix", kv.first); + s->formatter->dump_string("Prefix", kv.first); } } s->formatter->close_section(); -- 2.39.5