Merge pull request ceph#61285 from cbodley/wip-69462

ivancich · web-flow · commit 4fea58a98f3e · 2025-01-17T09:26:00.000-05:00
rgw: /admin/user api dumps account-related user info

Reviewed-by: J. Eric Ivancich &lt;ivancich@redhat.com&gt;
diff --git a/src/rgw/driver/rados/rgw_user.cc b/src/rgw/driver/rados/rgw_user.cc
@@ -189,6 +189,11 @@ static void dump_user_info(Formatter *f, RGWUserInfo &info,
   }
   encode_json("type", user_source_type, f);
   encode_json("mfa_ids", info.mfa_ids, f);
+  encode_json("account_id", info.account_id, f);
+  encode_json("path", info.path, f);
+  encode_json("create_date", info.create_date, f);
+  encode_json("tags", info.tags, f);
+  encode_json("group_ids", info.group_ids, f);
   if (stats) {
     encode_json("stats", *stats, f);
   }

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,11 @@ static void dump_user_info(Formatter *f, RGWUserInfo &info,`
`189`	`189`	`}`
`190`	`190`	`encode_json("type", user_source_type, f);`
`191`	`191`	`encode_json("mfa_ids", info.mfa_ids, f);`
	`192`	`+ encode_json("account_id", info.account_id, f);`
	`193`	`+ encode_json("path", info.path, f);`
	`194`	`+ encode_json("create_date", info.create_date, f);`
	`195`	`+ encode_json("tags", info.tags, f);`
	`196`	`+ encode_json("group_ids", info.group_ids, f);`
`192`	`197`	`if (stats) {`
`193`	`198`	`encode_json("stats", *stats, f);`
`194`	`199`	`}`