fixes type check issues

elastic · May 5, 2020 · a4ba0b3 · a4ba0b3
1 parent 80c23cc
commit a4ba0b3
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 31 deletions.
diff --git a/x-pack/plugins/lists/server/plugin.ts b/x-pack/plugins/lists/server/plugin.ts
@@ -5,7 +5,7 @@
  */
 
 import { first } from 'rxjs/operators';
-import { Logger, PluginInitializerContext } from 'kibana/server';
+import { APICaller, KibanaRequest, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
 import { CoreSetup } from 'src/core/server';
 
 import { SecurityPluginSetup } from '../../security/server';
@@ -36,7 +36,7 @@ export class ListPlugin
     this.logger = this.initializerContext.logger.get();
   }
 
-  public async setup(core: CoreSetup, plugins: PluginsSetup): Promise<void> {
+  public async setup(core: CoreSetup, plugins: PluginsSetup): Promise<ListPluginSetup> {
     const config = await createConfig$(this.initializerContext)
       .pipe(first())
       .toPromise();
@@ -55,15 +55,17 @@ export class ListPlugin
       getListClient: (apiCaller, spaceId): ListClient => {
         // create adapter for apicaller / dataclient and space / space id
         // just fake the request object with the spaceid on it.
+        const request: KibanaRequest = {
+          url: { path: `/s/${spaceId}/app/kibana` },
+        } as KibanaRequest;
         if (this.security != null) {
           return new ListClient({
-            apiCaller,
+            callCluster: apiCaller,
             config,
-            dataClient: undefined,
-            request: undefined,
+            request,
             security: this.security,
             spaceId,
-            spaces: this.spaces,
+            user: 'elastic',
           });
         }
         throw new TypeError('Security plugin is required for this plugin to operate');

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts b/x-pack/plugins/siem/server/lib/detection_engine/signals/bulk_create_ml_signals.ts
@@ -86,5 +86,5 @@ export const bulkCreateMlSignals = async (
   const anomalyResults = params.someResult;
   const ecsResults = transformAnomalyResultsToEcs(anomalyResults);
 
-  return singleBulkCreate({ ...params, someResult: ecsResults });
+  return singleBulkCreate({ ...params, filteredEvents: ecsResults });
 };
diff --git a/x-pack/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.test.ts
@@ -12,12 +12,12 @@ import {
   repeatedSearchResultsWithSortId,
   sampleBulkCreateDuplicateResult,
   sampleDocSearchResultsNoSortId,
-  sampleDocSearchResultsNoSortIdNoHits,
 } from './__mocks__/es_results';
 import { searchAfterAndBulkCreate } from './search_after_bulk_create';
 import { DEFAULT_SIGNALS_INDEX } from '../../../../common/constants';
 import { alertsMock, AlertServicesMock } from '../../../../../alerting/server/mocks';
 import uuid from 'uuid';
+import { ListClient } from '../../../../../lists/server/services/lists/client';
 
 describe('searchAfterAndBulkCreate', () => {
   let mockService: AlertServicesMock;
@@ -33,7 +33,8 @@ describe('searchAfterAndBulkCreate', () => {
     const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({
       ruleParams: sampleParams,
       services: mockService,
-      listClient: () => undefined,
+      listClient: ((() => []) as unknown) as ListClient,
+      listValueType: 'ip',
       logger: mockLogger,
       id: sampleRuleGuid,
       inputIndexPattern,
@@ -107,8 +108,9 @@ describe('searchAfterAndBulkCreate', () => {
         ],
       });
     const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({
-      someResult: repeatedSearchResultsWithSortId(3, 1, someGuids.slice(6, 9)),
       ruleParams: sampleParams,
+      listClient: ((() => []) as unknown) as ListClient,
+      listValueType: 'ip',
       services: mockService,
       logger: mockLogger,
       id: sampleRuleGuid,
@@ -135,11 +137,11 @@ describe('searchAfterAndBulkCreate', () => {
   });
 
   test('if unsuccessful first bulk create', async () => {
-    const someGuids = Array.from({ length: 4 }).map(x => uuid.v4());
     const sampleParams = sampleRuleAlertParams(10);
     mockService.callCluster.mockResolvedValue(sampleBulkCreateDuplicateResult);
     const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({
-      someResult: repeatedSearchResultsWithSortId(4, 1, someGuids),
+      listClient: ((() => []) as unknown) as ListClient,
+      listValueType: 'ip',
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -183,7 +185,8 @@ describe('searchAfterAndBulkCreate', () => {
       ],
     });
     const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({
-      someResult: sampleDocSearchResultsNoSortId(),
+      listClient: ((() => []) as unknown) as ListClient,
+      listValueType: 'ip',
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -227,7 +230,8 @@ describe('searchAfterAndBulkCreate', () => {
       ],
     });
     const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({
-      someResult: sampleDocSearchResultsNoSortIdNoHits(),
+      listClient: ((() => []) as unknown) as ListClient,
+      listValueType: 'ip',
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -255,7 +259,6 @@ describe('searchAfterAndBulkCreate', () => {
 
   test('if successful iteration of while loop with maxDocs and search after returns results with no sort ids', async () => {
     const sampleParams = sampleRuleAlertParams(10);
-    const someGuids = Array.from({ length: 4 }).map(x => uuid.v4());
     mockService.callCluster
       .mockResolvedValueOnce({
         took: 100,
@@ -273,7 +276,8 @@ describe('searchAfterAndBulkCreate', () => {
       })
       .mockResolvedValueOnce(sampleDocSearchResultsNoSortId());
     const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({
-      someResult: repeatedSearchResultsWithSortId(4, 1, someGuids),
+      listClient: ((() => []) as unknown) as ListClient,
+      listValueType: 'ip',
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -301,7 +305,6 @@ describe('searchAfterAndBulkCreate', () => {
 
   test('if successful iteration of while loop with maxDocs and search after returns empty results with no sort ids', async () => {
     const sampleParams = sampleRuleAlertParams(10);
-    const someGuids = Array.from({ length: 4 }).map(x => uuid.v4());
     mockService.callCluster
       .mockResolvedValueOnce({
         took: 100,
@@ -319,7 +322,8 @@ describe('searchAfterAndBulkCreate', () => {
       })
       .mockResolvedValueOnce(sampleEmptyDocSearchResults());
     const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({
-      someResult: repeatedSearchResultsWithSortId(4, 1, someGuids),
+      listClient: ((() => []) as unknown) as ListClient,
+      listValueType: 'ip',
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -347,7 +351,6 @@ describe('searchAfterAndBulkCreate', () => {
 
   test('if returns false when singleSearchAfter throws an exception', async () => {
     const sampleParams = sampleRuleAlertParams(10);
-    const someGuids = Array.from({ length: 4 }).map(x => uuid.v4());
     mockService.callCluster
       .mockResolvedValueOnce({
         took: 100,
@@ -367,7 +370,8 @@ describe('searchAfterAndBulkCreate', () => {
         throw Error('Fake Error');
       });
     const { success, createdSignalsCount, lastLookBackDate } = await searchAfterAndBulkCreate({
-      someResult: repeatedSearchResultsWithSortId(4, 1, someGuids),
+      listClient: ((() => []) as unknown) as ListClient,
+      listValueType: 'ip',
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts b/x-pack/plugins/siem/server/lib/detection_engine/signals/search_after_bulk_create.ts
@@ -12,7 +12,6 @@ import { Logger } from '../../../../../../../src/core/server';
 import { singleSearchAfter } from './single_search_after';
 import { singleBulkCreate } from './single_bulk_create';
 import { SignalSearchResponse } from './types';
-import { BuildRuleMessage } from './rule_messages';
 import { filterEventsAgainstList } from './filter_events_with_list';
 
 interface SearchAfterAndBulkCreateParams {
@@ -21,7 +20,6 @@ interface SearchAfterAndBulkCreateParams {
   listClient: ListClientType; // for now....
   listValueType: string;
   logger: Logger;
-  buildRuleMessage: BuildRuleMessage;
   id: string;
   inputIndexPattern: string[];
   signalsIndex: string;
@@ -54,7 +52,6 @@ export const searchAfterAndBulkCreate = async ({
   services,
   listClient,
   logger,
-  buildRuleMessage,
   listValueType,
   id,
   inputIndexPattern,

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/plugins/siem/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -219,7 +219,6 @@ export const signalRulesAlertType = ({
             services,
             logger,
             listValueType: 'ip',
-            buildRuleMessage,
             id: alertId,
             inputIndexPattern: inputIndex,
             signalsIndex: outputIndex,

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts b/x-pack/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.test.ts
@@ -141,7 +141,7 @@ describe('singleBulkCreate', () => {
       ],
     });
     const { success, createdItemsCount } = await singleBulkCreate({
-      someResult: sampleDocSearchResultsNoSortId(),
+      filteredEvents: sampleDocSearchResultsNoSortId(),
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -175,7 +175,7 @@ describe('singleBulkCreate', () => {
       ],
     });
     const { success, createdItemsCount } = await singleBulkCreate({
-      someResult: sampleDocSearchResultsNoSortIdNoVersion(),
+      filteredEvents: sampleDocSearchResultsNoSortIdNoVersion(),
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -201,7 +201,7 @@ describe('singleBulkCreate', () => {
     const sampleParams = sampleRuleAlertParams();
     mockService.callCluster.mockResolvedValue(false);
     const { success, createdItemsCount } = await singleBulkCreate({
-      someResult: sampleEmptyDocSearchResults(),
+      filteredEvents: sampleEmptyDocSearchResults(),
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -228,7 +228,7 @@ describe('singleBulkCreate', () => {
     const sampleSearchResult = sampleDocSearchResultsNoSortId;
     mockService.callCluster.mockResolvedValue(sampleBulkCreateDuplicateResult);
     const { success, createdItemsCount } = await singleBulkCreate({
-      someResult: sampleSearchResult(),
+      filteredEvents: sampleSearchResult(),
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -257,7 +257,7 @@ describe('singleBulkCreate', () => {
     const sampleSearchResult = sampleDocSearchResultsNoSortId;
     mockService.callCluster.mockResolvedValue(sampleBulkCreateErrorResult);
     const { success, createdItemsCount } = await singleBulkCreate({
-      someResult: sampleSearchResult(),
+      filteredEvents: sampleSearchResult(),
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,
@@ -352,7 +352,7 @@ describe('singleBulkCreate', () => {
     const sampleParams = sampleRuleAlertParams();
     mockService.callCluster.mockResolvedValue(sampleBulkCreateDuplicateResult);
     const { success, createdItemsCount } = await singleBulkCreate({
-      someResult: sampleDocSearchResultsNoSortId(),
+      filteredEvents: sampleDocSearchResultsNoSortId(),
       ruleParams: sampleParams,
       services: mockService,
       logger: mockLogger,

diff --git a/x-pack/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts b/x-pack/plugins/siem/server/lib/detection_engine/signals/single_bulk_create.ts
@@ -7,7 +7,7 @@
 import { countBy, isEmpty } from 'lodash';
 import { performance } from 'perf_hooks';
 import { AlertServices } from '../../../../../alerting/server';
-import { SignalSearchResponse, BulkResponse, EventSearchResponse } from './types';
+import { SignalSearchResponse, BulkResponse } from './types';
 import { RuleAlertAction } from '../../../../common/detection_engine/types';
 import { RuleTypeParams, RefreshTypes } from '../types';
 import { generateId, makeFloatString, errorAggregator } from './utils';