support http proxy for artifact upload

.github/workflows/artifact-tests.yml

@@ -1,3 +1,5 @@
+# Temporarily disabled while v2.0.0 of @actions/artifact is under development
+
 name: artifact-unit-tests
 on:
   push:
@@ -10,8 +12,8 @@ on:
       - '**.md'
 
 jobs:
-  upload:
-    name: Upload
+  build:
+    name: Build
 
     strategy:
       matrix:
@@ -40,13 +42,19 @@ jobs:
         npm run tsc
       working-directory: packages/artifact
 
+    - name: Set artifact file contents
+      shell: bash
+      run: |
+        echo "file1=hello from file 1" >> $GITHUB_ENV
+        echo "file2=hello from file 2" >> $GITHUB_ENV
+
     - name: Create files that will be uploaded
       run: |
         mkdir artifact-path
-        echo -n 'hello from file 1' > artifact-path/first.txt
-        echo -n 'hello from file 2' > artifact-path/second.txt
+        echo '${{ env.file1 }}' > artifact-path/first.txt
+        echo '${{ env.file2 }}' > artifact-path/second.txt
 
-    - name: Upload Artifacts
+    - name: Upload Artifacts using actions/github-script@v7
       uses: actions/github-script@v7
       with:
         script: |
@@ -65,16 +73,9 @@ jobs:
 
           console.log(`Successfully uploaded artifact ${id}`)
 
-          try {
-            await artifact.uploadArtifact(artifactName, fileContents, './')
-            throw new Error('should have failed second upload')
-          } catch (err) {
-            console.log('Successfully blocked second artifact upload')
-          }
   verify:
-    name: Verify and Delete
     runs-on: ubuntu-latest
-    needs: [upload]
+    needs: [build]
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -95,100 +96,35 @@ jobs:
         npm run tsc
       working-directory: packages/artifact
 
-    - name: List and Download Artifacts
+    - name: List artifacts using actions/github-script@v7
       uses: actions/github-script@v7
       with:
         script: |
-          const {default: artifactClient} = require('./packages/artifact/lib/artifact')
+          const {default: artifact} = require('./packages/artifact/lib/artifact')
 
-          const {readFile} = require('fs/promises')
-          const path = require('path')
+          const workflowRunId = process.env.GITHUB_RUN_ID
+          const repository = process.env.GITHUB_REPOSITORY
+          const repositoryOwner = repository.split('/')[0]
+          const repositoryName = repository.split('/')[1]
 
-          const findBy = {
-            repositoryOwner: process.env.GITHUB_REPOSITORY.split('/')[0],
-            repositoryName: process.env.GITHUB_REPOSITORY.split('/')[1],
-            token: '${{ secrets.GITHUB_TOKEN }}',
-            workflowRunId: process.env.GITHUB_RUN_ID
-          }
-
-          const listResult = await artifactClient.listArtifacts({latest: true, findBy})
+          const listResult = await artifact.listArtifacts(workflowRunId, repositoryOwner, repositoryName, '${{ secrets.GITHUB_TOKEN }}')
           console.log(listResult)
 
           const artifacts = listResult.artifacts
-          const expected = [
-            'my-artifact-ubuntu-latest',
-            'my-artifact-windows-latest',
-            'my-artifact-macos-latest'
-          ]
 
-          const foundArtifacts = artifacts.filter(artifact =>
-            expected.includes(artifact.name)
-          )
+          if (artifacts.length !== 3) {
+            throw new Error('Expected 3 artifacts but only found ' + artifacts.length + ' artifacts')
+          }
 
-          if (foundArtifacts.length !== 3) {
-            console.log('Unexpected length of found artifacts', foundArtifacts)
-            throw new Error(
-              `Expected 3 artifacts but found ${foundArtifacts.length} artifacts.`
-            )
+          const artifactNames = artifacts.map(artifact => artifact.name)
+          if (!artifactNames.includes('my-artifact-ubuntu-latest')){
+            throw new Error("Expected artifact list to contain an artifact named my-artifact-ubuntu-latest but it's missing")
+          }
+          if (!artifactNames.includes('my-artifact-windows-latest')){
+            throw new Error("Expected artifact list to contain an artifact named my-artifact-windows-latest but it's missing")
+          }
+          if (!artifactNames.includes('my-artifact-macos-latest')){
+            throw new Error("Expected artifact list to contain an artifact named my-artifact-macos-latest but it's missing")
           }
 
           console.log('Successfully listed artifacts that were uploaded')
-
-          const files = [
-            {name: 'artifact-path/first.txt', content: 'hello from file 1'},
-            {name: 'artifact-path/second.txt', content: 'hello from file 2'}
-          ]
-
-          for (const artifact of foundArtifacts) {
-            const {downloadPath} = await artifactClient.downloadArtifact(artifact.id, {
-              path: artifact.name,
-              findBy
-            })
-
-            console.log('Downloaded artifact to:', downloadPath)
-
-            for (const file of files) {
-              const filepath = path.join(
-                process.env.GITHUB_WORKSPACE,
-                downloadPath,
-                file.name
-              )
-
-              console.log('Checking file:', filepath)
-
-              const content = await readFile(filepath, 'utf8')
-              if (content.trim() !== file.content.trim()) {
-                throw new Error(
-                  `Expected file '${file.name}' to contain '${file.content}' but found '${content}'`
-                )
-              }
-            }
-          }
-    - name: Delete Artifacts
-      uses: actions/github-script@v7
-      with:
-        script: |
-          const {default: artifactClient} = require('./packages/artifact/lib/artifact')
-
-          const artifactsToDelete = [
-            'my-artifact-ubuntu-latest',
-            'my-artifact-windows-latest',
-            'my-artifact-macos-latest'
-          ]
-
-          for (const artifactName of artifactsToDelete) {
-            const {id} = await artifactClient.deleteArtifact(artifactName)
-          }
-
-          const {artifacts} = await artifactClient.listArtifacts({latest: true})
-          const foundArtifacts = artifacts.filter(artifact =>
-            artifactsToDelete.includes(artifact.name)
-          )
-
-          if (foundArtifacts.length !== 0) {
-            console.log('Unexpected length of found artifacts:', foundArtifacts)
-            throw new Error(
-              `Expected 0 artifacts but found ${foundArtifacts.length} artifacts.`
-            )
-          }
-

jest.config.js

@@ -8,4 +8,4 @@ module.exports = {
     '^.+\\.ts$': 'ts-jest'
   },
   verbose: true
-}
+}

package-lock.json

@@ -5781,9 +5781,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "dev": true,
       "funding": [
         {

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 10000"
   },
   "devDependencies": {
     "@types/jest": "^29.5.4",

packages/artifact/README.md

@@ -12,7 +12,6 @@ This is the core library that powers the [`@actions/upload-artifact`](https://gi
   - [Quick Start](#quick-start)
   - [Examples](#examples)
     - [Upload and Download](#upload-and-download)
-    - [Delete an Artifact](#delete-an-artifact)
     - [Downloading from other workflow runs or repos](#downloading-from-other-workflow-runs-or-repos)
     - [Speeding up large uploads](#speeding-up-large-uploads)
   - [Additional Resources](#additional-resources)
@@ -20,7 +19,7 @@ This is the core library that powers the [`@actions/upload-artifact`](https://gi
 ## v2 - What's New
 
 > [!IMPORTANT]
-> @actions/artifact v2+, upload-artifact@v4+, and download-artifact@v4+ are not currently supported on GHES yet. The previous version of this package can be found at [this tag](https://github.com/actions/toolkit/tree/@actions/artifact@1.1.2/packages/artifact) and [on npm](https://www.npmjs.com/package/@actions/artifact/v/1.1.2).
+> @actions/artifact v2+, upload-artifact@v4+ download-artifact@v4+ are not currently supported on GHES yet. The previous version of this package can be found at [this tag](https://github.com/actions/toolkit/tree/@actions/artifact@1.1.2/packages/artifact) and [on npm](https://www.npmjs.com/package/@actions/artifact/v/1.1.2).
 
 The release of `@actions/artifact@v2` (including `upload-artifact@v4` and `download-artifact@v4`) are major changes to the backend architecture of Artifacts. They have numerous performance and behavioral improvements.
 
@@ -64,16 +63,10 @@ Import the module:
 
 ```js
 // ES6 module
-import {DefaultArtifactClient} from '@actions/artifact'
+import artifact from '@actions/artifact'
 
 // CommonJS
-const {DefaultArtifactClient} = require('@actions/artifact')
-```
-
-Then instantiate:
-
-```js
-const artifact = new DefaultArtifactClient()
+const {default: artifact} = require('@actions/artifact')
 ```
 
 ℹ️ For a comprehensive list of classes, interfaces, functions and more, see the [generated documentation](./docs/generated/README.md).
@@ -107,41 +100,6 @@ const {downloadPath} = await artifact.downloadArtifact(id, {
 console.log(`Downloaded artifact ${id} to: ${downloadPath}`)
 ```
 
-### Delete an Artifact
-
-To delete an artifact, all you need is the name.
-
-```js
-const {id} = await artifact.deleteArtifact(
-  // name of the artifact
-  'my-artifact'
-)
-
-console.log(`Deleted Artifact ID '${id}'`)
-```
-
-It also supports options to delete from other repos/runs given a github token with `actions:write` permissions on the target repository is supplied.
-
-```js
-const findBy = {
-  // must have actions:write permission on target repository
-  token: process.env['GITHUB_TOKEN'],
-  workflowRunId: 123,
-  repositoryOwner: 'actions',
-  repositoryName: 'toolkit'
-}
-
-
-const {id} = await artifact.deleteArtifact(
-  // name of the artifact
-  'my-artifact',
-  // options to find by other repo/owner
-  { findBy }
-)
-
-console.log(`Deleted Artifact ID '${id}' from ${findBy.repositoryOwner}/ ${findBy.repositoryName}`)
-```
-
 ### Downloading from other workflow runs or repos
 
 It may be useful to download Artifacts from other workflow runs, or even other repositories. By default, the permissions are scoped so they can only download Artifacts within the current workflow run. To elevate permissions for this scenario, you must specify `options.findBy` to `downloadArtifact`.

packages/artifact/RELEASES.md

@@ -97,11 +97,7 @@
 
 ### 2.0.0
 
-- Major release. Supports new Artifact backend for improved speed, reliability and behavior.
-- Numerous API changes, [some breaking](./README.md#breaking-changes).
+Major release. Supports new Artifact backend for improved speed, reliability and behavior.
+Numerous API changes, [some breaking](./README.md#breaking-changes).
 
-- Blog post with more info: TBD
-
-### 2.0.1
-
-- Patch to fix transient request timeouts https://github.com/actions/download-artifact/issues/249
+Blog post with more info: TBD

packages/artifact/__tests__/artifact-http-client.test.ts

@@ -4,7 +4,6 @@ import {HttpClient} from '@actions/http-client'
 import * as config from '../src/internal/shared/config'
 import {internalArtifactTwirpClient} from '../src/internal/shared/artifact-twirp-client'
 import {noopLogs} from './common'
-import {NetworkError, UsageError} from '../src/internal/shared/errors'
 
 jest.mock('@actions/http-client')
 
@@ -258,42 +257,9 @@ describe('artifact-http-client', () => {
         name: 'artifact',
         version: 4
       })
-    }).rejects.toThrowError(new NetworkError('ENOTFOUND').message)
-    expect(mockHttpClient).toHaveBeenCalledTimes(1)
-    expect(mockPost).toHaveBeenCalledTimes(1)
-  })
-
-  it('should properly describe a usage error', async () => {
-    const mockPost = jest.fn(() => {
-      const msgFailed = new http.IncomingMessage(new net.Socket())
-      msgFailed.statusCode = 403
-      msgFailed.statusMessage = 'Forbidden'
-      return {
-        message: msgFailed,
-        readBody: async () => {
-          return Promise.resolve(
-            `{"msg": "insufficient usage to create artifact"}`
-          )
-        }
-      }
-    })
-
-    const mockHttpClient = (
-      HttpClient as unknown as jest.Mock
-    ).mockImplementation(() => {
-      return {
-        post: mockPost
-      }
-    })
-    const client = internalArtifactTwirpClient()
-    await expect(async () => {
-      await client.CreateArtifact({
-        workflowRunBackendId: '1234',
-        workflowJobRunBackendId: '5678',
-        name: 'artifact',
-        version: 4
-      })
-    }).rejects.toThrowError(new UsageError().message)
+    }).rejects.toThrowError(
+      'Failed to CreateArtifact: Unable to make request: ENOTFOUND\nIf you are using self-hosted runners, please make sure your runner has access to all GitHub endpoints: https://docs.github.com/en/actions/hosting-your-own-runners/managing-self-hosted-runners/about-self-hosted-runners#communication-between-self-hosted-runners-and-github'
+    )
     expect(mockHttpClient).toHaveBeenCalledTimes(1)
     expect(mockPost).toHaveBeenCalledTimes(1)
   })

packages/artifact/__tests__/delete-artifacts.test.ts

@@ -1,192 +0,0 @@
-import * as github from '@actions/github'
-import type {RestEndpointMethods} from '@octokit/plugin-rest-endpoint-methods/dist-types/generated/method-types'
-import type {RequestInterface} from '@octokit/types'
-import {
-  deleteArtifactInternal,
-  deleteArtifactPublic
-} from '../src/internal/delete/delete-artifact'
-import * as config from '../src/internal/shared/config'
-import {ArtifactServiceClientJSON, Timestamp} from '../src/generated'
-import * as util from '../src/internal/shared/util'
-import {noopLogs} from './common'
-
-type MockedRequest = jest.MockedFunction<RequestInterface<object>>
-
-type MockedDeleteArtifact = jest.MockedFunction<
-  RestEndpointMethods['actions']['deleteArtifact']
->
-
-jest.mock('@actions/github', () => ({
-  getOctokit: jest.fn().mockReturnValue({
-    request: jest.fn(),
-    rest: {
-      actions: {
-        deleteArtifact: jest.fn()
-      }
-    }
-  })
-}))
-
-const fixtures = {
-  repo: 'toolkit',
-  owner: 'actions',
-  token: 'ghp_1234567890',
-  runId: 123,
-  backendIds: {
-    workflowRunBackendId: 'c4d7c21f-ba3f-4ddc-a8c8-6f2f626f8422',
-    workflowJobRunBackendId: '760803a1-f890-4d25-9a6e-a3fc01a0c7cf'
-  },
-  artifacts: [
-    {
-      id: 1,
-      name: 'my-artifact',
-      size: 456,
-      createdAt: new Date('2023-12-01')
-    },
-    {
-      id: 2,
-      name: 'my-artifact',
-      size: 456,
-      createdAt: new Date('2023-12-02')
-    }
-  ]
-}
-
-describe('delete-artifact', () => {
-  beforeAll(() => {
-    noopLogs()
-  })
-
-  describe('public', () => {
-    it('should delete an artifact', async () => {
-      const mockRequest = github.getOctokit(fixtures.token)
-        .request as MockedRequest
-      mockRequest.mockResolvedValueOnce({
-        status: 200,
-        headers: {},
-        url: '',
-        data: {
-          artifacts: [
-            {
-              name: fixtures.artifacts[0].name,
-              id: fixtures.artifacts[0].id,
-              size_in_bytes: fixtures.artifacts[0].size,
-              created_at: fixtures.artifacts[0].createdAt.toISOString()
-            }
-          ]
-        }
-      })
-
-      const mockDeleteArtifact = github.getOctokit(fixtures.token).rest.actions
-        .deleteArtifact as MockedDeleteArtifact
-      mockDeleteArtifact.mockResolvedValueOnce({
-        status: 204,
-        headers: {},
-        url: '',
-        data: null as never
-      })
-
-      const response = await deleteArtifactPublic(
-        fixtures.artifacts[0].name,
-        fixtures.runId,
-        fixtures.owner,
-        fixtures.repo,
-        fixtures.token
-      )
-
-      expect(response).toEqual({
-        id: fixtures.artifacts[0].id
-      })
-    })
-
-    it('should fail if non-200 response', async () => {
-      const mockRequest = github.getOctokit(fixtures.token)
-        .request as MockedRequest
-      mockRequest.mockResolvedValueOnce({
-        status: 200,
-        headers: {},
-        url: '',
-        data: {
-          artifacts: [
-            {
-              name: fixtures.artifacts[0].name,
-              id: fixtures.artifacts[0].id,
-              size_in_bytes: fixtures.artifacts[0].size,
-              created_at: fixtures.artifacts[0].createdAt.toISOString()
-            }
-          ]
-        }
-      })
-
-      const mockDeleteArtifact = github.getOctokit(fixtures.token).rest.actions
-        .deleteArtifact as MockedDeleteArtifact
-      mockDeleteArtifact.mockRejectedValue(new Error('boom'))
-
-      await expect(
-        deleteArtifactPublic(
-          fixtures.artifacts[0].name,
-          fixtures.runId,
-          fixtures.owner,
-          fixtures.repo,
-          fixtures.token
-        )
-      ).rejects.toThrow('boom')
-    })
-  })
-
-  describe('internal', () => {
-    beforeEach(() => {
-      jest.spyOn(config, 'getRuntimeToken').mockReturnValue('test-token')
-      jest
-        .spyOn(util, 'getBackendIdsFromToken')
-        .mockReturnValue(fixtures.backendIds)
-      jest
-        .spyOn(config, 'getResultsServiceUrl')
-        .mockReturnValue('https://results.local')
-    })
-
-    it('should delete an artifact', async () => {
-      jest
-        .spyOn(ArtifactServiceClientJSON.prototype, 'ListArtifacts')
-        .mockResolvedValue({
-          artifacts: fixtures.artifacts.map(artifact => ({
-            ...fixtures.backendIds,
-            databaseId: artifact.id.toString(),
-            name: artifact.name,
-            size: artifact.size.toString(),
-            createdAt: Timestamp.fromDate(artifact.createdAt)
-          }))
-        })
-      jest
-        .spyOn(ArtifactServiceClientJSON.prototype, 'DeleteArtifact')
-        .mockResolvedValue({
-          ok: true,
-          artifactId: fixtures.artifacts[0].id.toString()
-        })
-      const response = await deleteArtifactInternal(fixtures.artifacts[0].name)
-      expect(response).toEqual({
-        id: fixtures.artifacts[0].id
-      })
-    })
-
-    it('should fail if non-200 response', async () => {
-      jest
-        .spyOn(ArtifactServiceClientJSON.prototype, 'ListArtifacts')
-        .mockResolvedValue({
-          artifacts: fixtures.artifacts.map(artifact => ({
-            ...fixtures.backendIds,
-            databaseId: artifact.id.toString(),
-            name: artifact.name,
-            size: artifact.size.toString(),
-            createdAt: Timestamp.fromDate(artifact.createdAt)
-          }))
-        })
-      jest
-        .spyOn(ArtifactServiceClientJSON.prototype, 'DeleteArtifact')
-        .mockRejectedValue(new Error('boom'))
-      await expect(
-        deleteArtifactInternal(fixtures.artifacts[0].id)
-      ).rejects.toThrow('boom')
-    })
-  })
-})

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

@@ -9,8 +9,7 @@ import archiver from 'archiver'
 
 import {
   downloadArtifactInternal,
-  downloadArtifactPublic,
-  streamExtractExternal
+  downloadArtifactPublic
 } from '../src/internal/download/download-artifact'
 import {getUserAgentString} from '../src/internal/shared/user-agent'
 import {noopLogs} from './common'
@@ -249,44 +248,7 @@ describe('download-artifact', () => {
       })
     })
 
-    it('should fail if blob storage storage chunk does not respond within 30s', async () => {
-      // mock http client to delay response data by 30s
-      const msg = new http.IncomingMessage(new net.Socket())
-      msg.statusCode = 200
-
-      const mockGet = jest.fn(async () => {
-        return new Promise((resolve, reject) => {
-          // Resolve with a 200 status code immediately
-          resolve({
-            message: msg,
-            readBody: async () => {
-              return Promise.resolve(`{"ok": true}`)
-            }
-          })
-
-          // Reject with an error after 31 seconds
-          setTimeout(() => {
-            reject(new Error('Request timeout'))
-          }, 31000) // Timeout after 31 seconds
-        })
-      })
-
-      const mockHttpClient = (HttpClient as jest.Mock).mockImplementation(
-        () => {
-          return {
-            get: mockGet
-          }
-        }
-      )
-
-      await expect(
-        streamExtractExternal(fixtures.blobStorageUrl, fixtures.workspaceDir)
-      ).rejects.toBeInstanceOf(Error)
-
-      expect(mockHttpClient).toHaveBeenCalledWith(getUserAgentString())
-    }, 35000) // add longer timeout to allow for timer to run out
-
-    it('should fail if blob storage response is non-200 after 5 retries', async () => {
+    it('should fail if blob storage response is non-200', async () => {
       const downloadArtifactMock = github.getOctokit(fixtures.token).rest
         .actions.downloadArtifact as MockedDownloadArtifact
       downloadArtifactMock.mockResolvedValueOnce({
@@ -328,60 +290,7 @@ describe('download-artifact', () => {
       expect(mockGetArtifactFailure).toHaveBeenCalledWith(
         fixtures.blobStorageUrl
       )
-      expect(mockGetArtifactFailure).toHaveBeenCalledTimes(5)
-    }, 38000)
-
-    it('should retry if blob storage response is non-200 and then succeed with a 200', async () => {
-      const downloadArtifactMock = github.getOctokit(fixtures.token).rest
-        .actions.downloadArtifact as MockedDownloadArtifact
-      downloadArtifactMock.mockResolvedValueOnce({
-        headers: {
-          location: fixtures.blobStorageUrl
-        },
-        status: 302,
-        url: '',
-        data: Buffer.from('')
-      })
-
-      const mockGetArtifact = jest
-        .fn(mockGetArtifactSuccess)
-        .mockImplementationOnce(mockGetArtifactFailure)
-
-      const mockHttpClient = (HttpClient as jest.Mock).mockImplementation(
-        () => {
-          return {
-            get: mockGetArtifact
-          }
-        }
-      )
-
-      const response = await downloadArtifactPublic(
-        fixtures.artifactID,
-        fixtures.repositoryOwner,
-        fixtures.repositoryName,
-        fixtures.token
-      )
-
-      expect(downloadArtifactMock).toHaveBeenCalledWith({
-        owner: fixtures.repositoryOwner,
-        repo: fixtures.repositoryName,
-        artifact_id: fixtures.artifactID,
-        archive_format: 'zip',
-        request: {
-          redirect: 'manual'
-        }
-      })
-      expect(mockHttpClient).toHaveBeenCalledWith(getUserAgentString())
-      expect(mockGetArtifactFailure).toHaveBeenCalledWith(
-        fixtures.blobStorageUrl
-      )
-      expect(mockGetArtifactFailure).toHaveBeenCalledTimes(1)
-      expect(mockGetArtifactSuccess).toHaveBeenCalledWith(
-        fixtures.blobStorageUrl
-      )
-      expect(mockGetArtifactSuccess).toHaveBeenCalledTimes(1)
-      expect(response.downloadPath).toBe(fixtures.workspaceDir)
-    }, 28000)
+    })
   })
 
   describe('internal', () => {

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

@@ -352,3 +352,46 @@ describe('upload-artifact', () => {
     expect(uploadResp).rejects.toThrow()
   })
 })
+
+describe('getBlobClientOptions', () => {
+  afterEach(() => {
+    delete process.env['HTTPS_PROXY']
+    delete process.env['HTTP_PROXY']
+    delete process.env['NO_PROXY']
+    jest.restoreAllMocks()
+  })
+
+  it('should not use proxy settings if not specified', () => {
+    const opts = blobUpload.getBlobClientOptions('https://blob-storage.local')
+    expect(opts.proxyOptions).toBeUndefined()
+  })
+
+  it('should use https proxy settings from environment', () => {
+    process.env['HTTPS_PROXY'] = 'https://foo:bar@my-proxy.local'
+    const opts = blobUpload.getBlobClientOptions('https://blob-storage.local')
+    expect(opts.proxyOptions).toEqual({
+      host: 'my-proxy.local',
+      port: 443,
+      username: 'foo',
+      password: 'bar'
+    })
+  })
+
+  it('should use http proxy settings from environment', () => {
+    process.env['HTTP_PROXY'] = 'http://foo:bar@my-proxy.local:1234'
+    const opts = blobUpload.getBlobClientOptions('http://blob-storage.local')
+    expect(opts.proxyOptions).toEqual({
+      host: 'my-proxy.local',
+      port: 1234,
+      username: 'foo',
+      password: 'bar'
+    })
+  })
+
+  it('should respect NO_PROXY', () => {
+    process.env['HTTPS_PROXY'] = 'https://foo:bar@my-proxy.local'
+    process.env['NO_PROXY'] = 'no-proxy-me.local'
+    const opts = blobUpload.getBlobClientOptions('https://no-proxy-me.local')
+    expect(opts.proxyOptions).toBeUndefined()
+  })
+})

packages/artifact/package-lock.json

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

packages/artifact/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/artifact",
-  "version": "2.0.1",
+  "version": "2.0.0",
   "preview": true,
   "description": "Actions artifact lib",
   "keywords": [
@@ -62,4 +62,4 @@
     "typedoc-plugin-markdown": "^3.17.1",
     "typescript": "^5.2.2"
   }
-}
+}

packages/artifact/src/generated/results/api/v1/artifact.ts

@@ -196,36 +196,6 @@ export interface GetSignedArtifactURLResponse {
      */
     signedUrl: string;
 }
-/**
- * @generated from protobuf message github.actions.results.api.v1.DeleteArtifactRequest
- */
-export interface DeleteArtifactRequest {
-    /**
-     * @generated from protobuf field: string workflow_run_backend_id = 1;
-     */
-    workflowRunBackendId: string;
-    /**
-     * @generated from protobuf field: string workflow_job_run_backend_id = 2;
-     */
-    workflowJobRunBackendId: string;
-    /**
-     * @generated from protobuf field: string name = 3;
-     */
-    name: string;
-}
-/**
- * @generated from protobuf message github.actions.results.api.v1.DeleteArtifactResponse
- */
-export interface DeleteArtifactResponse {
-    /**
-     * @generated from protobuf field: bool ok = 1;
-     */
-    ok: boolean;
-    /**
-     * @generated from protobuf field: int64 artifact_id = 2;
-     */
-    artifactId: string;
-}
 // @generated message type with reflection information, may provide speed optimized methods
 class CreateArtifactRequest$Type extends MessageType<CreateArtifactRequest> {
     constructor() {
@@ -789,121 +759,6 @@ class GetSignedArtifactURLResponse$Type extends MessageType<GetSignedArtifactURL
  * @generated MessageType for protobuf message github.actions.results.api.v1.GetSignedArtifactURLResponse
  */
 export const GetSignedArtifactURLResponse = new GetSignedArtifactURLResponse$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class DeleteArtifactRequest$Type extends MessageType<DeleteArtifactRequest> {
-    constructor() {
-        super("github.actions.results.api.v1.DeleteArtifactRequest", [
-            { no: 1, name: "workflow_run_backend_id", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "workflow_job_run_backend_id", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "name", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-    create(value?: PartialMessage<DeleteArtifactRequest>): DeleteArtifactRequest {
-        const message = { workflowRunBackendId: "", workflowJobRunBackendId: "", name: "" };
-        globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
-        if (value !== undefined)
-            reflectionMergePartial<DeleteArtifactRequest>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: DeleteArtifactRequest): DeleteArtifactRequest {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* string workflow_run_backend_id */ 1:
-                    message.workflowRunBackendId = reader.string();
-                    break;
-                case /* string workflow_job_run_backend_id */ 2:
-                    message.workflowJobRunBackendId = reader.string();
-                    break;
-                case /* string name */ 3:
-                    message.name = reader.string();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: DeleteArtifactRequest, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* string workflow_run_backend_id = 1; */
-        if (message.workflowRunBackendId !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.workflowRunBackendId);
-        /* string workflow_job_run_backend_id = 2; */
-        if (message.workflowJobRunBackendId !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.workflowJobRunBackendId);
-        /* string name = 3; */
-        if (message.name !== "")
-            writer.tag(3, WireType.LengthDelimited).string(message.name);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message github.actions.results.api.v1.DeleteArtifactRequest
- */
-export const DeleteArtifactRequest = new DeleteArtifactRequest$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class DeleteArtifactResponse$Type extends MessageType<DeleteArtifactResponse> {
-    constructor() {
-        super("github.actions.results.api.v1.DeleteArtifactResponse", [
-            { no: 1, name: "ok", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 2, name: "artifact_id", kind: "scalar", T: 3 /*ScalarType.INT64*/ }
-        ]);
-    }
-    create(value?: PartialMessage<DeleteArtifactResponse>): DeleteArtifactResponse {
-        const message = { ok: false, artifactId: "0" };
-        globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
-        if (value !== undefined)
-            reflectionMergePartial<DeleteArtifactResponse>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: DeleteArtifactResponse): DeleteArtifactResponse {
-        let message = target ?? this.create(), end = reader.pos + length;
-        while (reader.pos < end) {
-            let [fieldNo, wireType] = reader.tag();
-            switch (fieldNo) {
-                case /* bool ok */ 1:
-                    message.ok = reader.bool();
-                    break;
-                case /* int64 artifact_id */ 2:
-                    message.artifactId = reader.int64().toString();
-                    break;
-                default:
-                    let u = options.readUnknownField;
-                    if (u === "throw")
-                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
-                    let d = reader.skip(wireType);
-                    if (u !== false)
-                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
-            }
-        }
-        return message;
-    }
-    internalBinaryWrite(message: DeleteArtifactResponse, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* bool ok = 1; */
-        if (message.ok !== false)
-            writer.tag(1, WireType.Varint).bool(message.ok);
-        /* int64 artifact_id = 2; */
-        if (message.artifactId !== "0")
-            writer.tag(2, WireType.Varint).int64(message.artifactId);
-        let u = options.writeUnknownFields;
-        if (u !== false)
-            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
-        return writer;
-    }
-}
-/**
- * @generated MessageType for protobuf message github.actions.results.api.v1.DeleteArtifactResponse
- */
-export const DeleteArtifactResponse = new DeleteArtifactResponse$Type();
 /**
  * @generated ServiceType for protobuf service github.actions.results.api.v1.ArtifactService
  */
@@ -911,6 +766,5 @@ export const ArtifactService = new ServiceType("github.actions.results.api.v1.Ar
     { name: "CreateArtifact", options: {}, I: CreateArtifactRequest, O: CreateArtifactResponse },
     { name: "FinalizeArtifact", options: {}, I: FinalizeArtifactRequest, O: FinalizeArtifactResponse },
     { name: "ListArtifacts", options: {}, I: ListArtifactsRequest, O: ListArtifactsResponse },
-    { name: "GetSignedArtifactURL", options: {}, I: GetSignedArtifactURLRequest, O: GetSignedArtifactURLResponse },
-    { name: "DeleteArtifact", options: {}, I: DeleteArtifactRequest, O: DeleteArtifactResponse }
+    { name: "GetSignedArtifactURL", options: {}, I: GetSignedArtifactURLRequest, O: GetSignedArtifactURLResponse }
 ]);

packages/artifact/src/generated/results/api/v1/artifact.twirp.ts

@@ -17,8 +17,6 @@ import {
   ListArtifactsResponse,
   GetSignedArtifactURLRequest,
   GetSignedArtifactURLResponse,
-  DeleteArtifactRequest,
-  DeleteArtifactResponse,
 } from "./artifact";
 
 //==================================//
@@ -45,9 +43,6 @@ export interface ArtifactServiceClient {
   GetSignedArtifactURL(
     request: GetSignedArtifactURLRequest
   ): Promise<GetSignedArtifactURLResponse>;
-  DeleteArtifact(
-    request: DeleteArtifactRequest
-  ): Promise<DeleteArtifactResponse>;
 }
 
 export class ArtifactServiceClientJSON implements ArtifactServiceClient {
@@ -58,7 +53,6 @@ export class ArtifactServiceClientJSON implements ArtifactServiceClient {
     this.FinalizeArtifact.bind(this);
     this.ListArtifacts.bind(this);
     this.GetSignedArtifactURL.bind(this);
-    this.DeleteArtifact.bind(this);
   }
   CreateArtifact(
     request: CreateArtifactRequest
@@ -135,26 +129,6 @@ export class ArtifactServiceClientJSON implements ArtifactServiceClient {
       })
     );
   }
-
-  DeleteArtifact(
-    request: DeleteArtifactRequest
-  ): Promise<DeleteArtifactResponse> {
-    const data = DeleteArtifactRequest.toJson(request, {
-      useProtoFieldName: true,
-      emitDefaultValues: false,
-    });
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "DeleteArtifact",
-      "application/json",
-      data as object
-    );
-    return promise.then((data) =>
-      DeleteArtifactResponse.fromJson(data as any, {
-        ignoreUnknownFields: true,
-      })
-    );
-  }
 }
 
 export class ArtifactServiceClientProtobuf implements ArtifactServiceClient {
@@ -165,7 +139,6 @@ export class ArtifactServiceClientProtobuf implements ArtifactServiceClient {
     this.FinalizeArtifact.bind(this);
     this.ListArtifacts.bind(this);
     this.GetSignedArtifactURL.bind(this);
-    this.DeleteArtifact.bind(this);
   }
   CreateArtifact(
     request: CreateArtifactRequest
@@ -224,21 +197,6 @@ export class ArtifactServiceClientProtobuf implements ArtifactServiceClient {
       GetSignedArtifactURLResponse.fromBinary(data as Uint8Array)
     );
   }
-
-  DeleteArtifact(
-    request: DeleteArtifactRequest
-  ): Promise<DeleteArtifactResponse> {
-    const data = DeleteArtifactRequest.toBinary(request);
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "DeleteArtifact",
-      "application/protobuf",
-      data
-    );
-    return promise.then((data) =>
-      DeleteArtifactResponse.fromBinary(data as Uint8Array)
-    );
-  }
 }
 
 //==================================//
@@ -262,10 +220,6 @@ export interface ArtifactServiceTwirp<T extends TwirpContext = TwirpContext> {
     ctx: T,
     request: GetSignedArtifactURLRequest
   ): Promise<GetSignedArtifactURLResponse>;
-  DeleteArtifact(
-    ctx: T,
-    request: DeleteArtifactRequest
-  ): Promise<DeleteArtifactResponse>;
 }
 
 export enum ArtifactServiceMethod {
@@ -273,7 +227,6 @@ export enum ArtifactServiceMethod {
   FinalizeArtifact = "FinalizeArtifact",
   ListArtifacts = "ListArtifacts",
   GetSignedArtifactURL = "GetSignedArtifactURL",
-  DeleteArtifact = "DeleteArtifact",
 }
 
 export const ArtifactServiceMethodList = [
@@ -281,7 +234,6 @@ export const ArtifactServiceMethodList = [
   ArtifactServiceMethod.FinalizeArtifact,
   ArtifactServiceMethod.ListArtifacts,
   ArtifactServiceMethod.GetSignedArtifactURL,
-  ArtifactServiceMethod.DeleteArtifact,
 ];
 
 export function createArtifactServiceServer<
@@ -381,26 +333,6 @@ function matchArtifactServiceRoute<T extends TwirpContext = TwirpContext>(
           interceptors
         );
       };
-    case "DeleteArtifact":
-      return async (
-        ctx: T,
-        service: ArtifactServiceTwirp,
-        data: Buffer,
-        interceptors?: Interceptor<
-          T,
-          DeleteArtifactRequest,
-          DeleteArtifactResponse
-        >[]
-      ) => {
-        ctx = { ...ctx, methodName: "DeleteArtifact" };
-        await events.onMatch(ctx);
-        return handleArtifactServiceDeleteArtifactRequest(
-          ctx,
-          service,
-          data,
-          interceptors
-        );
-      };
     default:
       events.onNotFound();
       const msg = `no handler found`;
@@ -531,35 +463,6 @@ function handleArtifactServiceGetSignedArtifactURLRequest<
       throw new TwirpError(TwirpErrorCode.BadRoute, msg);
   }
 }
-
-function handleArtifactServiceDeleteArtifactRequest<
-  T extends TwirpContext = TwirpContext
->(
-  ctx: T,
-  service: ArtifactServiceTwirp,
-  data: Buffer,
-  interceptors?: Interceptor<T, DeleteArtifactRequest, DeleteArtifactResponse>[]
-): Promise<string | Uint8Array> {
-  switch (ctx.contentType) {
-    case TwirpContentType.JSON:
-      return handleArtifactServiceDeleteArtifactJSON<T>(
-        ctx,
-        service,
-        data,
-        interceptors
-      );
-    case TwirpContentType.Protobuf:
-      return handleArtifactServiceDeleteArtifactProtobuf<T>(
-        ctx,
-        service,
-        data,
-        interceptors
-      );
-    default:
-      const msg = "unexpected Content-Type";
-      throw new TwirpError(TwirpErrorCode.BadRoute, msg);
-  }
-}
 async function handleArtifactServiceCreateArtifactJSON<
   T extends TwirpContext = TwirpContext
 >(
@@ -743,50 +646,6 @@ async function handleArtifactServiceGetSignedArtifactURLJSON<
     }) as string
   );
 }
-
-async function handleArtifactServiceDeleteArtifactJSON<
-  T extends TwirpContext = TwirpContext
->(
-  ctx: T,
-  service: ArtifactServiceTwirp,
-  data: Buffer,
-  interceptors?: Interceptor<T, DeleteArtifactRequest, DeleteArtifactResponse>[]
-) {
-  let request: DeleteArtifactRequest;
-  let response: DeleteArtifactResponse;
-
-  try {
-    const body = JSON.parse(data.toString() || "{}");
-    request = DeleteArtifactRequest.fromJson(body, {
-      ignoreUnknownFields: true,
-    });
-  } catch (e) {
-    if (e instanceof Error) {
-      const msg = "the json request could not be decoded";
-      throw new TwirpError(TwirpErrorCode.Malformed, msg).withCause(e, true);
-    }
-  }
-
-  if (interceptors && interceptors.length > 0) {
-    const interceptor = chainInterceptors(...interceptors) as Interceptor<
-      T,
-      DeleteArtifactRequest,
-      DeleteArtifactResponse
-    >;
-    response = await interceptor(ctx, request!, (ctx, inputReq) => {
-      return service.DeleteArtifact(ctx, inputReq);
-    });
-  } else {
-    response = await service.DeleteArtifact(ctx, request!);
-  }
-
-  return JSON.stringify(
-    DeleteArtifactResponse.toJson(response, {
-      useProtoFieldName: true,
-      emitDefaultValues: false,
-    }) as string
-  );
-}
 async function handleArtifactServiceCreateArtifactProtobuf<
   T extends TwirpContext = TwirpContext
 >(
@@ -938,39 +797,3 @@ async function handleArtifactServiceGetSignedArtifactURLProtobuf<
 
   return Buffer.from(GetSignedArtifactURLResponse.toBinary(response));
 }
-
-async function handleArtifactServiceDeleteArtifactProtobuf<
-  T extends TwirpContext = TwirpContext
->(
-  ctx: T,
-  service: ArtifactServiceTwirp,
-  data: Buffer,
-  interceptors?: Interceptor<T, DeleteArtifactRequest, DeleteArtifactResponse>[]
-) {
-  let request: DeleteArtifactRequest;
-  let response: DeleteArtifactResponse;
-
-  try {
-    request = DeleteArtifactRequest.fromBinary(data);
-  } catch (e) {
-    if (e instanceof Error) {
-      const msg = "the protobuf request could not be decoded";
-      throw new TwirpError(TwirpErrorCode.Malformed, msg).withCause(e, true);
-    }
-  }
-
-  if (interceptors && interceptors.length > 0) {
-    const interceptor = chainInterceptors(...interceptors) as Interceptor<
-      T,
-      DeleteArtifactRequest,
-      DeleteArtifactResponse
-    >;
-    response = await interceptor(ctx, request!, (ctx, inputReq) => {
-      return service.DeleteArtifact(ctx, inputReq);
-    });
-  } else {
-    response = await service.DeleteArtifact(ctx, request!);
-  }
-
-  return Buffer.from(DeleteArtifactResponse.toBinary(response));
-}

packages/artifact/src/internal/client.ts

@@ -8,18 +8,13 @@ import {
   ListArtifactsOptions,
   ListArtifactsResponse,
   DownloadArtifactResponse,
-  FindOptions,
-  DeleteArtifactResponse
+  FindOptions
 } from './shared/interfaces'
 import {uploadArtifact} from './upload/upload-artifact'
 import {
   downloadArtifactPublic,
   downloadArtifactInternal
 } from './download/download-artifact'
-import {
-  deleteArtifactPublic,
-  deleteArtifactInternal
-} from './delete/delete-artifact'
 import {getArtifactPublic, getArtifactInternal} from './find/get-artifact'
 import {listArtifactsPublic, listArtifactsInternal} from './find/list-artifacts'
 import {GHESNotSupportedError} from './shared/errors'
@@ -82,7 +77,7 @@ export interface ArtifactClient {
    *
    * If `options.findBy` is specified, this will use the public Download Artifact API https://docs.github.com/en/rest/actions/artifacts?apiVersion=2022-11-28#download-an-artifact
    *
-   * @param artifactId The id of the artifact to download
+   * @param artifactId The name of the artifact to download
    * @param options Extra options that allow for the customization of the download behavior
    * @returns single DownloadArtifactResponse object
    */
@@ -90,20 +85,6 @@ export interface ArtifactClient {
     artifactId: number,
     options?: DownloadArtifactOptions & FindOptions
   ): Promise<DownloadArtifactResponse>
-
-  /**
-   * Delete an Artifact
-   *
-   * If `options.findBy` is specified, this will use the public Delete Artifact API https://docs.github.com/en/rest/actions/artifacts?apiVersion=2022-11-28#delete-an-artifact
-   *
-   * @param artifactName The name of the artifact to delete
-   * @param options Extra options that allow for the customization of the delete behavior
-   * @returns single DeleteArtifactResponse object
-   */
-  deleteArtifact(
-    artifactName: string,
-    options?: FindOptions
-  ): Promise<DeleteArtifactResponse>
 }
 
 /**
@@ -244,41 +225,4 @@ If the error persists, please check whether Actions and API requests are operati
       throw error
     }
   }
-
-  async deleteArtifact(
-    artifactName: string,
-    options?: FindOptions
-  ): Promise<DeleteArtifactResponse> {
-    try {
-      if (isGhes()) {
-        throw new GHESNotSupportedError()
-      }
-
-      if (options?.findBy) {
-        const {
-          findBy: {repositoryOwner, repositoryName, workflowRunId, token}
-        } = options
-
-        return deleteArtifactPublic(
-          artifactName,
-          workflowRunId,
-          repositoryOwner,
-          repositoryName,
-          token
-        )
-      }
-
-      return deleteArtifactInternal(artifactName)
-    } catch (error) {
-      warning(
-        `Delete Artifact failed with error: ${error}.
-
-Errors can be temporary, so please try again and optionally run the action with debug mode enabled for more information.
-
-If the error persists, please check whether Actions and API requests are operating normally at [https://githubstatus.com](https://www.githubstatus.com).`
-      )
-
-      throw error
-    }
-  }
 }

packages/artifact/src/internal/delete/delete-artifact.ts

@@ -1,109 +0,0 @@
-import {info, debug} from '@actions/core'
-import {getOctokit} from '@actions/github'
-import {DeleteArtifactResponse} from '../shared/interfaces'
-import {getUserAgentString} from '../shared/user-agent'
-import {getRetryOptions} from '../find/retry-options'
-import {defaults as defaultGitHubOptions} from '@actions/github/lib/utils'
-import {requestLog} from '@octokit/plugin-request-log'
-import {retry} from '@octokit/plugin-retry'
-import {OctokitOptions} from '@octokit/core/dist-types/types'
-import {internalArtifactTwirpClient} from '../shared/artifact-twirp-client'
-import {getBackendIdsFromToken} from '../shared/util'
-import {
-  DeleteArtifactRequest,
-  ListArtifactsRequest,
-  StringValue
-} from '../../generated'
-import {getArtifactPublic} from '../find/get-artifact'
-import {ArtifactNotFoundError, InvalidResponseError} from '../shared/errors'
-
-export async function deleteArtifactPublic(
-  artifactName: string,
-  workflowRunId: number,
-  repositoryOwner: string,
-  repositoryName: string,
-  token: string
-): Promise<DeleteArtifactResponse> {
-  const [retryOpts, requestOpts] = getRetryOptions(defaultGitHubOptions)
-
-  const opts: OctokitOptions = {
-    log: undefined,
-    userAgent: getUserAgentString(),
-    previews: undefined,
-    retry: retryOpts,
-    request: requestOpts
-  }
-
-  const github = getOctokit(token, opts, retry, requestLog)
-
-  const getArtifactResp = await getArtifactPublic(
-    artifactName,
-    workflowRunId,
-    repositoryOwner,
-    repositoryName,
-    token
-  )
-
-  const deleteArtifactResp = await github.rest.actions.deleteArtifact({
-    owner: repositoryOwner,
-    repo: repositoryName,
-    artifact_id: getArtifactResp.artifact.id
-  })
-
-  if (deleteArtifactResp.status !== 204) {
-    throw new InvalidResponseError(
-      `Invalid response from GitHub API: ${deleteArtifactResp.status} (${deleteArtifactResp?.headers?.['x-github-request-id']})`
-    )
-  }
-
-  return {
-    id: getArtifactResp.artifact.id
-  }
-}
-
-export async function deleteArtifactInternal(
-  artifactName
-): Promise<DeleteArtifactResponse> {
-  const artifactClient = internalArtifactTwirpClient()
-
-  const {workflowRunBackendId, workflowJobRunBackendId} =
-    getBackendIdsFromToken()
-
-  const listReq: ListArtifactsRequest = {
-    workflowRunBackendId,
-    workflowJobRunBackendId,
-    nameFilter: StringValue.create({value: artifactName})
-  }
-
-  const listRes = await artifactClient.ListArtifacts(listReq)
-
-  if (listRes.artifacts.length === 0) {
-    throw new ArtifactNotFoundError(
-      `Artifact not found for name: ${artifactName}`
-    )
-  }
-
-  let artifact = listRes.artifacts[0]
-  if (listRes.artifacts.length > 1) {
-    artifact = listRes.artifacts.sort(
-      (a, b) => Number(b.databaseId) - Number(a.databaseId)
-    )[0]
-
-    debug(
-      `More than one artifact found for a single name, returning newest (id: ${artifact.databaseId})`
-    )
-  }
-
-  const req: DeleteArtifactRequest = {
-    workflowRunBackendId: artifact.workflowRunBackendId,
-    workflowJobRunBackendId: artifact.workflowJobRunBackendId,
-    name: artifact.name
-  }
-
-  const res = await artifactClient.DeleteArtifact(req)
-  info(`Artifact '${artifactName}' (ID: ${res.artifactId}) deleted`)
-
-  return {
-    id: Number(res.artifactId)
-  }
-}

packages/artifact/src/internal/download/download-artifact.ts

@@ -38,65 +38,20 @@ async function exists(path: string): Promise<boolean> {
 }
 
 async function streamExtract(url: string, directory: string): Promise<void> {
-  let retryCount = 0
-  while (retryCount < 5) {
-    try {
-      await streamExtractExternal(url, directory)
-      return
-    } catch (error) {
-      retryCount++
-      core.debug(
-        `Failed to download artifact after ${retryCount} retries due to ${error.message}. Retrying in 5 seconds...`
-      )
-      // wait 5 seconds before retrying
-      await new Promise(resolve => setTimeout(resolve, 5000))
-    }
-  }
-
-  throw new Error(`Artifact download failed after ${retryCount} retries.`)
-}
-
-export async function streamExtractExternal(
-  url: string,
-  directory: string
-): Promise<void> {
   const client = new httpClient.HttpClient(getUserAgentString())
   const response = await client.get(url)
+
   if (response.message.statusCode !== 200) {
     throw new Error(
       `Unexpected HTTP response from blob storage: ${response.message.statusCode} ${response.message.statusMessage}`
     )
   }
 
-  const timeout = 30 * 1000 // 30 seconds
-
   return new Promise((resolve, reject) => {
-    const timerFn = (): void => {
-      response.message.destroy(
-        new Error(`Blob storage chunk did not respond in ${timeout}ms`)
-      )
-    }
-    const timer = setTimeout(timerFn, timeout)
-
     response.message
-      .on('data', () => {
-        timer.refresh()
-      })
-      .on('error', (error: Error) => {
-        core.debug(
-          `response.message: Artifact download failed: ${error.message}`
-        )
-        clearTimeout(timer)
-        reject(error)
-      })
       .pipe(unzip.Extract({path: directory}))
-      .on('close', () => {
-        clearTimeout(timer)
-        resolve()
-      })
-      .on('error', (error: Error) => {
-        reject(error)
-      })
+      .on('close', resolve)
+      .on('error', reject)
   })
 }
 

packages/artifact/src/internal/shared/artifact-twirp-client.ts

@@ -4,7 +4,7 @@ import {info, debug} from '@actions/core'
 import {ArtifactServiceClientJSON} from '../../generated'
 import {getResultsServiceUrl, getRuntimeToken} from './config'
 import {getUserAgentString} from './user-agent'
-import {NetworkError, UsageError} from './errors'
+import {NetworkError} from './errors'
 
 // The twirp http client must implement this interface
 interface Rpc {
@@ -64,7 +64,7 @@ class ArtifactHttpClient implements Rpc {
         this.httpClient.post(url, JSON.stringify(data), headers)
       )
 
-      return body
+      return JSON.parse(body)
     } catch (error) {
       throw new Error(`Failed to ${method}: ${error.message}`)
     }
@@ -72,49 +72,34 @@ class ArtifactHttpClient implements Rpc {
 
   async retryableRequest(
     operation: () => Promise<HttpClientResponse>
-  ): Promise<{response: HttpClientResponse; body: object}> {
+  ): Promise<{response: HttpClientResponse; body: string}> {
     let attempt = 0
     let errorMessage = ''
-    let rawBody = ''
     while (attempt < this.maxAttempts) {
       let isRetryable = false
 
       try {
         const response = await operation()
         const statusCode = response.message.statusCode
-        rawBody = await response.readBody()
+        const body = await response.readBody()
         debug(`[Response] - ${response.message.statusCode}`)
         debug(`Headers: ${JSON.stringify(response.message.headers, null, 2)}`)
-        const body = JSON.parse(rawBody)
-        debug(`Body: ${JSON.stringify(body, null, 2)}`)
+        debug(`Body: ${body}`)
         if (this.isSuccessStatusCode(statusCode)) {
           return {response, body}
         }
         isRetryable = this.isRetryableHttpStatusCode(statusCode)
         errorMessage = `Failed request: (${statusCode}) ${response.message.statusMessage}`
-        if (body.msg) {
-          if (UsageError.isUsageErrorMessage(body.msg)) {
-            throw new UsageError()
-          }
-
-          errorMessage = `${errorMessage}: ${body.msg}`
+        const responseMessage = JSON.parse(body).msg
+        if (responseMessage) {
+          errorMessage = `${errorMessage}: ${responseMessage}`
         }
       } catch (error) {
-        if (error instanceof SyntaxError) {
-          debug(`Raw Body: ${rawBody}`)
-          throw error
-        }
-
-        if (error instanceof UsageError) {
-          throw error
-        }
-
+        isRetryable = true
+        errorMessage = error.message
         if (NetworkError.isNetworkErrorCode(error?.code)) {
           throw new NetworkError(error?.code)
         }
-
-        isRetryable = true
-        errorMessage = error.message
       }
 
       if (!isRetryable) {

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

@@ -57,16 +57,3 @@ export class NetworkError extends Error {
     ].includes(code)
   }
 }
-
-export class UsageError extends Error {
-  constructor() {
-    const message = `Artifact storage quota has been hit. Unable to upload any new artifacts. Usage is recalculated every 6-12 hours.\nMore info on storage limits: https://docs.github.com/en/billing/managing-billing-for-github-actions/about-billing-for-github-actions#calculating-minute-and-storage-spending`
-    super(message)
-    this.name = 'UsageError'
-  }
-
-  static isUsageErrorMessage = (msg?: string): boolean => {
-    if (!msg) return false
-    return msg.includes('insufficient usage')
-  }
-}

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

@@ -147,13 +147,3 @@ export interface FindOptions {
     repositoryName: string
   }
 }
-
-/**
- * Response from the server when deleting an artifact
- */
-export interface DeleteArtifactResponse {
-  /**
-   * The id of the artifact that was deleted
-   */
-  id: number
-}

packages/artifact/src/internal/upload/blob-upload.ts

@@ -1,11 +1,18 @@
-import {BlobClient, BlockBlobUploadStreamOptions} from '@azure/storage-blob'
+import {
+  AnonymousCredential,
+  BlobClient,
+  BlockBlobUploadStreamOptions,
+  StoragePipelineOptions
+} from '@azure/storage-blob'
 import {TransferProgressEvent} from '@azure/core-http'
 import {ZipUploadStream} from './zip'
 import {getUploadChunkSize, getConcurrency} from '../shared/config'
+import {getProxyUrl} from '@actions/http-client'
 import * as core from '@actions/core'
 import * as crypto from 'crypto'
 import * as stream from 'stream'
 import {NetworkError} from '../shared/errors'
+import {getUserAgentString} from '../shared/user-agent'
 
 export interface BlobUploadResponse {
   /**
@@ -27,7 +34,12 @@ export async function uploadZipToBlobStorage(
 
   const maxConcurrency = getConcurrency()
   const bufferSize = getUploadChunkSize()
-  const blobClient = new BlobClient(authenticatedUploadURL)
+
+  const blobClient = new BlobClient(
+    authenticatedUploadURL,
+    new AnonymousCredential(),
+    getBlobClientOptions(authenticatedUploadURL)
+  )
   const blockBlobClient = blobClient.getBlockBlobClient()
 
   core.debug(
@@ -85,3 +97,37 @@ export async function uploadZipToBlobStorage(
     sha256Hash
   }
 }
+
+export function getBlobClientOptions(sasURL: string): StoragePipelineOptions {
+  const options: StoragePipelineOptions = {
+    userAgentOptions: {
+      userAgentPrefix: getUserAgentString()
+    }
+  }
+
+  const proxyUrl = getProxyUrl(sasURL)
+  if (proxyUrl !== '') {
+    const {
+      port: portString,
+      hostname: host,
+      username,
+      password,
+      protocol
+    } = new URL(proxyUrl)
+    core.debug(`Using proxy server for blob storage upload, host: ${host}`)
+
+    let port = protocol === 'https:' ? 443 : 80
+    if (portString !== '') {
+      port = parseInt(portString)
+    }
+
+    options.proxyOptions = {
+      host,
+      port,
+      username,
+      password
+    }
+  }
+
+  return options
+}

packages/cache/RELEASES.md

@@ -164,7 +164,3 @@
 ### 3.2.2
 
 - Add new default cache download method to improve performance and reduce hangs [#1484](https://github.com/actions/toolkit/pull/1484)
-
-### 3.2.3
-
-- Fixed a bug that mutated path arguments to `getCacheVersion` [#1378](https://github.com/actions/toolkit/pull/1378)

packages/cache/package.json

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

packages/cache/src/internal/cacheHttpClient.ts

@@ -80,8 +80,7 @@ export function getCacheVersion(
   compressionMethod?: CompressionMethod,
   enableCrossOsArchive = false
 ): string {
-  // don't pass changes upstream
-  const components = paths.slice()
+  const components = paths
 
   // Add compression method to cache version to restore
   // compressed cache as per compression method

packages/core/README.md

@@ -358,129 +358,3 @@ const {
   version, // 10.0.22621
 } = await platform.getDetails()
 ```
-
-#### Populating job summary
-
-These methods can be used to populate a [job summary](https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary). A job summary is a buffer that can be added to throughout your job via `core.summary` methods.
-
-Job summaries when complete must be written to the summary buffer file via the `core.summary.write()` method.
-
-All methods except `addRaw()` utilize the `addRaw()` method to append to the buffer, followed by an EOL using the `addEOL()` method.
-
-```typescript
-
-// Write raw text, optionally add an EOL after the content, defaults to false
-core.summary.addRaw('Some content here :speech_balloon:', true)
-// Output: Some content here :speech_balloon:\n
-
-// Add an operating system-specific end-of-line marker
-core.summary.addEOL()
-// Output (POSIX): \n
-// Output (Windows): \r\n
-
-// Add a codeblock with an optional language for syntax highlighting
-core.summary.addCodeBlock('console.log(\'hello world\')', 'javascript')
-// Output: <pre lang="javascript"><code>console.log('hello world')</code></pre>
-
-// Add a list, second parameter indicates if list is ordered, defaults to false
-core.summary.addList(['item1','item2','item3'], true)
-// Output: <ol><li>item1</li><li>item2</li><li>item3</li></ol>
-
-// Add a collapsible HTML details element
-core.summary.addDetails('Label', 'Some detail that will be collapsed')
-// Output: <details><summary>Label</summary>Some detail that will be collapsed</details>
-
-// Add an image, image options parameter is optional, you can supply one of or both width and height in pixels
-core.summary.addImage('example.png', 'alt description of img', {width: '100', height: '100'})
-// Output: <img src="example.png" alt="alt description of img" width="100" height="100">
-
-// Add an HTML section heading element, optionally pass a level that translates to 'hX' ie. h2. Defaults to h1
-core.summary.addHeading('My Heading', '2')
-// Output: <h2>My Heading</h2>
-
-// Add an HTML thematic break <hr>
-core.summary.addSeparator()
-// Output: <hr>
-
-// Add an HTML line break <br>
-core.summary.addBreak()
-// Output: <br>
-
-// Add an HTML blockquote with an optional citation
-core.summary.addQuote('To be or not to be', 'Shakespeare')
-// Output: <blockquote cite="Shakespeare">To be or not to be</blockquote>
-
-// Add an HTML anchor tag
-core.summary.addLink('click here', 'https://github.com')
-// Output: <a href="https://github.com">click here</a>
-
-```
-
-Tables are added using the `addTable()` method, and an array of `SummaryTableRow`.
-
-```typescript
-
-export type SummaryTableRow = (SummaryTableCell | string)[]
-
-export interface SummaryTableCell {
-  /**
-   * Cell content
-   */
-  data: string
-  /**
-   * Render cell as header
-   * (optional) default: false
-   */
-  header?: boolean
-  /**
-   * Number of columns the cell extends
-   * (optional) default: '1'
-   */
-  colspan?: string
-  /**
-   * Number of rows the cell extends
-   * (optional) default: '1'
-   */
-  rowspan?: string
-}
-
-```
-
-For example
-
-```typescript
-
-const tableData = [
-  {data: 'Header1', header: true},
-  {data: 'Header2', header: true},
-  {data: 'Header3', header: true},
-  {data: 'MyData1'},
-  {data: 'MyData2'},
-  {data: 'MyData3'}
-]
-
-// Add an HTML table
-core.summary.addTable([tableData])
-// Output: <table><tr><th>Header1</th><th>Header2</th><th>Header3</th></tr><tr></tr><td>MyData1</td><td>MyData2</td><td>MyData3</td></tr></table>
-
-```
-
-In addition to job summary content, there are utility functions for interfacing with the buffer.
-
-```typescript
-
-// Empties the summary buffer AND wipes the summary file on disk
-core.summary.clear()
-
-// Returns the current summary buffer as a string
-core.summary.stringify()
-
-// If the summary buffer is empty
-core.summary.isEmptyBuffer()
-
-// Resets the summary buffer without writing to the summary file on disk
-core.summary.emptyBuffer()
-
-// Writes text in the buffer to the summary buffer file and empties the buffer, optionally overwriting all existing content in the summary file with buffer contents. Defaults to false.
-core.summary.write({overwrite: true})
-```