Uses common method and refactor to use batch instead

elastic · Jun 27, 2023 · dce6775 · dce6775
1 parent 88d5d70
commit dce6775
Showing 1 changed file with 17 additions and 23 deletions.
diff --git a/...security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts b/...security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
@@ -69,19 +69,17 @@ const iterateArtifactsBuildResult = (
 
 const iterateAllListItems = async <T>(
   pageSupplier: (page: number) => Promise<ListResult<T>>,
-  itemCallback: (item: T) => void
+  itemCallback: (items: T[]) => void
 ) => {
   let paging = true;
   let page = 1;
 
   while (paging) {
     const { items, total } = await pageSupplier(page);
 
-    for (const item of items) {
-      await itemCallback(item);
-    }
+    itemCallback(items);
 
-    paging = (page - 1) * 20 + items.length < total;
+    paging = (page - 1) * 1000 + items.length < total;
     page++;
   }
 };
@@ -560,8 +558,8 @@ export class ManifestManager {
     const allPackagePolicies: PackagePolicy[] = [];
     await iterateAllListItems(
       (page) => this.listEndpointPolicies(page),
-      (packagePolicy) => {
-        allPackagePolicies.push(packagePolicy);
+      (packagePoliciesBatch) => {
+        allPackagePolicies.push(...packagePoliciesBatch);
       }
     );
 
@@ -672,22 +670,18 @@ export class ManifestManager {
 
   private async listEndpointPolicyIds() {
     const allPolicyIds: string[] = [];
-
-    let paging = true;
-    let page = 1;
-
-    while (paging) {
-      const { items, total } = await this.packagePolicyService.listIds(this.savedObjectsClient, {
-        page,
-        perPage: 1000,
-        kuery: 'ingest-package-policies.package.name:endpoint',
-      });
-
-      allPolicyIds.push(...items);
-
-      paging = (page - 1) * 1000 + items.length < total;
-      page++;
-    }
+    await iterateAllListItems(
+      (page) => {
+        return this.packagePolicyService.listIds(this.savedObjectsClient, {
+          page,
+          perPage: 1000,
+          kuery: 'ingest-package-policies.package.name:endpoint',
+        });
+      },
+      (packagePolicyIdsBatch) => {
+        allPolicyIds.push(...packagePolicyIdsBatch);
+      }
+    );
     return allPolicyIds;
   }