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 <afreen23.git@gmail.com>

diff --git a/src/pybind/mgr/dashboard/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py
index 4df642a9c73384419140fcdbafa60c298aa7d696..4455fbee66926c13d84ce563685a04c54307da76 100644 (file)
--- 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)