From bfa85ecd8a3799143b6afbac2a302e4d6b3b4a24 Mon Sep 17 00:00:00 2001 From: Afreen Date: Tue, 16 Apr 2024 17:12:44 +0530 Subject: [PATCH] mgr/dashboard: Support Description and AccountId in rgw roles Fixes https://tracker.ceph.com/issues/65506 Rgw roles list page is crashing due to these new fields coming from api but not supported in dashboard frontend. This will also fix failing CI tests. Signed-off-by: Afreen --- src/pybind/mgr/dashboard/controllers/rgw.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py index 4df642a9c73..4455fbee669 100644 --- a/src/pybind/mgr/dashboard/controllers/rgw.py +++ b/src/pybind/mgr/dashboard/controllers/rgw.py @@ -858,9 +858,12 @@ edit_role_form = Form(path='/edit', "MaxSessionDuration": {'cellTemplate': 'duration'}, "RoleId": {'isHidden': True}, "AssumeRolePolicyDocument": {'isHidden': True}, - "PermissionPolicies": {'isHidden': True} + "PermissionPolicies": {'isHidden': True}, + "Description": {'isHidden': True}, + "AccountId": {'isHidden': True} }, - detail_columns=['RoleId', 'AssumeRolePolicyDocument', 'PermissionPolicies'], + detail_columns=['RoleId', 'Description', + 'AssumeRolePolicyDocument', 'PermissionPolicies', 'AccountId'], meta=CRUDMeta() ) class RgwUserRole(NamedTuple): @@ -872,6 +875,8 @@ class RgwUserRole(NamedTuple): MaxSessionDuration: int AssumeRolePolicyDocument: str PermissionPolicies: List + Description: str + AccountId: str @APIRouter('/rgw/realm', Scope.RGW) -- 2.39.5