Use KibanaRequest.from instead of as KibanaRequest

elastic · Nov 30, 2020 · 5129ba6 · 5129ba6
1 parent 0609062
commit 5129ba6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/x-pack/plugins/fleet/server/services/api_keys/security.ts b/x-pack/plugins/fleet/server/services/api_keys/security.ts
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaRequest, FakeRequest, SavedObjectsClientContract } from 'src/core/server';
+import type { Request } from '@hapi/hapi';
+import { KibanaRequest, SavedObjectsClientContract } from '../../../../../../src/core/server';
 import { FleetAdminUserInvalidError, isLegacyESClientError } from '../../errors';
 import { CallESAsCurrentUser } from '../../types';
 import { appContextService } from '../app_context';
@@ -19,13 +20,17 @@ export async function createAPIKey(
   if (!adminUser) {
     throw new Error('No admin user configured');
   }
-  const request: FakeRequest = {
+  const request = KibanaRequest.from(({
+    path: '/',
+    route: { settings: {} },
+    url: { href: '/' },
+    raw: { req: { url: '/' } },
     headers: {
       authorization: `Basic ${Buffer.from(`${adminUser.username}:${adminUser.password}`).toString(
         'base64'
       )}`,
     },
-  };
+  } as unknown) as Request);
   const security = appContextService.getSecurity();
   if (!security) {
     throw new Error('Missing security plugin');
@@ -64,13 +69,17 @@ export async function invalidateAPIKey(soClient: SavedObjectsClientContract, id:
   if (!adminUser) {
     throw new Error('No admin user configured');
   }
-  const request: FakeRequest = {
+  const request = KibanaRequest.from(({
+    path: '/',
+    route: { settings: {} },
+    url: { href: '/' },
+    raw: { req: { url: '/' } },
     headers: {
       authorization: `Basic ${Buffer.from(`${adminUser.username}:${adminUser.password}`).toString(
         'base64'
       )}`,
     },
-  };
+  } as unknown) as Request);
 
   const security = appContextService.getSecurity();
   if (!security) {

diff --git a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
@@ -185,8 +185,7 @@ export default function (providerContext: FtrProviderContext) {
               policy_id: 'policy1',
             })
             .expect(400);
-
-          expect(res.body.message).match(/Fleet Admin user is Invalid/);
+          expect(res.body.message).match(/Fleet Admin user is invalid/);
         });
       });
     });