]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix ListBucketMultiparts response with common prefixes 43779/head
authorCasey Bodley <cbodley@redhat.com>
Tue, 2 Nov 2021 18:18:31 +0000 (14:18 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 2 Nov 2021 18:20:50 +0000 (14:20 -0400)
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>
src/rgw/rgw_rest_s3.cc

index 73f3ed5729a3f0bab8dc01b19c5d06a54115a38b..f1786351a692ed13ca39186ed41480ee59275cfe 100644 (file)
@@ -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();