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>
k0ste · Oct 20, 2021 · f61215d · f61215d
1 parent a4fef1d
commit f61215d
Showing 1 changed file with 1 addition and 6 deletions.
diff --git 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);
 }