adopt security_solutions

x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts

@@ -15,7 +15,7 @@ import {
   getPackagePolicyCreateCallback,
   getPackagePolicyUpdateCallback,
 } from './ingest_integration';
-import { KibanaRequest, RequestHandlerContext } from 'kibana/server';
+import { KibanaRequest } from 'kibana/server';
 import { createMockConfig, requestContextMock } from '../lib/detection_engine/routes/__mocks__';
 import { EndpointAppContextServiceStartContract } from './endpoint_app_context_services';
 import { createMockEndpointAppContextServiceStartContract } from './mocks';
@@ -25,11 +25,12 @@ import { Subject } from 'rxjs';
 import { ILicense } from '../../../licensing/common/types';
 import { EndpointDocGenerator } from '../../common/endpoint/generate_data';
 import { ProtectionModes } from '../../common/endpoint/types';
+import type { SecuritySolutionRequestHandlerContext } from '../types';
 
 describe('ingest_integration tests ', () => {
   let endpointAppContextMock: EndpointAppContextServiceStartContract;
   let req: KibanaRequest;
-  let ctx: RequestHandlerContext;
+  let ctx: SecuritySolutionRequestHandlerContext;
   const maxTimelineImportExportSize = createMockConfig().maxTimelineImportExportSize;
   let licenseEmitter: Subject<ILicense>;
   let licenseService: LicenseService;

x-pack/plugins/security_solution/server/endpoint/ingest_integration.ts

@@ -98,10 +98,15 @@ export const getPackagePolicyCreateCallback = (
 
     // prep for detection rules creation
     const appClient = appClientFactory.create(request);
+    // This callback is called by fleet plugin.
+    // It doesn't have access to SecuritySolutionRequestHandlerContext in runtime.
+    // Muting the error to have green CI.
+    // @ts-expect-error
     const frameworkRequest = await buildFrameworkRequest(context, securitySetup, request);
 
     // Create detection index & rules (if necessary). move past any failure, this is just a convenience
     try {
+      // @ts-expect-error
       await createDetectionIndex(context, appClient);
     } catch (err) {
       if (err.statusCode !== 409) {
@@ -115,6 +120,7 @@ export const getPackagePolicyCreateCallback = (
       // this checks to make sure index exists first, safe to try in case of failure above
       // may be able to recover from minor errors
       await createPrepackagedRules(
+        // @ts-expect-error
         context,
         appClient,
         alerts.getAlertsClientWithRequest(request),

x-pack/plugins/security_solution/server/endpoint/mocks.ts

@@ -27,6 +27,7 @@ import { EndpointAppContext } from './types';
 import { MetadataRequestContext } from './routes/metadata/handlers';
 // import { licenseMock } from '../../../licensing/common/licensing.mock';
 import { LicenseService } from '../../common/license/license';
+import { SecuritySolutionRequestHandlerContext } from '../types';
 
 /**
  * Creates a mocked EndpointAppContext.
@@ -116,7 +117,7 @@ export const createMockMetadataRequestContext = (): jest.Mocked<MetadataRequestC
   return {
     endpointAppContextService: createMockEndpointAppContextService(),
     logger: loggingSystemMock.create().get('mock_endpoint_app_context'),
-    requestHandlerContext: xpackMocks.createRequestHandlerContext(),
+    requestHandlerContext: (xpackMocks.createRequestHandlerContext() as unknown) as jest.Mocked<SecuritySolutionRequestHandlerContext>,
   };
 };
 

x-pack/plugins/security_solution/server/endpoint/routes/artifacts/download_exception_list.test.ts

@@ -5,15 +5,14 @@
  */
 import { deflateSync, inflateSync } from 'zlib';
 import LRU from 'lru-cache';
-import {
+import type {
   ILegacyClusterClient,
   IRouter,
   SavedObjectsClientContract,
   ILegacyScopedClusterClient,
   RouteConfig,
   RequestHandler,
   KibanaResponseFactory,
-  RequestHandlerContext,
   SavedObject,
 } from 'kibana/server';
 import {
@@ -29,6 +28,7 @@ import { EndpointAppContextService } from '../../endpoint_app_context_services';
 import { createMockEndpointAppContextServiceStartContract } from '../../mocks';
 import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__';
 import { WrappedTranslatedExceptionList } from '../../schemas/artifacts/lists';
+import type { SecuritySolutionRequestHandlerContext } from '../../../types';
 
 const mockArtifactName = `${ArtifactConstants.GLOBAL_ALLOWLIST_NAME}-windows-v1`;
 const expectedEndpointExceptions: WrappedTranslatedExceptionList = {
@@ -173,7 +173,7 @@ describe('test alerts route', () => {
             client: mockSavedObjectClient,
           },
         },
-      } as unknown) as RequestHandlerContext,
+      } as unknown) as SecuritySolutionRequestHandlerContext,
       mockRequest,
       mockResponse
     );
@@ -217,7 +217,7 @@ describe('test alerts route', () => {
             client: mockSavedObjectClient,
           },
         },
-      } as unknown) as RequestHandlerContext,
+      } as unknown) as SecuritySolutionRequestHandlerContext,
       mockRequest,
       mockResponse
     );
@@ -251,7 +251,7 @@ describe('test alerts route', () => {
             client: mockSavedObjectClient,
           },
         },
-      } as unknown) as RequestHandlerContext,
+      } as unknown) as SecuritySolutionRequestHandlerContext,
       mockRequest,
       mockResponse
     );
@@ -279,7 +279,7 @@ describe('test alerts route', () => {
             client: mockSavedObjectClient,
           },
         },
-      } as unknown) as RequestHandlerContext,
+      } as unknown) as SecuritySolutionRequestHandlerContext,
       mockRequest,
       mockResponse
     );
@@ -313,7 +313,7 @@ describe('test alerts route', () => {
             client: mockSavedObjectClient,
           },
         },
-      } as unknown) as RequestHandlerContext,
+      } as unknown) as SecuritySolutionRequestHandlerContext,
       mockRequest,
       mockResponse
     );

x-pack/plugins/security_solution/server/endpoint/routes/metadata/handlers.ts

@@ -5,7 +5,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { RequestHandlerContext, Logger, RequestHandler } from 'kibana/server';
+import type { Logger, RequestHandler } from 'kibana/server';
 import { TypeOf } from '@kbn/config-schema';
 import {
   HostInfo,
@@ -14,6 +14,8 @@ import {
   HostStatus,
   MetadataQueryStrategyVersions,
 } from '../../../../common/endpoint/types';
+import type { SecuritySolutionRequestHandlerContext } from '../../../types';
+
 import { getESQueryHostMetadataByID, kibanaRequestToMetadataListESQuery } from './query_builders';
 import { Agent, AgentStatus, PackagePolicy } from '../../../../../fleet/common/types/models';
 import { EndpointAppContext, HostListQueryResult } from '../../types';
@@ -25,7 +27,7 @@ import { EndpointAppContextService } from '../../endpoint_app_context_services';
 export interface MetadataRequestContext {
   endpointAppContextService: EndpointAppContextService;
   logger: Logger;
-  requestHandlerContext: RequestHandlerContext;
+  requestHandlerContext: SecuritySolutionRequestHandlerContext;
 }
 
 const HOST_STATUS_MAPPING = new Map<AgentStatus, HostStatus>([
@@ -52,7 +54,12 @@ export const getMetadataListRequestHandler = function (
   endpointAppContext: EndpointAppContext,
   logger: Logger,
   queryStrategyVersion?: MetadataQueryStrategyVersions
-): RequestHandler<undefined, undefined, TypeOf<typeof GetMetadataListRequestSchema.body>> {
+): RequestHandler<
+  unknown,
+  unknown,
+  TypeOf<typeof GetMetadataListRequestSchema.body>,
+  SecuritySolutionRequestHandlerContext
+> {
   return async (context, request, response) => {
     try {
       const agentService = endpointAppContext.service.getAgentService();
@@ -110,7 +117,12 @@ export const getMetadataRequestHandler = function (
   endpointAppContext: EndpointAppContext,
   logger: Logger,
   queryStrategyVersion?: MetadataQueryStrategyVersions
-): RequestHandler<TypeOf<typeof GetMetadataRequestSchema.params>, undefined, undefined> {
+): RequestHandler<
+  TypeOf<typeof GetMetadataRequestSchema.params>,
+  unknown,
+  unknown,
+  SecuritySolutionRequestHandlerContext
+> {
   return async (context, request, response) => {
     const agentService = endpointAppContext.service.getAgentService();
     if (agentService === undefined) {

x-pack/plugins/security_solution/server/endpoint/routes/metadata/index.ts

@@ -4,12 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IRouter } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 
 import { HostStatus, MetadataQueryStrategyVersions } from '../../../../common/endpoint/types';
 import { EndpointAppContext } from '../../types';
 import { getLogger, getMetadataListRequestHandler, getMetadataRequestHandler } from './handlers';
+import type { SecuritySolutionPluginRouter } from '../../../types';
 
 export const BASE_ENDPOINT_ROUTE = '/api/endpoint';
 export const METADATA_REQUEST_V1_ROUTE = `${BASE_ENDPOINT_ROUTE}/v1/metadata`;
@@ -60,7 +60,10 @@ export const GetMetadataListRequestSchema = {
   ),
 };
 
-export function registerEndpointRoutes(router: IRouter, endpointAppContext: EndpointAppContext) {
+export function registerEndpointRoutes(
+  router: SecuritySolutionPluginRouter,
+  endpointAppContext: EndpointAppContext
+) {
   const logger = getLogger(endpointAppContext);
   router.post(
     {

x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata.test.ts

@@ -5,7 +5,6 @@
  */
 import {
   ILegacyClusterClient,
-  IRouter,
   ILegacyScopedClusterClient,
   KibanaResponseFactory,
   RequestHandler,
@@ -43,16 +42,17 @@ import {
 import { createV1SearchResponse, createV2SearchResponse } from './support/test_support';
 import { PackageService } from '../../../../../fleet/server/services';
 import { metadataTransformPrefix } from '../../../../common/endpoint/constants';
+import type { SecuritySolutionPluginRouter } from '../../../types';
 
 describe('test endpoint route', () => {
-  let routerMock: jest.Mocked<IRouter>;
+  let routerMock: jest.Mocked<SecuritySolutionPluginRouter>;
   let mockResponse: jest.Mocked<KibanaResponseFactory>;
   let mockClusterClient: jest.Mocked<ILegacyClusterClient>;
   let mockScopedClient: jest.Mocked<ILegacyScopedClusterClient>;
   let mockSavedObjectClient: jest.Mocked<SavedObjectsClientContract>;
   let mockPackageService: jest.Mocked<PackageService>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let routeHandler: RequestHandler<any, any, any>;
+  let routeHandler: RequestHandler<any, any, any, any>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let routeConfig: RouteConfig<any, any, any, any>;
   // tests assume that fleet is enabled, and thus agentService is available

x-pack/plugins/security_solution/server/endpoint/routes/metadata/metadata_v1.test.ts

@@ -5,7 +5,6 @@
  */
 import {
   ILegacyClusterClient,
-  IRouter,
   ILegacyScopedClusterClient,
   KibanaResponseFactory,
   RequestHandler,
@@ -38,16 +37,17 @@ import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data'
 import { Agent, EsAssetReference } from '../../../../../fleet/common/types/models';
 import { createV1SearchResponse } from './support/test_support';
 import { PackageService } from '../../../../../fleet/server/services';
+import type { SecuritySolutionPluginRouter } from '../../../types';
 
 describe('test endpoint route v1', () => {
-  let routerMock: jest.Mocked<IRouter>;
+  let routerMock: jest.Mocked<SecuritySolutionPluginRouter>;
   let mockResponse: jest.Mocked<KibanaResponseFactory>;
   let mockClusterClient: jest.Mocked<ILegacyClusterClient>;
   let mockScopedClient: jest.Mocked<ILegacyScopedClusterClient>;
   let mockSavedObjectClient: jest.Mocked<SavedObjectsClientContract>;
   let mockPackageService: jest.Mocked<PackageService>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let routeHandler: RequestHandler<any, any, any>;
+  let routeHandler: RequestHandler<any, any, any, any>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let routeConfig: RouteConfig<any, any, any, any>;
   // tests assume that fleet is enabled, and thus agentService is available

x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.test.ts

@@ -22,6 +22,7 @@ import {
   getTrustedAppsListRouteHandler,
   getTrustedAppsSummaryRouteHandler,
 } from './handlers';
+import type { SecuritySolutionRequestHandlerContext } from '../../../types';
 
 const exceptionsListClient = listMock.getExceptionListClient() as jest.Mocked<ExceptionListClient>;
 
@@ -31,13 +32,14 @@ const createAppContextMock = () => ({
   config: () => Promise.resolve(createMockConfig()),
 });
 
-const createHandlerContextMock = () => ({
-  ...xpackMocks.createRequestHandlerContext(),
-  lists: {
-    getListClient: jest.fn(),
-    getExceptionListClient: jest.fn().mockReturnValue(exceptionsListClient),
-  },
-});
+const createHandlerContextMock = () =>
+  (({
+    ...xpackMocks.createRequestHandlerContext(),
+    lists: {
+      getListClient: jest.fn(),
+      getExceptionListClient: jest.fn().mockReturnValue(exceptionsListClient),
+    },
+  } as unknown) as jest.Mocked<SecuritySolutionRequestHandlerContext>);
 
 const assertResponse = <T>(
   response: jest.Mocked<KibanaResponseFactory>,

x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.ts

@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestHandler, RequestHandlerContext } from 'kibana/server';
+import type { RequestHandler } from 'kibana/server';
+import type { SecuritySolutionRequestHandlerContext } from '../../../types';
 
 import { ExceptionListClient } from '../../../../../lists/server';
 
@@ -23,7 +24,9 @@ import {
   MissingTrustedAppException,
 } from './service';
 
-const exceptionListClientFromContext = (context: RequestHandlerContext): ExceptionListClient => {
+const exceptionListClientFromContext = (
+  context: SecuritySolutionRequestHandlerContext
+): ExceptionListClient => {
   const exceptionLists = context.lists?.getExceptionListClient();
 
   if (!exceptionLists) {
@@ -35,7 +38,12 @@ const exceptionListClientFromContext = (context: RequestHandlerContext): Excepti
 
 export const getTrustedAppsDeleteRouteHandler = (
   endpointAppContext: EndpointAppContext
-): RequestHandler<DeleteTrustedAppsRequestParams, undefined, undefined> => {
+): RequestHandler<
+  DeleteTrustedAppsRequestParams,
+  unknown,
+  unknown,
+  SecuritySolutionRequestHandlerContext
+> => {
   const logger = endpointAppContext.logFactory.get('trusted_apps');
 
   return async (context, req, res) => {
@@ -56,7 +64,12 @@ export const getTrustedAppsDeleteRouteHandler = (
 
 export const getTrustedAppsListRouteHandler = (
   endpointAppContext: EndpointAppContext
-): RequestHandler<undefined, GetTrustedAppsListRequest> => {
+): RequestHandler<
+  unknown,
+  GetTrustedAppsListRequest,
+  unknown,
+  SecuritySolutionRequestHandlerContext
+> => {
   const logger = endpointAppContext.logFactory.get('trusted_apps');
 
   return async (context, req, res) => {
@@ -73,7 +86,12 @@ export const getTrustedAppsListRouteHandler = (
 
 export const getTrustedAppsCreateRouteHandler = (
   endpointAppContext: EndpointAppContext
-): RequestHandler<undefined, undefined, PostTrustedAppCreateRequest> => {
+): RequestHandler<
+  unknown,
+  unknown,
+  PostTrustedAppCreateRequest,
+  SecuritySolutionRequestHandlerContext
+> => {
   const logger = endpointAppContext.logFactory.get('trusted_apps');
 
   return async (context, req, res) => {
@@ -90,7 +108,12 @@ export const getTrustedAppsCreateRouteHandler = (
 
 export const getTrustedAppsSummaryRouteHandler = (
   endpointAppContext: EndpointAppContext
-): RequestHandler<undefined, undefined, PostTrustedAppCreateRequest> => {
+): RequestHandler<
+  unknown,
+  unknown,
+  PostTrustedAppCreateRequest,
+  SecuritySolutionRequestHandlerContext
+> => {
   const logger = endpointAppContext.logFactory.get('trusted_apps');
 
   return async (context, req, res) => {

x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/index.ts

@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IRouter } from 'kibana/server';
 import {
   DeleteTrustedAppsRequestSchema,
   GetTrustedAppsRequestSchema,
@@ -23,9 +22,10 @@ import {
   getTrustedAppsSummaryRouteHandler,
 } from './handlers';
 import { EndpointAppContext } from '../../types';
+import { SecuritySolutionPluginRouter } from '../../../types';
 
 export const registerTrustedAppsRoutes = (
-  router: IRouter,
+  router: SecuritySolutionPluginRouter,
   endpointAppContext: EndpointAppContext
 ) => {
   // DELETE one