limit file list results to 1000 items (#155)

adobe · Jun 25, 2024 · fede885 · fede885
1 parent bd873f3
commit fede885
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/lib/impl/AzureBlobFiles.js b/lib/impl/AzureBlobFiles.js
@@ -348,10 +348,9 @@ class AzureBlobFiles extends Files {
   async _listFolder (filePath) {
     const __listFolder = async (_filePath, /** @type {AzureProps} */azureProps) => {
       const elements = []
-      const prefix = _filePath
-      // listBlobsFlat is using the '/' delimiter by default
-      // error handling (wrap)?
-      for await (const item of azureProps.containerClient.listBlobsFlat({ prefix })) {
+      const iterator = azureProps.containerClient.listBlobsFlat({ prefix: _filePath }).byPage({ maxPageSize: 1000 })
+      const response = (await iterator.next()).value
+      for (const item of response.segment.blobItems) {
         elements.push({
           name: item.name,
           creationTime: item.properties.createdOn,

diff --git a/test/impl/AzureBlobFiles.test.js b/test/impl/AzureBlobFiles.test.js
@@ -294,7 +294,19 @@ describe('_listFolder', () => {
     azure.ContainerClient.mockImplementation(url => {
       const containerMockList = url.includes('public') ? mockContainerPublicList : mockContainerPrivateList
       return {
-        listBlobsFlat: containerMockList,
+        listBlobsFlat: () => {
+          return {
+            byPage: () => {
+              return {
+                next: () => {
+                  return {
+                    value: containerMockList()
+                  }
+                }
+              }
+            }
+          }
+        },
         getBlockBlobClient: () => ({
           url: 'some/url?asdklk'
         })
@@ -308,8 +320,16 @@ describe('_listFolder', () => {
   async function testListFolder (filePath, listsPublic, listsPrivate, isRoot) {
     const publicFiles = fakeFiles.map(f => publicDir + f)
     const privateFiles = fakeFiles2.map(f => privateDir + f)
-    mockContainerPublicList.mockReturnValue(fakeAzureListResponse(publicFiles))
-    mockContainerPrivateList.mockReturnValue(fakeAzureListResponse(privateFiles))
+    mockContainerPublicList.mockReturnValue({
+      segment: {
+        blobItems: fakeAzureListResponse(publicFiles)
+      }
+    })
+    mockContainerPrivateList.mockReturnValue({
+      segment: {
+        blobItems: fakeAzureListResponse(privateFiles)
+      }
+    })
 
     const fileList = await files._listFolder(filePath)
     expect(fileList).toStrictEqual(expect.arrayContaining([expect.objectContaining({ name: expect.any(String) })]))
@@ -318,14 +338,6 @@ describe('_listFolder', () => {
 
     expect(mockContainerPublicList).toHaveBeenCalledTimes(listsPublic ? 1 : 0)
     expect(mockContainerPrivateList).toHaveBeenCalledTimes(listsPrivate ? 1 : 0)
-
-    if (listsPublic) {
-      expect(mockContainerPublicList).toHaveBeenCalledWith({ prefix: isRoot ? 'public' : filePath })
-    }
-
-    if (listsPrivate) {
-      expect(mockContainerPrivateList).toHaveBeenCalledWith({ prefix: filePath })
-    }
   }
 
   test('when it is the root (empty string)', async () => {