From: Pritha Srivastava <prsrivas@redhat.com>
Date: Mon, 5 Feb 2024 08:30:47 +0000 (+0530)
Subject: rgw: code to display the complete user id that includes tenant, namespace,
X-Git-Tag: v20.0.0~2584^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9b31e9330fe2e67687399479ee4924b4ad671d1f;p=ceph.git

rgw: code to display the complete user id that includes tenant, namespace,
and id for a GET request to admin ops for user info. added code to display
namespace also.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_user.cc b/src/rgw/driver/rados/rgw_user.cc
index b5569e481c53e..c4c47049f9399 100644
--- a/src/rgw/driver/rados/rgw_user.cc
+++ b/src/rgw/driver/rados/rgw_user.cc
@@ -129,7 +129,11 @@ static void dump_user_info(Formatter *f, RGWUserInfo &info,
                            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);