From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 2 Nov 2021 18:18:31 +0000 (-0400)
Subject: rgw: fix ListBucketMultiparts response with common prefixes
X-Git-Tag: v16.2.11~265^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a898423a59596e2f41c1c88733641e16fa4a5f91;p=ceph.git

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 <cbodley@redhat.com>
(cherry picked from commit b3860b366246b14e0844cb5eef38b5e47ec85412)
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 724c3d30d84b..7267664958a6 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -3832,7 +3832,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);
   const string& key_marker = marker.get_key();
   if (!key_marker.empty())
     s->formatter->dump_string("KeyMarker", key_marker);
@@ -3871,10 +3871,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();