From b301d84b3eed1768cf73de6384ad0fd852187f88 Mon Sep 17 00:00:00 2001
From: FrankHassanabad <frank.hassanabad@elastic.co>
Date: Fri, 4 Jun 2021 11:11:18 -0600
Subject: [PATCH] Removed optional parameter and fixed tests to operate with it
 _not_ optional

---
 .../lib/detection_engine/signals/build_events_query.ts |  4 +---
 .../signals/single_search_after.test.ts                | 10 +++++-----
 .../detection_engine/signals/single_search_after.ts    |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
index 123b7cbb3b591d..04144395803619 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
@@ -17,7 +17,7 @@ interface BuildEventsSearchQuery {
   index: string[];
   from: string;
   to: string;
-  filter?: estypes.QueryContainer;
+  filter: estypes.QueryContainer;
   size: number;
   sortOrder?: SortOrderOrUndefined;
   searchAfterSortIds: SortResults | undefined;
@@ -94,8 +94,6 @@ export const buildEventsSearchQuery = ({
         ];
 
   const filterWithTime: estypes.QueryContainer[] = [
-    // but tests contain undefined, so I suppose it's desired behavior
-    // @ts-expect-error undefined in not assignable to QueryContainer
     filter,
     { bool: { filter: [{ bool: { should: [...rangeFilter], minimum_should_match: 1 } }] } },
   ];
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
index a40459d312b9f5..a67016491aaefe 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts
@@ -41,7 +41,7 @@ describe('singleSearchAfter', () => {
       services: mockService,
       logger: mockLogger,
       pageSize: 1,
-      filter: undefined,
+      filter: {},
       timestampOverride: undefined,
       buildRuleMessage,
     });
@@ -59,7 +59,7 @@ describe('singleSearchAfter', () => {
       services: mockService,
       logger: mockLogger,
       pageSize: 1,
-      filter: undefined,
+      filter: {},
       timestampOverride: undefined,
       buildRuleMessage,
     });
@@ -109,7 +109,7 @@ describe('singleSearchAfter', () => {
       services: mockService,
       logger: mockLogger,
       pageSize: 1,
-      filter: undefined,
+      filter: {},
       timestampOverride: undefined,
       buildRuleMessage,
     });
@@ -132,7 +132,7 @@ describe('singleSearchAfter', () => {
       services: mockService,
       logger: mockLogger,
       pageSize: 1,
-      filter: undefined,
+      filter: {},
       timestampOverride: undefined,
       buildRuleMessage,
     });
@@ -152,7 +152,7 @@ describe('singleSearchAfter', () => {
         services: mockService,
         logger: mockLogger,
         pageSize: 1,
-        filter: undefined,
+        filter: {},
         timestampOverride: undefined,
         buildRuleMessage,
       })
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
index 57ed05bcb27cff..ae22964eced927 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.ts
@@ -32,7 +32,7 @@ interface SingleSearchAfterParams {
   logger: Logger;
   pageSize: number;
   sortOrder?: SortOrderOrUndefined;
-  filter?: estypes.QueryContainer;
+  filter: estypes.QueryContainer;
   timestampOverride: TimestampOverrideOrUndefined;
   buildRuleMessage: BuildRuleMessage;
 }