From 861b5ee16c09b98655bc1cb4cddc2332e54c5f39 Mon Sep 17 00:00:00 2001
From: pgayvallet <pierre.gayvallet@elastic.co>
Date: Wed, 20 Apr 2022 22:19:29 +0200
Subject: [PATCH] more test type failures fixes

---
 .../fleet/server/routes/package_policy/handlers.test.ts    | 2 +-
 x-pack/plugins/fleet/server/routes/setup/handlers.test.ts  | 2 +-
 x-pack/plugins/reporting/server/types.ts                   | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
index 1041dcc0579aa..2f814a0da15d4 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
@@ -93,7 +93,7 @@ describe('When calling package policy', () => {
   let routerMock: jest.Mocked<FleetAuthzRouter>;
   let routeHandler: FleetRequestHandler<any, any, any>;
   let routeConfig: RouteConfig<any, any, any, any>;
-  let context: jest.Mocked<FleetRequestHandlerContext>;
+  let context: FleetRequestHandlerContext;
   let response: ReturnType<typeof httpServerMock.createResponseFactory>;
 
   beforeEach(() => {
diff --git a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
index 12179ec39dbc9..400c18e85415b 100644
--- a/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/setup/handlers.test.ts
@@ -30,7 +30,7 @@ jest.mock('../../services/setup', () => {
 const mockSetupFleet = setupFleet as jest.MockedFunction<typeof setupFleet>;
 
 describe('FleetSetupHandler', () => {
-  let context: AwaitedProperties<FleetRequestHandlerContext>;
+  let context: AwaitedProperties<Omit<FleetRequestHandlerContext, 'resolve'>>;
   let response: ReturnType<typeof httpServerMock.createResponseFactory>;
   let request: ReturnType<typeof httpServerMock.createKibanaRequest>;
 
diff --git a/x-pack/plugins/reporting/server/types.ts b/x-pack/plugins/reporting/server/types.ts
index b272f9687c14b..f660690c6a755 100644
--- a/x-pack/plugins/reporting/server/types.ts
+++ b/x-pack/plugins/reporting/server/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { IRouter, Logger, RequestHandlerContext } from '@kbn/core/server';
+import type { IRouter, Logger, CustomRequestHandlerContext } from '@kbn/core/server';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import type { DataPluginStart } from '@kbn/data-plugin/server/plugin';
 import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
@@ -113,10 +113,9 @@ export interface ReportingStartDeps {
   taskManager: TaskManagerStartContract;
 }
 
-export interface ReportingRequestHandlerContext {
+export type ReportingRequestHandlerContext = CustomRequestHandlerContext<{
   reporting: ReportingStart | null;
-  core: RequestHandlerContext['core'];
-}
+}>;
 
 export type ReportingPluginRouter = IRouter<ReportingRequestHandlerContext>;