Fix upgrade assistant warning for optional roles and roleTemplate pro…

…perties (#179818) Closes #177065 ## Summary Upgrade assistant in cloud shows a warning when trying to upgrade due to mutually exclusive `roles` and `roleTemplates` property in the `Get Role Mappings` API from ES. This PR fixes that by introducing conditional checks for where we check for the `roles` property. ## Release notes Fix warning displayed in Upgrade Assistant regarding `roles` and `roleTemplate` properties when checking response from Get Role Mappings API. --------- Co-authored-by: Kibana Machine <[email protected]> Co-authored-by: Kurt <[email protected]>
elastic · Apr 6, 2024 · 597ab88 · 597ab88
1 parent f04153b
commit 597ab88
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/x-pack/plugins/reporting/server/deprecations/reporting_role.ts b/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
@@ -211,7 +211,7 @@ async function getRoleMappingsDeprecations(
   const roleMappingsWithReportingRole: string[] = Object.entries(roleMappings).reduce(
     (roleSet, current) => {
       const [roleName, role] = current;
-      const foundMapping = role.roles.find((roll) => deprecatedRoles.includes(roll));
+      const foundMapping = role.roles?.find((roll) => deprecatedRoles.includes(roll));
       if (foundMapping) {
         roleSet.push(`${roleName}[${foundMapping}]`);
       }

diff --git a/x-pack/plugins/security/server/deprecations/kibana_user_role.ts b/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
@@ -156,7 +156,7 @@ async function getRoleMappingsDeprecations(
   }
 
   const roleMappingsWithKibanaUserRole = Object.entries(roleMappings)
-    .filter(([, roleMapping]) => roleMapping.roles.includes(KIBANA_USER_ROLE_NAME))
+    .filter(([, roleMapping]) => roleMapping.roles?.includes(KIBANA_USER_ROLE_NAME))
     .map(([mappingName]) => mappingName);
   if (roleMappingsWithKibanaUserRole.length === 0) {
     return [];

diff --git a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts
@@ -100,7 +100,7 @@ export function defineKibanaUserRoleDeprecationRoutes({ router, logger }: RouteD
       }
 
       const roleMappingsWithKibanaUserRole = Object.entries(roleMappings).filter(([, mapping]) =>
-        mapping.roles.includes(KIBANA_USER_ROLE_NAME)
+        mapping.roles?.includes(KIBANA_USER_ROLE_NAME)
       );
 
       if (roleMappingsWithKibanaUserRole.length === 0) {