Fix SavedObjectClient find method arguments

elastic · Oct 19, 2021 · 92f6140 · 92f6140
1 parent 77453f3
commit 92f6140
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/...gins/security_solution/cypress/integration/detection_alerts/building_block_alerts.spec.ts b/...gins/security_solution/cypress/integration/detection_alerts/building_block_alerts.spec.ts
@@ -8,19 +8,23 @@
 import { getBuildingBlockRule } from '../../objects/rule';
 import { OVERVIEW_ALERTS_HISTOGRAM } from '../../screens/overview';
 import { OVERVIEW } from '../../screens/security_header';
+import { waitForAlertsIndexToBeCreated, waitForAlertsPanelToBeLoaded } from '../../tasks/alerts';
 import { goToRuleDetails } from '../../tasks/alerts_detection_rules';
 import { createCustomRuleActivated } from '../../tasks/api_calls/rules';
 import { cleanKibana } from '../../tasks/common';
 import { waitForAlertsToPopulate, waitForTheRuleToBeExecuted } from '../../tasks/create_new_rule';
-import { loginAndWaitForPage } from '../../tasks/login';
+import { loginAndWaitForPage, loginAndWaitForPageWithoutDateRange } from '../../tasks/login';
 import { navigateFromHeaderTo } from '../../tasks/security_header';
-import { DETECTIONS_RULE_MANAGEMENT_URL } from '../../urls/navigation';
+import { ALERTS_URL, DETECTIONS_RULE_MANAGEMENT_URL } from '../../urls/navigation';
 
 const EXPECTED_NUMBER_OF_ALERTS = 16;
 
 describe('Alerts generated by building block rules', () => {
   beforeEach(() => {
     cleanKibana();
+    loginAndWaitForPageWithoutDateRange(ALERTS_URL);
+    waitForAlertsPanelToBeLoaded();
+    waitForAlertsIndexToBeCreated();
   });
 
   it('Alerts should be visible on the Rule Detail page and not visible on the Overview page', () => {

diff --git a/...ction_engine/rule_execution_log/saved_objects_adapter/rule_status_saved_objects_client.ts b/...ction_engine/rule_execution_log/saved_objects_adapter/rule_status_saved_objects_client.ts
@@ -21,7 +21,7 @@ import { IRuleStatusSOAttributes } from '../../rules/types';
 
 export interface RuleStatusSavedObjectsClient {
   find: (
-    options?: Omit<SavedObjectsFindOptions, 'type'>
+    options: Omit<SavedObjectsFindOptions, 'type'> & { ruleId: string }
   ) => Promise<Array<SavedObjectsFindResult<IRuleStatusSOAttributes>>>;
   findBulk: (ids: string[], statusesPerId: number) => Promise<FindBulkResponse>;
   create: (
@@ -47,9 +47,14 @@ export const ruleStatusSavedObjectsClientFactory = (
   savedObjectsClient: SavedObjectsClientContract
 ): RuleStatusSavedObjectsClient => ({
   find: async (options) => {
+    const references = {
+      id: options.ruleId,
+      type: 'alert',
+    };
     const result = await savedObjectsClient.find<IRuleStatusSOAttributes>({
       ...options,
       type: legacyRuleStatusSavedObjectType,
+      hasReference: references,
     });
     return result.saved_objects;
   },

diff --git a/...er/lib/detection_engine/rule_execution_log/saved_objects_adapter/saved_objects_adapter.ts b/...er/lib/detection_engine/rule_execution_log/saved_objects_adapter/saved_objects_adapter.ts
@@ -53,8 +53,7 @@ export class SavedObjectsAdapter implements IRuleExecutionLogClient {
       perPage: logsCount,
       sortField: 'statusDate',
       sortOrder: 'desc',
-      search: ruleId,
-      searchFields: ['references.id'],
+      ruleId,
     });
   }