Remove id and ruleId from patchRules parameters

Instead of fetching the rule within patchRules, we now pass it in.
elastic · May 8, 2020 · 9d8ef0c · 9d8ef0c
1 parent 97ecba9
commit 9d8ef0c
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 27 deletions.
diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -209,8 +209,6 @@ export const importRulesRoute = (router: IRouter, config: ConfigType, ml: SetupP
                       meta,
                       filters,
                       rule,
-                      id: undefined,
-                      ruleId,
                       index,
                       interval,
                       maxSignals,

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.ts
@@ -107,8 +107,6 @@ export const patchRulesBulkRoute = (router: IRouter, ml: SetupPlugins['ml']) =>
               timelineTitle,
               meta,
               filters,
-              id,
-              ruleId,
               index,
               interval,
               maxSignals,

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts b/x-pack/plugins/siem/server/lib/detection_engine/routes/rules/patch_rules_route.ts
@@ -103,8 +103,6 @@ export const patchRulesRoute = (router: IRouter, ml: SetupPlugins['ml']) => {
           meta,
           filters,
           rule: existingRule,
-          id,
-          ruleId,
           index,
           interval,
           maxSignals,

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.test.ts
@@ -26,7 +26,6 @@ describe('patchRules', () => {
       alertsClient,
       savedObjectsClient,
       rule: existingRule,
-      id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
       ...params,
       enabled: false,
       interval: '',
@@ -36,7 +35,7 @@ describe('patchRules', () => {
 
     expect(alertsClient.disable).toHaveBeenCalledWith(
       expect.objectContaining({
-        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        id: existingRule.id,
       })
     );
   });
@@ -52,7 +51,6 @@ describe('patchRules', () => {
       alertsClient,
       savedObjectsClient,
       rule: existingRule,
-      id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
       ...params,
       enabled: true,
       interval: '',
@@ -62,7 +60,7 @@ describe('patchRules', () => {
 
     expect(alertsClient.enable).toHaveBeenCalledWith(
       expect.objectContaining({
-        id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
+        id: existingRule.id,
       })
     );
   });
@@ -79,7 +77,6 @@ describe('patchRules', () => {
       alertsClient,
       savedObjectsClient,
       rule: existingRule,
-      id: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
       ...params,
     });
 

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/patch_rules.ts
@@ -27,8 +27,6 @@ export const patchRules = async ({
   filters,
   from,
   immutable,
-  id,
-  ruleId,
   index,
   interval,
   maxSignals,

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/types.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/types.ts
@@ -140,8 +140,7 @@ export interface Clients {
   alertsClient: AlertsClient;
 }
 
-export type PatchRuleParams = Partial<Omit<RuleAlertParams, 'throttle'>> & {
-  id: string | undefined | null;
+export type PatchRuleParams = Partial<Omit<RuleAlertParams, 'ruleId' | 'throttle'>> & {
   rule: SanitizedAlert | null;
   savedObjectsClient: SavedObjectsClientContract;
 } & Clients;

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.test.ts
@@ -44,17 +44,8 @@ describe('updatePrepackagedRules', () => {
     );
 
     expect(patchRules).toHaveBeenCalledWith(
-      expect.objectContaining({
-        ruleId: 'rule-1',
-      })
-    );
-    expect(patchRules).not.toHaveBeenCalledWith(
-      expect.objectContaining({
+      expect.not.objectContaining({
         enabled: true,
-      })
-    );
-    expect(patchRules).not.toHaveBeenCalledWith(
-      expect.objectContaining({
         actions,
       })
     );

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts b/x-pack/plugins/siem/server/lib/detection_engine/rules/update_prepacked_rules.ts
@@ -58,12 +58,10 @@ export const updatePrepackagedRules = async (
         language,
         outputIndex,
         rule: existingRule,
-        id: undefined, // We never have an id when updating from pre-packaged rules
         savedId,
         savedObjectsClient,
         meta,
         filters,
-        ruleId,
         index,
         interval,
         maxSignals,