From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 19 Oct 2021 17:06:42 +0000 (-0400)
Subject: radosgw-admin: don't duplicate bucket name in bucket_id
X-Git-Tag: v17.1.0~522^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f61215d85766efc649319fdcca505d5e3e347b3e;p=ceph.git

radosgw-admin: don't duplicate bucket name in bucket_id

Fixes: https://tracker.ceph.com/issues/52976

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 295ae5a2430e..e0c18efef6da 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1145,12 +1145,7 @@ static int init_bucket(rgw::sal::User* user,
 		       const string& bucket_id,
                        std::unique_ptr<rgw::sal::Bucket>* bucket)
 {
-  rgw_bucket b;
-  b.tenant = tenant_name;
-  b.name = bucket_name;
-  if (!bucket_id.empty()) {
-    b.bucket_id = bucket_name + ":" + bucket_id;
-  }
+  rgw_bucket b{tenant_name, bucket_name, bucket_id};
   return init_bucket(user, b, bucket);
 }