Generates non sorted ES response at the end of the bulkCreateArtifacts

x-pack/plugins/fleet/server/services/artifacts/artifacts.ts

@@ -95,20 +95,13 @@ export const BULK_CREATE_MAX_ARTIFACTS_BYTES = 4_000_000;
 const generateArtifactBatches = (
   artifacts: NewArtifact[],
   maxArtifactsBatchSizeInBytes: number = BULK_CREATE_MAX_ARTIFACTS_BYTES
-): {
-  batches: Array<Array<ArtifactElasticsearchProperties | { create: { _id: string } }>>;
-  nonSortedEsArtifactsResponse: Artifact[];
-} => {
+): Array<Array<ArtifactElasticsearchProperties | { create: { _id: string } }>> => {
   const batches: Array<Array<ArtifactElasticsearchProperties | { create: { _id: string } }>> = [];
-  const nonSortedEsArtifactsResponse: Artifact[] = [];
+
   let artifactsBatchLengthInBytes = 0;
   const sortedArtifacts = sortBy(artifacts, 'encodedSize');
 
-  sortedArtifacts.forEach((artifact, index) => {
-    const nonSortedEsArtifactResponse = esSearchHitToArtifact({
-      _id: uniqueIdFromArtifact(artifacts[index]),
-      _source: newArtifactToElasticsearchProperties(artifacts[index]),
-    });
+  sortedArtifacts.forEach((artifact) => {
     const esArtifact = newArtifactToElasticsearchProperties(artifact);
     const bulkOperation = {
       create: {
@@ -120,9 +113,6 @@ const generateArtifactBatches = (
     // If there is no artifact yet added to the current batch, we add it anyway ignoring the batch limit as the batch size has to be > 0.
     if (artifact.encodedSize + artifactsBatchLengthInBytes >= maxArtifactsBatchSizeInBytes) {
       artifactsBatchLengthInBytes = artifact.encodedSize;
-      // Use non sorted artifacts array to preserve the artifacts order in the response
-      nonSortedEsArtifactsResponse.push(nonSortedEsArtifactResponse);
-
       batches.push([bulkOperation, esArtifact]);
     } else {
       // Case it's the first one
@@ -131,22 +121,19 @@ const generateArtifactBatches = (
       }
       // Adds the next artifact to the current batch and increases the batch size count with the artifact size.
       artifactsBatchLengthInBytes += artifact.encodedSize;
-      // Use non sorted artifacts array to preserve the artifacts order in the response
-      nonSortedEsArtifactsResponse.push(nonSortedEsArtifactResponse);
-
       batches[batches.length - 1].push(bulkOperation, esArtifact);
     }
   });
 
-  return { batches, nonSortedEsArtifactsResponse };
+  return batches;
 };
 
 export const bulkCreateArtifacts = async (
   esClient: ElasticsearchClient,
   artifacts: NewArtifact[],
   refresh = false
 ): Promise<{ artifacts?: Artifact[]; errors?: Error[] }> => {
-  const { batches, nonSortedEsArtifactsResponse } = generateArtifactBatches(
+  const batches = generateArtifactBatches(
     artifacts,
     appContextService.getConfig()?.createArtifactsBulkBatchSize
   );
@@ -185,6 +172,14 @@ export const bulkCreateArtifacts = async (
     return { errors: nonConflictErrors };
   }
 
+  // Use non sorted artifacts array to preserve the artifacts order in the response
+  const nonSortedEsArtifactsResponse: Artifact[] = ([] = artifacts.map((artifact) => {
+    return esSearchHitToArtifact({
+      _id: uniqueIdFromArtifact(artifact),
+      _source: newArtifactToElasticsearchProperties(artifact),
+    });
+  }));
+
   return {
     artifacts: nonSortedEsArtifactsResponse,
   };