Merge pull request #1712 from actions/vmjoseph/update-archiver

Upgrading `upload-artifact` and `download-artifact` archiver package

package.json

@@ -13,7 +13,7 @@
     "lint": "eslint packages/**/*.ts",
     "lint-fix": "eslint packages/**/*.ts --fix",
     "new-package": "scripts/create-package",
-    "test": "jest --testTimeout 60000"
+    "test": "jest --testTimeout 70000"
   },
   "devDependencies": {
     "@types/jest": "^29.5.4",
@@ -33,4 +33,4 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.2.2"
   }
-}
+}

packages/artifact/__tests__/upload-artifact.test.ts

@@ -8,6 +8,9 @@ import * as blobUpload from '../src/internal/upload/blob-upload'
 import {uploadArtifact} from '../src/internal/upload/upload-artifact'
 import {noopLogs} from './common'
 import {FilesNotFoundError} from '../src/internal/shared/errors'
+import {BlockBlobClient} from '@azure/storage-blob'
+import * as fs from 'fs'
+import * as path from 'path'
 
 describe('upload-artifact', () => {
   beforeEach(() => {
@@ -351,4 +354,94 @@ describe('upload-artifact', () => {
 
     expect(uploadResp).rejects.toThrow()
   })
+
+  it('should throw an error uploading blob chunks get delayed', async () => {
+    const mockDate = new Date('2020-01-01')
+    const dirPath = path.join(__dirname, `plz-upload`)
+    if (!fs.existsSync(dirPath)) {
+      fs.mkdirSync(dirPath, {recursive: true})
+    }
+
+    fs.writeFileSync(path.join(dirPath, 'file1.txt'), 'test file content')
+    fs.writeFileSync(path.join(dirPath, 'file2.txt'), 'test file content')
+
+    fs.writeFileSync(path.join(dirPath, 'file3.txt'), 'test file content')
+
+    jest
+      .spyOn(uploadZipSpecification, 'validateRootDirectory')
+      .mockReturnValue()
+    jest
+      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
+      .mockReturnValue([
+        {
+          sourcePath: path.join(dirPath, 'file1.txt'),
+          destinationPath: 'file1.txt'
+        },
+        {
+          sourcePath: path.join(dirPath, 'file2.txt'),
+          destinationPath: 'file2.txt'
+        },
+        {
+          sourcePath: path.join(dirPath, 'file3.txt'),
+          destinationPath: 'dir/file3.txt'
+        }
+      ])
+
+    jest.spyOn(util, 'getBackendIdsFromToken').mockReturnValue({
+      workflowRunBackendId: '1234',
+      workflowJobRunBackendId: '5678'
+    })
+    jest
+      .spyOn(retention, 'getExpiration')
+      .mockReturnValue(Timestamp.fromDate(mockDate))
+    jest
+      .spyOn(ArtifactServiceClientJSON.prototype, 'CreateArtifact')
+      .mockReturnValue(
+        Promise.resolve({
+          ok: true,
+          signedUploadUrl: 'https://signed-upload-url.com'
+        })
+      )
+    jest
+      .spyOn(blobUpload, 'uploadZipToBlobStorage')
+      .mockReturnValue(Promise.reject(new Error('Upload progress stalled.')))
+
+    // ArtifactHttpClient mocks
+    jest.spyOn(config, 'getRuntimeToken').mockReturnValue('test-token')
+    jest
+      .spyOn(config, 'getResultsServiceUrl')
+      .mockReturnValue('https://test-url.com')
+
+    BlockBlobClient.prototype.uploadStream = jest
+      .fn()
+      .mockImplementation(
+        async (stream, bufferSize, maxConcurrency, options) => {
+          return new Promise<void>(resolve => {
+            // Call the onProgress callback with a progress event
+            options.onProgress({loadedBytes: 0})
+
+            // Wait for 31 seconds before resolving the promise
+            setTimeout(() => {
+              // Call the onProgress callback again to simulate progress
+              options.onProgress({loadedBytes: 100})
+
+              resolve()
+            }, 31000) // Delay longer than your timeout
+          })
+        }
+      )
+
+    jest.mock('fs')
+    const uploadResp = uploadArtifact(
+      'test-artifact',
+      [
+        '/home/user/files/plz-upload/file1.txt',
+        '/home/user/files/plz-upload/file2.txt',
+        '/home/user/files/plz-upload/dir/file3.txt'
+      ],
+      '/home/user/files/plz-upload'
+    )
+
+    expect(uploadResp).rejects.toThrow('Upload progress stalled.')
+  })
 })