Cleanup after ExecLog integration (#107695)

elastic · Aug 24, 2021 · 1f73c0f · 1f73c0f
1 parent dc9da8e
commit 1f73c0f
Show file tree

Hide file tree

Showing 35 changed files with 579 additions and 888 deletions.
diff --git a/packages/kbn-securitysolution-io-ts-types/src/enumeration/index.ts b/packages/kbn-securitysolution-io-ts-types/src/enumeration/index.ts
@@ -8,6 +8,14 @@
 
 import * as t from 'io-ts';
 
+/**
+ * Converts string value to a Typescript enum
+ *  - "foo" -> MyEnum.foo
+ *
+ * @param name Enum name
+ * @param originalEnum Typescript enum
+ * @returns Codec
+ */
 export function enumeration<EnumType extends string>(
   name: string,
   originalEnum: Record<string, EnumType>

diff --git a/x-pack/plugins/security_solution/common/utils/invariant.ts b/x-pack/plugins/security_solution/common/utils/invariant.ts
@@ -6,7 +6,7 @@
  */
 
 export class InvariantError extends Error {
-  name = 'Invariant violation';
+  name = 'InvariantError';
 }
 
 /**

diff --git a/...plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/...plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
@@ -14,14 +14,14 @@ import {
 import { rulesClientMock } from '../../../../../../alerting/server/mocks';
 import { licensingMock } from '../../../../../../licensing/server/mocks';
 import { siemMock } from '../../../../mocks';
-import { RuleExecutionLogClient } from '../../rule_execution_log/__mocks__/rule_execution_log_client';
+import { ruleExecutionLogClientMock } from '../../rule_execution_log/__mocks__/rule_execution_log_client';
 
 const createMockClients = () => ({
   rulesClient: rulesClientMock.create(),
   licensing: { license: licensingMock.createLicenseMock() },
   clusterClient: elasticsearchServiceMock.createScopedClusterClient(),
   savedObjectsClient: savedObjectsClientMock.create(),
-  ruleExecutionLogClient: new RuleExecutionLogClient(),
+  ruleExecutionLogClient: ruleExecutionLogClientMock.create(),
   appClient: siemMock.createClient(),
 });
 

diff --git a/...ugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts b/...ugins/security_solution/server/lib/detection_engine/routes/rules/find_rules_route.test.ts
@@ -17,7 +17,6 @@ import {
 } from '../__mocks__/request_responses';
 import { findRulesRoute } from './find_rules_route';
 
-jest.mock('../../signals/rule_status_service');
 describe('find_rules', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();

diff --git a/...ecurity_solution/server/lib/detection_engine/routes/rules/find_rules_status_route.test.ts b/...ecurity_solution/server/lib/detection_engine/routes/rules/find_rules_status_route.test.ts
@@ -17,8 +17,6 @@ import { RuleStatusResponse } from '../../rules/types';
 import { AlertExecutionStatusErrorReasons } from '../../../../../../alerting/common';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
 
-jest.mock('../../signals/rule_status_service');
-
 describe('find_statuses', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();

diff --git a/...ion/server/lib/detection_engine/rule_execution_log/__mocks__/rule_execution_log_client.ts b/...ion/server/lib/detection_engine/rule_execution_log/__mocks__/rule_execution_log_client.ts
@@ -7,16 +7,17 @@
 
 import { IRuleExecutionLogClient } from '../types';
 
+export const ruleExecutionLogClientMock = {
+  create: (): jest.Mocked<IRuleExecutionLogClient> => ({
+    find: jest.fn(),
+    findBulk: jest.fn(),
+    update: jest.fn(),
+    delete: jest.fn(),
+    logStatusChange: jest.fn(),
+    logExecutionMetric: jest.fn(),
+  }),
+};
+
 export const RuleExecutionLogClient = jest
   .fn<jest.Mocked<IRuleExecutionLogClient>, []>()
-  .mockImplementation(() => {
-    return {
-      find: jest.fn(),
-      findBulk: jest.fn(),
-      create: jest.fn(),
-      update: jest.fn(),
-      delete: jest.fn(),
-      logStatusChange: jest.fn(),
-      logExecutionMetric: jest.fn(),
-    };
-  });
+  .mockImplementation(ruleExecutionLogClientMock.create);
diff --git a/...solution/server/lib/detection_engine/rule_execution_log/adapters/saved_objects_adapter.ts b/...solution/server/lib/detection_engine/rule_execution_log/adapters/saved_objects_adapter.ts
diff --git a/...rity_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts b/...rity_solution/server/lib/detection_engine/rule_execution_log/rule_execution_log_client.ts
@@ -6,10 +6,9 @@
  */
 
 import { SavedObjectsClientContract } from '../../../../../../../src/core/server';
-import { RuleRegistryAdapter } from './adapters/rule_registry_adapter';
-import { SavedObjectsAdapter } from './adapters/saved_objects_adapter';
+import { RuleRegistryAdapter } from './rule_registry_adapter/rule_registry_adapter';
+import { SavedObjectsAdapter } from './saved_objects_adapter/saved_objects_adapter';
 import {
-  CreateExecutionLogArgs,
   ExecutionMetric,
   ExecutionMetricArgs,
   FindBulkExecutionLogArgs,
@@ -46,10 +45,6 @@ export class RuleExecutionLogClient implements IRuleExecutionLogClient {
     return this.client.findBulk(args);
   }
 
-  public async create(args: CreateExecutionLogArgs) {
-    return this.client.create(args);
-  }
-
   public async update(args: UpdateExecutionLogArgs) {
     return this.client.update(args);
   }

diff --git a/...ion_log/adapters/rule_registry_adapter.ts → ...registry_adapter/rule_registry_adapter.ts b/...ion_log/adapters/rule_registry_adapter.ts → ...registry_adapter/rule_registry_adapter.ts
@@ -7,7 +7,7 @@
 
 import { merge } from 'lodash';
 import { RuleExecutionStatus } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { RuleRegistryLogClient } from '../rule_registry_log_client/rule_registry_log_client';
+import { RuleRegistryLogClient } from './rule_registry_log_client/rule_registry_log_client';
 import {
   CreateExecutionLogArgs,
   ExecutionMetric,
@@ -59,7 +59,7 @@ export class RuleRegistryAdapter implements IRuleExecutionLogClient {
     return merge(statusesById, lastErrorsById);
   }
 
-  public async create({ attributes, spaceId }: CreateExecutionLogArgs) {
+  private async create({ attributes, spaceId }: CreateExecutionLogArgs) {
     if (attributes.status) {
       await this.ruleRegistryClient.logStatusChange({
         ruleId: attributes.alertId,
@@ -85,14 +85,6 @@ export class RuleRegistryAdapter implements IRuleExecutionLogClient {
         spaceId,
       });
     }
-
-    return {
-      id: '',
-      type: '',
-      score: 0,
-      attributes,
-      references: [],
-    };
   }
 
   public async update({ attributes, spaceId }: UpdateExecutionLogArgs) {

diff --git a/...log/rule_registry_log_client/constants.ts → ...ter/rule_registry_log_client/constants.ts b/...log/rule_registry_log_client/constants.ts → ...ter/rule_registry_log_client/constants.ts
diff --git a/...ry_log_client/parse_rule_execution_log.ts → ...ry_log_client/parse_rule_execution_log.ts b/...ry_log_client/parse_rule_execution_log.ts → ...ry_log_client/parse_rule_execution_log.ts
@@ -7,11 +7,11 @@
 
 import { isLeft } from 'fp-ts/lib/Either';
 import { PathReporter } from 'io-ts/lib/PathReporter';
-import { technicalRuleFieldMap } from '../../../../../../rule_registry/common/assets/field_maps/technical_rule_field_map';
+import { technicalRuleFieldMap } from '../../../../../../../rule_registry/common/assets/field_maps/technical_rule_field_map';
 import {
   mergeFieldMaps,
   runtimeTypeFromFieldMap,
-} from '../../../../../../rule_registry/common/field_map';
+} from '../../../../../../../rule_registry/common/field_map';
 import { ruleExecutionFieldMap } from './rule_execution_field_map';
 
 const ruleExecutionLogRuntimeType = runtimeTypeFromFieldMap(

diff --git a/...ry_log_client/rule_execution_field_map.ts → ...ry_log_client/rule_execution_field_map.ts b/...ry_log_client/rule_execution_field_map.ts → ...ry_log_client/rule_execution_field_map.ts
diff --git a/...ry_log_client/rule_registry_log_client.ts → ...ry_log_client/rule_registry_log_client.ts b/...ry_log_client/rule_registry_log_client.ts → ...ry_log_client/rule_registry_log_client.ts
@@ -17,19 +17,19 @@ import {
 } from '@kbn/rule-data-utils';
 import moment from 'moment';
 
-import { mappingFromFieldMap } from '../../../../../../rule_registry/common/mapping_from_field_map';
-import { Dataset, IRuleDataClient } from '../../../../../../rule_registry/server';
-import { SERVER_APP_ID } from '../../../../../common/constants';
-import { RuleExecutionStatus } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { invariant } from '../../../../../common/utils/invariant';
-import { IRuleStatusSOAttributes } from '../../rules/types';
-import { makeFloatString } from '../../signals/utils';
+import { mappingFromFieldMap } from '../../../../../../../rule_registry/common/mapping_from_field_map';
+import { Dataset, IRuleDataClient } from '../../../../../../../rule_registry/server';
+import { SERVER_APP_ID } from '../../../../../../common/constants';
+import { RuleExecutionStatus } from '../../../../../../common/detection_engine/schemas/common/schemas';
+import { invariant } from '../../../../../../common/utils/invariant';
+import { IRuleStatusSOAttributes } from '../../../rules/types';
+import { makeFloatString } from '../../../signals/utils';
 import {
   ExecutionMetric,
   ExecutionMetricArgs,
   IRuleDataPluginService,
   LogStatusChangeArgs,
-} from '../types';
+} from '../../types';
 import { EVENT_SEQUENCE, MESSAGE, RULE_STATUS, RULE_STATUS_SEVERITY } from './constants';
 import { parseRuleExecutionLog, RuleExecutionEvent } from './parse_rule_execution_log';
 import { ruleExecutionFieldMap } from './rule_execution_field_map';

diff --git a/...ion_log/rule_registry_log_client/utils.ts → ...adapter/rule_registry_log_client/utils.ts b/...ion_log/rule_registry_log_client/utils.ts → ...adapter/rule_registry_log_client/utils.ts
@@ -7,8 +7,8 @@
 
 import { SearchSort } from '@elastic/elasticsearch/api/types';
 import { EVENT_ACTION, TIMESTAMP } from '@kbn/rule-data-utils';
-import { RuleExecutionStatus } from '../../../../../common/detection_engine/schemas/common/schemas';
-import { ExecutionMetric } from '../types';
+import { RuleExecutionStatus } from '../../../../../../common/detection_engine/schemas/common/schemas';
+import { ExecutionMetric } from '../../types';
 import { RULE_STATUS, EVENT_SEQUENCE, EVENT_DURATION, EVENT_END } from './constants';
 
 const METRIC_FIELDS = {

diff --git a/...gnals/rule_status_saved_objects_client.ts → ...apter/rule_status_saved_objects_client.ts b/...gnals/rule_status_saved_objects_client.ts → ...apter/rule_status_saved_objects_client.ts
@@ -12,10 +12,10 @@ import {
   SavedObjectsUpdateResponse,
   SavedObjectsFindOptions,
   SavedObjectsFindResult,
-} from '../../../../../../../src/core/server';
-import { ruleStatusSavedObjectType } from '../rules/saved_object_mappings';
-import { IRuleStatusSOAttributes } from '../rules/types';
-import { buildChunkedOrFilter } from './utils';
+} from '../../../../../../../../src/core/server';
+import { ruleStatusSavedObjectType } from '../../rules/saved_object_mappings';
+import { IRuleStatusSOAttributes } from '../../rules/types';
+import { buildChunkedOrFilter } from '../../signals/utils';
 
 export interface RuleStatusSavedObjectsClient {
   find: (