Skip to content

Commit 8215f29

Browse files
FrankHassanabadFrankHassanabad
committed
Renamed to be shorter and more consumable
1 parent 48e790a commit 8215f29

4 files changed

Lines changed: 16 additions & 19 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
createSearchAfterReturnTypeFromResponse,
1313
createTotalHitsFromSearchResult,
1414
getSignalTimeTuples,
15-
mergeSearchAfterAndBulkCreate,
15+
mergeReturns,
1616
} from './utils';
1717
import { SearchAfterAndBulkCreateParams, SearchAfterAndBulkCreateReturnType } from './types';
1818

@@ -90,7 +90,7 @@ export const searchAfterAndBulkCreate = async ({
9090
pageSize: tuple.maxSignals < pageSize ? Math.ceil(tuple.maxSignals) : pageSize, // maximum number of docs to receive per search result.
9191
timestampOverride: ruleParams.timestampOverride,
9292
});
93-
toReturn = mergeSearchAfterAndBulkCreate([
93+
toReturn = mergeReturns([
9494
toReturn,
9595
createSearchAfterReturnTypeFromResponse({ searchResult }),
9696
createSearchAfterReturnType({
@@ -171,7 +171,7 @@ export const searchAfterAndBulkCreate = async ({
171171
tags,
172172
throttle,
173173
});
174-
toReturn = mergeSearchAfterAndBulkCreate([
174+
toReturn = mergeReturns([
175175
toReturn,
176176
createSearchAfterReturnType({
177177
success: bulkSuccess,
@@ -200,7 +200,7 @@ export const searchAfterAndBulkCreate = async ({
200200
}
201201
} catch (exc: unknown) {
202202
logger.error(buildRuleMessage(`[-] search_after and bulk threw an error ${exc}`));
203-
return mergeSearchAfterAndBulkCreate([
203+
return mergeReturns([
204204
toReturn,
205205
createSearchAfterReturnType({
206206
success: false,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
MAX_RULE_GAP_RATIO,
3434
createErrorsFromShard,
3535
createSearchAfterReturnType,
36-
mergeSearchAfterAndBulkCreate,
36+
mergeReturns,
3737
createSearchAfterReturnTypeFromResponse,
3838
} from './utils';
3939
import { signalParamsSchema } from './signal_params_schema';
@@ -256,7 +256,7 @@ export const signalRulesAlertType = ({
256256
const searchErrors = createErrorsFromShard({
257257
errors: shardFailures,
258258
});
259-
result = mergeSearchAfterAndBulkCreate([
259+
result = mergeReturns([
260260
result,
261261
createSearchAfterReturnType({
262262
success: success && anomalyResults._shards.failed === 0,
@@ -317,7 +317,7 @@ export const signalRulesAlertType = ({
317317
refresh,
318318
tags,
319319
});
320-
result = mergeSearchAfterAndBulkCreate([
320+
result = mergeReturns([
321321
result,
322322
createSearchAfterReturnTypeFromResponse({ searchResult: thresholdResults }),
323323
createSearchAfterReturnType({

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
createErrorsFromShard,
2929
createSearchAfterReturnTypeFromResponse,
3030
createSearchAfterReturnType,
31-
mergeSearchAfterAndBulkCreate,
31+
mergeReturns,
3232
createTotalHitsFromSearchResult,
3333
} from './utils';
3434
import { BulkResponseErrorAggregation, SearchAfterAndBulkCreateReturnType } from './types';
@@ -967,12 +967,9 @@ describe('utils', () => {
967967
});
968968
});
969969

970-
describe('mergeSearchAfterAndBulkCreate', () => {
970+
describe('mergeReturns', () => {
971971
test('it merges a default "prev" and "next" correctly ', () => {
972-
const merged = mergeSearchAfterAndBulkCreate([
973-
createSearchAfterReturnType(),
974-
createSearchAfterReturnType(),
975-
]);
972+
const merged = mergeReturns([createSearchAfterReturnType(), createSearchAfterReturnType()]);
976973
const expected: SearchAfterAndBulkCreateReturnType = {
977974
bulkCreateTimes: [],
978975
createdSignalsCount: 0,
@@ -985,23 +982,23 @@ describe('utils', () => {
985982
});
986983

987984
test('it merges search in with two default search results where "prev" "success" is false correctly', () => {
988-
const { success } = mergeSearchAfterAndBulkCreate([
985+
const { success } = mergeReturns([
989986
createSearchAfterReturnType({ success: false }),
990987
createSearchAfterReturnType(),
991988
]);
992989
expect(success).toEqual(false);
993990
});
994991

995992
test('it merges search in with two default search results where "next" "success" is false correctly', () => {
996-
const { success } = mergeSearchAfterAndBulkCreate([
993+
const { success } = mergeReturns([
997994
createSearchAfterReturnType(),
998995
createSearchAfterReturnType({ success: false }),
999996
]);
1000997
expect(success).toEqual(false);
1001998
});
1002999

10031000
test('it merges search where the lastLookBackDate is the "next" date when given', () => {
1004-
const { lastLookBackDate } = mergeSearchAfterAndBulkCreate([
1001+
const { lastLookBackDate } = mergeReturns([
10051002
createSearchAfterReturnType({
10061003
lastLookBackDate: new Date('2020-08-21T19:21:46.194Z'),
10071004
}),
@@ -1013,7 +1010,7 @@ describe('utils', () => {
10131010
});
10141011

10151012
test('it merges search where the lastLookBackDate is the "prev" if given undefined for "next', () => {
1016-
const { lastLookBackDate } = mergeSearchAfterAndBulkCreate([
1013+
const { lastLookBackDate } = mergeReturns([
10171014
createSearchAfterReturnType({
10181015
lastLookBackDate: new Date('2020-08-21T19:21:46.194Z'),
10191016
}),
@@ -1025,7 +1022,7 @@ describe('utils', () => {
10251022
});
10261023

10271024
test('it merges search where values from "next" and "prev" are computed together', () => {
1028-
const merged = mergeSearchAfterAndBulkCreate([
1025+
const merged = mergeReturns([
10291026
createSearchAfterReturnType({
10301027
bulkCreateTimes: ['123'],
10311028
createdSignalsCount: 3,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ export const createSearchAfterReturnType = ({
496496
};
497497
};
498498

499-
export const mergeSearchAfterAndBulkCreate = (
499+
export const mergeReturns = (
500500
searchAfters: SearchAfterAndBulkCreateReturnType[]
501501
): SearchAfterAndBulkCreateReturnType => {
502502
return searchAfters.reduce((prev, next) => {

0 commit comments

Comments
 (0)