bump undici in http-client to 5.28.5

Signed-off-by: Brian DeHamer <bdehamer@github.com>

packages/artifact/RELEASES.md

@@ -1,9 +1,5 @@
 # @actions/artifact Releases
 
-### 2.2.2
-
-- Default concurrency to 5 for uploading artifacts [#1962](https://github.com/actions/toolkit/pull/1962
-
 ### 2.2.1
 
 - Add `ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY` and `ACTIONS_ARTIFACT_UPLOAD_TIMEOUT_MS` environment variables [#1928](https://github.com/actions/toolkit/pull/1928)

packages/artifact/__tests__/config.test.ts

@@ -56,30 +56,22 @@ describe('uploadChunkTimeoutEnv', () => {
 })
 
 describe('uploadConcurrencyEnv', () => {
-  it('Concurrency default to 5', () => {
+  it('should return default 32 when cpu num is <= 4', () => {
     ;(os.cpus as jest.Mock).mockReturnValue(new Array(4))
-    expect(config.getConcurrency()).toBe(5)
-  })
-
-  it('Concurrency max out at 300 on systems with many CPUs', () => {
-    ;(os.cpus as jest.Mock).mockReturnValue(new Array(32))
-    process.env.ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY = '301'
-    expect(config.getConcurrency()).toBe(300)
-  })
-
-  it('Concurrency can be set to 32 when cpu num is <= 4', () => {
-    ;(os.cpus as jest.Mock).mockReturnValue(new Array(4))
-    process.env.ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY = '32'
     expect(config.getConcurrency()).toBe(32)
   })
 
-  it('Concurrency can be set 16 * num of cpu when cpu num is > 4', () => {
+  it('should return 16 * num of cpu when cpu num is > 4', () => {
     ;(os.cpus as jest.Mock).mockReturnValue(new Array(6))
-    process.env.ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY = '96'
     expect(config.getConcurrency()).toBe(96)
   })
 
-  it('Concurrency can be overridden by env var ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY', () => {
+  it('should return up to 300 max value', () => {
+    ;(os.cpus as jest.Mock).mockReturnValue(new Array(32))
+    expect(config.getConcurrency()).toBe(300)
+  })
+
+  it('should return override value when ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY is set', () => {
     ;(os.cpus as jest.Mock).mockReturnValue(new Array(4))
     process.env.ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY = '10'
     expect(config.getConcurrency()).toBe(10)
@@ -100,4 +92,10 @@ describe('uploadConcurrencyEnv', () => {
       config.getConcurrency()
     }).toThrow()
   })
+
+  it('cannot go over currency cap when override value is greater', () => {
+    ;(os.cpus as jest.Mock).mockReturnValue(new Array(4))
+    process.env.ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY = '40'
+    expect(config.getConcurrency()).toBe(32)
+  })
 })

packages/artifact/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@actions/artifact",
-  "version": "2.2.2",
+  "version": "2.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@actions/artifact",
-      "version": "2.2.2",
+      "version": "2.2.1",
       "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.10.0",

packages/artifact/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/artifact",
-  "version": "2.2.2",
+  "version": "2.2.1",
   "preview": true,
   "description": "Actions artifact lib",
   "keywords": [

packages/artifact/src/internal/shared/config.ts

@@ -45,8 +45,10 @@ export function getGitHubWorkspaceDir(): string {
   return ghWorkspaceDir
 }
 
-// The maximum value of concurrency is 300.
-// This value can be changed with ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY variable.
+// Mimics behavior of azcopy: https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azcopy-optimize
+// If your machine has fewer than 5 CPUs, then the value of this variable is set to 32.
+// Otherwise, the default value is equal to 16 multiplied by the number of CPUs. The maximum value of this variable is 300.
+// This value can be lowered with ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY variable.
 export function getConcurrency(): number {
   const numCPUs = os.cpus().length
   let concurrencyCap = 32
@@ -66,20 +68,15 @@ export function getConcurrency(): number {
     }
 
     if (concurrency < concurrencyCap) {
-      info(
-        `Set concurrency based on the value set in ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY.`
-      )
       return concurrency
     }
 
     info(
-      `ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY is higher than the cap of ${concurrencyCap} based on the number of cpus. Set it to the maximum value allowed.`
+      `ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY is higher than the cap of ${concurrencyCap} based on the number of cpus. Lowering it to the cap.`
     )
-    return concurrencyCap
   }
 
-  // default concurrency to 5
-  return 5
+  return concurrencyCap
 }
 
 export function getUploadChunkTimeout(): number {

packages/cache/RELEASES.md

@@ -1,10 +1,5 @@
 # @actions/cache Releases
 
-### 4.0.1
-
-- Remove runtime dependency on `twirp-ts` [#1947](https://github.com/actions/toolkit/pull/1947)
-- Cache miss as debug, not warning annotation [#1954](https://github.com/actions/toolkit/pull/1954)
-
 ### 4.0.0
 
 #### Important changes

packages/cache/__tests__/restoreCacheV2.test.ts

@@ -115,6 +115,7 @@ test('restore with restore keys and no cache found', async () => {
   const paths = ['node_modules']
   const key = 'node-test'
   const restoreKeys = ['node-']
+  const logWarningMock = jest.spyOn(core, 'warning')
 
   jest
     .spyOn(CacheServiceClientJSON.prototype, 'GetCacheEntryDownloadURL')
@@ -129,7 +130,7 @@ test('restore with restore keys and no cache found', async () => {
   const cacheKey = await restoreCache(paths, key, restoreKeys)
 
   expect(cacheKey).toBe(undefined)
-  expect(logDebugMock).toHaveBeenCalledWith(
+  expect(logWarningMock).toHaveBeenCalledWith(
     `Cache not found for keys: ${[key, ...restoreKeys].join(', ')}`
   )
 })

packages/cache/__tests__/saveCacheV2.test.ts

@@ -92,14 +92,14 @@ test('save with large cache outputs should fail using', async () => {
   expect(getCompressionMock).toHaveBeenCalledTimes(1)
 })
 
-test('create cache entry failure on non-ok response', async () => {
+test('create cache entry failure', async () => {
   const paths = ['node_modules']
   const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
   const infoLogMock = jest.spyOn(core, 'info')
 
   const createCacheEntryMock = jest
     .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockResolvedValue({ok: false, signedUploadUrl: ''})
+    .mockReturnValue(Promise.resolve({ok: false, signedUploadUrl: ''}))
 
   const createTarMock = jest.spyOn(tar, 'createTar')
   const finalizeCacheEntryMock = jest.spyOn(
@@ -109,7 +109,7 @@ test('create cache entry failure on non-ok response', async () => {
   const compression = CompressionMethod.Zstd
   const getCompressionMock = jest
     .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockResolvedValueOnce(compression)
+    .mockReturnValueOnce(Promise.resolve(compression))
   const archiveFileSize = 1024
   jest
     .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
@@ -133,39 +133,6 @@ test('create cache entry failure on non-ok response', async () => {
   expect(saveCacheMock).toHaveBeenCalledTimes(0)
 })
 
-test('create cache entry fails on rejected promise', async () => {
-  const paths = ['node_modules']
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  const infoLogMock = jest.spyOn(core, 'info')
-
-  const createCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockRejectedValue(new Error('Failed to create cache entry'))
-
-  const createTarMock = jest.spyOn(tar, 'createTar')
-  const compression = CompressionMethod.Zstd
-  const getCompressionMock = jest
-    .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockResolvedValueOnce(compression)
-  const archiveFileSize = 1024
-  jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValueOnce(archiveFileSize)
-
-  const cacheId = await saveCache(paths, key)
-  expect(cacheId).toBe(-1)
-  expect(infoLogMock).toHaveBeenCalledWith(
-    `Failed to save: Unable to reserve cache with key ${key}, another job may be creating this cache.`
-  )
-
-  expect(createCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheUtils.getCacheVersion(paths, compression)
-  })
-  expect(createTarMock).toHaveBeenCalledTimes(1)
-  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-})
-
 test('save cache fails if a signedUploadURL was not passed', async () => {
   const paths = 'node_modules'
   const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'

packages/cache/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@actions/cache",
-  "version": "4.0.1",
+  "version": "4.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@actions/cache",
-      "version": "4.0.1",
+      "version": "4.0.0",
       "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.11.1",

packages/cache/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/cache",
-  "version": "4.0.1",
+  "version": "4.0.0",
   "preview": true,
   "description": "Actions cache lib",
   "keywords": [

packages/cache/src/cache.ts

@@ -256,7 +256,7 @@ async function restoreCacheV2(
     const response = await twirpClient.GetCacheEntryDownloadURL(request)
 
     if (!response.ok) {
-      core.debug(`Cache not found for keys: ${keys.join(', ')}`)
+      core.warning(`Cache not found for keys: ${keys.join(', ')}`)
       return undefined
     }
 
@@ -525,16 +525,8 @@ async function saveCacheV2(
       version
     }
 
-    let signedUploadUrl
-
-    try {
-      const response = await twirpClient.CreateCacheEntry(request)
-      if (!response.ok) {
-        throw new Error('Response was not ok')
-      }
-      signedUploadUrl = response.signedUploadUrl
-    } catch (error) {
-      core.debug(`Failed to reserve cache: ${error}`)
+    const response = await twirpClient.CreateCacheEntry(request)
+    if (!response.ok) {
       throw new ReserveCacheError(
         `Unable to reserve cache with key ${key}, another job may be creating this cache.`
       )
@@ -544,7 +536,7 @@ async function saveCacheV2(
     await cacheHttpClient.saveCache(
       cacheId,
       archivePath,
-      signedUploadUrl,
+      response.signedUploadUrl,
       options
     )
 

packages/http-client/RELEASES.md

@@ -1,5 +1,8 @@
 ## Releases
 
+## 2.2.4
+- Bump `undici` to version 5.28.5 [#1956](https://github.com/actions/toolkit/pull/1956)
+
 ## 2.2.3
 - Fixed an issue where proxy username and password were not handled correctly [#1799](https://github.com/actions/toolkit/pull/1799)
 

packages/http-client/package-lock.json

@@ -1,16 +1,16 @@
 {
   "name": "@actions/http-client",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@actions/http-client",
-      "version": "2.2.3",
+      "version": "2.2.4",
       "license": "MIT",
       "dependencies": {
         "tunnel": "^0.0.6",
-        "undici": "^5.25.5"
+        "undici": "^5.28.5"
       },
       "devDependencies": {
         "@types/node": "20.7.1",

packages/http-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/http-client",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Actions Http Client",
   "keywords": [
     "github",
@@ -46,6 +46,6 @@
   },
   "dependencies": {
     "tunnel": "^0.0.6",
-    "undici": "^5.25.5"
+    "undici": "^5.28.5"
   }
-}
+}