Consolidate project type alias maps and fix es→elasticsearch for UIAM

flash1293 · claude · flash1293 · commit 96feb4eea98b · 2026-04-01T17:48:48.000+02:00
Move projectTypeToAlias map from kbn-mock-idp-plugin into kbn-mock-idp-utils
as the single source of truth, addressing review feedback. Also fix the UIAM
normalization to map 'es' to 'elasticsearch' instead of 'search'.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/packages/kbn-mock-idp-plugin/server/plugin.ts b/packages/kbn-mock-idp-plugin/server/plugin.ts
@@ -22,7 +22,12 @@ import {
   STATEFUL_ROLES_ROOT_PATH,
 } from '@kbn/es';
 import type { ServerlessProductTier } from '@kbn/es/src/utils';
-import { createSAMLResponse, MOCK_IDP_LOGIN_PATH, MOCK_IDP_LOGOUT_PATH } from '@kbn/mock-idp-utils';
+import {
+  createSAMLResponse,
+  MOCK_IDP_LOGIN_PATH,
+  MOCK_IDP_LOGOUT_PATH,
+  projectTypeToAlias,
+} from '@kbn/mock-idp-utils';
 import { getSAMLRequestId } from '@kbn/mock-idp-utils/src/utils';
 
 import type { ConfigType } from './config';
@@ -39,14 +44,6 @@ const createSAMLResponseSchema = schema.object({
   url: schema.string(),
 });
 
-// BOOKMARK - List of Kibana project types
-const projectToAlias = new Map<string, string>([
-  ['observability', 'oblt'],
-  ['security', 'security'],
-  ['search', 'es'],
-  ['workplaceai', 'workplaceai'],
-]);
-
 const tierSpecificRolesFileExists = (filePath: string): boolean => {
   try {
     return existsSync(filePath);
@@ -56,8 +53,8 @@ const tierSpecificRolesFileExists = (filePath: string): boolean => {
 };
 
 const readServerlessRoles = (projectType: string, productTier?: ServerlessProductTier) => {
-  if (projectToAlias.has(projectType)) {
-    const alias = projectToAlias.get(projectType)!;
+  if (projectTypeToAlias.has(projectType)) {
+    const alias = projectTypeToAlias.get(projectType)!;
 
     const tierSpecificRolesResourcePath =
       productTier && resolve(SERVERLESS_ROLES_ROOT_PATH, alias, productTier, 'roles.yml');
diff --git a/src/platform/packages/private/kbn-mock-idp-utils/src/index.ts b/src/platform/packages/private/kbn-mock-idp-utils/src/index.ts
@@ -47,4 +47,5 @@ export {
   getSAMLRequestId,
   createUiamSessionTokens,
   createUiamOAuthAccessToken,
+  projectTypeToAlias,
 } from './utils';
diff --git a/src/platform/packages/private/kbn-mock-idp-utils/src/utils.ts b/src/platform/packages/private/kbn-mock-idp-utils/src/utils.ts
@@ -292,11 +292,20 @@ export function generateCosmosDBApiRequestHeaders(
   };
 }
 
-// Normalizes Kibana CLI project type aliases (e.g. 'oblt', 'es') to the canonical
-// ES project type names used in UIAM tokens and ES serverless configuration.
+// Kibana project type names mapped to CLI aliases used for role file paths.
+export const projectTypeToAlias = new Map<string, string>([
+  ['observability', 'oblt'],
+  ['security', 'security'],
+  ['search', 'es'],
+  ['workplaceai', 'workplaceai'],
+]);
+
+// Normalizes CLI aliases (e.g. 'oblt', 'es') to the canonical project type names
+// used in UIAM tokens and ES serverless configuration.
+// Note: 'es' maps to 'elasticsearch' for UIAM (not 'search' which is the Kibana solution name).
 const projectTypeAliases = new Map<string, string>([
   ['oblt', 'observability'],
-  ['es', 'search'],
+  ['es', 'elasticsearch'],
 ]);
 
 const normalizeProjectType = (projectType: string): string =>
