streamline DRC methods params interfaces

Author: maximpn

x-pack/solutions/security/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rule_base_version/get_prebuilt_rule_base_version_handler.ts

@@ -39,7 +39,7 @@ export const getPrebuiltRuleBaseVersionHandler = async (
     const rulesClient = await ctx.alerting.getRulesClient();
     const ruleAssetsClient = createPrebuiltRuleAssetsClient(soClient);
 
-    const currentRule = await getRuleById({ rulesClient, id });
+    const currentRule = await getRuleById({ id, rulesClient });
 
     if (!currentRule) {
       throw new Error(`Cannot find rule with id: ${id}`);

x-pack/solutions/security/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/assert_pick_version_is_target.test.ts

@@ -6,7 +6,10 @@
  */
 
 import { assertPickVersionIsTarget } from './assert_pick_version_is_target';
-import type { PickVersionValues, RuleUpgradeSpecifier } from '../../../../../../common/api/detection_engine';
+import type {
+  PickVersionValues,
+  RuleUpgradeSpecifier,
+} from '../../../../../../common/api/detection_engine';
 
 describe('assertPickVersionIsTarget', () => {
   const ruleId = 'test-rule-id';
@@ -28,9 +31,7 @@ describe('assertPickVersionIsTarget', () => {
         pick_version: 'TARGET',
       };
 
-      expect(() =>
-        assertPickVersionIsTarget({ ruleId, ruleUpgradeSpecifier })
-      ).not.toThrow();
+      expect(() => assertPickVersionIsTarget({ ruleId, ruleUpgradeSpecifier })).not.toThrow();
     });
 
     it('should not throw when all pick_version values are TARGET', () => {
@@ -56,9 +57,9 @@ describe('assertPickVersionIsTarget', () => {
       const pickVersions: PickVersionValues[] = ['BASE', 'CURRENT', 'MERGED'];
 
       pickVersions.forEach((globalPickVersion) => {
-        expect(() =>
-          assertPickVersionIsTarget({ ruleId, globalPickVersion })
-        ).toThrowError(createExpectedError(ruleId));
+        expect(() => assertPickVersionIsTarget({ ruleId, globalPickVersion })).toThrowError(
+          createExpectedError(ruleId)
+        );
       });
     });
 
@@ -70,9 +71,9 @@ describe('assertPickVersionIsTarget', () => {
         pick_version: 'BASE',
       };
 
-      expect(() =>
-        assertPickVersionIsTarget({ ruleId, ruleUpgradeSpecifier })
-      ).toThrowError(createExpectedError(ruleId));
+      expect(() => assertPickVersionIsTarget({ ruleId, ruleUpgradeSpecifier })).toThrowError(
+        createExpectedError(ruleId)
+      );
     });
 
     it('should throw when any field-specific pick_version is not TARGET', () => {
@@ -86,9 +87,9 @@ describe('assertPickVersionIsTarget', () => {
         },
       };
 
-      expect(() =>
-        assertPickVersionIsTarget({ ruleId, ruleUpgradeSpecifier })
-      ).toThrowError(createExpectedError(ruleId));
+      expect(() => assertPickVersionIsTarget({ ruleId, ruleUpgradeSpecifier })).toThrowError(
+        createExpectedError(ruleId)
+      );
     });
 
     it('should throw when pick_version is missing (defaults to MERGED)', () => {
@@ -98,9 +99,7 @@ describe('assertPickVersionIsTarget', () => {
         version: 1,
       };
 
-      expect(() =>
-        assertPickVersionIsTarget({ ruleId, ruleUpgradeSpecifier })
-      ).toThrow();
+      expect(() => assertPickVersionIsTarget({ ruleId, ruleUpgradeSpecifier })).toThrow();
     });
   });
 });

x-pack/solutions/security/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/revert_prebuilt_rule/revert_prebuilt_rule_handler.ts

@@ -48,7 +48,7 @@ export const revertPrebuiltRuleHandler = async (
     const updated: RuleResponse[] = [];
     const errors: BulkActionError[] = [];
 
-    const ruleResponse = await getRuleById({ rulesClient, id });
+    const ruleResponse = await getRuleById({ id, rulesClient });
 
     if (!ruleResponse) {
       errors.push(

x-pack/solutions/security/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/import_rules/route.test.ts

@@ -29,11 +29,11 @@ import {
 import * as createPromiseFromRuleImportStream from '../../../logic/import/create_promise_from_rule_import_stream';
 import { getQueryRuleParams } from '../../../../rule_schema/mocks';
 import { importRulesRoute } from './route';
-import { HttpAuthzError } from '../../../../../machine_learning/validation';
 import { createPrebuiltRuleAssetsClient as createPrebuiltRuleAssetsClientMock } from '../../../../prebuilt_rules/logic/rule_assets/__mocks__/prebuilt_rule_assets_client';
 import { createMockEndpointAppContextService } from '../../../../../../endpoint/mocks';
 
 jest.mock('../../../../../machine_learning/authz');
+jest.mock('@kbn/streamlang');
 
 let mockPrebuiltRuleAssetsClient: ReturnType<typeof createPrebuiltRuleAssetsClientMock>;
 
@@ -45,7 +45,7 @@ jest.mock('../../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_cli
 // We have to find a way to use original detectionRulesClient.importRules() while mocking detectionRulesClient.importRule().
 // detectionRulesClient.importRules() uses detectionRulesClient.importRule() under the hood.
 // Without proper mocking this test suite will test the mock.
-describe.skip('Import rules route', () => {
+describe('Import rules route', () => {
   let config: ReturnType<typeof configMock.createDefault>;
   let server: ReturnType<typeof serverMock.create>;
   let request: ReturnType<typeof requestMock.create>;
@@ -63,7 +63,6 @@ describe.skip('Import rules route', () => {
     clients.rulesClient.find.mockResolvedValue(getEmptyFindResult()); // no extant rules
     clients.rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
     clients.detectionRulesClient.createCustomRule.mockResolvedValue(getRulesSchemaMock());
-    clients.detectionRulesClient.importRule.mockResolvedValue(getRulesSchemaMock());
     clients.actionsClient.getAll.mockResolvedValue([]);
     context.core.elasticsearch.client.asCurrentUser.search.mockResolvedValue(
       elasticsearchClientMock.createSuccessTransportRequestPromise(getBasicEmptySearchResponse())
@@ -106,10 +105,6 @@ describe.skip('Import rules route', () => {
 
   describe('unhappy paths', () => {
     test('returns a 403 error object if ML Authz fails', async () => {
-      clients.detectionRulesClient.importRule.mockImplementationOnce(async () => {
-        throw new HttpAuthzError('mocked validation message');
-      });
-
       const response = await server.inject(request, requestContextMock.convertContext(context));
 
       expect(response.status).toEqual(200);
@@ -233,10 +228,6 @@ describe.skip('Import rules route', () => {
     describe('rule with existing rule_id', () => {
       test('returns with reported conflict if `overwrite` is set to `false`', async () => {
         clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit()); // extant rule
-        clients.detectionRulesClient.importRule.mockRejectedValue({
-          message: 'Rule with this rule_id already exists',
-          statusCode: 409,
-        });
         const response = await server.inject(request, requestContextMock.convertContext(context));
 
         expect(response.status).toEqual(200);
@@ -449,10 +440,6 @@ describe.skip('Import rules route', () => {
       });
 
       test('returns with reported conflict if `overwrite` is set to `false`', async () => {
-        clients.detectionRulesClient.importRule.mockRejectedValueOnce({
-          message: 'Rule with this rule_id already exists',
-          statusCode: 409,
-        });
         const multiRequest = getImportRulesRequest(
           buildHapiStream(ruleIdsToNdJsonString(['rule-1', 'rule-2', 'rule-3']))
         );

x-pack/solutions/security/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.change_tracking.test.ts

@@ -11,7 +11,10 @@ import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { licenseMock } from '@kbn/licensing-plugin/common/licensing.mock';
 
 import { SecurityRuleChangeTrackingAction } from '../../../../../../common/detection_engine/rule_management/rule_change_tracking';
-import { getCreateRulesSchemaMock, getRulesSchemaMock } from '../../../../../../common/api/detection_engine/model/rule_schema/mocks';
+import {
+  getCreateRulesSchemaMock,
+  getRulesSchemaMock,
+} from '../../../../../../common/api/detection_engine/model/rule_schema/mocks';
 import { getImportRulesSchemaMock } from '../../../../../../common/api/detection_engine/rule_management/mocks';
 import { getRuleMock } from '../../../routes/__mocks__/request_responses';
 import { getQueryRuleParams } from '../../../rule_schema/mocks';
@@ -117,7 +120,6 @@ describe('DetectionRulesClient change tracking', () => {
         })
       );
     });
-
   });
 
   describe('changeTracking.bulkCount', () => {

x-pack/solutions/security/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_prebuilt_rule.test.ts

@@ -8,7 +8,7 @@
 import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import type { ActionsClient } from '@kbn/actions-plugin/server';
 import { SecurityRuleChangeTrackingAction } from '../../../../../../common/detection_engine/rule_management/rule_change_tracking';
-
+import type { RuleCreateProps } from '../../../../../../common/api/detection_engine/model/rule_schema';
 import {
   getCreateRulesSchemaMock,
   getCreateMachineLearningRulesSchemaMock,
@@ -32,12 +32,10 @@ describe('createPrebuiltRule behavior (via createRule with prebuilt params)', ()
     isSystemAction: jest.fn(() => false),
   } as unknown as jest.Mocked<ActionsClient>;
 
-  const callCreatePrebuiltRule = (params: Parameters<typeof createRule>[0]['rule']) =>
+  const callCreatePrebuiltRule = (params: RuleCreateProps) =>
     createRule({
-      actionsClient,
-      rulesClient,
-      mlAuthz,
       rule: { ...params, immutable: true },
+      deps: { actionsClient, rulesClient, mlAuthz },
       changeTracking: { action: SecurityRuleChangeTrackingAction.ruleInstall },
     });