undid some of the type moves into common that werent needed, cleaning up PR a bit

Author: yctercero

x-pack/plugins/security_solution/common/detection_engine/types.ts

@@ -53,57 +53,3 @@ export interface EqlSearchResponse<T> {
     events?: Array<BaseHit<T>>;
   };
 }
-
-export interface ShardsResponse {
-  total: number;
-  successful: number;
-  failed: number;
-  skipped: number;
-  failures?: ShardError[];
-}
-
-export interface ShardError {
-  shard: number;
-  index: string;
-  node: string;
-  reason: {
-    type: string;
-    reason: string;
-    index_uuid: string;
-    index: string;
-    caused_by: {
-      type: string;
-      reason: string;
-    };
-  };
-}
-
-export interface SearchResponse<T> {
-  took: number;
-  timed_out: boolean;
-  _scroll_id?: string;
-  _shards: ShardsResponse;
-  hits: {
-    total: TotalValue | number;
-    max_score: number;
-    hits: Array<
-      BaseHit<T> & {
-        _type: string;
-        _score: number;
-        _version?: number;
-        _explanation?: Explanation;
-        fields?: string[];
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        highlight?: any;
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        inner_hits?: any;
-        matched_queries?: string[];
-        sort?: string[];
-      }
-    >;
-  };
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  aggregations?: any;
-}
-
-export type SearchHit = SearchResponse<object>['hits']['hits'][0];

x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_responses.ts

@@ -17,6 +17,7 @@ import {
   DETECTION_ENGINE_PREPACKAGED_URL,
   DETECTION_ENGINE_EQL_VALIDATION_URL,
 } from '../../../../../common/constants';
+import { ShardsResponse } from '../../../types';
 import {
   RuleAlertType,
   IRuleSavedAttributesSavedObjectAttributes,
@@ -29,7 +30,7 @@ import { SetSignalsStatusSchemaDecoded } from '../../../../../common/detection_e
 import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/create_rules_schema.mock';
 import { getListArrayMock } from '../../../../../common/detection_engine/schemas/types/lists.mock';
 import { getEqlValidationSchemaMock } from '../../../../../common/detection_engine/schemas/request/eql_validation_schema.mock';
-import { EqlSearchResponse, ShardsResponse } from '../../../../../common/detection_engine/types';
+import { EqlSearchResponse } from '../../../../../common/detection_engine/types';
 
 export const typicalSetStatusSignalByIdsPayload = (): SetSignalsStatusSchemaDecoded => ({
   signal_ids: ['somefakeid1', 'somefakeid2'],

x-pack/plugins/security_solution/server/lib/detection_engine/signals/single_search_after.test.ts

@@ -11,8 +11,8 @@ import {
 } from './__mocks__/es_results';
 import { singleSearchAfter } from './single_search_after';
 import { alertsMock, AlertServicesMock } from '../../../../../alerts/server/mocks';
+import { ShardError } from '../../types';
 import { buildRuleMessageFactory } from './rule_messages';
-import { ShardError } from '../../../../common/detection_engine/types';
 
 const buildRuleMessage = buildRuleMessageFactory({
   id: 'fake id',

x-pack/plugins/security_solution/server/lib/detection_engine/signals/types.ts

@@ -14,8 +14,8 @@ import {
   AlertExecutorOptions,
   AlertServices,
 } from '../../../../../alerts/server';
+import { SearchResponse } from '../../types';
 import {
-  SearchResponse,
   EqlSearchResponse,
   BaseHit,
   RuleAlertAction,

x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts

@@ -46,7 +46,7 @@ import {
   sampleDocSearchResultsNoSortIdNoHits,
   repeatedSearchResultsWithSortId,
 } from './__mocks__/es_results';
-import { ShardError } from '../../../../common/detection_engine/types';
+import { ShardError } from '../../types';
 
 const buildRuleMessage = buildRuleMessageFactory({
   id: 'fake id',

x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts

@@ -26,7 +26,8 @@ import { BuildRuleMessage } from './rule_messages';
 import { parseScheduleDates } from '../../../../common/detection_engine/parse_schedule_dates';
 import { hasLargeValueList } from '../../../../common/detection_engine/utils';
 import { MAX_EXCEPTION_LIST_SIZE } from '../../../../../lists/common/constants';
-import { ShardError } from '../../../../common/detection_engine/types';
+import { ShardError } from '../../types';
+
 interface SortExceptionsReturn {
   exceptionsWithValueLists: ExceptionListItemSchema[];
   exceptionsWithoutValueLists: ExceptionListItemSchema[];

x-pack/plugins/security_solution/server/lib/hosts/types.ts

@@ -17,8 +17,8 @@ import {
   DocValueFieldsInput,
 } from '../../graphql/types';
 import { FrameworkRequest, RequestOptionsPaginated } from '../framework';
-import { Hit, Hits } from '../types';
-import { SearchHit, TotalValue } from '../../../common/detection_engine/types';
+import { Hit, Hits, SearchHit } from '../types';
+import { TotalValue } from '../../../common/detection_engine/types';
 
 export interface HostsAdapter {
   getHosts(req: FrameworkRequest, options: HostsRequestOptions): Promise<HostsData>;

x-pack/plugins/security_solution/server/lib/types.ts

@@ -16,6 +16,7 @@ import { Sources } from './sources';
 import { Note } from './note/saved_object';
 import { PinnedEvent } from './pinned_event/saved_object';
 import { Timeline } from './timeline/saved_object';
+import { TotalValue, BaseHit, Explanation } from '../../common/detection_engine/types';
 
 export * from './hosts';
 
@@ -39,6 +40,60 @@ export interface SiemContext {
   user: AuthenticatedUser | null;
 }
 
+export interface ShardsResponse {
+  total: number;
+  successful: number;
+  failed: number;
+  skipped: number;
+  failures?: ShardError[];
+}
+
+export interface ShardError {
+  shard: number;
+  index: string;
+  node: string;
+  reason: {
+    type: string;
+    reason: string;
+    index_uuid: string;
+    index: string;
+    caused_by: {
+      type: string;
+      reason: string;
+    };
+  };
+}
+
+export interface SearchResponse<T> {
+  took: number;
+  timed_out: boolean;
+  _scroll_id?: string;
+  _shards: ShardsResponse;
+  hits: {
+    total: TotalValue | number;
+    max_score: number;
+    hits: Array<
+      BaseHit<T> & {
+        _type: string;
+        _score: number;
+        _version?: number;
+        _explanation?: Explanation;
+        fields?: string[];
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        highlight?: any;
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        inner_hits?: any;
+        matched_queries?: string[];
+        sort?: string[];
+      }
+    >;
+  };
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  aggregations?: any;
+}
+
+export type SearchHit = SearchResponse<object>['hits']['hits'][0];
+
 export interface TermAggregation {
   [agg: string]: {
     buckets: Array<{