adds savedObjectsClient to the add and upate prepackaged rules and im…

…port rules route.
elastic · Jan 17, 2020 · 6fb3b35 · 6fb3b35
1 parent dadefe7
commit 6fb3b35
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
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
@@ -36,8 +36,10 @@ export const createAddPrepackedRulesRoute = (server: ServerFacade): Hapi.ServerR
       const actionsClient = isFunction(request.getActionsClient)
         ? request.getActionsClient()
         : null;
-
-      if (!alertsClient || !actionsClient) {
+      const savedObjectsClient = isFunction(request.getSavedObjectsClient)
+        ? request.getSavedObjectsClient()
+        : null;
+      if (!alertsClient || !actionsClient || !savedObjectsClient) {
         return headers.response().code(404);
       }
 
@@ -59,7 +61,13 @@ export const createAddPrepackedRulesRoute = (server: ServerFacade): Hapi.ServerR
           }
         }
         await installPrepackagedRules(alertsClient, actionsClient, rulesToInstall, spaceIndex);
-        await updatePrepackagedRules(alertsClient, actionsClient, rulesToUpdate, spaceIndex);
+        await updatePrepackagedRules(
+          alertsClient,
+          actionsClient,
+          savedObjectsClient,
+          rulesToUpdate,
+          spaceIndex
+        );
         return {
           rules_installed: rulesToInstall.length,
           rules_updated: rulesToUpdate.length,

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -52,8 +52,10 @@ export const createImportRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
       const actionsClient = isFunction(request.getActionsClient)
         ? request.getActionsClient()
         : null;
-
-      if (!alertsClient || !actionsClient) {
+      const savedObjectsClient = isFunction(request.getSavedObjectsClient)
+        ? request.getSavedObjectsClient()
+        : null;
+      if (!alertsClient || !actionsClient || !savedObjectsClient) {
         return headers.response().code(404);
       }
       const { filename } = request.payload.file.hapi;
@@ -161,6 +163,7 @@ export const createImportRulesRoute = (server: ServerFacade): Hapi.ServerRoute =
               const updatedRule = await updateRules({
                 alertsClient,
                 actionsClient,
+                savedObjectsClient,
                 description,
                 enabled,
                 falsePositives,

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/types.ts
@@ -150,11 +150,11 @@ export interface FindRulesStatusesRequest extends Omit<RequestFacade, 'query'> {
 export interface Clients {
   alertsClient: AlertsClient;
   actionsClient: ActionsClient;
-  savedObjectsClient?: SavedObjectsClientContract;
 }
 
 export type UpdateRuleParams = Partial<RuleAlertParams> & {
   id: string | undefined | null;
+  savedObjectsClient: SavedObjectsClientContract;
 } & Clients;
 
 export type DeleteRuleParams = Clients & {

diff --git a/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts b/x-pack/legacy/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { SavedObjectsClientContract } from 'kibana/server';
 import { ActionsClient } from '../../../../../actions';
 import { AlertsClient } from '../../../../../alerting';
 import { updateRules } from './update_rules';
@@ -12,6 +13,7 @@ import { RuleAlertParamsRest } from '../types';
 export const updatePrepackagedRules = async (
   alertsClient: AlertsClient,
   actionsClient: ActionsClient,
+  savedObjectsClient: SavedObjectsClientContract,
   rules: RuleAlertParamsRest[],
   outputIndex: string
 ): Promise<void> => {
@@ -55,6 +57,7 @@ export const updatePrepackagedRules = async (
       outputIndex,
       id: undefined, // We never have an id when updating from pre-packaged rules
       savedId,
+      savedObjectsClient,
       meta,
       filters,
       ruleId,