EMT-451: use loop, remove await

elastic · Jun 25, 2020 · 46d2130 · 46d2130
1 parent b310f92
commit 46d2130
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/support/unenroll.ts
@@ -85,19 +85,18 @@ export async function findAllUnenrolledHostIds(client: IScopedClusterClient): Pr
     HostId
   >;
 
-  // eslint-disable-next-line no-return-await
-  return await fetchAllUnenrolledHostIdsWithScroll(response, client.callAsCurrentUser);
+  return fetchAllUnenrolledHostIdsWithScroll(response, client.callAsCurrentUser);
 }
 
 export async function fetchAllUnenrolledHostIdsWithScroll(
   response: SearchResponse<HostId>,
   client: APICaller,
   hits: HostId[] = []
 ): Promise<HostId[]> {
-  const newHits = response.hits?.hits || [];
-  const scrollId = response._scroll_id;
+  let newHits = response.hits?.hits || [];
+  let scrollId = response._scroll_id;
 
-  if (newHits.length > 0) {
+  while (newHits.length > 0) {
     const hostIds: HostId[] = newHits.map((hitSource: HitSource) => hitSource._source);
     hits.push(...hostIds);
 
@@ -108,8 +107,8 @@ export async function fetchAllUnenrolledHostIdsWithScroll(
       },
     });
 
-    // eslint-disable-next-line no-return-await
-    return await fetchAllUnenrolledHostIdsWithScroll(innerResponse, client, hits);
+    newHits = innerResponse.hits?.hits || [];
+    scrollId = innerResponse._scroll_id;
   }
   return hits;
 }