[Security Solution][Admin][Endpoint Generator] Endpoint generator use…

…s correct merge to preserve array values (#131273)
elastic · Apr 30, 2022 · 7cc364a · 7cc364a
1 parent 578364c
commit 7cc364a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_endpoint_hosts.ts
@@ -6,7 +6,7 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { cloneDeep, merge } from 'lodash';
+import { cloneDeep } from 'lodash';
 import { AxiosResponse } from 'axios';
 import uuid from 'uuid';
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -35,7 +35,7 @@ import {
   indexFleetEndpointPolicy,
 } from './index_fleet_endpoint_policy';
 import { metadataCurrentIndexPattern } from '../constants';
-import { EndpointDataLoadingError, wrapErrorAndRejectPromise } from './utils';
+import { EndpointDataLoadingError, mergeAndAppendArrays, wrapErrorAndRejectPromise } from './utils';
 
 export interface IndexedHostsResponse
   extends IndexedFleetAgentResponse,
@@ -141,7 +141,7 @@ export async function indexEndpointHostDocs({
           epmEndpointPackage.version
         );
 
-        merge(response, createdPolicies);
+        mergeAndAppendArrays(response, createdPolicies);
 
         // eslint-disable-next-line require-atomic-updates
         realPolicies[appliedPolicyId] = createdPolicies.integrationPolicies[0];
@@ -160,7 +160,7 @@ export async function indexEndpointHostDocs({
         );
 
         enrolledAgent = indexedAgentResponse.agents[0];
-        merge(response, indexedAgentResponse);
+        mergeAndAppendArrays(response, indexedAgentResponse);
       }
       // Update the Host metadata record with the ID of the "real" policy along with the enrolled agent id
       hostMetadata = {
@@ -317,9 +317,9 @@ export const deleteIndexedEndpointHosts = async (
       .catch(wrapErrorAndRejectPromise);
   }
 
-  merge(response, await deleteIndexedFleetAgents(esClient, indexedData));
-  merge(response, await deleteIndexedEndpointAndFleetActions(esClient, indexedData));
-  merge(response, await deleteIndexedFleetEndpointPolicies(kbnClient, indexedData));
+  mergeAndAppendArrays(response, await deleteIndexedFleetAgents(esClient, indexedData));
+  mergeAndAppendArrays(response, await deleteIndexedEndpointAndFleetActions(esClient, indexedData));
+  mergeAndAppendArrays(response, await deleteIndexedFleetEndpointPolicies(kbnClient, indexedData));
 
   return response;
 };
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/utils.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/utils.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { mergeWith } from 'lodash';
+
 export class EndpointDataLoadingError extends Error {
   constructor(message: string, public meta?: unknown) {
     super(message);
@@ -18,3 +20,13 @@ export const wrapErrorIfNeeded = (error: Error): EndpointDataLoadingError =>
 
 // Use it in Promise's `.catch()` as `.catch(wrapErrorAndRejectPromise)`
 export const wrapErrorAndRejectPromise = (error: Error) => Promise.reject(wrapErrorIfNeeded(error));
+
+export const mergeAndAppendArrays = <T, S>(destinationObj: T, srcObj: S): T => {
+  const customizer = (objValue: T[keyof T], srcValue: S[keyof S]) => {
+    if (Array.isArray(objValue)) {
+      return objValue.concat(srcValue);
+    }
+  };
+
+  return mergeWith(destinationObj, srcObj, customizer);
+};
diff --git a/x-pack/plugins/security_solution/common/endpoint/index_data.ts b/x-pack/plugins/security_solution/common/endpoint/index_data.ts
@@ -10,7 +10,6 @@ import seedrandom from 'seedrandom';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { KbnClient } from '@kbn/test';
 import { AxiosResponse } from 'axios';
-import { merge } from 'lodash';
 import {
   CreatePackagePolicyResponse,
   EPM_API_ROUTES,
@@ -26,6 +25,7 @@ import {
 import { enableFleetServerIfNecessary } from './data_loaders/index_fleet_server';
 import { indexAlerts } from './data_loaders/index_alerts';
 import { setupFleetForEndpoint } from './data_loaders/setup_fleet_for_endpoint';
+import { mergeAndAppendArrays } from './data_loaders/utils';
 
 export type IndexedHostsAndAlertsResponse = IndexedHostsResponse;
 
@@ -105,7 +105,7 @@ export async function indexHostsAndAlerts(
       generator,
     });
 
-    merge(response, indexedHosts);
+    mergeAndAppendArrays(response, indexedHosts);
 
     await indexAlerts({
       client,