From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Mon, 19 Feb 2024 17:52:02 +0000 (+0000)
Subject: Merge pull request #55451 from pritha-srivastava/wip-rgw-admin-ops-user-info
X-Git-Tag: testing/wip-batrick-testing-20240411.154038~410
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8196d69659186fd82b76a95538dddaaf906ddd96;p=ceph-ci.git

Merge pull request #55451 from pritha-srivastava/wip-rgw-admin-ops-user-info

rgw: code to display the complete user id that includes tenant, names…

Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

8196d69659186fd82b76a95538dddaaf906ddd96
diff --cc src/rgw/driver/rados/rgw_user.cc
index b282083c824,c4c47049f93..4e48506202f
--- a/src/rgw/driver/rados/rgw_user.cc
+++ b/src/rgw/driver/rados/rgw_user.cc
@@@ -128,10 -126,14 +128,14 @@@ static void dump_swift_keys_info(Format
  }
  
  static void dump_user_info(Formatter *f, RGWUserInfo &info,
 -                           RGWStorageStats *stats = NULL)
 +                           bool dump_keys, RGWStorageStats *stats = NULL)
  {
    f->open_object_section("user_info");
+   encode_json("full_user_id", info.user_id, f);
    encode_json("tenant", info.user_id.tenant, f);
+   if (!info.user_id.ns.empty()) {
+     encode_json("namespace", info.user_id.ns, f);
+   }
    encode_json("user_id", info.user_id.id, f);
    encode_json("display_name", info.display_name, f);
    encode_json("email", info.user_email, f);