[SIEM][Detection Engine] Reworks actionClient to work with new platform

## Summary * Changes action client to use new platform from their changes * Removes unit tests not needed * Updates unit tests that need updating ### Checklist Use ~~strikethroughs~~ to remove checklist items you don't feel are applicable to this PR. ~~- [ ] This was checked for cross-browser compatibility, [including a check against IE11](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility)~~ ~~- [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/master/packages/kbn-i18n/README.md)~~ ~~- [ ] [Documentation](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#writing-documentation) was added for features that require explanation or tutorials~~ - [x] [Unit or functional tests](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#cross-browser-compatibility) were updated or added to match the most common scenarios ~~- [ ] This was checked for [keyboard-only and screenreader accessibility](https://developer.mozilla.org/en-US/docs/Learn/Tools_and_testing/Cross_browser_testing/Accessibility#Accessibility_testing_checklist)~~ ### For maintainers ~~- [ ] This was checked for breaking API changes and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)~~ - [x] This includes a feature addition or change that requires a release note and was [labeled appropriately](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md#release-notes-process)
elastic · Jan 23, 2020 · da5710d · da5710d
1 parent 4348a34
commit da5710d
Show file tree

Hide file tree

Showing 27 changed files with 288 additions and 485 deletions.
diff --git a/x-pack/legacy/plugins/siem/index.ts b/x-pack/legacy/plugins/siem/index.ts
@@ -153,11 +153,11 @@ export const siem = (kibana: any) => {
       const { config, newPlatform, plugins, route } = server;
       const { coreContext, env, setup } = newPlatform;
       const initializerContext = { ...coreContext, env } as PluginInitializerContext;
-
       const serverFacade = {
         config,
         plugins: {
           alerting: plugins.alerting,
+          actions: newPlatform.start.plugins.actions,
           elasticsearch: plugins.elasticsearch,
           spaces: plugins.spaces,
           savedObjects: server.savedObjects.SavedObjectsClient,

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/_mock_server.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/__mocks__/_mock_server.ts
@@ -59,9 +59,12 @@ export const createMockServer = (config: Record<string, string> = defaultConfig)
   };
   server.decorate('request', 'getAlertsClient', () => alertsClient);
   server.decorate('request', 'getBasePath', () => '/s/default');
-  server.decorate('request', 'getActionsClient', () => actionsClient);
   server.plugins.elasticsearch = (elasticsearch as unknown) as ElasticsearchPlugin;
   server.plugins.spaces = { getSpaceId: () => 'default' };
+  server.plugins.actions = {
+    getActionsClientWithRequest: () => actionsClient,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } as any; // The types have really bad conflicts at the moment so I have to use any
   server.decorate('request', 'getSavedObjectsClient', () => savedObjectsClient);
   return {
     server: server as ServerFacade & Hapi.Server,
@@ -79,52 +82,23 @@ export const createMockServerWithoutAlertClientDecoration = (
     port: 0,
   });
 
+  const savedObjectsClient = savedObjectsClientMock.create();
   serverWithoutAlertClient.config = () => createMockKibanaConfig(config);
+  serverWithoutAlertClient.decorate('request', 'getSavedObjectsClient', () => savedObjectsClient);
+  serverWithoutAlertClient.plugins.actions = {
+    getActionsClientWithRequest: () => actionsClient,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } as any; // The types have really bad conflicts at the moment so I have to use any
 
   const actionsClient = actionsClientMock.create();
   serverWithoutAlertClient.decorate('request', 'getBasePath', () => '/s/default');
-  serverWithoutAlertClient.decorate('request', 'getActionsClient', () => actionsClient);
 
   return {
     serverWithoutAlertClient: serverWithoutAlertClient as ServerFacade & Hapi.Server,
     actionsClient,
   };
 };
 
-export const createMockServerWithoutActionClientDecoration = (
-  config: Record<string, string> = defaultConfig
-) => {
-  const serverWithoutActionClient = new Hapi.Server({
-    port: 0,
-  });
-
-  serverWithoutActionClient.config = () => createMockKibanaConfig(config);
-
-  const alertsClient = alertsClientMock.create();
-  serverWithoutActionClient.decorate('request', 'getBasePath', () => '/s/default');
-  serverWithoutActionClient.decorate('request', 'getAlertsClient', () => alertsClient);
-
-  return {
-    serverWithoutActionClient: serverWithoutActionClient as ServerFacade & Hapi.Server,
-    alertsClient,
-  };
-};
-
-export const createMockServerWithoutActionOrAlertClientDecoration = (
-  config: Record<string, string> = defaultConfig
-) => {
-  const serverWithoutActionOrAlertClient = new Hapi.Server({
-    port: 0,
-  });
-
-  serverWithoutActionOrAlertClient.config = () => createMockKibanaConfig(config);
-
-  return {
-    serverWithoutActionOrAlertClient: serverWithoutActionOrAlertClient as ServerFacade &
-      Hapi.Server,
-  };
-};
-
 export const getMockIndexName = () =>
   jest.fn().mockImplementation(() => ({
     callWithRequest: jest.fn().mockImplementationOnce(() => 'index-name'),

diff --git a/...plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts b/...plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.test.ts
@@ -6,9 +6,7 @@
 
 import {
   createMockServer,
-  createMockServerWithoutActionClientDecoration,
   createMockServerWithoutAlertClientDecoration,
-  createMockServerWithoutActionOrAlertClientDecoration,
   getMockEmptyIndex,
   getMockNonEmptyIndex,
 } from '../__mocks__/_mock_server';
@@ -67,30 +65,12 @@ describe('add_prepackaged_rules_route', () => {
       expect(statusCode).toBe(200);
     });
 
-    test('returns 404 if actionClient is not available on the route', async () => {
-      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
-      createRulesRoute(serverWithoutActionClient);
-      const { statusCode } = await serverWithoutActionClient.inject(addPrepackagedRulesRequest());
-      expect(statusCode).toBe(404);
-    });
-
     test('returns 404 if alertClient is not available on the route', async () => {
       const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
       createRulesRoute(serverWithoutAlertClient);
       const { statusCode } = await serverWithoutAlertClient.inject(addPrepackagedRulesRequest());
       expect(statusCode).toBe(404);
     });
-
-    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
-      const {
-        serverWithoutActionOrAlertClient,
-      } = createMockServerWithoutActionOrAlertClientDecoration();
-      createRulesRoute(serverWithoutActionOrAlertClient);
-      const { statusCode } = await serverWithoutActionOrAlertClient.inject(
-        addPrepackagedRulesRequest()
-      );
-      expect(statusCode).toBe(404);
-    });
   });
 
   describe('validation', () => {

diff --git a/...gacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts b/...gacy/plugins/siem/server/lib/detection_engine/routes/rules/add_prepackaged_rules_route.ts
@@ -18,6 +18,7 @@ import { updatePrepackagedRules } from '../../rules/update_prepacked_rules';
 import { getRulesToInstall } from '../../rules/get_rules_to_install';
 import { getRulesToUpdate } from '../../rules/get_rules_to_update';
 import { getExistingPrepackagedRules } from '../../rules/get_existing_prepackaged_rules';
+import { KibanaRequest } from '../../../../../../../../../src/core/server';
 
 export const createAddPrepackedRulesRoute = (server: ServerFacade): Hapi.ServerRoute => {
   return {
@@ -33,13 +34,13 @@ export const createAddPrepackedRulesRoute = (server: ServerFacade): Hapi.ServerR
     },
     async handler(request: RequestFacade, headers) {
       const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
-      const actionsClient = isFunction(request.getActionsClient)
-        ? request.getActionsClient()
-        : null;
+      const actionsClient = await server.plugins.actions.getActionsClientWithRequest(
+        KibanaRequest.from((request as unknown) as Hapi.Request)
+      );
       const savedObjectsClient = isFunction(request.getSavedObjectsClient)
         ? request.getSavedObjectsClient()
         : null;
-      if (!alertsClient || !actionsClient || !savedObjectsClient) {
+      if (!alertsClient || !savedObjectsClient) {
         return headers.response().code(404);
       }
 

diff --git a/...acy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/...acy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -6,9 +6,7 @@
 
 import {
   createMockServer,
-  createMockServerWithoutActionClientDecoration,
   createMockServerWithoutAlertClientDecoration,
-  createMockServerWithoutActionOrAlertClientDecoration,
   getMockEmptyIndex,
 } from '../__mocks__/_mock_server';
 import { createRulesRoute } from './create_rules_route';
@@ -42,28 +40,12 @@ describe('create_rules_bulk', () => {
       expect(statusCode).toBe(200);
     });
 
-    test('returns 404 if actionClient is not available on the route', async () => {
-      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
-      createRulesRoute(serverWithoutActionClient);
-      const { statusCode } = await serverWithoutActionClient.inject(getReadBulkRequest());
-      expect(statusCode).toBe(404);
-    });
-
     test('returns 404 if alertClient is not available on the route', async () => {
       const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
       createRulesRoute(serverWithoutAlertClient);
       const { statusCode } = await serverWithoutAlertClient.inject(getReadBulkRequest());
       expect(statusCode).toBe(404);
     });
-
-    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
-      const {
-        serverWithoutActionOrAlertClient,
-      } = createMockServerWithoutActionOrAlertClientDecoration();
-      createRulesRoute(serverWithoutActionOrAlertClient);
-      const { statusCode } = await serverWithoutActionOrAlertClient.inject(getReadBulkRequest());
-      expect(statusCode).toBe(404);
-    });
   });
 
   describe('validation', () => {

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_bulk_route.ts
@@ -21,6 +21,7 @@ import {
   createBulkErrorObject,
 } from '../utils';
 import { createRulesBulkSchema } from '../schemas/create_rules_bulk_schema';
+import { KibanaRequest } from '../../../../../../../../../src/core/server';
 
 export const createCreateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRoute => {
   return {
@@ -37,13 +38,13 @@ export const createCreateRulesBulkRoute = (server: ServerFacade): Hapi.ServerRou
     },
     async handler(request: BulkRulesRequest, headers) {
       const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
-      const actionsClient = isFunction(request.getActionsClient)
-        ? request.getActionsClient()
-        : null;
+      const actionsClient = await server.plugins.actions.getActionsClientWithRequest(
+        KibanaRequest.from((request as unknown) as Hapi.Request)
+      );
       const savedObjectsClient = isFunction(request.getSavedObjectsClient)
         ? request.getSavedObjectsClient()
         : null;
-      if (!alertsClient || !actionsClient || !savedObjectsClient) {
+      if (!alertsClient || !savedObjectsClient) {
         return headers.response().code(404);
       }
 

diff --git a/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/...k/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -6,9 +6,7 @@
 
 import {
   createMockServer,
-  createMockServerWithoutActionClientDecoration,
   createMockServerWithoutAlertClientDecoration,
-  createMockServerWithoutActionOrAlertClientDecoration,
   getMockNonEmptyIndex,
   getMockEmptyIndex,
 } from '../__mocks__/_mock_server';
@@ -58,28 +56,12 @@ describe('create_rules', () => {
       expect(statusCode).toBe(200);
     });
 
-    test('returns 404 if actionClient is not available on the route', async () => {
-      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
-      createRulesRoute(serverWithoutActionClient);
-      const { statusCode } = await serverWithoutActionClient.inject(getCreateRequest());
-      expect(statusCode).toBe(404);
-    });
-
     test('returns 404 if alertClient is not available on the route', async () => {
       const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
       createRulesRoute(serverWithoutAlertClient);
       const { statusCode } = await serverWithoutAlertClient.inject(getCreateRequest());
       expect(statusCode).toBe(404);
     });
-
-    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
-      const {
-        serverWithoutActionOrAlertClient,
-      } = createMockServerWithoutActionOrAlertClientDecoration();
-      createRulesRoute(serverWithoutActionOrAlertClient);
-      const { statusCode } = await serverWithoutActionOrAlertClient.inject(getCreateRequest());
-      expect(statusCode).toBe(404);
-    });
   });
 
   describe('validation', () => {

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/create_rules_route.ts
@@ -18,6 +18,7 @@ import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
 import { transformOrError } from './utils';
 import { getIndexExists } from '../../index/get_index_exists';
 import { callWithRequestFactory, getIndex, transformError } from '../utils';
+import { KibanaRequest } from '../../../../../../../../../src/core/server';
 
 export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute => {
   return {
@@ -62,13 +63,13 @@ export const createCreateRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
         references,
       } = request.payload;
       const alertsClient = isFunction(request.getAlertsClient) ? request.getAlertsClient() : null;
-      const actionsClient = isFunction(request.getActionsClient)
-        ? request.getActionsClient()
-        : null;
+      const actionsClient = await server.plugins.actions.getActionsClientWithRequest(
+        KibanaRequest.from((request as unknown) as Hapi.Request)
+      );
       const savedObjectsClient = isFunction(request.getSavedObjectsClient)
         ? request.getSavedObjectsClient()
         : null;
-      if (!alertsClient || !actionsClient || !savedObjectsClient) {
+      if (!alertsClient || !savedObjectsClient) {
         return headers.response().code(404);
       }
 

diff --git a/...acy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts b/...acy/plugins/siem/server/lib/detection_engine/routes/rules/delete_rules_bulk_route.test.ts
@@ -6,9 +6,7 @@
 
 import {
   createMockServer,
-  createMockServerWithoutActionClientDecoration,
   createMockServerWithoutAlertClientDecoration,
-  createMockServerWithoutActionOrAlertClientDecoration,
 } from '../__mocks__/_mock_server';
 
 import { ServerInjectOptions } from 'hapi';
@@ -97,28 +95,12 @@ describe('delete_rules', () => {
       expect(parsed).toEqual(expected);
     });
 
-    test('returns 404 if actionClient is not available on the route', async () => {
-      const { serverWithoutActionClient } = createMockServerWithoutActionClientDecoration();
-      deleteRulesBulkRoute(serverWithoutActionClient);
-      const { statusCode } = await serverWithoutActionClient.inject(getDeleteBulkRequest());
-      expect(statusCode).toBe(404);
-    });
-
     test('returns 404 if alertClient is not available on the route', async () => {
       const { serverWithoutAlertClient } = createMockServerWithoutAlertClientDecoration();
       deleteRulesBulkRoute(serverWithoutAlertClient);
       const { statusCode } = await serverWithoutAlertClient.inject(getDeleteBulkRequest());
       expect(statusCode).toBe(404);
     });
-
-    test('returns 404 if alertClient and actionClient are both not available on the route', async () => {
-      const {
-        serverWithoutActionOrAlertClient,
-      } = createMockServerWithoutActionOrAlertClientDecoration();
-      deleteRulesBulkRoute(serverWithoutActionOrAlertClient);
-      const { statusCode } = await serverWithoutActionOrAlertClient.inject(getDeleteBulkRequest());
-      expect(statusCode).toBe(404);
-    });
   });
 
   describe('validation', () => {