fixes after merging main

elastic · Dec 1, 2021 · dc24afd · dc24afd
1 parent 44cb2b3
commit dc24afd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.test.ts b/x-pack/plugins/rule_registry/server/utils/create_lifecycle_executor.test.ts
@@ -31,6 +31,7 @@ describe('createLifecycleExecutor', () => {
   it('wraps and unwraps the original executor state', async () => {
     const logger = loggerMock.create();
     const ruleDataClientMock = createRuleDataClientMock();
+    // @ts-ignore 4.3.5 upgrade - Expression produces a union type that is too complex to represent.ts(2590)
     const executor = createLifecycleExecutor(
       logger,
       ruleDataClientMock

diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
@@ -29,9 +29,10 @@ export const securitySolutionSearchStrategyProvider = <T extends FactoryQueryTyp
 
   return {
     search: (request, options, deps) => {
-      if (request.factoryQueryType == null) {
+      if (!('factoryQueryType' in request) || request.factoryQueryType == null) {
         throw new Error('factoryQueryType is required');
       }
+
       const queryFactory: SecuritySolutionFactory<T> =
         securitySolutionFactory[request.factoryQueryType];
       const dsl = queryFactory.buildDsl(request);