core: Add return type to test helper function

core: Update parameter defaulting behavior for error/warning/notice to honor an empty object passed in
core: Extract AnnotationProperties from Error instances when logging with error/warning/notice
2024-03-28 10:38:51 -05:00 · 2024-03-28 10:26:41 -05:00 · 2024-03-28 00:34:36 -05:00 · 2024-03-28 00:01:09 -05:00
165 changed files with 9971 additions and 18381 deletions
@@ -43,7 +43,7 @@ Note that before a PR will be accepted, you must ensure:
 1. In a new branch, create a new Lerna package:

 ```console
-$ npm run new-package [name]
+$ npm run create-package new-package
 ```

 This will ask you some questions about the new package. Start with `0.0.0` as the first version (look generally at some of the other packages for how the package.json is structured).
@@ -1,27 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/packages/artifact"
-    schedule:
-      interval: "daily"
-    groups:
-      # Group minor and patch updates together but keep major separate
-      artifact-minor-patch:
-        update-types:
-          - "minor"
-          - "patch"
-  - package-ecosystem: "npm"
-    directory: "/packages/cache"
-    schedule:
-      interval: "daily"
-    groups:
-      # Group minor and patch updates together but keep major separate
-      cache-minor-patch:
-        update-types:
-          - "minor"
-          - "patch"
@@ -22,12 +22,12 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

-    - name: Set Node.js 24.x
-      uses: actions/setup-node@v5
+    - name: Set Node.js 20.x
+      uses: actions/setup-node@v4
      with:
-        node-version: 24.x
+        node-version: 20.x

    # Need root node_modules because certain npm packages like jest are configured for the entire repository and it won't be possible
    # without these to just compile the artifacts package
@@ -47,7 +47,7 @@ jobs:
        echo -n 'hello from file 2' > artifact-path/second.txt

    - name: Upload Artifacts
-      uses: actions/github-script@v8
+      uses: actions/github-script@v7
      with:
        script: |
          const {default: artifact} = require('./packages/artifact/lib/artifact')
@@ -77,12 +77,12 @@ jobs:
    needs: [upload]
    steps:
    - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

-    - name: Set Node.js 24.x
-      uses: actions/setup-node@v5
+    - name: Set Node.js 20.x
+      uses: actions/setup-node@v4
      with:
-        node-version: 24.x
+        node-version: 20.x

    # Need root node_modules because certain npm packages like jest are configured for the entire repository and it won't be possible
    # without these to just compile the artifacts package
@@ -96,7 +96,7 @@ jobs:
      working-directory: packages/artifact

    - name: List and Download Artifacts
-      uses: actions/github-script@v8
+      uses: actions/github-script@v7
      with:
        script: |
          const {default: artifactClient} = require('./packages/artifact/lib/artifact')
@@ -165,7 +165,7 @@ jobs:
            }
          }
    - name: Delete Artifacts
-      uses: actions/github-script@v8
+      uses: actions/github-script@v7
      with:
        script: |
          const {default: artifactClient} = require('./packages/artifact/lib/artifact')
@@ -18,12 +18,12 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

-    - name: Set Node.js 24.x
-      uses: actions/setup-node@v5
+    - name: Set Node.js 20.x
+      uses: actions/setup-node@v4
      with:
-        node-version: 24.x
+        node-version: 20.x

    - name: npm install
      run: npm install
@@ -32,7 +32,7 @@ jobs:
      run: npm run bootstrap

    - name: audit tools (without allow-list)
-      run: npm audit --audit-level=moderate --omit dev
+      run: npm audit --audit-level=moderate

    - name: audit packages
      run: npm run audit-all
@@ -22,12 +22,12 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

-    - name: Set Node.js 24.x
-      uses: actions/setup-node@v5
+    - name: Set Node.js 20.x
+      uses: actions/setup-node@v4
      with:
-        node-version: 24.x
+        node-version: 20.x

    # In order to save & restore cache from a shell script, certain env variables need to be set that are only available in the
    # node context. This runs a local action that gets and sets the necessary env variables that are needed
@@ -39,11 +39,9 @@ jobs:
    - name: Install root npm packages
      run: npm ci

-    # We need to install only runtime dependencies (omit dev dependencies) to verify that what we're shipping is all
-    # that is needed
    - name: Compile cache package
      run: |
-        npm ci --omit=dev
+        npm ci
        npm run tsc
      working-directory: packages/cache
    
@@ -17,16 +17,16 @@ jobs:

    steps:
    - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v2

    - shell: bash
      run: |
        rm "C:\Program Files\Git\usr\bin\tar.exe"

-    - name: Set Node.js 24.x
-      uses: actions/setup-node@v5
+    - name: Set Node.js 20.x
+      uses: actions/setup-node@v1
      with:
-        node-version: 24.x
+        node-version: 20.x

    # In order to save & restore cache from a shell script, certain env variables need to be set that are only available in the
    # node context. This runs a local action that gets and sets the necessary env variables that are needed
@@ -20,7 +20,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
@@ -1,42 +1,27 @@
 name: Publish NPM

-run-name: Publish NPM - ${{ github.event.inputs.package }}
-
 on:
  workflow_dispatch:
    inputs:
      package:
-        type: choice
        required: true
-        description: 'Which package to release'
-        options:
-          - artifact
-          - attest
-          - cache
-          - core
-          - exec
-          - github
-          - glob
-          - http-client
-          - io
-          - tool-cache
-          
+        description: 'core, artifact, cache, exec, github, glob, http-client, io, tool-cache, attest'

 jobs:
  test:
-    runs-on: macos-latest-large
+    runs-on: macos-latest

    steps:
      - name: setup repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: verify package exists
        run: ls packages/${{ github.event.inputs.package }}

-      - name: Set Node.js 24.x
-        uses: actions/setup-node@v5
+      - name: Set Node.js 20.x
+        uses: actions/setup-node@v4
        with:
-          node-version: 24.x
+          node-version: 20.x

      - name: npm install
        run: npm install
@@ -61,7 +46,7 @@ jobs:
          path: packages/${{ github.event.inputs.package }}/*.tgz

  publish:
-    runs-on: macos-latest-large
+    runs-on: macos-latest
    needs: test
    environment: npm-publish
    permissions:
@@ -69,16 +54,16 @@ jobs:
      id-token: write
    steps:

-      - name: Set Node.js 24.x
-        uses: actions/setup-node@v5
-        with:
-          node-version: 24.x
-
      - name: download artifact
        uses: actions/download-artifact@v4
        with:
          name: ${{ github.event.inputs.package }}

+      - name: setup authentication
+        run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
+        env:
+          NPM_TOKEN: ${{ secrets.TOKEN }}
+
      - name: publish
        run: npm publish --provenance *.tgz

@@ -16,23 +16,19 @@ jobs:

    strategy:
      matrix:
-        runs-on: [ubuntu-latest, macos-latest-large, windows-latest]
-
-        # Node 20 is the currently supported stable Node version for actions - https://docs.github.com/actions/sharing-automations/creating-actions/metadata-syntax-for-github-actions#runsusing-for-javascript-actions
-        # Node 24 is the new version being added with support in actions runners
-        node-version: [20.x, 24.x]
+        runs-on: [ubuntu-latest, macos-latest, windows-latest]
      fail-fast: false

    runs-on: ${{ matrix.runs-on }}

    steps:
    - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

-    - name: Set up Node ${{ matrix.node-version }}
-      uses: actions/setup-node@v5
+    - name: Set Node.js 20.x
+      uses: actions/setup-node@v4
      with:
-        node-version: ${{ matrix.node-version }}
+        node-version: 20.x

    - name: npm install
      run: npm install
@@ -9,7 +9,7 @@ jobs:
    if: ${{ github.repository_owner == 'actions' }}
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4
    - name: Update Octokit
      working-directory: packages/github 
      run: |
@@ -24,7 +24,7 @@ The GitHub Actions ToolKit provides a set of packages to make creating actions e
 Provides functions for inputs, outputs, results, logging, secrets and variables. Read more [here](packages/core)

 ```bash
-npm install @actions/core
+$ npm install @actions/core
 ```
 <br/>

@@ -33,7 +33,7 @@ npm install @actions/core
 Provides functions to exec cli tools and process output. Read more [here](packages/exec)

 ```bash
-npm install @actions/exec
+$ npm install @actions/exec
 ```
 <br/>

@@ -42,7 +42,7 @@ npm install @actions/exec
 Provides functions to search for files matching glob patterns. Read more [here](packages/glob)

 ```bash
-npm install @actions/glob
+$ npm install @actions/glob
 ```
 <br/>

@@ -51,7 +51,7 @@ npm install @actions/glob
 A lightweight HTTP client optimized for building actions. Read more [here](packages/http-client)

 ```bash
-npm install @actions/http-client
+$ npm install @actions/http-client
 ```
 <br/>

@@ -60,7 +60,7 @@ npm install @actions/http-client
 Provides disk i/o functions like cp, mv, rmRF, which etc. Read more [here](packages/io)

 ```bash
-npm install @actions/io
+$ npm install @actions/io
 ```
 <br/>

@@ -71,7 +71,7 @@ Provides functions for downloading and caching tools.  e.g. setup-* actions. Rea
 See @actions/cache for caching workflow dependencies.

 ```bash
-npm install @actions/tool-cache
+$ npm install @actions/tool-cache
 ```
 <br/>

@@ -80,7 +80,7 @@ npm install @actions/tool-cache
 Provides an Octokit client hydrated with the context that the current action is being run in. Read more [here](packages/github)

 ```bash
-npm install @actions/github
+$ npm install @actions/github
 ```
 <br/>

@@ -89,7 +89,7 @@ npm install @actions/github
 Provides functions to interact with actions artifacts. Read more [here](packages/artifact)

 ```bash
-npm install @actions/artifact
+$ npm install @actions/artifact
 ```
 <br/>

@@ -98,7 +98,7 @@ npm install @actions/artifact
 Provides functions to cache dependencies and build outputs to improve workflow execution time. Read more [here](packages/cache)

 ```bash
-npm install @actions/cache
+$ npm install @actions/cache
 ```
 <br/>

@@ -107,7 +107,7 @@ npm install @actions/cache
 Provides functions to write attestations for workflow artifacts. Read more [here](packages/attest)

 ```bash
-npm install @actions/attest
+$ npm install @actions/attest
 ```
 <br/>

@@ -227,23 +227,9 @@ console.log(`We can even get context data, like the repo: ${context.repo.repo}`)
 ```
 <br/>

-## Note
+## Contributing

-Thank you for your interest in this GitHub repo, however, right now we are not taking contributions. 
-
-We continue to focus our resources on strategic areas that help our customers be successful while making developers' lives easier. While GitHub Actions remains a key part of this vision, we are allocating resources towards other areas of Actions and are not taking contributions to this repository at this time. The GitHub public roadmap is the best place to follow along for any updates on features we’re working on and what stage they’re in.
-
-We are taking the following steps to better direct requests related to GitHub Actions, including:
-
-1. We will be directing questions and support requests to our [Community Discussions area](https://github.com/orgs/community/discussions/categories/actions)
-
-2. High Priority bugs can be reported through Community Discussions or you can report these to our support team https://support.github.com/contact/bug-report.
-
-3. Security Issues should be handled as per our [security.md](SECURITY.md).
-
-We will still provide security updates for this project and fix major breaking changes during this time.
-
-You are welcome to still raise bugs in this repo.
+We welcome contributions.  See [how to contribute](.github/CONTRIBUTING.md).

 ## Code of Conduct

@@ -32,7 +32,7 @@ jobs:
        os: [ubuntu-16.04, windows-2019]
    runs-on: ${{matrix.os}}
    actions:
-    - uses: actions/setup-node@v5
+    - uses: actions/setup-node@v4
      with:
        version: ${{matrix.node}}
    - run: | 
@@ -18,7 +18,7 @@ e.g. To use https://github.com/actions/setup-node, users will author:

 ```yaml
 steps:
-    using: actions/setup-node@v5
+    using: actions/setup-node@v4
 ```

 # Define Metadata
@@ -5,7 +5,7 @@ module.exports = {
  testEnvironment: 'node',
  testMatch: ['**/__tests__/*.test.ts'],
  transform: {
-    '^.+\\.ts$': ['ts-jest', {isolatedModules: true, diagnostics: {warnOnly: true}}]
+    '^.+\\.ts$': 'ts-jest'
  },
  verbose: true
 }
@@ -1,6 +1,6 @@
 {
  "name": "root",
-  "private": true, 
+  "private": true,
  "scripts": {
    "audit-all": "lerna run audit-moderate",
    "bootstrap": "lerna exec -- npm install",
@@ -13,11 +13,11 @@
    "lint": "eslint packages/**/*.ts",
    "lint-fix": "eslint packages/**/*.ts --fix",
    "new-package": "scripts/create-package",
-    "test": "jest --testTimeout 70000"
+    "test": "jest --testTimeout 60000"
  },
  "devDependencies": {
    "@types/jest": "^29.5.4",
-    "@types/node": "^24.1.0",
+    "@types/node": "^20.5.7",
    "@types/signale": "^1.4.1",
    "concurrently": "^6.1.0",
    "eslint": "^8.0.1",
@@ -27,24 +27,10 @@
    "eslint-plugin-prettier": "^5.0.0",
    "flow-bin": "^0.115.0",
    "jest": "^29.6.4",
-    "lerna": "^6.4.1",
+    "lerna": "^7.1.4",
    "nx": "16.6.0",
    "prettier": "^3.0.0",
    "ts-jest": "^29.1.1",
    "typescript": "^5.2.2"
-  },
-  "overrides": {
-    "semver": "^7.6.0",
-    "tar": "^6.2.1",
-    "@octokit/plugin-paginate-rest": "^9.2.2",
-    "@octokit/request": "^8.4.1",
-    "@octokit/request-error": "^5.1.1",
-    "@octokit/core": "^5.0.3",
-    "tmp": "^0.2.4",
-    "@types/node": "^24.1.0",
-    "brace-expansion": "^2.0.2",
-    "form-data": "^4.0.4",
-    "uri-js": "npm:uri-js-replace@^1.0.1",
-    "node-fetch": "^3.3.2"
  }
 }
@@ -41,4 +41,3 @@ Any easy way to test changes for the official upload/download actions is to fork
   1. In the locally cloned fork, link to your local toolkit changes: `npm link @actions/artifact`
   2. Then, compile your changes with: `npm run release`. The local `dist/index.js` should be updated with your changes.
   3. Commit and push to your fork, you can then test with a `uses:` in your workflow pointed at your fork.
-   4. The format for the above is `<username>/<repository-name>/@<ref>`, i.e. `me/myrepo/@HEAD`
@@ -1,72 +1,5 @@
 # @actions/artifact Releases

-### 4.0.0
-
- Add support for Node 24 [#2110](https://github.com/actions/toolkit/pull/2110)
- Fix: artifact pagination bugs and configurable artifact count limits [#2165](https://github.com/actions/toolkit/pull/2165)
- Fix: reject the promise on timeout [#2124](https://github.com/actions/toolkit/pull/2124)
- Update dependency versions
-
-### 2.3.3
-
- Dependency updates [#2049](https://github.com/actions/toolkit/pull/2049)
-
-### 2.3.2
-
- Added masking for Shared Access Signature (SAS) artifact URLs [#1982](https://github.com/actions/toolkit/pull/1982)
- Change hash to digest for consistent terminology across runner logs [#1991](https://github.com/actions/toolkit/pull/1991) 
-
-### 2.3.1
-
- Fix comment typo on expectedHash. [#1986](https://github.com/actions/toolkit/pull/1986)
-
-### 2.3.0
-
- Allow ArtifactClient to perform digest comparisons, if supplied. [#1975](https://github.com/actions/toolkit/pull/1975)
-
-### 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)
-
-### 2.2.0
-
- Return artifact digest on upload [#1896](https://github.com/actions/toolkit/pull/1896)
-
-### 2.1.11
-
- Fixed a bug with relative symlinks resolution [#1844](https://github.com/actions/toolkit/pull/1844)
- Use native `crypto` [#1815](https://github.com/actions/toolkit/pull/1815)
-
-### 2.1.10
-
- Fixed a regression with symlinks not being automatically resolved [#1830](https://github.com/actions/toolkit/pull/1830)
- Fixed a regression with chunk timeout [#1786](https://github.com/actions/toolkit/pull/1786)
-
-### 2.1.9
-
- Fixed artifact upload chunk timeout logic [#1774](https://github.com/actions/toolkit/pull/1774)
- Use lazy stream to prevent issues with open file limits [#1771](https://github.com/actions/toolkit/pull/1771)
-
-### 2.1.8
-
- Allows `*.localhost` domains for hostname checks for local development.
-
-### 2.1.7
-
- Update unzip-stream dependency and reverted to using `unzip.Extract()`
-
-### 2.1.6
-
- Will retry on invalid request responses.
-
-### 2.1.5
-
- Bumped `archiver` dependency to 7.0.1
-
 ### 2.1.4

 - Adds info-level logging for zip extraction
@@ -78,9 +11,9 @@
 ### 2.1.2

 - Updated the stream extract functionality to use `unzip.Parse()` instead of `unzip.Extract()` for greater control of unzipping artifacts
-
+  
 ### 2.1.1
-
+ 
 - Updated `isGhes` check to include `.ghe.com` and `.ghe.localhost` as accepted hosts

 ### 2.1.0
@@ -116,54 +116,6 @@ describe('artifact-http-client', () => {
    expect(mockPost).toHaveBeenCalledTimes(2)
  })

-  it('should retry if invalid body response', async () => {
-    const mockPost = jest
-      .fn(() => {
-        const msgSucceeded = new http.IncomingMessage(new net.Socket())
-        msgSucceeded.statusCode = 200
-        return {
-          message: msgSucceeded,
-          readBody: async () => {
-            return Promise.resolve(
-              `{"ok": true, "signedUploadUrl": "http://localhost:8080/upload"}`
-            )
-          }
-        }
-      })
-      .mockImplementationOnce(() => {
-        const msgFailed = new http.IncomingMessage(new net.Socket())
-        msgFailed.statusCode = 502
-        msgFailed.statusMessage = 'Bad Gateway'
-        return {
-          message: msgFailed,
-          readBody: async () => {
-            return Promise.resolve('💥')
-          }
-        }
-      })
-    const mockHttpClient = (
-      HttpClient as unknown as jest.Mock
-    ).mockImplementation(() => {
-      return {
-        post: mockPost
-      }
-    })
-
-    const client = internalArtifactTwirpClient(clientOptions)
-    const artifact = await client.CreateArtifact({
-      workflowRunBackendId: '1234',
-      workflowJobRunBackendId: '5678',
-      name: 'artifact',
-      version: 4
-    })
-
-    expect(mockHttpClient).toHaveBeenCalledTimes(1)
-    expect(artifact).toBeDefined()
-    expect(artifact.ok).toBe(true)
-    expect(artifact.signedUploadUrl).toBe('http://localhost:8080/upload')
-    expect(mockPost).toHaveBeenCalledTimes(2)
-  })
-
  it('should fail if the request fails 5 times', async () => {
    const mockPost = jest.fn(() => {
      const msgFailed = new http.IncomingMessage(new net.Socket())
@@ -1,14 +1,4 @@
 import * as config from '../src/internal/shared/config'
-import os from 'os'
-
-// Mock the `cpus()` function in the `os` module
-jest.mock('os', () => {
-  const osActual = jest.requireActual('os')
-  return {
-    ...osActual,
-    cpus: jest.fn()
-  }
-})

 beforeEach(() => {
  jest.resetModules()
@@ -30,120 +20,8 @@ describe('isGhes', () => {
    expect(config.isGhes()).toBe(false)
  })

-  it('should return false when the request domain ends with .localhost', () => {
-    process.env.GITHUB_SERVER_URL = 'https://github.localhost'
-    expect(config.isGhes()).toBe(false)
-  })
-
  it('should return false when the request domain is specific to an enterprise', () => {
    process.env.GITHUB_SERVER_URL = 'https://my-enterprise.github.com'
    expect(config.isGhes()).toBe(true)
  })
 })
-
-describe('uploadChunkTimeoutEnv', () => {
-  it('should return default 300000 when no env set', () => {
-    expect(config.getUploadChunkTimeout()).toBe(300000)
-  })
-
-  it('should return value set in ACTIONS_ARTIFACT_UPLOAD_TIMEOUT_MS', () => {
-    process.env.ACTIONS_ARTIFACT_UPLOAD_TIMEOUT_MS = '150000'
-    expect(config.getUploadChunkTimeout()).toBe(150000)
-  })
-
-  it('should throw if value set in ACTIONS_ARTIFACT_UPLOAD_TIMEOUT_MS is invalid', () => {
-    process.env.ACTIONS_ARTIFACT_UPLOAD_TIMEOUT_MS = 'abc'
-    expect(() => {
-      config.getUploadChunkTimeout()
-    }).toThrow()
-  })
-})
-
-describe('uploadConcurrencyEnv', () => {
-  it('Concurrency default to 5', () => {
-    ;(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', () => {
-    ;(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', () => {
-    ;(os.cpus as jest.Mock).mockReturnValue(new Array(4))
-    process.env.ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY = '10'
-    expect(config.getConcurrency()).toBe(10)
-  })
-
-  it('should throw with invalid value of ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY', () => {
-    ;(os.cpus as jest.Mock).mockReturnValue(new Array(4))
-    process.env.ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY = 'abc'
-    expect(() => {
-      config.getConcurrency()
-    }).toThrow()
-  })
-
-  it('should throw if ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY is < 1', () => {
-    ;(os.cpus as jest.Mock).mockReturnValue(new Array(4))
-    process.env.ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY = '0'
-    expect(() => {
-      config.getConcurrency()
-    }).toThrow()
-  })
-})
-
-describe('getMaxArtifactListCount', () => {
-  beforeEach(() => {
-    delete process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT
-  })
-
-  it('should return default 1000 when no env set', () => {
-    expect(config.getMaxArtifactListCount()).toBe(1000)
-  })
-
-  it('should return value set in ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT', () => {
-    process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT = '2000'
-    expect(config.getMaxArtifactListCount()).toBe(2000)
-  })
-
-  it('should throw if value set in ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT is invalid', () => {
-    process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT = 'abc'
-    expect(() => {
-      config.getMaxArtifactListCount()
-    }).toThrow(
-      'Invalid value set for ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT env variable'
-    )
-  })
-
-  it('should throw if ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT is < 1', () => {
-    process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT = '0'
-    expect(() => {
-      config.getMaxArtifactListCount()
-    }).toThrow(
-      'Invalid value set for ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT env variable'
-    )
-  })
-
-  it('should throw if ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT is negative', () => {
-    process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT = '-100'
-    expect(() => {
-      config.getMaxArtifactListCount()
-    }).toThrow(
-      'Invalid value set for ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT env variable'
-    )
-  })
-})
@@ -111,16 +111,6 @@ const mockGetArtifactSuccess = jest.fn(() => {
  }
 })

-const mockGetArtifactHung = jest.fn(() => {
-  const message = new http.IncomingMessage(new net.Socket())
-  message.statusCode = 200
-  // Don't push any data or call push(null) to end the stream
-  // This creates a stream that hangs and never completes
-  return {
-    message
-  }
-})
-
 const mockGetArtifactFailure = jest.fn(() => {
  const message = new http.IncomingMessage(new net.Socket())
  message.statusCode = 500
@@ -210,12 +200,14 @@ describe('download-artifact', () => {
        }
      )

-      const response = await downloadArtifactPublic(
-        fixtures.artifactID,
-        fixtures.repositoryOwner,
-        fixtures.repositoryName,
-        fixtures.token
-      )
+      await expect(
+        downloadArtifactPublic(
+          fixtures.artifactID,
+          fixtures.repositoryOwner,
+          fixtures.repositoryName,
+          fixtures.token
+        )
+      ).rejects.toBeInstanceOf(Error)

      expect(downloadArtifactMock).toHaveBeenCalledWith({
        owner: fixtures.repositoryOwner,
@@ -231,16 +223,6 @@ describe('download-artifact', () => {
      expect(mockGetArtifactMalicious).toHaveBeenCalledWith(
        fixtures.blobStorageUrl
      )
-
-      // ensure path traversal was not possible
-      expect(
-        fs.existsSync(path.join(fixtures.workspaceDir, 'x/etc/hosts'))
-      ).toBe(true)
-      expect(
-        fs.existsSync(path.join(fixtures.workspaceDir, 'y/etc/hosts'))
-      ).toBe(true)
-
-      expect(response.downloadPath).toBe(fixtures.workspaceDir)
    })

    it('should successfully download an artifact to user defined path', async () => {
@@ -329,6 +311,14 @@ describe('download-artifact', () => {

      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'))
@@ -621,32 +611,4 @@ describe('download-artifact', () => {
      })
    })
  })
-
-  describe('streamExtractExternal', () => {
-    it('should fail if the timeout is exceeded', async () => {
-      const mockSlowGetArtifact = jest.fn(mockGetArtifactHung)
-
-      const mockHttpClient = (HttpClient as jest.Mock).mockImplementation(
-        () => {
-          return {
-            get: mockSlowGetArtifact
-          }
-        }
-      )
-
-      try {
-        await streamExtractExternal(
-          fixtures.blobStorageUrl,
-          fixtures.workspaceDir,
-          {timeout: 2}
-        )
-        expect(true).toBe(false) // should not be called
-      } catch (e) {
-        expect(e).toBeInstanceOf(Error)
-        expect(e.message).toContain('did not respond in 2ms')
-        expect(mockHttpClient).toHaveBeenCalledWith(getUserAgentString())
-        expect(mockSlowGetArtifact).toHaveBeenCalledTimes(1)
-      }
-    })
-  })
 })
@@ -1,4 +1,5 @@
 import * as github from '@actions/github'
+import type {RestEndpointMethods} from '@octokit/plugin-rest-endpoint-methods/dist-types/generated/method-types'
 import type {RestEndpointMethodTypes} from '@octokit/plugin-rest-endpoint-methods/dist-types/generated/parameters-and-response-types'
 import {
  listArtifactsInternal,
@@ -9,13 +10,13 @@ import {ArtifactServiceClientJSON, Timestamp} from '../src/generated'
 import * as util from '../src/internal/shared/util'
 import {noopLogs} from './common'
 import {Artifact} from '../src/internal/shared/interfaces'
-import {RequestInterface} from '@octokit/types'

-type MockedRequest = jest.MockedFunction<RequestInterface<object>>
+type MockedListWorkflowRunArtifacts = jest.MockedFunction<
+  RestEndpointMethods['actions']['listWorkflowRunArtifacts']
+>

 jest.mock('@actions/github', () => ({
  getOctokit: jest.fn().mockReturnValue({
-    request: jest.fn(),
    rest: {
      actions: {
        listWorkflowRunArtifacts: jest.fn()
@@ -80,10 +81,10 @@ describe('list-artifact', () => {

  describe('public', () => {
    it('should return a list of artifacts', async () => {
-      const mockRequest = github.getOctokit(fixtures.token)
-        .request as MockedRequest
+      const mockListArtifacts = github.getOctokit(fixtures.token).rest.actions
+        .listWorkflowRunArtifacts as MockedListWorkflowRunArtifacts

-      mockRequest.mockResolvedValueOnce({
+      mockListArtifacts.mockResolvedValueOnce({
        status: 200,
        headers: {},
        url: '',
@@ -104,10 +105,10 @@ describe('list-artifact', () => {
    })

    it('should return the latest artifact when latest is specified', async () => {
-      const mockRequest = github.getOctokit(fixtures.token)
-        .request as MockedRequest
+      const mockListArtifacts = github.getOctokit(fixtures.token).rest.actions
+        .listWorkflowRunArtifacts as MockedListWorkflowRunArtifacts

-      mockRequest.mockResolvedValueOnce({
+      mockListArtifacts.mockResolvedValueOnce({
        status: 200,
        headers: {},
        url: '',
@@ -128,10 +129,10 @@ describe('list-artifact', () => {
    })

    it('can return empty artifacts', async () => {
-      const mockRequest = github.getOctokit(fixtures.token)
-        .request as MockedRequest
+      const mockListArtifacts = github.getOctokit(fixtures.token).rest.actions
+        .listWorkflowRunArtifacts as MockedListWorkflowRunArtifacts

-      mockRequest.mockResolvedValueOnce({
+      mockListArtifacts.mockResolvedValueOnce({
        status: 200,
        headers: {},
        url: '',
@@ -155,10 +156,10 @@ describe('list-artifact', () => {
    })

    it('should fail if non-200 response', async () => {
-      const mockRequest = github.getOctokit(fixtures.token)
-        .request as MockedRequest
+      const mockListArtifacts = github.getOctokit(fixtures.token).rest.actions
+        .listWorkflowRunArtifacts as MockedListWorkflowRunArtifacts

-      mockRequest.mockRejectedValueOnce(new Error('boom'))
+      mockListArtifacts.mockRejectedValue(new Error('boom'))

      await expect(
        listArtifactsPublic(
@@ -170,126 +171,6 @@ describe('list-artifact', () => {
        )
      ).rejects.toThrow('boom')
    })
-
-    it('should handle pagination correctly when fetching multiple pages', async () => {
-      const mockRequest = github.getOctokit(fixtures.token)
-        .request as MockedRequest
-
-      const manyArtifacts = Array.from({length: 150}, (_, i) => ({
-        id: i + 1,
-        name: `artifact-${i + 1}`,
-        size: 100,
-        createdAt: new Date('2023-12-01')
-      }))
-
-      mockRequest
-        .mockResolvedValueOnce({
-          status: 200,
-          headers: {},
-          url: '',
-          data: {
-            ...artifactsToListResponse(manyArtifacts.slice(0, 100)),
-            total_count: 150
-          }
-        })
-        .mockResolvedValueOnce({
-          status: 200,
-          headers: {},
-          url: '',
-          data: {
-            ...artifactsToListResponse(manyArtifacts.slice(100, 150)),
-            total_count: 150
-          }
-        })
-
-      const response = await listArtifactsPublic(
-        fixtures.runId,
-        fixtures.owner,
-        fixtures.repo,
-        fixtures.token,
-        false
-      )
-
-      // Verify that both API calls were made
-      expect(mockRequest).toHaveBeenCalledTimes(2)
-
-      // Should return all 150 artifacts across both pages
-      expect(response.artifacts).toHaveLength(150)
-
-      // Verify we got artifacts from both pages
-      expect(response.artifacts[0].name).toBe('artifact-1')
-      expect(response.artifacts[99].name).toBe('artifact-100')
-      expect(response.artifacts[100].name).toBe('artifact-101')
-      expect(response.artifacts[149].name).toBe('artifact-150')
-    })
-
-    it('should respect ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT environment variable', async () => {
-      const originalEnv = process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT
-      process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT = '150'
-
-      jest.resetModules()
-
-      try {
-        const {listArtifactsPublic: listArtifactsPublicReloaded} = await import(
-          '../src/internal/find/list-artifacts'
-        )
-        const githubReloaded = await import('@actions/github')
-
-        const mockRequest = (githubReloaded.getOctokit as jest.Mock)(
-          fixtures.token
-        ).request as MockedRequest
-
-        const manyArtifacts = Array.from({length: 200}, (_, i) => ({
-          id: i + 1,
-          name: `artifact-${i + 1}`,
-          size: 100,
-          createdAt: new Date('2023-12-01')
-        }))
-
-        mockRequest
-          .mockResolvedValueOnce({
-            status: 200,
-            headers: {},
-            url: '',
-            data: {
-              ...artifactsToListResponse(manyArtifacts.slice(0, 100)),
-              total_count: 200
-            }
-          })
-          .mockResolvedValueOnce({
-            status: 200,
-            headers: {},
-            url: '',
-            data: {
-              ...artifactsToListResponse(manyArtifacts.slice(100, 150)),
-              total_count: 200
-            }
-          })
-
-        const response = await listArtifactsPublicReloaded(
-          fixtures.runId,
-          fixtures.owner,
-          fixtures.repo,
-          fixtures.token,
-          false
-        )
-
-        // Should only return 150 artifacts due to the limit
-        expect(response.artifacts).toHaveLength(150)
-        expect(response.artifacts[0].name).toBe('artifact-1')
-        expect(response.artifacts[149].name).toBe('artifact-150')
-      } finally {
-        // Restore original environment variable
-        if (originalEnv !== undefined) {
-          process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT = originalEnv
-        } else {
-          delete process.env.ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT
-        }
-
-        // Reset modules again to restore original state
-        jest.resetModules()
-      }
-    })
  })

  describe('internal', () => {
@@ -1,173 +1,257 @@
 import * as uploadZipSpecification from '../src/internal/upload/upload-zip-specification'
 import * as zip from '../src/internal/upload/zip'
 import * as util from '../src/internal/shared/util'
+import * as retention from '../src/internal/upload/retention'
 import * as config from '../src/internal/shared/config'
-import {ArtifactServiceClientJSON} from '../src/generated'
+import {Timestamp, ArtifactServiceClientJSON} from '../src/generated'
 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 {BlockBlobUploadStreamOptions} from '@azure/storage-blob'
-import * as fs from 'fs'
-import * as path from 'path'
-import unzip from 'unzip-stream'
-
-const uploadStreamMock = jest.fn()
-const blockBlobClientMock = jest.fn().mockImplementation(() => ({
-  uploadStream: uploadStreamMock
-}))
-
-jest.mock('@azure/storage-blob', () => ({
-  BlobClient: jest.fn().mockImplementation(() => {
-    return {
-      getBlockBlobClient: blockBlobClientMock
-    }
-  })
-}))
-
-const fixtures = {
-  uploadDirectory: path.join(__dirname, '_temp', 'plz-upload'),
-  files: [
-    {name: 'file1.txt', content: 'test 1 file content'},
-    {name: 'file2.txt', content: 'test 2 file content'},
-    {name: 'file3.txt', content: 'test 3 file content'},
-    {
-      name: 'real.txt',
-      content: 'from a symlink'
-    },
-    {
-      name: 'relative.txt',
-      content: 'from a symlink',
-      symlink: 'real.txt',
-      relative: true
-    },
-    {
-      name: 'absolute.txt',
-      content: 'from a symlink',
-      symlink: 'real.txt',
-      relative: false
-    }
-  ],
-  backendIDs: {
-    workflowRunBackendId: '67dbcc20-e851-4452-a7c3-2cc0d2e0ec67',
-    workflowJobRunBackendId: '5f49179d-3386-4c38-85f7-00f8138facd0'
-  },
-  runtimeToken: 'test-token',
-  resultsServiceURL: 'http://results.local',
-  inputs: {
-    artifactName: 'test-artifact',
-    files: [
-      '/home/user/files/plz-upload/file1.txt',
-      '/home/user/files/plz-upload/file2.txt',
-      '/home/user/files/plz-upload/dir/file3.txt'
-    ],
-    rootDirectory: '/home/user/files/plz-upload'
-  }
-}

 describe('upload-artifact', () => {
-  beforeAll(() => {
-    fs.mkdirSync(fixtures.uploadDirectory, {
-      recursive: true
-    })
-
-    for (const file of fixtures.files) {
-      if (file.symlink) {
-        let symlinkPath = file.symlink
-        if (!file.relative) {
-          symlinkPath = path.join(fixtures.uploadDirectory, file.symlink)
-        }
-
-        if (!fs.existsSync(path.join(fixtures.uploadDirectory, file.name))) {
-          fs.symlinkSync(
-            symlinkPath,
-            path.join(fixtures.uploadDirectory, file.name),
-            'file'
-          )
-        }
-      } else {
-        fs.writeFileSync(
-          path.join(fixtures.uploadDirectory, file.name),
-          file.content
-        )
-      }
-    }
-  })
-
  beforeEach(() => {
    noopLogs()
-    jest
-      .spyOn(uploadZipSpecification, 'validateRootDirectory')
-      .mockReturnValue()
-    jest
-      .spyOn(util, 'getBackendIdsFromToken')
-      .mockReturnValue(fixtures.backendIDs)
-    jest
-      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
-      .mockReturnValue(
-        fixtures.files.map(file => ({
-          sourcePath: path.join(fixtures.uploadDirectory, file.name),
-          destinationPath: file.name,
-          stats: fs.statSync(path.join(fixtures.uploadDirectory, file.name))
-        }))
-      )
-    jest.spyOn(config, 'getRuntimeToken').mockReturnValue(fixtures.runtimeToken)
-    jest
-      .spyOn(config, 'getResultsServiceUrl')
-      .mockReturnValue(fixtures.resultsServiceURL)
  })

  afterEach(() => {
    jest.restoreAllMocks()
  })

-  it('should reject if there are no files to upload', async () => {
+  it('should successfully upload an artifact', () => {
+    const mockDate = new Date('2020-01-01')
+    jest
+      .spyOn(uploadZipSpecification, 'validateRootDirectory')
+      .mockReturnValue()
    jest
      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
-      .mockClear()
-      .mockReturnValue([])
+      .mockReturnValue([
+        {
+          sourcePath: '/home/user/files/plz-upload/file1.txt',
+          destinationPath: 'file1.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/file2.txt',
+          destinationPath: 'file2.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/dir/file3.txt',
+          destinationPath: 'dir/file3.txt'
+        }
+      ])

-    const uploadResp = uploadArtifact(
-      fixtures.inputs.artifactName,
-      fixtures.inputs.files,
-      fixtures.inputs.rootDirectory
-    )
-    await expect(uploadResp).rejects.toThrowError(FilesNotFoundError)
-  })
-
-  it('should reject if no backend IDs are found', async () => {
-    jest.spyOn(util, 'getBackendIdsFromToken').mockRestore()
-
-    const uploadResp = uploadArtifact(
-      fixtures.inputs.artifactName,
-      fixtures.inputs.files,
-      fixtures.inputs.rootDirectory
-    )
-
-    await expect(uploadResp).rejects.toThrow()
-  })
-
-  it('should return false if the creation request fails', async () => {
    jest
      .spyOn(zip, 'createZipUploadStream')
      .mockReturnValue(Promise.resolve(new zip.ZipUploadStream(1)))
+    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.resolve({
+        uploadSize: 1234,
+        sha256Hash: 'test-sha256-hash'
+      })
+    )
+    jest
+      .spyOn(ArtifactServiceClientJSON.prototype, 'FinalizeArtifact')
+      .mockReturnValue(Promise.resolve({ok: true, artifactId: '1'}))
+
+    // ArtifactHttpClient mocks
+    jest.spyOn(config, 'getRuntimeToken').mockReturnValue('test-token')
+    jest
+      .spyOn(config, 'getResultsServiceUrl')
+      .mockReturnValue('https://test-url.com')
+
+    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).resolves.toEqual({size: 1234, id: 1})
+  })
+
+  it('should throw an error if the root directory is invalid', () => {
+    jest
+      .spyOn(uploadZipSpecification, 'validateRootDirectory')
+      .mockImplementation(() => {
+        throw new Error('Invalid root directory')
+      })
+
+    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('Invalid root directory')
+  })
+
+  it('should reject if there are no files to upload', () => {
+    jest
+      .spyOn(uploadZipSpecification, 'validateRootDirectory')
+      .mockReturnValue()
+    jest
+      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
+      .mockReturnValue([])
+
+    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.toThrowError(FilesNotFoundError)
+  })
+
+  it('should reject if no backend IDs are found', () => {
+    jest
+      .spyOn(uploadZipSpecification, 'validateRootDirectory')
+      .mockReturnValue()
+    jest
+      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
+      .mockReturnValue([
+        {
+          sourcePath: '/home/user/files/plz-upload/file1.txt',
+          destinationPath: 'file1.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/file2.txt',
+          destinationPath: 'file2.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/dir/file3.txt',
+          destinationPath: 'dir/file3.txt'
+        }
+      ])
+
+    jest
+      .spyOn(zip, 'createZipUploadStream')
+      .mockReturnValue(Promise.resolve(new zip.ZipUploadStream(1)))
+
+    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()
+  })
+
+  it('should return false if the creation request fails', () => {
+    const mockDate = new Date('2020-01-01')
+    jest
+      .spyOn(uploadZipSpecification, 'validateRootDirectory')
+      .mockReturnValue()
+    jest
+      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
+      .mockReturnValue([
+        {
+          sourcePath: '/home/user/files/plz-upload/file1.txt',
+          destinationPath: 'file1.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/file2.txt',
+          destinationPath: 'file2.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/dir/file3.txt',
+          destinationPath: 'dir/file3.txt'
+        }
+      ])
+
+    jest
+      .spyOn(zip, 'createZipUploadStream')
+      .mockReturnValue(Promise.resolve(new zip.ZipUploadStream(1)))
+    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: false, signedUploadUrl: ''}))

+    // ArtifactHttpClient mocks
+    jest.spyOn(config, 'getRuntimeToken').mockReturnValue('test-token')
+    jest
+      .spyOn(config, 'getResultsServiceUrl')
+      .mockReturnValue('https://test-url.com')
+
    const uploadResp = uploadArtifact(
-      fixtures.inputs.artifactName,
-      fixtures.inputs.files,
-      fixtures.inputs.rootDirectory
+      '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'
    )

-    await expect(uploadResp).rejects.toThrow()
+    expect(uploadResp).rejects.toThrow()
  })

-  it('should return false if blob storage upload is unsuccessful', async () => {
+  it('should return false if blob storage upload is unsuccessful', () => {
+    const mockDate = new Date('2020-01-01')
+    jest
+      .spyOn(uploadZipSpecification, 'validateRootDirectory')
+      .mockReturnValue()
+    jest
+      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
+      .mockReturnValue([
+        {
+          sourcePath: '/home/user/files/plz-upload/file1.txt',
+          destinationPath: 'file1.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/file2.txt',
+          destinationPath: 'file2.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/dir/file3.txt',
+          destinationPath: 'dir/file3.txt'
+        }
+      ])
+
    jest
      .spyOn(zip, 'createZipUploadStream')
      .mockReturnValue(Promise.resolve(new zip.ZipUploadStream(1)))
+    jest.spyOn(util, 'getBackendIdsFromToken').mockReturnValue({
+      workflowRunBackendId: '1234',
+      workflowJobRunBackendId: '5678'
+    })
+    jest
+      .spyOn(retention, 'getExpiration')
+      .mockReturnValue(Timestamp.fromDate(mockDate))
    jest
      .spyOn(ArtifactServiceClientJSON.prototype, 'CreateArtifact')
      .mockReturnValue(
@@ -180,19 +264,57 @@ describe('upload-artifact', () => {
      .spyOn(blobUpload, 'uploadZipToBlobStorage')
      .mockReturnValue(Promise.reject(new Error('boom')))

+    // ArtifactHttpClient mocks
+    jest.spyOn(config, 'getRuntimeToken').mockReturnValue('test-token')
+    jest
+      .spyOn(config, 'getResultsServiceUrl')
+      .mockReturnValue('https://test-url.com')
+
    const uploadResp = uploadArtifact(
-      fixtures.inputs.artifactName,
-      fixtures.inputs.files,
-      fixtures.inputs.rootDirectory
+      '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'
    )

-    await expect(uploadResp).rejects.toThrow()
+    expect(uploadResp).rejects.toThrow()
  })

-  it('should reject if finalize artifact fails', async () => {
+  it('should reject if finalize artifact fails', () => {
+    const mockDate = new Date('2020-01-01')
+    jest
+      .spyOn(uploadZipSpecification, 'validateRootDirectory')
+      .mockReturnValue()
+    jest
+      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
+      .mockReturnValue([
+        {
+          sourcePath: '/home/user/files/plz-upload/file1.txt',
+          destinationPath: 'file1.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/file2.txt',
+          destinationPath: 'file2.txt'
+        },
+        {
+          sourcePath: '/home/user/files/plz-upload/dir/file3.txt',
+          destinationPath: 'dir/file3.txt'
+        }
+      ])
+
    jest
      .spyOn(zip, 'createZipUploadStream')
      .mockReturnValue(Promise.resolve(new zip.ZipUploadStream(1)))
+    jest.spyOn(util, 'getBackendIdsFromToken').mockReturnValue({
+      workflowRunBackendId: '1234',
+      workflowJobRunBackendId: '5678'
+    })
+    jest
+      .spyOn(retention, 'getExpiration')
+      .mockReturnValue(Timestamp.fromDate(mockDate))
    jest
      .spyOn(ArtifactServiceClientJSON.prototype, 'CreateArtifact')
      .mockReturnValue(
@@ -211,163 +333,22 @@ describe('upload-artifact', () => {
      .spyOn(ArtifactServiceClientJSON.prototype, 'FinalizeArtifact')
      .mockReturnValue(Promise.resolve({ok: false, artifactId: ''}))

-    const uploadResp = uploadArtifact(
-      fixtures.inputs.artifactName,
-      fixtures.inputs.files,
-      fixtures.inputs.rootDirectory
-    )
-
-    await expect(uploadResp).rejects.toThrow()
-  })
-
-  it('should successfully upload an artifact', async () => {
-    jest
-      .spyOn(uploadZipSpecification, 'getUploadZipSpecification')
-      .mockRestore()
-
-    jest
-      .spyOn(ArtifactServiceClientJSON.prototype, 'CreateArtifact')
-      .mockReturnValue(
-        Promise.resolve({
-          ok: true,
-          signedUploadUrl: 'https://signed-upload-url.local'
-        })
-      )
-    jest
-      .spyOn(ArtifactServiceClientJSON.prototype, 'FinalizeArtifact')
-      .mockReturnValue(
-        Promise.resolve({
-          ok: true,
-          artifactId: '1'
-        })
-      )
-
-    let loadedBytes = 0
-    const uploadedZip = path.join(
-      fixtures.uploadDirectory,
-      '..',
-      'uploaded.zip'
-    )
-    uploadStreamMock.mockImplementation(
-      async (
-        stream: NodeJS.ReadableStream,
-        bufferSize?: number,
-        maxConcurrency?: number,
-        options?: BlockBlobUploadStreamOptions
-      ) => {
-        const {onProgress} = options || {}
-
-        if (fs.existsSync(uploadedZip)) {
-          fs.unlinkSync(uploadedZip)
-        }
-        const uploadedZipStream = fs.createWriteStream(uploadedZip)
-
-        onProgress?.({loadedBytes: 0})
-        return new Promise((resolve, reject) => {
-          stream.on('data', chunk => {
-            loadedBytes += chunk.length
-            uploadedZipStream.write(chunk)
-            onProgress?.({loadedBytes})
-          })
-          stream.on('end', () => {
-            onProgress?.({loadedBytes})
-            uploadedZipStream.end()
-            resolve({})
-          })
-          stream.on('error', err => {
-            reject(err)
-          })
-        })
-      }
-    )
-
-    const {id, size, digest} = await uploadArtifact(
-      fixtures.inputs.artifactName,
-      fixtures.files.map(file =>
-        path.join(fixtures.uploadDirectory, file.name)
-      ),
-      fixtures.uploadDirectory
-    )
-
-    expect(id).toBe(1)
-    expect(size).toBe(loadedBytes)
-    expect(digest).toBeDefined()
-    expect(digest).toHaveLength(64)
-
-    const extractedDirectory = path.join(
-      fixtures.uploadDirectory,
-      '..',
-      'extracted'
-    )
-    if (fs.existsSync(extractedDirectory)) {
-      fs.rmdirSync(extractedDirectory, {recursive: true})
-    }
-
-    const extract = new Promise((resolve, reject) => {
-      fs.createReadStream(uploadedZip)
-        .pipe(unzip.Extract({path: extractedDirectory}))
-        .on('close', () => {
-          resolve(true)
-        })
-        .on('error', err => {
-          reject(err)
-        })
-    })
-
-    await expect(extract).resolves.toBe(true)
-    for (const file of fixtures.files) {
-      const filePath = path.join(extractedDirectory, file.name)
-      expect(fs.existsSync(filePath)).toBe(true)
-      expect(fs.readFileSync(filePath, 'utf8')).toBe(file.content)
-    }
-  })
-
-  it('should throw an error uploading blob chunks get delayed', async () => {
-    jest
-      .spyOn(ArtifactServiceClientJSON.prototype, 'CreateArtifact')
-      .mockReturnValue(
-        Promise.resolve({
-          ok: true,
-          signedUploadUrl: 'https://signed-upload-url.local'
-        })
-      )
-    jest
-      .spyOn(ArtifactServiceClientJSON.prototype, 'FinalizeArtifact')
-      .mockReturnValue(
-        Promise.resolve({
-          ok: true,
-          artifactId: '1'
-        })
-      )
+    // ArtifactHttpClient mocks
+    jest.spyOn(config, 'getRuntimeToken').mockReturnValue('test-token')
    jest
      .spyOn(config, 'getResultsServiceUrl')
-      .mockReturnValue('https://results.local')
-
-    jest.spyOn(config, 'getUploadChunkTimeout').mockReturnValue(2_000)
-
-    uploadStreamMock.mockImplementation(
-      async (
-        stream: NodeJS.ReadableStream,
-        bufferSize?: number,
-        maxConcurrency?: number,
-        options?: BlockBlobUploadStreamOptions
-      ) => {
-        const {onProgress, abortSignal} = options || {}
-        onProgress?.({loadedBytes: 0})
-        return new Promise(resolve => {
-          abortSignal?.addEventListener('abort', () => {
-            resolve({})
-          })
-        })
-      }
-    )
+      .mockReturnValue('https://test-url.com')

    const uploadResp = uploadArtifact(
-      fixtures.inputs.artifactName,
-      fixtures.inputs.files,
-      fixtures.inputs.rootDirectory
+      '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'
    )

-    await expect(uploadResp).rejects.toThrow('Upload progress stalled.')
+    expect(uploadResp).rejects.toThrow()
  })
 })
@@ -305,22 +305,4 @@ describe('Search', () => {
      }
    }
  })
-
-  it('Upload Specification - Includes symlinks', async () => {
-    const targetPath = path.join(root, 'link-dir', 'symlink-me.txt')
-    await fs.mkdir(path.dirname(targetPath), {recursive: true})
-    await fs.writeFile(targetPath, 'symlink file content')
-
-    const uploadPath = path.join(root, 'upload-dir', 'symlink.txt')
-    await fs.mkdir(path.dirname(uploadPath), {recursive: true})
-    await fs.symlink(targetPath, uploadPath, 'file')
-
-    const specifications = getUploadZipSpecification([uploadPath], root)
-    expect(specifications.length).toEqual(1)
-    expect(specifications[0].sourcePath).toEqual(uploadPath)
-    expect(specifications[0].destinationPath).toEqual(
-      path.join('/upload-dir', 'symlink.txt')
-    )
-    expect(specifications[0].stats.isSymbolicLink()).toBe(true)
-  })
 })
@@ -1,7 +1,5 @@
 import * as config from '../src/internal/shared/config'
 import * as util from '../src/internal/shared/util'
-import {maskSigUrl, maskSecretUrls} from '../src/internal/shared/util'
-import {setSecret, debug} from '@actions/core'

 export const testRuntimeToken =
  'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwic2NwIjoiQWN0aW9ucy5FeGFtcGxlIEFjdGlvbnMuQW5vdGhlckV4YW1wbGU6dGVzdCBBY3Rpb25zLlJlc3VsdHM6Y2U3ZjU0YzctNjFjNy00YWFlLTg4N2YtMzBkYTQ3NWY1ZjFhOmNhMzk1MDg1LTA0MGEtNTI2Yi0yY2U4LWJkYzg1ZjY5Mjc3NCIsImlhdCI6MTUxNjIzOTAyMn0.XYnI_wHPBlUi1mqYveJnnkJhp4dlFjqxzRmISPsqfw8'
@@ -61,159 +59,3 @@ describe('get-backend-ids-from-token', () => {
    )
  })
 })
-
-jest.mock('@actions/core')
-
-describe('maskSigUrl', () => {
-  beforeEach(() => {
-    jest.clearAllMocks()
-  })
-
-  it('does nothing if no sig parameter is present', () => {
-    const url = 'https://example.com'
-    maskSigUrl(url)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('masks the sig parameter in the middle of the URL and sets it as a secret', () => {
-    const url = 'https://example.com/?param1=value1&sig=12345&param2=value2'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('12345')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('12345'))
-  })
-
-  it('does nothing if the URL is empty', () => {
-    const url = ''
-    maskSigUrl(url)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('handles URLs with fragments', () => {
-    const url = 'https://example.com?sig=12345#fragment'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('12345')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('12345'))
-  })
-})
-
-describe('maskSigUrl handles special characters in signatures', () => {
-  beforeEach(() => {
-    jest.clearAllMocks()
-  })
-
-  it('handles signatures with slashes', () => {
-    const url = 'https://example.com/?sig=abc/123'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('abc/123')
-    expect(setSecret).toHaveBeenCalledWith('abc%2F123')
-  })
-
-  it('handles signatures with plus signs', () => {
-    const url = 'https://example.com/?sig=abc+123'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('abc 123')
-    expect(setSecret).toHaveBeenCalledWith('abc%20123')
-  })
-
-  it('handles signatures with equals signs', () => {
-    const url = 'https://example.com/?sig=abc=123'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('abc=123')
-    expect(setSecret).toHaveBeenCalledWith('abc%3D123')
-  })
-
-  it('handles already percent-encoded signatures', () => {
-    const url = 'https://example.com/?sig=abc%2F123%3D'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('abc/123=')
-    expect(setSecret).toHaveBeenCalledWith('abc%2F123%3D')
-  })
-
-  it('handles complex Azure SAS signatures', () => {
-    const url =
-      'https://example.com/container/file.txt?sig=nXyQIUj%2F%2F06Cxt80pBRYiiJlYqtPYg5sz%2FvEh5iHAhw%3D&se=2023-12-31'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith(
-      'nXyQIUj//06Cxt80pBRYiiJlYqtPYg5sz/vEh5iHAhw='
-    )
-    expect(setSecret).toHaveBeenCalledWith(
-      'nXyQIUj%2F%2F06Cxt80pBRYiiJlYqtPYg5sz%2FvEh5iHAhw%3D'
-    )
-  })
-
-  it('handles signatures with multiple special characters', () => {
-    const url = 'https://example.com/?sig=a/b+c=d&e=f'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('a/b c=d')
-    expect(setSecret).toHaveBeenCalledWith('a%2Fb%20c%3Dd')
-  })
-})
-
-describe('maskSecretUrls', () => {
-  beforeEach(() => {
-    jest.clearAllMocks()
-  })
-
-  it('masks sig parameters in signed_upload_url and signed_url', () => {
-    const body = {
-      signed_upload_url: 'https://upload.com?sig=upload123',
-      signed_url: 'https://download.com?sig=download123'
-    }
-    maskSecretUrls(body)
-    expect(setSecret).toHaveBeenCalledWith('upload123')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('upload123'))
-    expect(setSecret).toHaveBeenCalledWith('download123')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('download123'))
-  })
-
-  it('handles case where only upload_url is present', () => {
-    const body = {
-      signed_upload_url: 'https://upload.com?sig=upload123'
-    }
-    maskSecretUrls(body)
-    expect(setSecret).toHaveBeenCalledWith('upload123')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('upload123'))
-  })
-
-  it('handles case where only download_url is present', () => {
-    const body = {
-      signed_url: 'https://download.com?sig=download123'
-    }
-    maskSecretUrls(body)
-    expect(setSecret).toHaveBeenCalledWith('download123')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('download123'))
-  })
-
-  it('handles case where URLs do not contain sig parameters', () => {
-    const body = {
-      signed_upload_url: 'https://upload.com?token=abc',
-      signed_url: 'https://download.com?token=xyz'
-    }
-    maskSecretUrls(body)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('handles empty string URLs', () => {
-    const body = {
-      signed_upload_url: '',
-      signed_url: ''
-    }
-    maskSecretUrls(body)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('does nothing if body is not an object or is null', () => {
-    maskSecretUrls(null)
-    expect(debug).toHaveBeenCalledWith('body is not an object or is null')
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('does nothing if signed_upload_url and signed_url are not strings', () => {
-    const body = {
-      signed_upload_url: 123,
-      signed_url: 456
-    }
-    maskSecretUrls(body)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-})
@@ -40,4 +40,4 @@

 #### Defined in

-[src/artifact.ts:7](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/artifact.ts#L7)
+[src/artifact.ts:7](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/artifact.ts#L7)
@@ -48,7 +48,7 @@ Error.constructor

 #### Defined in

-[src/internal/shared/errors.ts:24](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L24)
+[src/internal/shared/errors.ts:24](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L24)

 ## Properties

@@ -61,7 +61,7 @@ single DeleteArtifactResponse object

 #### Defined in

-[src/internal/client.ts:248](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L248)
+[src/internal/client.ts:248](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L248)

 ___

@@ -92,7 +92,7 @@ single DownloadArtifactResponse object

 #### Defined in

-[src/internal/client.ts:138](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L138)
+[src/internal/client.ts:138](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L138)

 ___

@@ -127,7 +127,7 @@ If there are multiple artifacts with the same name in the same workflow run this

 #### Defined in

-[src/internal/client.ts:212](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L212)
+[src/internal/client.ts:212](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L212)

 ___

@@ -159,7 +159,7 @@ ListArtifactResponse object

 #### Defined in

-[src/internal/client.ts:176](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L176)
+[src/internal/client.ts:176](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L176)

 ___

@@ -190,4 +190,4 @@ single UploadArtifactResponse object

 #### Defined in

-[src/internal/client.ts:113](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L113)
+[src/internal/client.ts:113](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L113)
@@ -49,7 +49,7 @@ Error.constructor

 #### Defined in

-[src/internal/shared/errors.ts:4](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L4)
+[src/internal/shared/errors.ts:4](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L4)

 ## Properties

@@ -59,7 +59,7 @@ Error.constructor

 #### Defined in

-[src/internal/shared/errors.ts:2](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L2)
+[src/internal/shared/errors.ts:2](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L2)

 ___

@@ -48,7 +48,7 @@ Error.constructor

 #### Defined in

-[src/internal/shared/errors.ts:31](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L31)
+[src/internal/shared/errors.ts:31](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L31)

 ## Properties

@@ -48,7 +48,7 @@ Error.constructor

 #### Defined in

-[src/internal/shared/errors.ts:17](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L17)
+[src/internal/shared/errors.ts:17](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L17)

 ## Properties

@@ -50,7 +50,7 @@ Error.constructor

 #### Defined in

-[src/internal/shared/errors.ts:42](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L42)
+[src/internal/shared/errors.ts:42](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L42)

 ## Properties

@@ -60,7 +60,7 @@ Error.constructor

 #### Defined in

-[src/internal/shared/errors.ts:40](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L40)
+[src/internal/shared/errors.ts:40](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L40)

 ___

@@ -198,4 +198,4 @@ ___

 #### Defined in

-[src/internal/shared/errors.ts:49](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L49)
+[src/internal/shared/errors.ts:49](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L49)
@@ -43,7 +43,7 @@ Error.constructor

 #### Defined in

-[src/internal/shared/errors.ts:62](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L62)
+[src/internal/shared/errors.ts:62](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L62)

 ## Properties

@@ -181,4 +181,4 @@ ___

 #### Defined in

-[src/internal/shared/errors.ts:68](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/errors.ts#L68)
+[src/internal/shared/errors.ts:68](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/errors.ts#L68)
@@ -23,7 +23,7 @@ The time when the artifact was created

 #### Defined in

-[src/internal/shared/interfaces.ts:128](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L128)
+[src/internal/shared/interfaces.ts:123](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L123)

 ___

@@ -35,7 +35,7 @@ The ID of the artifact

 #### Defined in

-[src/internal/shared/interfaces.ts:118](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L118)
+[src/internal/shared/interfaces.ts:113](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L113)

 ___

@@ -47,7 +47,7 @@ The name of the artifact

 #### Defined in

-[src/internal/shared/interfaces.ts:113](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L113)
+[src/internal/shared/interfaces.ts:108](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L108)

 ___

@@ -59,4 +59,4 @@ The size of the artifact in bytes

 #### Defined in

-[src/internal/shared/interfaces.ts:123](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L123)
+[src/internal/shared/interfaces.ts:118](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L118)
@@ -43,7 +43,7 @@ single DeleteArtifactResponse object

 #### Defined in

-[src/internal/client.ts:103](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L103)
+[src/internal/client.ts:103](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L103)

 ___

@@ -70,7 +70,7 @@ single DownloadArtifactResponse object

 #### Defined in

-[src/internal/client.ts:89](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L89)
+[src/internal/client.ts:89](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L89)

 ___

@@ -101,7 +101,7 @@ If there are multiple artifacts with the same name in the same workflow run this

 #### Defined in

-[src/internal/client.ts:75](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L75)
+[src/internal/client.ts:75](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L75)

 ___

@@ -129,7 +129,7 @@ ListArtifactResponse object

 #### Defined in

-[src/internal/client.ts:57](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L57)
+[src/internal/client.ts:57](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L57)

 ___

@@ -156,4 +156,4 @@ single UploadArtifactResponse object

 #### Defined in

-[src/internal/client.ts:40](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/client.ts#L40)
+[src/internal/client.ts:40](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/client.ts#L40)
@@ -20,4 +20,4 @@ The id of the artifact that was deleted

 #### Defined in

-[src/internal/shared/interfaces.ts:163](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L163)
+[src/internal/shared/interfaces.ts:158](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L158)
@@ -20,4 +20,4 @@ Denotes where the artifact will be downloaded to. If not specified then the arti

 #### Defined in

-[src/internal/shared/interfaces.ts:103](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L103)
+[src/internal/shared/interfaces.ts:98](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L98)
@@ -20,4 +20,4 @@ The path where the artifact was downloaded to

 #### Defined in

-[src/internal/shared/interfaces.ts:93](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L93)
+[src/internal/shared/interfaces.ts:88](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L88)
@@ -27,4 +27,4 @@ The criteria for finding Artifact(s) out of the scope of the current run.

 #### Defined in

-[src/internal/shared/interfaces.ts:136](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L136)
+[src/internal/shared/interfaces.ts:131](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L131)
@@ -20,4 +20,4 @@ Metadata about the artifact that was found

 #### Defined in

-[src/internal/shared/interfaces.ts:62](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L62)
+[src/internal/shared/interfaces.ts:57](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L57)
@@ -21,4 +21,4 @@ In the case of reruns, this can be useful to avoid duplicates

 #### Defined in

-[src/internal/shared/interfaces.ts:73](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L73)
+[src/internal/shared/interfaces.ts:68](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L68)
@@ -20,4 +20,4 @@ A list of artifacts that were found

 #### Defined in

-[src/internal/shared/interfaces.ts:83](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L83)
+[src/internal/shared/interfaces.ts:78](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L78)
@@ -28,7 +28,7 @@ For large files that are not easily compressed, a value of 0 is recommended for

 #### Defined in

-[src/internal/shared/interfaces.ts:52](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L52)
+[src/internal/shared/interfaces.ts:47](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L47)

 ___

@@ -52,4 +52,4 @@ input of 0 assumes default retention setting.

 #### Defined in

-[src/internal/shared/interfaces.ts:41](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L41)
+[src/internal/shared/interfaces.ts:36](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L36)
@@ -8,24 +8,11 @@ Response from the server when an artifact is uploaded

 ### Properties

- [digest](UploadArtifactResponse.md#digest)
 - [id](UploadArtifactResponse.md#id)
 - [size](UploadArtifactResponse.md#size)

 ## Properties

-### digest
-
-• `Optional` **digest**: `string`
-
-The SHA256 digest of the artifact that was created. Not provided if no artifact was uploaded
-
-#### Defined in
-
-[src/internal/shared/interfaces.ts:19](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L19)
-
-___
-
 ### id

 • `Optional` **id**: `number`
@@ -35,7 +22,7 @@ This ID can be used as input to other APIs to download, delete or get more infor

 #### Defined in

-[src/internal/shared/interfaces.ts:14](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L14)
+[src/internal/shared/interfaces.ts:14](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L14)

 ___

@@ -47,4 +34,4 @@ Total size of the artifact in bytes. Not provided if no artifact was uploaded

 #### Defined in

-[src/internal/shared/interfaces.ts:8](https://github.com/actions/toolkit/blob/f522fdf/packages/artifact/src/internal/shared/interfaces.ts#L8)
+[src/internal/shared/interfaces.ts:8](https://github.com/actions/toolkit/blob/daf23ba/packages/artifact/src/internal/shared/interfaces.ts#L8)
@@ -1,6 +1,6 @@
 {
  "name": "@actions/artifact",
-  "version": "4.0.0",
+  "version": "2.1.4",
  "preview": true,
  "description": "Actions artifact lib",
  "keywords": [
@@ -41,29 +41,25 @@
  },
  "dependencies": {
    "@actions/core": "^1.10.0",
-    "@actions/github": "^6.0.1",
+    "@actions/github": "^5.1.1",
    "@actions/http-client": "^2.1.0",
-    "@azure/core-http": "^3.0.5",
    "@azure/storage-blob": "^12.15.0",
-    "@octokit/core": "^5.2.1",
+    "@octokit/core": "^3.5.1",
    "@octokit/plugin-request-log": "^1.0.4",
    "@octokit/plugin-retry": "^3.0.9",
-    "@octokit/request": "^8.4.1",
-    "@octokit/request-error": "^5.1.1",
+    "@octokit/request-error": "^5.0.0",
    "@protobuf-ts/plugin": "^2.2.3-alpha.1",
-    "archiver": "^7.0.1",
+    "archiver": "^5.3.1",
+    "crypto": "^1.0.1",
    "jwt-decode": "^3.1.2",
+    "twirp-ts": "^2.5.0",
    "unzip-stream": "^0.3.1"
  },
  "devDependencies": {
    "@types/archiver": "^5.3.2",
    "@types/unzip-stream": "^0.3.4",
-    "typedoc": "^0.28.13",
+    "typedoc": "^0.25.4",
    "typedoc-plugin-markdown": "^3.17.1",
    "typescript": "^5.2.2"
-  },
-  "overrides": {
-    "uri-js": "npm:uri-js-replace@^1.0.1",
-    "node-fetch": "^3.3.2"
  }
 }
@@ -1,4 +1,4 @@
 export * from './google/protobuf/timestamp'
 export * from './google/protobuf/wrappers'
 export * from './results/api/v1/artifact'
-export * from './results/api/v1/artifact.twirp-client'
+export * from './results/api/v1/artifact.twirp'
@@ -15,66 +15,6 @@ import { MessageType } from "@protobuf-ts/runtime";
 import { Int64Value } from "../../../google/protobuf/wrappers";
 import { StringValue } from "../../../google/protobuf/wrappers";
 import { Timestamp } from "../../../google/protobuf/timestamp";
-/**
- * @generated from protobuf message github.actions.results.api.v1.MigrateArtifactRequest
- */
-export interface MigrateArtifactRequest {
-    /**
-     * @generated from protobuf field: string workflow_run_backend_id = 1;
-     */
-    workflowRunBackendId: string;
-    /**
-     * @generated from protobuf field: string name = 2;
-     */
-    name: string;
-    /**
-     * @generated from protobuf field: google.protobuf.Timestamp expires_at = 3;
-     */
-    expiresAt?: Timestamp;
-}
-/**
- * @generated from protobuf message github.actions.results.api.v1.MigrateArtifactResponse
- */
-export interface MigrateArtifactResponse {
-    /**
-     * @generated from protobuf field: bool ok = 1;
-     */
-    ok: boolean;
-    /**
-     * @generated from protobuf field: string signed_upload_url = 2;
-     */
-    signedUploadUrl: string;
-}
-/**
- * @generated from protobuf message github.actions.results.api.v1.FinalizeMigratedArtifactRequest
- */
-export interface FinalizeMigratedArtifactRequest {
-    /**
-     * @generated from protobuf field: string workflow_run_backend_id = 1;
-     */
-    workflowRunBackendId: string;
-    /**
-     * @generated from protobuf field: string name = 2;
-     */
-    name: string;
-    /**
-     * @generated from protobuf field: int64 size = 3;
-     */
-    size: string;
-}
-/**
- * @generated from protobuf message github.actions.results.api.v1.FinalizeMigratedArtifactResponse
- */
-export interface FinalizeMigratedArtifactResponse {
-    /**
-     * @generated from protobuf field: bool ok = 1;
-     */
-    ok: boolean;
-    /**
-     * @generated from protobuf field: int64 artifact_id = 2;
-     */
-    artifactId: string;
-}
 /**
 * @generated from protobuf message github.actions.results.api.v1.CreateArtifactRequest
 */
@@ -229,12 +169,6 @@ export interface ListArtifactsResponse_MonolithArtifact {
     * @generated from protobuf field: google.protobuf.Timestamp created_at = 6;
     */
    createdAt?: Timestamp;
-    /**
-     * The SHA-256 digest of the artifact, calculated on upload for upload-artifact v4 & newer
-     *
-     * @generated from protobuf field: google.protobuf.StringValue digest = 7;
-     */
-    digest?: StringValue;
 }
 /**
 * @generated from protobuf message github.actions.results.api.v1.GetSignedArtifactURLRequest
@@ -293,236 +227,6 @@ export interface DeleteArtifactResponse {
    artifactId: string;
 }
 // @generated message type with reflection information, may provide speed optimized methods
-class MigrateArtifactRequest$Type extends MessageType<MigrateArtifactRequest> {
-    constructor() {
-        super("github.actions.results.api.v1.MigrateArtifactRequest", [
-            { no: 1, name: "workflow_run_backend_id", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "name", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "expires_at", kind: "message", T: () => Timestamp }
-        ]);
-    }
-    create(value?: PartialMessage<MigrateArtifactRequest>): MigrateArtifactRequest {
-        const message = { workflowRunBackendId: "", name: "" };
-        globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
-        if (value !== undefined)
-            reflectionMergePartial<MigrateArtifactRequest>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: MigrateArtifactRequest): MigrateArtifactRequest {
-        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 name */ 2:
-                    message.name = reader.string();
-                    break;
-                case /* google.protobuf.Timestamp expires_at */ 3:
-                    message.expiresAt = Timestamp.internalBinaryRead(reader, reader.uint32(), options, message.expiresAt);
-                    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: MigrateArtifactRequest, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* string workflow_run_backend_id = 1; */
-        if (message.workflowRunBackendId !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.workflowRunBackendId);
-        /* string name = 2; */
-        if (message.name !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.name);
-        /* google.protobuf.Timestamp expires_at = 3; */
-        if (message.expiresAt)
-            Timestamp.internalBinaryWrite(message.expiresAt, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
-        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.MigrateArtifactRequest
- */
-export const MigrateArtifactRequest = new MigrateArtifactRequest$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class MigrateArtifactResponse$Type extends MessageType<MigrateArtifactResponse> {
-    constructor() {
-        super("github.actions.results.api.v1.MigrateArtifactResponse", [
-            { no: 1, name: "ok", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 2, name: "signed_upload_url", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
-        ]);
-    }
-    create(value?: PartialMessage<MigrateArtifactResponse>): MigrateArtifactResponse {
-        const message = { ok: false, signedUploadUrl: "" };
-        globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
-        if (value !== undefined)
-            reflectionMergePartial<MigrateArtifactResponse>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: MigrateArtifactResponse): MigrateArtifactResponse {
-        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 /* string signed_upload_url */ 2:
-                    message.signedUploadUrl = 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: MigrateArtifactResponse, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* bool ok = 1; */
-        if (message.ok !== false)
-            writer.tag(1, WireType.Varint).bool(message.ok);
-        /* string signed_upload_url = 2; */
-        if (message.signedUploadUrl !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.signedUploadUrl);
-        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.MigrateArtifactResponse
- */
-export const MigrateArtifactResponse = new MigrateArtifactResponse$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class FinalizeMigratedArtifactRequest$Type extends MessageType<FinalizeMigratedArtifactRequest> {
-    constructor() {
-        super("github.actions.results.api.v1.FinalizeMigratedArtifactRequest", [
-            { no: 1, name: "workflow_run_backend_id", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 2, name: "name", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
-            { no: 3, name: "size", kind: "scalar", T: 3 /*ScalarType.INT64*/ }
-        ]);
-    }
-    create(value?: PartialMessage<FinalizeMigratedArtifactRequest>): FinalizeMigratedArtifactRequest {
-        const message = { workflowRunBackendId: "", name: "", size: "0" };
-        globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
-        if (value !== undefined)
-            reflectionMergePartial<FinalizeMigratedArtifactRequest>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: FinalizeMigratedArtifactRequest): FinalizeMigratedArtifactRequest {
-        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 name */ 2:
-                    message.name = reader.string();
-                    break;
-                case /* int64 size */ 3:
-                    message.size = 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: FinalizeMigratedArtifactRequest, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
-        /* string workflow_run_backend_id = 1; */
-        if (message.workflowRunBackendId !== "")
-            writer.tag(1, WireType.LengthDelimited).string(message.workflowRunBackendId);
-        /* string name = 2; */
-        if (message.name !== "")
-            writer.tag(2, WireType.LengthDelimited).string(message.name);
-        /* int64 size = 3; */
-        if (message.size !== "0")
-            writer.tag(3, WireType.Varint).int64(message.size);
-        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.FinalizeMigratedArtifactRequest
- */
-export const FinalizeMigratedArtifactRequest = new FinalizeMigratedArtifactRequest$Type();
-// @generated message type with reflection information, may provide speed optimized methods
-class FinalizeMigratedArtifactResponse$Type extends MessageType<FinalizeMigratedArtifactResponse> {
-    constructor() {
-        super("github.actions.results.api.v1.FinalizeMigratedArtifactResponse", [
-            { no: 1, name: "ok", kind: "scalar", T: 8 /*ScalarType.BOOL*/ },
-            { no: 2, name: "artifact_id", kind: "scalar", T: 3 /*ScalarType.INT64*/ }
-        ]);
-    }
-    create(value?: PartialMessage<FinalizeMigratedArtifactResponse>): FinalizeMigratedArtifactResponse {
-        const message = { ok: false, artifactId: "0" };
-        globalThis.Object.defineProperty(message, MESSAGE_TYPE, { enumerable: false, value: this });
-        if (value !== undefined)
-            reflectionMergePartial<FinalizeMigratedArtifactResponse>(this, message, value);
-        return message;
-    }
-    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: FinalizeMigratedArtifactResponse): FinalizeMigratedArtifactResponse {
-        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: FinalizeMigratedArtifactResponse, 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.FinalizeMigratedArtifactResponse
- */
-export const FinalizeMigratedArtifactResponse = new FinalizeMigratedArtifactResponse$Type();
-// @generated message type with reflection information, may provide speed optimized methods
 class CreateArtifactRequest$Type extends MessageType<CreateArtifactRequest> {
    constructor() {
        super("github.actions.results.api.v1.CreateArtifactRequest", [
@@ -904,8 +608,7 @@ class ListArtifactsResponse_MonolithArtifact$Type extends MessageType<ListArtifa
            { no: 3, name: "database_id", kind: "scalar", T: 3 /*ScalarType.INT64*/ },
            { no: 4, name: "name", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
            { no: 5, name: "size", kind: "scalar", T: 3 /*ScalarType.INT64*/ },
-            { no: 6, name: "created_at", kind: "message", T: () => Timestamp },
-            { no: 7, name: "digest", kind: "message", T: () => StringValue }
+            { no: 6, name: "created_at", kind: "message", T: () => Timestamp }
        ]);
    }
    create(value?: PartialMessage<ListArtifactsResponse_MonolithArtifact>): ListArtifactsResponse_MonolithArtifact {
@@ -938,9 +641,6 @@ class ListArtifactsResponse_MonolithArtifact$Type extends MessageType<ListArtifa
                case /* google.protobuf.Timestamp created_at */ 6:
                    message.createdAt = Timestamp.internalBinaryRead(reader, reader.uint32(), options, message.createdAt);
                    break;
-                case /* google.protobuf.StringValue digest */ 7:
-                    message.digest = StringValue.internalBinaryRead(reader, reader.uint32(), options, message.digest);
-                    break;
                default:
                    let u = options.readUnknownField;
                    if (u === "throw")
@@ -971,9 +671,6 @@ class ListArtifactsResponse_MonolithArtifact$Type extends MessageType<ListArtifa
        /* google.protobuf.Timestamp created_at = 6; */
        if (message.createdAt)
            Timestamp.internalBinaryWrite(message.createdAt, writer.tag(6, WireType.LengthDelimited).fork(), options).join();
-        /* google.protobuf.StringValue digest = 7; */
-        if (message.digest)
-            StringValue.internalBinaryWrite(message.digest, writer.tag(7, WireType.LengthDelimited).fork(), options).join();
        let u = options.writeUnknownFields;
        if (u !== false)
            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
@@ -1215,7 +912,5 @@ export const ArtifactService = new ServiceType("github.actions.results.api.v1.Ar
    { 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: "MigrateArtifact", options: {}, I: MigrateArtifactRequest, O: MigrateArtifactResponse },
-    { name: "FinalizeMigratedArtifact", options: {}, I: FinalizeMigratedArtifactRequest, O: FinalizeMigratedArtifactResponse }
-]);
+    { name: "DeleteArtifact", options: {}, I: DeleteArtifactRequest, O: DeleteArtifactResponse }
+]);
@@ -1,232 +0,0 @@
-import {
-  CreateArtifactRequest,
-  CreateArtifactResponse,
-  FinalizeArtifactRequest,
-  FinalizeArtifactResponse,
-  ListArtifactsRequest,
-  ListArtifactsResponse,
-  GetSignedArtifactURLRequest,
-  GetSignedArtifactURLResponse,
-  DeleteArtifactRequest,
-  DeleteArtifactResponse,
-} from "./artifact";
-
-//==================================//
-//          Client Code             //
-//==================================//
-
-interface Rpc {
-  request(
-    service: string,
-    method: string,
-    contentType: "application/json" | "application/protobuf",
-    data: object | Uint8Array
-  ): Promise<object | Uint8Array>;
-}
-
-export interface ArtifactServiceClient {
-  CreateArtifact(
-    request: CreateArtifactRequest
-  ): Promise<CreateArtifactResponse>;
-  FinalizeArtifact(
-    request: FinalizeArtifactRequest
-  ): Promise<FinalizeArtifactResponse>;
-  ListArtifacts(request: ListArtifactsRequest): Promise<ListArtifactsResponse>;
-  GetSignedArtifactURL(
-    request: GetSignedArtifactURLRequest
-  ): Promise<GetSignedArtifactURLResponse>;
-  DeleteArtifact(
-    request: DeleteArtifactRequest
-  ): Promise<DeleteArtifactResponse>;
-}
-
-export class ArtifactServiceClientJSON implements ArtifactServiceClient {
-  private readonly rpc: Rpc;
-  constructor(rpc: Rpc) {
-    this.rpc = rpc;
-    this.CreateArtifact.bind(this);
-    this.FinalizeArtifact.bind(this);
-    this.ListArtifacts.bind(this);
-    this.GetSignedArtifactURL.bind(this);
-    this.DeleteArtifact.bind(this);
-  }
-  CreateArtifact(
-    request: CreateArtifactRequest
-  ): Promise<CreateArtifactResponse> {
-    const data = CreateArtifactRequest.toJson(request, {
-      useProtoFieldName: true,
-      emitDefaultValues: false,
-    });
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "CreateArtifact",
-      "application/json",
-      data as object
-    );
-    return promise.then((data) =>
-      CreateArtifactResponse.fromJson(data as any, {
-        ignoreUnknownFields: true,
-      })
-    );
-  }
-
-  FinalizeArtifact(
-    request: FinalizeArtifactRequest
-  ): Promise<FinalizeArtifactResponse> {
-    const data = FinalizeArtifactRequest.toJson(request, {
-      useProtoFieldName: true,
-      emitDefaultValues: false,
-    });
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "FinalizeArtifact",
-      "application/json",
-      data as object
-    );
-    return promise.then((data) =>
-      FinalizeArtifactResponse.fromJson(data as any, {
-        ignoreUnknownFields: true,
-      })
-    );
-  }
-
-  ListArtifacts(request: ListArtifactsRequest): Promise<ListArtifactsResponse> {
-    const data = ListArtifactsRequest.toJson(request, {
-      useProtoFieldName: true,
-      emitDefaultValues: false,
-    });
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "ListArtifacts",
-      "application/json",
-      data as object
-    );
-    return promise.then((data) =>
-      ListArtifactsResponse.fromJson(data as any, { ignoreUnknownFields: true })
-    );
-  }
-
-  GetSignedArtifactURL(
-    request: GetSignedArtifactURLRequest
-  ): Promise<GetSignedArtifactURLResponse> {
-    const data = GetSignedArtifactURLRequest.toJson(request, {
-      useProtoFieldName: true,
-      emitDefaultValues: false,
-    });
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "GetSignedArtifactURL",
-      "application/json",
-      data as object
-    );
-    return promise.then((data) =>
-      GetSignedArtifactURLResponse.fromJson(data as any, {
-        ignoreUnknownFields: true,
-      })
-    );
-  }
-
-  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 {
-  private readonly rpc: Rpc;
-  constructor(rpc: Rpc) {
-    this.rpc = rpc;
-    this.CreateArtifact.bind(this);
-    this.FinalizeArtifact.bind(this);
-    this.ListArtifacts.bind(this);
-    this.GetSignedArtifactURL.bind(this);
-    this.DeleteArtifact.bind(this);
-  }
-  CreateArtifact(
-    request: CreateArtifactRequest
-  ): Promise<CreateArtifactResponse> {
-    const data = CreateArtifactRequest.toBinary(request);
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "CreateArtifact",
-      "application/protobuf",
-      data
-    );
-    return promise.then((data) =>
-      CreateArtifactResponse.fromBinary(data as Uint8Array)
-    );
-  }
-
-  FinalizeArtifact(
-    request: FinalizeArtifactRequest
-  ): Promise<FinalizeArtifactResponse> {
-    const data = FinalizeArtifactRequest.toBinary(request);
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "FinalizeArtifact",
-      "application/protobuf",
-      data
-    );
-    return promise.then((data) =>
-      FinalizeArtifactResponse.fromBinary(data as Uint8Array)
-    );
-  }
-
-  ListArtifacts(request: ListArtifactsRequest): Promise<ListArtifactsResponse> {
-    const data = ListArtifactsRequest.toBinary(request);
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "ListArtifacts",
-      "application/protobuf",
-      data
-    );
-    return promise.then((data) =>
-      ListArtifactsResponse.fromBinary(data as Uint8Array)
-    );
-  }
-
-  GetSignedArtifactURL(
-    request: GetSignedArtifactURLRequest
-  ): Promise<GetSignedArtifactURLResponse> {
-    const data = GetSignedArtifactURLRequest.toBinary(request);
-    const promise = this.rpc.request(
-      "github.actions.results.api.v1.ArtifactService",
-      "GetSignedArtifactURL",
-      "application/protobuf",
-      data
-    );
-    return promise.then((data) =>
-      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)
-    );
-  }
-}
@@ -0,0 +1,976 @@
+import {
+  TwirpContext,
+  TwirpServer,
+  RouterEvents,
+  TwirpError,
+  TwirpErrorCode,
+  Interceptor,
+  TwirpContentType,
+  chainInterceptors,
+} from "twirp-ts";
+import {
+  CreateArtifactRequest,
+  CreateArtifactResponse,
+  FinalizeArtifactRequest,
+  FinalizeArtifactResponse,
+  ListArtifactsRequest,
+  ListArtifactsResponse,
+  GetSignedArtifactURLRequest,
+  GetSignedArtifactURLResponse,
+  DeleteArtifactRequest,
+  DeleteArtifactResponse,
+} from "./artifact";
+
+//==================================//
+//          Client Code             //
+//==================================//
+
+interface Rpc {
+  request(
+    service: string,
+    method: string,
+    contentType: "application/json" | "application/protobuf",
+    data: object | Uint8Array
+  ): Promise<object | Uint8Array>;
+}
+
+export interface ArtifactServiceClient {
+  CreateArtifact(
+    request: CreateArtifactRequest
+  ): Promise<CreateArtifactResponse>;
+  FinalizeArtifact(
+    request: FinalizeArtifactRequest
+  ): Promise<FinalizeArtifactResponse>;
+  ListArtifacts(request: ListArtifactsRequest): Promise<ListArtifactsResponse>;
+  GetSignedArtifactURL(
+    request: GetSignedArtifactURLRequest
+  ): Promise<GetSignedArtifactURLResponse>;
+  DeleteArtifact(
+    request: DeleteArtifactRequest
+  ): Promise<DeleteArtifactResponse>;
+}
+
+export class ArtifactServiceClientJSON implements ArtifactServiceClient {
+  private readonly rpc: Rpc;
+  constructor(rpc: Rpc) {
+    this.rpc = rpc;
+    this.CreateArtifact.bind(this);
+    this.FinalizeArtifact.bind(this);
+    this.ListArtifacts.bind(this);
+    this.GetSignedArtifactURL.bind(this);
+    this.DeleteArtifact.bind(this);
+  }
+  CreateArtifact(
+    request: CreateArtifactRequest
+  ): Promise<CreateArtifactResponse> {
+    const data = CreateArtifactRequest.toJson(request, {
+      useProtoFieldName: true,
+      emitDefaultValues: false,
+    });
+    const promise = this.rpc.request(
+      "github.actions.results.api.v1.ArtifactService",
+      "CreateArtifact",
+      "application/json",
+      data as object
+    );
+    return promise.then((data) =>
+      CreateArtifactResponse.fromJson(data as any, {
+        ignoreUnknownFields: true,
+      })
+    );
+  }
+
+  FinalizeArtifact(
+    request: FinalizeArtifactRequest
+  ): Promise<FinalizeArtifactResponse> {
+    const data = FinalizeArtifactRequest.toJson(request, {
+      useProtoFieldName: true,
+      emitDefaultValues: false,
+    });
+    const promise = this.rpc.request(
+      "github.actions.results.api.v1.ArtifactService",
+      "FinalizeArtifact",
+      "application/json",
+      data as object
+    );
+    return promise.then((data) =>
+      FinalizeArtifactResponse.fromJson(data as any, {
+        ignoreUnknownFields: true,
+      })
+    );
+  }
+
+  ListArtifacts(request: ListArtifactsRequest): Promise<ListArtifactsResponse> {
+    const data = ListArtifactsRequest.toJson(request, {
+      useProtoFieldName: true,
+      emitDefaultValues: false,
+    });
+    const promise = this.rpc.request(
+      "github.actions.results.api.v1.ArtifactService",
+      "ListArtifacts",
+      "application/json",
+      data as object
+    );
+    return promise.then((data) =>
+      ListArtifactsResponse.fromJson(data as any, { ignoreUnknownFields: true })
+    );
+  }
+
+  GetSignedArtifactURL(
+    request: GetSignedArtifactURLRequest
+  ): Promise<GetSignedArtifactURLResponse> {
+    const data = GetSignedArtifactURLRequest.toJson(request, {
+      useProtoFieldName: true,
+      emitDefaultValues: false,
+    });
+    const promise = this.rpc.request(
+      "github.actions.results.api.v1.ArtifactService",
+      "GetSignedArtifactURL",
+      "application/json",
+      data as object
+    );
+    return promise.then((data) =>
+      GetSignedArtifactURLResponse.fromJson(data as any, {
+        ignoreUnknownFields: true,
+      })
+    );
+  }
+
+  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 {
+  private readonly rpc: Rpc;
+  constructor(rpc: Rpc) {
+    this.rpc = rpc;
+    this.CreateArtifact.bind(this);
+    this.FinalizeArtifact.bind(this);
+    this.ListArtifacts.bind(this);
+    this.GetSignedArtifactURL.bind(this);
+    this.DeleteArtifact.bind(this);
+  }
+  CreateArtifact(
+    request: CreateArtifactRequest
+  ): Promise<CreateArtifactResponse> {
+    const data = CreateArtifactRequest.toBinary(request);
+    const promise = this.rpc.request(
+      "github.actions.results.api.v1.ArtifactService",
+      "CreateArtifact",
+      "application/protobuf",
+      data
+    );
+    return promise.then((data) =>
+      CreateArtifactResponse.fromBinary(data as Uint8Array)
+    );
+  }
+
+  FinalizeArtifact(
+    request: FinalizeArtifactRequest
+  ): Promise<FinalizeArtifactResponse> {
+    const data = FinalizeArtifactRequest.toBinary(request);
+    const promise = this.rpc.request(
+      "github.actions.results.api.v1.ArtifactService",
+      "FinalizeArtifact",
+      "application/protobuf",
+      data
+    );
+    return promise.then((data) =>
+      FinalizeArtifactResponse.fromBinary(data as Uint8Array)
+    );
+  }
+
+  ListArtifacts(request: ListArtifactsRequest): Promise<ListArtifactsResponse> {
+    const data = ListArtifactsRequest.toBinary(request);
+    const promise = this.rpc.request(
+      "github.actions.results.api.v1.ArtifactService",
+      "ListArtifacts",
+      "application/protobuf",
+      data
+    );
+    return promise.then((data) =>
+      ListArtifactsResponse.fromBinary(data as Uint8Array)
+    );
+  }
+
+  GetSignedArtifactURL(
+    request: GetSignedArtifactURLRequest
+  ): Promise<GetSignedArtifactURLResponse> {
+    const data = GetSignedArtifactURLRequest.toBinary(request);
+    const promise = this.rpc.request(
+      "github.actions.results.api.v1.ArtifactService",
+      "GetSignedArtifactURL",
+      "application/protobuf",
+      data
+    );
+    return promise.then((data) =>
+      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)
+    );
+  }
+}
+
+//==================================//
+//          Server Code             //
+//==================================//
+
+export interface ArtifactServiceTwirp<T extends TwirpContext = TwirpContext> {
+  CreateArtifact(
+    ctx: T,
+    request: CreateArtifactRequest
+  ): Promise<CreateArtifactResponse>;
+  FinalizeArtifact(
+    ctx: T,
+    request: FinalizeArtifactRequest
+  ): Promise<FinalizeArtifactResponse>;
+  ListArtifacts(
+    ctx: T,
+    request: ListArtifactsRequest
+  ): Promise<ListArtifactsResponse>;
+  GetSignedArtifactURL(
+    ctx: T,
+    request: GetSignedArtifactURLRequest
+  ): Promise<GetSignedArtifactURLResponse>;
+  DeleteArtifact(
+    ctx: T,
+    request: DeleteArtifactRequest
+  ): Promise<DeleteArtifactResponse>;
+}
+
+export enum ArtifactServiceMethod {
+  CreateArtifact = "CreateArtifact",
+  FinalizeArtifact = "FinalizeArtifact",
+  ListArtifacts = "ListArtifacts",
+  GetSignedArtifactURL = "GetSignedArtifactURL",
+  DeleteArtifact = "DeleteArtifact",
+}
+
+export const ArtifactServiceMethodList = [
+  ArtifactServiceMethod.CreateArtifact,
+  ArtifactServiceMethod.FinalizeArtifact,
+  ArtifactServiceMethod.ListArtifacts,
+  ArtifactServiceMethod.GetSignedArtifactURL,
+  ArtifactServiceMethod.DeleteArtifact,
+];
+
+export function createArtifactServiceServer<
+  T extends TwirpContext = TwirpContext
+>(service: ArtifactServiceTwirp<T>) {
+  return new TwirpServer<ArtifactServiceTwirp, T>({
+    service,
+    packageName: "github.actions.results.api.v1",
+    serviceName: "ArtifactService",
+    methodList: ArtifactServiceMethodList,
+    matchRoute: matchArtifactServiceRoute,
+  });
+}
+
+function matchArtifactServiceRoute<T extends TwirpContext = TwirpContext>(
+  method: string,
+  events: RouterEvents<T>
+) {
+  switch (method) {
+    case "CreateArtifact":
+      return async (
+        ctx: T,
+        service: ArtifactServiceTwirp,
+        data: Buffer,
+        interceptors?: Interceptor<
+          T,
+          CreateArtifactRequest,
+          CreateArtifactResponse
+        >[]
+      ) => {
+        ctx = { ...ctx, methodName: "CreateArtifact" };
+        await events.onMatch(ctx);
+        return handleArtifactServiceCreateArtifactRequest(
+          ctx,
+          service,
+          data,
+          interceptors
+        );
+      };
+    case "FinalizeArtifact":
+      return async (
+        ctx: T,
+        service: ArtifactServiceTwirp,
+        data: Buffer,
+        interceptors?: Interceptor<
+          T,
+          FinalizeArtifactRequest,
+          FinalizeArtifactResponse
+        >[]
+      ) => {
+        ctx = { ...ctx, methodName: "FinalizeArtifact" };
+        await events.onMatch(ctx);
+        return handleArtifactServiceFinalizeArtifactRequest(
+          ctx,
+          service,
+          data,
+          interceptors
+        );
+      };
+    case "ListArtifacts":
+      return async (
+        ctx: T,
+        service: ArtifactServiceTwirp,
+        data: Buffer,
+        interceptors?: Interceptor<
+          T,
+          ListArtifactsRequest,
+          ListArtifactsResponse
+        >[]
+      ) => {
+        ctx = { ...ctx, methodName: "ListArtifacts" };
+        await events.onMatch(ctx);
+        return handleArtifactServiceListArtifactsRequest(
+          ctx,
+          service,
+          data,
+          interceptors
+        );
+      };
+    case "GetSignedArtifactURL":
+      return async (
+        ctx: T,
+        service: ArtifactServiceTwirp,
+        data: Buffer,
+        interceptors?: Interceptor<
+          T,
+          GetSignedArtifactURLRequest,
+          GetSignedArtifactURLResponse
+        >[]
+      ) => {
+        ctx = { ...ctx, methodName: "GetSignedArtifactURL" };
+        await events.onMatch(ctx);
+        return handleArtifactServiceGetSignedArtifactURLRequest(
+          ctx,
+          service,
+          data,
+          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`;
+      throw new TwirpError(TwirpErrorCode.BadRoute, msg);
+  }
+}
+
+function handleArtifactServiceCreateArtifactRequest<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<T, CreateArtifactRequest, CreateArtifactResponse>[]
+): Promise<string | Uint8Array> {
+  switch (ctx.contentType) {
+    case TwirpContentType.JSON:
+      return handleArtifactServiceCreateArtifactJSON<T>(
+        ctx,
+        service,
+        data,
+        interceptors
+      );
+    case TwirpContentType.Protobuf:
+      return handleArtifactServiceCreateArtifactProtobuf<T>(
+        ctx,
+        service,
+        data,
+        interceptors
+      );
+    default:
+      const msg = "unexpected Content-Type";
+      throw new TwirpError(TwirpErrorCode.BadRoute, msg);
+  }
+}
+
+function handleArtifactServiceFinalizeArtifactRequest<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<
+    T,
+    FinalizeArtifactRequest,
+    FinalizeArtifactResponse
+  >[]
+): Promise<string | Uint8Array> {
+  switch (ctx.contentType) {
+    case TwirpContentType.JSON:
+      return handleArtifactServiceFinalizeArtifactJSON<T>(
+        ctx,
+        service,
+        data,
+        interceptors
+      );
+    case TwirpContentType.Protobuf:
+      return handleArtifactServiceFinalizeArtifactProtobuf<T>(
+        ctx,
+        service,
+        data,
+        interceptors
+      );
+    default:
+      const msg = "unexpected Content-Type";
+      throw new TwirpError(TwirpErrorCode.BadRoute, msg);
+  }
+}
+
+function handleArtifactServiceListArtifactsRequest<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<T, ListArtifactsRequest, ListArtifactsResponse>[]
+): Promise<string | Uint8Array> {
+  switch (ctx.contentType) {
+    case TwirpContentType.JSON:
+      return handleArtifactServiceListArtifactsJSON<T>(
+        ctx,
+        service,
+        data,
+        interceptors
+      );
+    case TwirpContentType.Protobuf:
+      return handleArtifactServiceListArtifactsProtobuf<T>(
+        ctx,
+        service,
+        data,
+        interceptors
+      );
+    default:
+      const msg = "unexpected Content-Type";
+      throw new TwirpError(TwirpErrorCode.BadRoute, msg);
+  }
+}
+
+function handleArtifactServiceGetSignedArtifactURLRequest<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<
+    T,
+    GetSignedArtifactURLRequest,
+    GetSignedArtifactURLResponse
+  >[]
+): Promise<string | Uint8Array> {
+  switch (ctx.contentType) {
+    case TwirpContentType.JSON:
+      return handleArtifactServiceGetSignedArtifactURLJSON<T>(
+        ctx,
+        service,
+        data,
+        interceptors
+      );
+    case TwirpContentType.Protobuf:
+      return handleArtifactServiceGetSignedArtifactURLProtobuf<T>(
+        ctx,
+        service,
+        data,
+        interceptors
+      );
+    default:
+      const msg = "unexpected Content-Type";
+      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
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<T, CreateArtifactRequest, CreateArtifactResponse>[]
+) {
+  let request: CreateArtifactRequest;
+  let response: CreateArtifactResponse;
+
+  try {
+    const body = JSON.parse(data.toString() || "{}");
+    request = CreateArtifactRequest.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,
+      CreateArtifactRequest,
+      CreateArtifactResponse
+    >;
+    response = await interceptor(ctx, request!, (ctx, inputReq) => {
+      return service.CreateArtifact(ctx, inputReq);
+    });
+  } else {
+    response = await service.CreateArtifact(ctx, request!);
+  }
+
+  return JSON.stringify(
+    CreateArtifactResponse.toJson(response, {
+      useProtoFieldName: true,
+      emitDefaultValues: false,
+    }) as string
+  );
+}
+
+async function handleArtifactServiceFinalizeArtifactJSON<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<
+    T,
+    FinalizeArtifactRequest,
+    FinalizeArtifactResponse
+  >[]
+) {
+  let request: FinalizeArtifactRequest;
+  let response: FinalizeArtifactResponse;
+
+  try {
+    const body = JSON.parse(data.toString() || "{}");
+    request = FinalizeArtifactRequest.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,
+      FinalizeArtifactRequest,
+      FinalizeArtifactResponse
+    >;
+    response = await interceptor(ctx, request!, (ctx, inputReq) => {
+      return service.FinalizeArtifact(ctx, inputReq);
+    });
+  } else {
+    response = await service.FinalizeArtifact(ctx, request!);
+  }
+
+  return JSON.stringify(
+    FinalizeArtifactResponse.toJson(response, {
+      useProtoFieldName: true,
+      emitDefaultValues: false,
+    }) as string
+  );
+}
+
+async function handleArtifactServiceListArtifactsJSON<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<T, ListArtifactsRequest, ListArtifactsResponse>[]
+) {
+  let request: ListArtifactsRequest;
+  let response: ListArtifactsResponse;
+
+  try {
+    const body = JSON.parse(data.toString() || "{}");
+    request = ListArtifactsRequest.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,
+      ListArtifactsRequest,
+      ListArtifactsResponse
+    >;
+    response = await interceptor(ctx, request!, (ctx, inputReq) => {
+      return service.ListArtifacts(ctx, inputReq);
+    });
+  } else {
+    response = await service.ListArtifacts(ctx, request!);
+  }
+
+  return JSON.stringify(
+    ListArtifactsResponse.toJson(response, {
+      useProtoFieldName: true,
+      emitDefaultValues: false,
+    }) as string
+  );
+}
+
+async function handleArtifactServiceGetSignedArtifactURLJSON<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<
+    T,
+    GetSignedArtifactURLRequest,
+    GetSignedArtifactURLResponse
+  >[]
+) {
+  let request: GetSignedArtifactURLRequest;
+  let response: GetSignedArtifactURLResponse;
+
+  try {
+    const body = JSON.parse(data.toString() || "{}");
+    request = GetSignedArtifactURLRequest.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,
+      GetSignedArtifactURLRequest,
+      GetSignedArtifactURLResponse
+    >;
+    response = await interceptor(ctx, request!, (ctx, inputReq) => {
+      return service.GetSignedArtifactURL(ctx, inputReq);
+    });
+  } else {
+    response = await service.GetSignedArtifactURL(ctx, request!);
+  }
+
+  return JSON.stringify(
+    GetSignedArtifactURLResponse.toJson(response, {
+      useProtoFieldName: true,
+      emitDefaultValues: false,
+    }) 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
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<T, CreateArtifactRequest, CreateArtifactResponse>[]
+) {
+  let request: CreateArtifactRequest;
+  let response: CreateArtifactResponse;
+
+  try {
+    request = CreateArtifactRequest.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,
+      CreateArtifactRequest,
+      CreateArtifactResponse
+    >;
+    response = await interceptor(ctx, request!, (ctx, inputReq) => {
+      return service.CreateArtifact(ctx, inputReq);
+    });
+  } else {
+    response = await service.CreateArtifact(ctx, request!);
+  }
+
+  return Buffer.from(CreateArtifactResponse.toBinary(response));
+}
+
+async function handleArtifactServiceFinalizeArtifactProtobuf<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<
+    T,
+    FinalizeArtifactRequest,
+    FinalizeArtifactResponse
+  >[]
+) {
+  let request: FinalizeArtifactRequest;
+  let response: FinalizeArtifactResponse;
+
+  try {
+    request = FinalizeArtifactRequest.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,
+      FinalizeArtifactRequest,
+      FinalizeArtifactResponse
+    >;
+    response = await interceptor(ctx, request!, (ctx, inputReq) => {
+      return service.FinalizeArtifact(ctx, inputReq);
+    });
+  } else {
+    response = await service.FinalizeArtifact(ctx, request!);
+  }
+
+  return Buffer.from(FinalizeArtifactResponse.toBinary(response));
+}
+
+async function handleArtifactServiceListArtifactsProtobuf<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<T, ListArtifactsRequest, ListArtifactsResponse>[]
+) {
+  let request: ListArtifactsRequest;
+  let response: ListArtifactsResponse;
+
+  try {
+    request = ListArtifactsRequest.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,
+      ListArtifactsRequest,
+      ListArtifactsResponse
+    >;
+    response = await interceptor(ctx, request!, (ctx, inputReq) => {
+      return service.ListArtifacts(ctx, inputReq);
+    });
+  } else {
+    response = await service.ListArtifacts(ctx, request!);
+  }
+
+  return Buffer.from(ListArtifactsResponse.toBinary(response));
+}
+
+async function handleArtifactServiceGetSignedArtifactURLProtobuf<
+  T extends TwirpContext = TwirpContext
+>(
+  ctx: T,
+  service: ArtifactServiceTwirp,
+  data: Buffer,
+  interceptors?: Interceptor<
+    T,
+    GetSignedArtifactURLRequest,
+    GetSignedArtifactURLResponse
+  >[]
+) {
+  let request: GetSignedArtifactURLRequest;
+  let response: GetSignedArtifactURLResponse;
+
+  try {
+    request = GetSignedArtifactURLRequest.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,
+      GetSignedArtifactURLRequest,
+      GetSignedArtifactURLResponse
+    >;
+    response = await interceptor(ctx, request!, (ctx, inputReq) => {
+      return service.GetSignedArtifactURL(ctx, inputReq);
+    });
+  } else {
+    response = await service.GetSignedArtifactURL(ctx, request!);
+  }
+
+  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));
+}
@@ -1,15 +1,14 @@
 import fs from 'fs/promises'
-import * as crypto from 'crypto'
 import * as stream from 'stream'
-
+import {createWriteStream} from 'fs'
+import * as path from 'path'
 import * as github from '@actions/github'
 import * as core from '@actions/core'
 import * as httpClient from '@actions/http-client'
 import unzip from 'unzip-stream'
 import {
  DownloadArtifactOptions,
-  DownloadArtifactResponse,
-  StreamExtractResponse
+  DownloadArtifactResponse
 } from '../shared/interfaces'
 import {getUserAgentString} from '../shared/user-agent'
 import {getGitHubWorkspaceDir} from '../shared/config'
@@ -41,15 +40,18 @@ async function exists(path: string): Promise<boolean> {
  }
 }

-async function streamExtract(
-  url: string,
-  directory: string
-): Promise<StreamExtractResponse> {
+async function streamExtract(url: string, directory: string): Promise<void> {
  let retryCount = 0
  while (retryCount < 5) {
    try {
-      return await streamExtractExternal(url, directory)
+      await streamExtractExternal(url, directory)
+      return
    } catch (error) {
+      if (error.message.includes('Malformed extraction path')) {
+        throw new Error(
+          `Artifact download failed with unretryable error: ${error.message}`
+        )
+      }
      retryCount++
      core.debug(
        `Failed to download artifact after ${retryCount} retries due to ${error.message}. Retrying in 5 seconds...`
@@ -64,9 +66,8 @@ async function streamExtract(

 export async function streamExtractExternal(
  url: string,
-  directory: string,
-  opts: {timeout: number} = {timeout: 30 * 1000}
-): Promise<StreamExtractResponse> {
+  directory: string
+): Promise<void> {
  const client = new httpClient.HttpClient(getUserAgentString())
  const response = await client.get(url)
  if (response.message.statusCode !== 200) {
@@ -75,26 +76,19 @@ export async function streamExtractExternal(
    )
  }

-  let sha256Digest: string | undefined = undefined
+  const timeout = 30 * 1000 // 30 seconds

  return new Promise((resolve, reject) => {
    const timerFn = (): void => {
-      const timeoutError = new Error(
-        `Blob storage chunk did not respond in ${opts.timeout}ms`
+      response.message.destroy(
+        new Error(`Blob storage chunk did not respond in ${timeout}ms`)
      )
-      response.message.destroy(timeoutError)
-      reject(timeoutError)
    }
-    const timer = setTimeout(timerFn, opts.timeout)
+    const timer = setTimeout(timerFn, timeout)

-    const hashStream = crypto.createHash('sha256').setEncoding('hex')
-    const passThrough = new stream.PassThrough()
-
-    response.message.pipe(passThrough)
-    passThrough.pipe(hashStream)
-    const extractStream = passThrough
-
-    extractStream
+    const createdDirectories = new Set<string>()
+    createdDirectories.add(directory)
+    response.message
      .on('data', () => {
        timer.refresh()
      })
@@ -105,15 +99,48 @@ export async function streamExtractExternal(
        clearTimeout(timer)
        reject(error)
      })
-      .pipe(unzip.Extract({path: directory}))
-      .on('close', () => {
+      .pipe(unzip.Parse())
+      .pipe(
+        new stream.Transform({
+          objectMode: true,
+          transform: async (entry, _, callback) => {
+            const fullPath = path.normalize(path.join(directory, entry.path))
+            if (!directory.endsWith(path.sep)) {
+              directory += path.sep
+            }
+            if (!fullPath.startsWith(directory)) {
+              reject(new Error(`Malformed extraction path: ${fullPath}`))
+            }
+
+            if (entry.type === 'Directory') {
+              if (!createdDirectories.has(fullPath)) {
+                createdDirectories.add(fullPath)
+                await resolveOrCreateDirectory(fullPath).then(() => {
+                  entry.autodrain()
+                  callback()
+                })
+              } else {
+                entry.autodrain()
+                callback()
+              }
+            } else {
+              core.info(`Extracting artifact entry: ${fullPath}`)
+              if (!createdDirectories.has(path.dirname(fullPath))) {
+                createdDirectories.add(path.dirname(fullPath))
+                await resolveOrCreateDirectory(path.dirname(fullPath))
+              }
+
+              const writeStream = createWriteStream(fullPath)
+              writeStream.on('finish', callback)
+              writeStream.on('error', reject)
+              entry.pipe(writeStream)
+            }
+          }
+        })
+      )
+      .on('finish', async () => {
        clearTimeout(timer)
-        if (hashStream) {
-          hashStream.end()
-          sha256Digest = hashStream.read() as string
-          core.info(`SHA256 digest of downloaded artifact is ${sha256Digest}`)
-        }
-        resolve({sha256Digest: `sha256:${sha256Digest}`})
+        resolve()
      })
      .on('error', (error: Error) => {
        reject(error)
@@ -132,8 +159,6 @@ export async function downloadArtifactPublic(

  const api = github.getOctokit(token)

-  let digestMismatch = false
-
  core.info(
    `Downloading artifact '${artifactId}' from '${repositoryOwner}/${repositoryName}'`
  )
@@ -163,20 +188,13 @@ export async function downloadArtifactPublic(

  try {
    core.info(`Starting download of artifact to: ${downloadPath}`)
-    const extractResponse = await streamExtract(location, downloadPath)
+    await streamExtract(location, downloadPath)
    core.info(`Artifact download completed successfully.`)
-    if (options?.expectedHash) {
-      if (options?.expectedHash !== extractResponse.sha256Digest) {
-        digestMismatch = true
-        core.debug(`Computed digest: ${extractResponse.sha256Digest}`)
-        core.debug(`Expected digest: ${options.expectedHash}`)
-      }
-    }
  } catch (error) {
    throw new Error(`Unable to download and extract artifact: ${error.message}`)
  }

-  return {downloadPath, digestMismatch}
+  return {downloadPath}
 }

 export async function downloadArtifactInternal(
@@ -187,8 +205,6 @@ export async function downloadArtifactInternal(

  const artifactClient = internalArtifactTwirpClient()

-  let digestMismatch = false
-
  const {workflowRunBackendId, workflowJobRunBackendId} =
    getBackendIdsFromToken()

@@ -224,20 +240,13 @@ export async function downloadArtifactInternal(

  try {
    core.info(`Starting download of artifact to: ${downloadPath}`)
-    const extractResponse = await streamExtract(signedUrl, downloadPath)
+    await streamExtract(signedUrl, downloadPath)
    core.info(`Artifact download completed successfully.`)
-    if (options?.expectedHash) {
-      if (options?.expectedHash !== extractResponse.sha256Digest) {
-        digestMismatch = true
-        core.debug(`Computed digest: ${extractResponse.sha256Digest}`)
-        core.debug(`Expected digest: ${options.expectedHash}`)
-      }
-    }
  } catch (error) {
    throw new Error(`Unable to download and extract artifact: ${error.message}`)
  }

-  return {downloadPath, digestMismatch}
+  return {downloadPath}
 }

 async function resolveOrCreateDirectory(
@@ -68,10 +68,7 @@ export async function getArtifactPublic(
      name: artifact.name,
      id: artifact.id,
      size: artifact.size_in_bytes,
-      createdAt: artifact.created_at
-        ? new Date(artifact.created_at)
-        : undefined,
-      digest: artifact.digest
+      createdAt: artifact.created_at ? new Date(artifact.created_at) : undefined
    }
  }
 }
@@ -118,8 +115,7 @@ export async function getArtifactInternal(
      size: Number(artifact.size),
      createdAt: artifact.createdAt
        ? Timestamp.toDate(artifact.createdAt)
-        : undefined,
-      digest: artifact.digest?.value
+        : undefined
    }
  }
 }
@@ -9,12 +9,12 @@ 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 {getMaxArtifactListCount} from '../shared/config'
 import {ListArtifactsRequest, Timestamp} from '../../generated'

-const maximumArtifactCount = getMaxArtifactListCount()
+// Limiting to 1000 for perf reasons
+const maximumArtifactCount = 1000
 const paginationCount = 100
-const maxNumberOfPages = Math.ceil(maximumArtifactCount / paginationCount)
+const maxNumberOfPages = maximumArtifactCount / paginationCount

 export async function listArtifactsPublic(
  workflowRunId: number,
@@ -41,17 +41,14 @@ export async function listArtifactsPublic(
  const github = getOctokit(token, opts, retry, requestLog)

  let currentPageNumber = 1
-
-  const {data: listArtifactResponse} = await github.request(
-    'GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts',
-    {
+  const {data: listArtifactResponse} =
+    await github.rest.actions.listWorkflowRunArtifacts({
      owner: repositoryOwner,
      repo: repositoryName,
      run_id: workflowRunId,
      per_page: paginationCount,
      page: currentPageNumber
-    }
-  )
+    })

  let numberOfPages = Math.ceil(
    listArtifactResponse.total_count / paginationCount
@@ -59,7 +56,7 @@ export async function listArtifactsPublic(
  const totalArtifactCount = listArtifactResponse.total_count
  if (totalArtifactCount > maximumArtifactCount) {
    warning(
-      `Workflow run ${workflowRunId} has ${totalArtifactCount} artifacts, exceeding the limit of ${maximumArtifactCount}. Results will be incomplete as only the first ${maximumArtifactCount} artifacts will be returned`
+      `Workflow run ${workflowRunId} has more than 1000 artifacts. Results will be incomplete as only the first ${maximumArtifactCount} artifacts will be returned`
    )
    numberOfPages = maxNumberOfPages
  }
@@ -70,32 +67,27 @@ export async function listArtifactsPublic(
      name: artifact.name,
      id: artifact.id,
      size: artifact.size_in_bytes,
-      createdAt: artifact.created_at
-        ? new Date(artifact.created_at)
-        : undefined,
-      digest: (artifact as ArtifactResponse).digest
+      createdAt: artifact.created_at ? new Date(artifact.created_at) : undefined
    })
  }
-  // Move to the next page
-  currentPageNumber++
+
  // Iterate over any remaining pages
  for (
    currentPageNumber;
-    currentPageNumber <= numberOfPages;
+    currentPageNumber < numberOfPages;
    currentPageNumber++
  ) {
+    currentPageNumber++
    debug(`Fetching page ${currentPageNumber} of artifact list`)

-    const {data: listArtifactResponse} = await github.request(
-      'GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts',
-      {
+    const {data: listArtifactResponse} =
+      await github.rest.actions.listWorkflowRunArtifacts({
        owner: repositoryOwner,
        repo: repositoryName,
        run_id: workflowRunId,
        per_page: paginationCount,
        page: currentPageNumber
-      }
-    )
+      })

    for (const artifact of listArtifactResponse.artifacts) {
      artifacts.push({
@@ -104,8 +96,7 @@ export async function listArtifactsPublic(
        size: artifact.size_in_bytes,
        createdAt: artifact.created_at
          ? new Date(artifact.created_at)
-          : undefined,
-        digest: (artifact as ArtifactResponse).digest
+          : undefined
      })
    }
  }
@@ -141,8 +132,7 @@ export async function listArtifactsInternal(
    size: Number(artifact.size),
    createdAt: artifact.createdAt
      ? Timestamp.toDate(artifact.createdAt)
-      : undefined,
-    digest: artifact.digest?.value
+      : undefined
  }))

  if (latest) {
@@ -156,18 +146,6 @@ export async function listArtifactsInternal(
  }
 }

-/**
- * This exists so that we don't have to use 'any' when receiving the artifact list from the GitHub API.
- * The digest field is not present in OpenAPI/types at time of writing, which necessitates this change.
- */
-interface ArtifactResponse {
-  name: string
-  id: number
-  size_in_bytes: number
-  created_at?: string
-  digest?: string
-}
-
 /**
 * Filters a list of artifacts to only include the latest artifact for each name
 * @param artifacts The artifacts to filter
@@ -5,7 +5,6 @@ import {ArtifactServiceClientJSON} from '../../generated'
 import {getResultsServiceUrl, getRuntimeToken} from './config'
 import {getUserAgentString} from './user-agent'
 import {NetworkError, UsageError} from './errors'
-import {maskSecretUrls} from './util'

 // The twirp http client must implement this interface
 interface Rpc {
@@ -87,7 +86,6 @@ class ArtifactHttpClient implements Rpc {
        debug(`[Response] - ${response.message.statusCode}`)
        debug(`Headers: ${JSON.stringify(response.message.headers, null, 2)}`)
        const body = JSON.parse(rawBody)
-        maskSecretUrls(body)
        debug(`Body: ${JSON.stringify(body, null, 2)}`)
        if (this.isSuccessStatusCode(statusCode)) {
          return {response, body}
@@ -104,6 +102,7 @@ class ArtifactHttpClient implements Rpc {
      } catch (error) {
        if (error instanceof SyntaxError) {
          debug(`Raw Body: ${rawBody}`)
+          throw error
        }

        if (error instanceof UsageError) {
@@ -1,5 +1,4 @@
 import os from 'os'
-import {info} from '@actions/core'

 // Used for controlling the highWaterMark value of the zip that is being streamed
 // The same value is used as the chunk size that is use during upload to blob storage
@@ -31,10 +30,10 @@ export function isGhes(): boolean {

  const hostname = ghUrl.hostname.trimEnd().toUpperCase()
  const isGitHubHost = hostname === 'GITHUB.COM'
-  const isGheHost = hostname.endsWith('.GHE.COM')
-  const isLocalHost = hostname.endsWith('.LOCALHOST')
+  const isGheHost =
+    hostname.endsWith('.GHE.COM') || hostname.endsWith('.GHE.LOCALHOST')

-  return !isGitHubHost && !isGheHost && !isLocalHost
+  return !isGitHubHost && !isGheHost
 }

 export function getGitHubWorkspaceDir(): string {
@@ -45,71 +44,16 @@ 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.
 export function getConcurrency(): number {
  const numCPUs = os.cpus().length
-  let concurrencyCap = 32

-  if (numCPUs > 4) {
-    const concurrency = 16 * numCPUs
-    concurrencyCap = concurrency > 300 ? 300 : concurrency
+  if (numCPUs <= 4) {
+    return 32
  }

-  const concurrencyOverride = process.env['ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY']
-  if (concurrencyOverride) {
-    const concurrency = parseInt(concurrencyOverride)
-    if (isNaN(concurrency) || concurrency < 1) {
-      throw new Error(
-        'Invalid value set for ACTIONS_ARTIFACT_UPLOAD_CONCURRENCY env variable'
-      )
-    }
-
-    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.`
-    )
-    return concurrencyCap
-  }
-
-  // default concurrency to 5
-  return 5
-}
-
-export function getUploadChunkTimeout(): number {
-  const timeoutVar = process.env['ACTIONS_ARTIFACT_UPLOAD_TIMEOUT_MS']
-  if (!timeoutVar) {
-    return 300000 // 5 minutes
-  }
-
-  const timeout = parseInt(timeoutVar)
-  if (isNaN(timeout)) {
-    throw new Error(
-      'Invalid value set for ACTIONS_ARTIFACT_UPLOAD_TIMEOUT_MS env variable'
-    )
-  }
-
-  return timeout
-}
-
-// This value can be changed with ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT variable.
-// Defaults to 1000 as a safeguard for rate limiting.
-export function getMaxArtifactListCount(): number {
-  const maxCountVar =
-    process.env['ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT'] || '1000'
-
-  const maxCount = parseInt(maxCountVar)
-  if (isNaN(maxCount) || maxCount < 1) {
-    throw new Error(
-      'Invalid value set for ACTIONS_ARTIFACT_MAX_ARTIFACT_COUNT env variable'
-    )
-  }
-
-  return maxCount
+  const concurrency = 16 * numCPUs
+  return concurrency > 300 ? 300 : concurrency
 }
@@ -12,11 +12,6 @@ export interface UploadArtifactResponse {
   * This ID can be used as input to other APIs to download, delete or get more information about an artifact: https://docs.github.com/en/rest/actions/artifacts
   */
  id?: number
-
-  /**
-   * The SHA256 digest of the artifact that was created. Not provided if no artifact was uploaded
-   */
-  digest?: string
 }

 /**
@@ -91,11 +86,6 @@ export interface DownloadArtifactResponse {
   * The path where the artifact was downloaded to
   */
  downloadPath?: string
-
-  /**
-   * Returns true if the digest of the downloaded artifact does not match the expected hash
-   */
-  digestMismatch?: boolean
 }

 /**
@@ -106,20 +96,6 @@ export interface DownloadArtifactOptions {
   * Denotes where the artifact will be downloaded to. If not specified then the artifact is download to GITHUB_WORKSPACE
   */
  path?: string
-
-  /**
-   * The hash that was computed for the artifact during upload. If provided, the outcome of the download
-   * will provide a digestMismatch property indicating whether the hash of the downloaded artifact
-   * matches the expected hash.
-   */
-  expectedHash?: string
-}
-
-export interface StreamExtractResponse {
-  /**
-   * The SHA256 hash of the downloaded file
-   */
-  sha256Digest?: string
 }

 /**
@@ -145,11 +121,6 @@ export interface Artifact {
   * The time when the artifact was created
   */
  createdAt?: Date
-
-  /**
-   * The digest of the artifact, computed at time of upload.
-   */
-  digest?: string
 }

 // FindOptions are for fetching Artifact(s) out of the scope of the current run.
@@ -1,7 +1,6 @@
 import * as core from '@actions/core'
 import {getRuntimeToken} from './config'
 import jwt_decode from 'jwt-decode'
-import {debug, setSecret} from '@actions/core'

 export interface BackendIds {
  workflowRunBackendId: string
@@ -70,76 +69,3 @@ export function getBackendIdsFromToken(): BackendIds {

  throw InvalidJwtError
 }
-
-/**
- * Masks the `sig` parameter in a URL and sets it as a secret.
- *
- * @param url - The URL containing the signature parameter to mask
- * @remarks
- * This function attempts to parse the provided URL and identify the 'sig' query parameter.
- * If found, it registers both the raw and URL-encoded signature values as secrets using
- * the Actions `setSecret` API, which prevents them from being displayed in logs.
- *
- * The function handles errors gracefully if URL parsing fails, logging them as debug messages.
- *
- * @example
- * ```typescript
- * // Mask a signature in an Azure SAS token URL
- * maskSigUrl('https://example.blob.core.windows.net/container/file.txt?sig=abc123&se=2023-01-01');
- * ```
- */
-export function maskSigUrl(url: string): void {
-  if (!url) return
-  try {
-    const parsedUrl = new URL(url)
-    const signature = parsedUrl.searchParams.get('sig')
-    if (signature) {
-      setSecret(signature)
-      setSecret(encodeURIComponent(signature))
-    }
-  } catch (error) {
-    debug(
-      `Failed to parse URL: ${url} ${
-        error instanceof Error ? error.message : String(error)
-      }`
-    )
-  }
-}
-
-/**
- * Masks sensitive information in URLs containing signature parameters.
- * Currently supports masking 'sig' parameters in the 'signed_upload_url'
- * and 'signed_download_url' properties of the provided object.
- *
- * @param body - The object should contain a signature
- * @remarks
- * This function extracts URLs from the object properties and calls maskSigUrl
- * on each one to redact sensitive signature information. The function doesn't
- * modify the original object; it only marks the signatures as secrets for
- * logging purposes.
- *
- * @example
- * ```typescript
- * const responseBody = {
- *   signed_upload_url: 'https://example.com?sig=abc123',
- *   signed_download_url: 'https://example.com?sig=def456'
- * };
- * maskSecretUrls(responseBody);
- * ```
- */
-export function maskSecretUrls(body: Record<string, unknown> | null): void {
-  if (typeof body !== 'object' || body === null) {
-    debug('body is not an object or is null')
-    return
-  }
-
-  if (
-    'signed_upload_url' in body &&
-    typeof body.signed_upload_url === 'string'
-  ) {
-    maskSigUrl(body.signed_upload_url)
-  }
-  if ('signed_url' in body && typeof body.signed_url === 'string') {
-    maskSigUrl(body.signed_url)
-  }
-}
@@ -1,11 +1,7 @@
 import {BlobClient, BlockBlobUploadStreamOptions} from '@azure/storage-blob'
-import {TransferProgressEvent} from '@azure/core-http-compat'
+import {TransferProgressEvent} from '@azure/core-http'
 import {ZipUploadStream} from './zip'
-import {
-  getUploadChunkSize,
-  getConcurrency,
-  getUploadChunkTimeout
-} from '../shared/config'
+import {getUploadChunkSize, getConcurrency} from '../shared/config'
 import * as core from '@actions/core'
 import * as crypto from 'crypto'
 import * as stream from 'stream'
@@ -28,22 +24,6 @@ export async function uploadZipToBlobStorage(
  zipUploadStream: ZipUploadStream
 ): Promise<BlobUploadResponse> {
  let uploadByteCount = 0
-  let lastProgressTime = Date.now()
-  const abortController = new AbortController()
-
-  const chunkTimer = async (interval: number): Promise<void> =>
-    new Promise((resolve, reject) => {
-      const timer = setInterval(() => {
-        if (Date.now() - lastProgressTime > interval) {
-          reject(new Error('Upload progress stalled.'))
-        }
-      }, interval)
-
-      abortController.signal.addEventListener('abort', () => {
-        clearInterval(timer)
-        resolve()
-      })
-    })

  const maxConcurrency = getConcurrency()
  const bufferSize = getUploadChunkSize()
@@ -57,13 +37,11 @@ export async function uploadZipToBlobStorage(
  const uploadCallback = (progress: TransferProgressEvent): void => {
    core.info(`Uploaded bytes ${progress.loadedBytes}`)
    uploadByteCount = progress.loadedBytes
-    lastProgressTime = Date.now()
  }

  const options: BlockBlobUploadStreamOptions = {
    blobHTTPHeaders: {blobContentType: 'zip'},
-    onProgress: uploadCallback,
-    abortSignal: abortController.signal
+    onProgress: uploadCallback
  }

  let sha256Hash: string | undefined = undefined
@@ -76,35 +54,32 @@ export async function uploadZipToBlobStorage(
  core.info('Beginning upload of artifact content to blob storage')

  try {
-    await Promise.race([
-      blockBlobClient.uploadStream(
-        uploadStream,
-        bufferSize,
-        maxConcurrency,
-        options
-      ),
-      chunkTimer(getUploadChunkTimeout())
-    ])
+    await blockBlobClient.uploadStream(
+      uploadStream,
+      bufferSize,
+      maxConcurrency,
+      options
+    )
  } catch (error) {
    if (NetworkError.isNetworkErrorCode(error?.code)) {
      throw new NetworkError(error?.code)
    }
+
    throw error
-  } finally {
-    abortController.abort()
  }

  core.info('Finished uploading artifact content to blob storage!')

  hashStream.end()
  sha256Hash = hashStream.read() as string
-  core.info(`SHA256 digest of uploaded artifact zip is ${sha256Hash}`)
+  core.info(`SHA256 hash of uploaded artifact zip is ${sha256Hash}`)

  if (uploadByteCount === 0) {
    core.warning(
      `No data was uploaded to blob storage. Reported upload byte count is 0.`
    )
  }
+
  return {
    uploadSize: uploadByteCount,
    sha256Hash
@@ -110,7 +110,6 @@ export async function uploadArtifact(

  return {
    size: uploadResult.uploadSize,
-    digest: uploadResult.sha256Hash,
    id: Number(artifactId)
  }
 }
@@ -13,12 +13,6 @@ export interface UploadZipSpecification {
   * The destination path in a zip for a file
   */
  destinationPath: string
-
-  /**
-   * Information about the file
-   * https://nodejs.org/api/fs.html#class-fsstats
-   */
-  stats: fs.Stats
 }

 /**
@@ -81,11 +75,10 @@ export function getUploadZipSpecification(
          - file3.txt
  */
  for (let file of filesToZip) {
-    const stats = fs.lstatSync(file, {throwIfNoEntry: false})
-    if (!stats) {
+    if (!fs.existsSync(file)) {
      throw new Error(`File ${file} does not exist`)
    }
-    if (!stats.isDirectory()) {
+    if (!fs.statSync(file).isDirectory()) {
      // Normalize and resolve, this allows for either absolute or relative paths to be used
      file = normalize(file)
      file = resolve(file)
@@ -101,8 +94,7 @@ export function getUploadZipSpecification(

      specification.push({
        sourcePath: file,
-        destinationPath: uploadPath,
-        stats
+        destinationPath: uploadPath
      })
    } else {
      // Empty directory
@@ -111,8 +103,7 @@ export function getUploadZipSpecification(

      specification.push({
        sourcePath: null,
-        destinationPath: directoryPath,
-        stats
+        destinationPath: directoryPath
      })
    }
  }
@@ -1,7 +1,7 @@
 import * as stream from 'stream'
-import {realpath} from 'fs/promises'
 import * as archiver from 'archiver'
 import * as core from '@actions/core'
+import {createReadStream} from 'fs'
 import {UploadZipSpecification} from './upload-zip-specification'
 import {getUploadChunkSize} from '../shared/config'

@@ -43,14 +43,8 @@ export async function createZipUploadStream(

  for (const file of uploadSpecification) {
    if (file.sourcePath !== null) {
-      // Check if symlink and resolve the source path
-      let sourcePath = file.sourcePath
-      if (file.stats.isSymbolicLink()) {
-        sourcePath = await realpath(file.sourcePath)
-      }
-
-      // Add the file to the zip
-      zip.file(sourcePath, {
+      // Add a normal file to the zip
+      zip.append(createReadStream(file.sourcePath), {
        name: file.destinationPath
      })
    } else {
@@ -12,17 +12,6 @@ Once the attestation has been created and signed, it will be uploaded to the GH
 attestations API and associated with the repository from which the workflow was
 initiated.

-See [Using artifact attestations to establish provenance for builds](https://docs.github.com/en/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)
-for more information on artifact attestations.
-
-## Table of Contents
- [Usage](#usage)
-  - [attest](#attest)
-  - [attestProvenance](#attestprovenance)
-  - [Attestation](#attestation)
- [Sigstore Instance](#sigstore-instance)
- [Storage](#storage)
-
 ## Usage

 ### `attest`
@@ -40,7 +29,8 @@ async function run() {
    const ghToken = core.getInput('gh-token');

    const attestation = await attest({
-        subjects: [{name: 'my-artifact-name', digest: { 'sha256': '36ab4667...'}}],
+        subjectName: 'my-artifact-name',
+        subjectDigest: { 'sha256': '36ab4667...'},
        predicateType: 'https://in-toto.io/attestation/release',
        predicate: { . . . },
        token: ghToken
@@ -56,12 +46,11 @@ The `attest` function supports the following options:

 ```typescript
 export type AttestOptions = {
-  // Deprecated. Use 'subjects' instead.
-  subjectName?: string
-  // Deprecated. Use 'subjects' instead.
-  subjectDigest?: Record<string, string>
-  // Collection of subjects to be attested
-  subjects?: Subject[]
+  // The name of the subject to be attested.
+  subjectName: string
+  // The digest of the subject to be attested. Should be a map of digest
+  // algorithms to their hex-encoded values.
+  subjectDigest: Record<string, string>
  // URI identifying the content type of the predicate being attested.
  predicateType: string
  // Predicate to be attested.
@@ -71,18 +60,9 @@ export type AttestOptions = {
  // Sigstore instance to use for signing. Must be one of "public-good" or
  // "github".
  sigstore?: 'public-good' | 'github'
-  // HTTP headers to include in request to attestations API.
-  headers?: {[header: string]: string | number | undefined}
  // Whether to skip writing the attestation to the GH attestations API.
  skipWrite?: boolean
 }
-
-export type Subject = {
-   // Name of the subject.
-  name: string
-   // Digests of the subject. Should be a map of digest algorithms to their hex-encoded values.
-  digest: Record<string, string>
-}
 ```

 ### `attestProvenance`
@@ -120,25 +100,18 @@ The `attestProvenance` function supports the following options:

 ```typescript
 export type AttestProvenanceOptions = {
-  // Deprecated. Use 'subjects' instead.
-  subjectName?: string
-  // Deprecated. Use 'subjects' instead.
-  subjectDigest?: Record<string, string>
-  // Collection of subjects to be attested
-  subjects?: Subject[]
-  // URI identifying the content type of the predicate being attested.
+  // The name of the subject to be attested.
+  subjectName: string
+  // The digest of the subject to be attested. Should be a map of digest
+  // algorithms to their hex-encoded values.
+  subjectDigest: Record<string, string>
+  // GitHub token for writing attestations.
  token: string
  // Sigstore instance to use for signing. Must be one of "public-good" or
  // "github".
  sigstore?: 'public-good' | 'github'
-  // HTTP headers to include in request to attestations API.
-  headers?: {[header: string]: string | number | undefined}
  // Whether to skip writing the attestation to the GH attestations API.
  skipWrite?: boolean
-  // Issuer URL responsible for minting the OIDC token from which the
-  // provenance data is read. Defaults to
-  // 'https://token.actions.githubusercontent.com".
-  issuer?: string
 }
 ```

@@ -173,74 +146,6 @@ export type Attestation = {
 For details about the Sigstore bundle format, see the [Bundle protobuf
 specification](https://github.com/sigstore/protobuf-specs/blob/main/protos/sigstore_bundle.proto).

-### createStorageRecord
-
-The `createStorageRecord` function creates an
-[artifact metadata storage record](https://docs.github.com/en/rest/orgs/artifact-metadata?apiVersion=2022-11-28#create-artifact-metadata-storage-record)
-on behalf of an attested artifact. It accepts parameters defining artifact
-and package registry details. The storage record contains metadata about where the artifact is stored on a given package registry.
-
-```js
-const { createStorageRecord } = require('@actions/attest');
-const core = require('@actions/core');
-
-async function run() {
-    // In order to persist attestations to the repo, this should be a token with
-    // repository write permissions.
-    const ghToken = core.getInput('gh-token');
-
-    const record = await createStorageRecord(
-        artifactOptions: {
-            name: 'my-artifact-name',
-            digest: { 'sha256': '36ab4667...'},
-            version: "v1.0.0"
-        },
-        packageRegistryOptions: {
-            registryUrl: "https://my-fave-pkg-registry.com"
-        },
-        token: ghToken
-    );
-
-    console.log(record);
-}
-
-run();
-```
-
-The `createStorageRecord` function supports the following options:
-
-```typescript
-// Artifact details to associate the record with
-export type ArtifactOptions = {
-  // The name of the artifact
-  name: string
-  // The digest of the artifact
-  digest: string
-  // The version of the artifact
-  version?: string
-  // The status of the artifact
-  status?: string
-}
-// Includes details about the package registry the artifact was published to
-export type PackageRegistryOptions = {
-  // The URL of the package registry
-  registryUrl: string
-  // The URL of the artifact in the package registry
-  artifactUrl?: string
-  // The package registry repository the artifact was published to.
-  repo?: string
-  // The path of the artifact in the package registry repository.
-  path?: string
-}
-// GitHub token for writing attestations.
-token: string
-// Optional parameters for the write operation.
-// The number of times to retry the request.
-retryAttempts?: number
-// HTTP headers to include in request to Artifact Metadata API.
-headers?: RequestHeaders
-```
-
 ## Sigstore Instance

 When generating the signed attestation there are two different Sigstore
@@ -1,63 +1,5 @@
 # @actions/attest Releases

-### 2.0.0
-
- Add support for Node 24 [#2110](https://github.com/actions/toolkit/pull/2110)
- Bump @sigstore/bundle from 3.0.0 to 3.1.0
- Bump @sigstore/sign from 3.0.0 to 3.1.0
- Bump jose from 5.2.3 to 5.10.0
-
-### 1.6.0
-
- Update `buildSLSAProvenancePredicate` to populate `workflow.ref` field from the `ref` claim in the OIDC token [#1969](https://github.com/actions/toolkit/pull/1969)
-
-### 1.5.0
-
- Bump @actions/core from 1.10.1 to 1.11.1 [#1847](https://github.com/actions/toolkit/pull/1847)
- Bump @sigstore/bundle from 2.3.2 to 3.0.0 [#1846](https://github.com/actions/toolkit/pull/1846)
- Bump @sigstore/sign from 2.3.2 to 3.0.0 [#1846](https://github.com/actions/toolkit/pull/1846)
- Support for generating multi-subject attestations [#1864](https://github.com/actions/toolkit/pull/1865)
- Fix bug in `buildSLSAProvenancePredicate` related to `workflow_ref` OIDC token claims containing the "@" symbol in the tag name [#1863](https://github.com/actions/toolkit/pull/1863)
-
-### 1.4.2
-
- Fix bug in `buildSLSAProvenancePredicate`/`attestProvenance` when generating provenance statement for enterprise account using customized OIDC issuer value [#1823](https://github.com/actions/toolkit/pull/1823)
-
-### 1.4.1
-
- Bump @actions/http-client from 2.2.1 to 2.2.3 [#1805](https://github.com/actions/toolkit/pull/1805)
-
-### 1.4.0
-
- Add new `headers` parameter to the `attest` and `attestProvenance` functions [#1790](https://github.com/actions/toolkit/pull/1790)
- Update `buildSLSAProvenancePredicate`/`attestProvenance` to automatically derive default OIDC issuer URL from current execution context [#1796](https://github.com/actions/toolkit/pull/1796)
-### 1.3.1
-
- Fix bug with proxy support when retrieving JWKS for OIDC issuer [#1776](https://github.com/actions/toolkit/pull/1776)
-
-### 1.3.0
-
- Dynamic construction of Sigstore API URLs [#1735](https://github.com/actions/toolkit/pull/1735)
- Switch to new GH provenance build type [#1745](https://github.com/actions/toolkit/pull/1745)
- Fetch existing Rekor entry on 409 conflict error [#1759](https://github.com/actions/toolkit/pull/1759)
- Bump @sigstore/bundle from 2.3.0 to 2.3.2 [#1738](https://github.com/actions/toolkit/pull/1738)
- Bump @sigstore/sign from 2.3.0 to 2.3.2 [#1738](https://github.com/actions/toolkit/pull/1738)
-
-### 1.2.1
-
- Retry request on attestation persistence failure [#1725](https://github.com/actions/toolkit/pull/1725)
-
-### 1.2.0
-
- Generate attestations using the v0.3 Sigstore bundle format [#1701](https://github.com/actions/toolkit/pull/1701)
- Bump @sigstore/bundle from 2.2.0 to 2.3.0 [#1701](https://github.com/actions/toolkit/pull/1701)
- Bump @sigstore/sign from 2.2.3 to 2.3.0 [#1701](https://github.com/actions/toolkit/pull/1701)
- Remove dependency on make-fetch-happen [#1714](https://github.com/actions/toolkit/pull/1714)
-
-### 1.1.0
-
- Updates the `attestProvenance` function to retrieve a token from the GitHub OIDC provider and use the token claims to populate the provenance statement [#1693](https://github.com/actions/toolkit/pull/1693)
-
 ### 1.0.0

 - Initial release
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`buildIntotoStatement returns an intoto statement 1`] = `
+exports[`buildIntotoStatement returns a provenance hydrated from env vars 1`] = `
 {
  "_type": "https://in-toto.io/Statement/v1",
  "predicate": {
@@ -1,15 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`provenance functions buildSLSAProvenancePredicate returns a provenance hydrated from an OIDC token 1`] = `
+exports[`buildSLSAProvenancePredicate returns a provenance hydrated from env vars 1`] = `
 {
  "params": {
    "buildDefinition": {
-      "buildType": "https://actions.github.io/buildtypes/workflow/v1",
+      "buildType": "https://slsa-framework.github.io/github-actions-buildtypes/workflow/v1",
      "externalParameters": {
        "workflow": {
          "path": ".github/workflows/main.yml",
-          "ref": "refs/heads/main",
-          "repository": "https://foo.ghe.com/owner/repo",
+          "ref": "main",
+          "repository": "https://github.com/owner/repo",
        },
      },
      "internalParameters": {
@@ -17,7 +17,6 @@ exports[`provenance functions buildSLSAProvenancePredicate returns a provenance
          "event_name": "push",
          "repository_id": "repo-id",
          "repository_owner_id": "owner-id",
-          "runner_environment": "github-hosted",
        },
      },
      "resolvedDependencies": [
@@ -25,16 +24,16 @@ exports[`provenance functions buildSLSAProvenancePredicate returns a provenance
          "digest": {
            "gitCommit": "babca52ab0c93ae16539e5923cb0d7403b9a093b",
          },
-          "uri": "git+https://foo.ghe.com/owner/repo@refs/heads/main",
+          "uri": "git+https://github.com/owner/repo@refs/heads/main",
        },
      ],
    },
    "runDetails": {
      "builder": {
-        "id": "https://foo.ghe.com/owner/workflows/.github/workflows/publish.yml@main",
+        "id": "https://github.com/actions/runner/github-hosted",
      },
      "metadata": {
-        "invocationId": "https://foo.ghe.com/owner/repo/actions/runs/run-id/attempts/run-attempt",
+        "invocationId": "https://github.com/owner/repo/actions/runs/run-id/attempts/run-attempt",
      },
    },
  },
@@ -1,137 +0,0 @@
-import {MockAgent, setGlobalDispatcher} from 'undici'
-import {createStorageRecord} from '../src/artifactMetadata'
-
-describe('createStorageRecord', () => {
-  const originalEnv = process.env
-  const token = 'token'
-  const headers = {'X-GitHub-Foo': 'true'}
-
-  const artifactOptions = {
-    name: 'my-lib',
-    version: '1.0.0',
-    digest: `sha256:${'a'.repeat(64)}`
-  }
-  const packageRegistryOptions = {
-    registryUrl: 'https://my-registry.org'
-  }
-
-  const mockAgent = new MockAgent()
-  setGlobalDispatcher(mockAgent)
-
-  beforeEach(() => {
-    process.env = {
-      ...originalEnv,
-      GITHUB_REPOSITORY: 'foo/bar'
-    }
-  })
-
-  afterEach(() => {
-    process.env = originalEnv
-  })
-
-  describe('when the api call is successful', () => {
-    beforeEach(() => {
-      mockAgent
-        .get('https://api.github.com')
-        .intercept({
-          path: '/orgs/foo/artifacts/metadata/storage-record',
-          method: 'POST',
-          headers: {authorization: `token ${token}`, ...headers},
-          body: JSON.stringify({
-            name: 'my-lib',
-            version: '1.0.0',
-            digest: `sha256:${'a'.repeat(64)}`,
-            registry_url: 'https://my-registry.org'
-          })
-        })
-        .reply(200, {storage_records: [{id: 123}, {id: 456}]})
-    })
-
-    it('persists the storage record', async () => {
-      await expect(
-        createStorageRecord(
-          artifactOptions,
-          packageRegistryOptions,
-          token,
-          undefined,
-          headers
-        )
-      ).resolves.toEqual([123, 456])
-    })
-  })
-
-  describe('when the api call fails', () => {
-    beforeEach(() => {
-      mockAgent
-        .get('https://api.github.com')
-        .intercept({
-          path: '/orgs/foo/artifacts/metadata/storage-record',
-          method: 'POST',
-          headers: {authorization: `token ${token}`},
-          body: JSON.stringify({
-            name: 'my-lib',
-            version: '1.0.0',
-            digest: `sha256:${'a'.repeat(64)}`,
-            registry_url: 'https://my-registry.org'
-          })
-        })
-        .reply(500, 'oops')
-    })
-
-    it('throws an error', async () => {
-      await expect(
-        createStorageRecord(
-          artifactOptions,
-          packageRegistryOptions,
-          token,
-          0,
-          headers
-        )
-      ).rejects.toThrow(/oops/)
-    })
-  })
-
-  describe('when the api call fails but succeeds on retry', () => {
-    beforeEach(() => {
-      const pool = mockAgent.get('https://api.github.com')
-
-      pool
-        .intercept({
-          path: '/orgs/foo/artifacts/metadata/storage-record',
-          method: 'POST',
-          headers: {authorization: `token ${token}`},
-          body: JSON.stringify({
-            ...artifactOptions,
-            registry_url: packageRegistryOptions.registryUrl
-          })
-        })
-        .reply(500, 'oops')
-        .times(1)
-
-      pool
-        .intercept({
-          path: '/orgs/foo/artifacts/metadata/storage-record',
-          method: 'POST',
-          headers: {authorization: `token ${token}`},
-          body: JSON.stringify({
-            ...artifactOptions,
-            registry_url: packageRegistryOptions.registryUrl
-          })
-        })
-        .reply(200, {storage_records: [{id: 123}, {id: 456}]})
-        .times(1)
-    })
-
-    it('persists the storage record', async () => {
-      await expect(
-        createStorageRecord(
-          artifactOptions,
-          packageRegistryOptions,
-          token,
-          undefined,
-          headers
-        )
-      ).resolves.toEqual([123, 456])
-    })
-  })
-})
@@ -1,16 +0,0 @@
-import {attest} from '../src/attest'
-
-describe('attest', () => {
-  describe('when no subject information is provided', () => {
-    it('throws an error', async () => {
-      const options = {
-        predicateType: 'foo',
-        predicate: {bar: 'baz'},
-        token: 'token'
-      }
-      expect(attest(options)).rejects.toThrowError(
-        'Must provide either subjectName and subjectDigest or subjects'
-      )
-    })
-  })
-})
@@ -1,41 +0,0 @@
-import {signingEndpoints} from '../src/endpoints'
-
-describe('signingEndpoints', () => {
-  const originalEnv = process.env
-
-  afterEach(() => {
-    process.env = originalEnv
-  })
-
-  describe('when using github.com', () => {
-    beforeEach(async () => {
-      process.env = {
-        ...originalEnv,
-        GITHUB_SERVER_URL: 'https://github.com'
-      }
-    })
-
-    it('returns expected endpoints', async () => {
-      const endpoints = signingEndpoints('github')
-
-      expect(endpoints.fulcioURL).toEqual('https://fulcio.githubapp.com')
-      expect(endpoints.tsaServerURL).toEqual('https://timestamp.githubapp.com')
-    })
-  })
-
-  describe('when using custom domain', () => {
-    beforeEach(async () => {
-      process.env = {
-        ...originalEnv,
-        GITHUB_SERVER_URL: 'https://foo.bar.com'
-      }
-    })
-
-    it('returns a expected endpoints', async () => {
-      const endpoints = signingEndpoints('github')
-
-      expect(endpoints.fulcioURL).toEqual('https://fulcio.foo.bar.com')
-      expect(endpoints.tsaServerURL).toEqual('https://timestamp.foo.bar.com')
-    })
-  })
-})
@@ -16,8 +16,8 @@ describe('buildIntotoStatement', () => {
    }
  }

-  it('returns an intoto statement', () => {
-    const statement = buildIntotoStatement([subject], predicate)
+  it('returns a provenance hydrated from env vars', () => {
+    const statement = buildIntotoStatement(subject, predicate)
    expect(statement).toMatchSnapshot()
  })
 })
@@ -1,199 +0,0 @@
-import * as jose from 'jose'
-import nock from 'nock'
-import {getIDTokenClaims} from '../src/oidc'
-
-describe('getIDTokenClaims', () => {
-  const originalEnv = process.env
-  const issuer = 'https://example.com'
-  const audience = 'nobody'
-  const requestToken = 'token'
-  const openidConfigPath = '/.well-known/openid-configuration'
-  const jwksPath = '/.well-known/jwks.json'
-  const tokenPath = '/token'
-  const openIDConfig = {jwks_uri: `${issuer}${jwksPath}`}
-
-  /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-  let key: any
-
-  beforeEach(async () => {
-    process.env = {
-      ...originalEnv,
-      ACTIONS_ID_TOKEN_REQUEST_URL: `${issuer}${tokenPath}?`,
-      ACTIONS_ID_TOKEN_REQUEST_TOKEN: requestToken
-    }
-
-    // Generate JWT signing key
-    key = await jose.generateKeyPair('PS256')
-
-    // Create JWK and JWKS
-    const jwk = await jose.exportJWK(key.publicKey)
-    const jwks = {keys: [jwk]}
-
-    nock(issuer).get(openidConfigPath).reply(200, openIDConfig)
-    nock(issuer).get(jwksPath).reply(200, jwks)
-  })
-
-  afterEach(() => {
-    process.env = originalEnv
-  })
-
-  describe('when ID token is valid', () => {
-    const claims = {
-      iss: issuer,
-      aud: audience,
-      ref: 'ref',
-      sha: 'sha',
-      repository: 'repo',
-      event_name: 'push',
-      job_workflow_ref: 'job_workflow_ref',
-      workflow_ref: 'workflow',
-      repository_id: '1',
-      repository_owner_id: '1',
-      runner_environment: 'github-hosted',
-      run_id: '1',
-      run_attempt: '1'
-    }
-
-    beforeEach(async () => {
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({alg: 'PS256'})
-        .sign(key.privateKey)
-
-      nock(issuer).get(tokenPath).query({audience}).reply(200, {value: jwt})
-    })
-
-    it('returns the ID token claims', async () => {
-      const result = await getIDTokenClaims(issuer)
-      expect(result).toEqual(claims)
-    })
-  })
-
-  describe('when ID token is valid (w/ enterprise slug)', () => {
-    const claims = {
-      iss: `${issuer}/foo-bar`,
-      aud: audience,
-      ref: 'ref',
-      sha: 'sha',
-      repository: 'repo',
-      event_name: 'push',
-      job_workflow_ref: 'job_workflow_ref',
-      workflow_ref: 'workflow',
-      repository_id: '1',
-      repository_owner_id: '1',
-      runner_environment: 'github-hosted',
-      run_id: '1',
-      run_attempt: '1'
-    }
-
-    beforeEach(async () => {
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({alg: 'PS256'})
-        .sign(key.privateKey)
-
-      nock(issuer).get(tokenPath).query({audience}).reply(200, {value: jwt})
-    })
-
-    it('returns the ID token claims', async () => {
-      const result = await getIDTokenClaims(issuer)
-      expect(result).toEqual(claims)
-    })
-  })
-
-  describe('when ID token is missing the "iss" claim', () => {
-    const claims = {
-      aud: audience
-    }
-
-    beforeEach(async () => {
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({alg: 'PS256'})
-        .sign(key.privateKey)
-
-      nock(issuer).get(tokenPath).query({audience}).reply(200, {value: jwt})
-    })
-
-    it('throws an error', async () => {
-      await expect(getIDTokenClaims(issuer)).rejects.toThrow(/missing "iss"/i)
-    })
-  })
-
-  describe('when ID token is missing required claims', () => {
-    const claims = {
-      iss: issuer,
-      aud: audience
-    }
-
-    beforeEach(async () => {
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({alg: 'PS256'})
-        .sign(key.privateKey)
-
-      nock(issuer).get(tokenPath).query({audience}).reply(200, {value: jwt})
-    })
-
-    it('throws an error', async () => {
-      await expect(getIDTokenClaims(issuer)).rejects.toThrow(/missing claims/i)
-    })
-  })
-
-  describe('when ID has the wrong issuer', () => {
-    const claims = {foo: 'bar', iss: 'foo', aud: 'nobody'}
-
-    beforeEach(async () => {
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({alg: 'PS256'})
-        .sign(key.privateKey)
-
-      nock(issuer).get(tokenPath).query({audience}).reply(200, {value: jwt})
-    })
-
-    it('throws an error', async () => {
-      await expect(getIDTokenClaims(issuer)).rejects.toThrow(
-        /unexpected "iss"/i
-      )
-    })
-  })
-
-  describe('when ID has the wrong audience', () => {
-    const claims = {foo: 'bar', iss: issuer, aud: 'bar'}
-
-    beforeEach(async () => {
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({alg: 'PS256'})
-        .sign(key.privateKey)
-
-      nock(issuer).get(tokenPath).query({audience}).reply(200, {value: jwt})
-    })
-
-    it('throw an error', async () => {
-      await expect(getIDTokenClaims(issuer)).rejects.toThrow(/unexpected "aud"/)
-    })
-  })
-
-  describe('when openid config cannot be retrieved', () => {
-    const claims = {foo: 'bar', iss: issuer, aud: 'nobody'}
-
-    beforeEach(async () => {
-      const jwt = await new jose.SignJWT(claims)
-        .setProtectedHeader({alg: 'PS256'})
-        .sign(key.privateKey)
-
-      nock(issuer).get(tokenPath).query({audience}).reply(200, {value: jwt})
-
-      // Disable the openid config endpoint
-      nock.removeInterceptor({
-        proto: 'https',
-        hostname: 'example.com',
-        port: '443',
-        method: 'GET',
-        path: openidConfigPath
-      })
-    })
-
-    it('throws an error', async () => {
-      await expect(getIDTokenClaims(issuer)).rejects.toThrow(
-        /failed to get id/i
-      )
-    })
-  })
-})
@@ -1,248 +1,213 @@
 import * as github from '@actions/github'
 import {mockFulcio, mockRekor, mockTSA} from '@sigstore/mock'
-import * as jose from 'jose'
 import nock from 'nock'
-import {MockAgent, setGlobalDispatcher} from 'undici'
-import {SIGSTORE_PUBLIC_GOOD, signingEndpoints} from '../src/endpoints'
+import {SIGSTORE_GITHUB, SIGSTORE_PUBLIC_GOOD} from '../src/endpoints'
 import {attestProvenance, buildSLSAProvenancePredicate} from '../src/provenance'

-describe('provenance functions', () => {
+// Dummy workflow environment
+const env = {
+  GITHUB_REPOSITORY: 'owner/repo',
+  GITHUB_REF: 'refs/heads/main',
+  GITHUB_SHA: 'babca52ab0c93ae16539e5923cb0d7403b9a093b',
+  GITHUB_WORKFLOW_REF: 'owner/repo/.github/workflows/main.yml@main',
+  GITHUB_SERVER_URL: 'https://github.com',
+  GITHUB_EVENT_NAME: 'push',
+  GITHUB_REPOSITORY_ID: 'repo-id',
+  GITHUB_REPOSITORY_OWNER_ID: 'owner-id',
+  GITHUB_RUN_ID: 'run-id',
+  GITHUB_RUN_ATTEMPT: 'run-attempt',
+  RUNNER_ENVIRONMENT: 'github-hosted'
+}
+
+describe('buildSLSAProvenancePredicate', () => {
+  it('returns a provenance hydrated from env vars', () => {
+    const predicate = buildSLSAProvenancePredicate(env)
+    expect(predicate).toMatchSnapshot()
+  })
+})
+
+describe('attestProvenance', () => {
+  // Capture original environment variables so we can restore them after each
+  // test
  const originalEnv = process.env
-  const issuer = 'https://token.actions.foo.ghe.com'
-  const audience = 'nobody'
-  const jwksPath = '/.well-known/jwks.json'
-  const tokenPath = '/token'

-  // MockAgent for mocking @actions/github
-  const mockAgent = new MockAgent()
-  setGlobalDispatcher(mockAgent)
-
-  const claims = {
-    iss: issuer,
-    aud: 'nobody',
-    repository: 'owner/repo',
-    ref: 'refs/heads/main',
-    sha: 'babca52ab0c93ae16539e5923cb0d7403b9a093b',
-    job_workflow_ref: 'owner/workflows/.github/workflows/publish.yml@main',
-    workflow_ref: 'owner/repo/.github/workflows/main.yml@main',
-    event_name: 'push',
-    repository_id: 'repo-id',
-    repository_owner_id: 'owner-id',
-    run_id: 'run-id',
-    run_attempt: 'run-attempt',
-    runner_environment: 'github-hosted'
+  // Subject to attest
+  const subjectName = 'subjective'
+  const subjectDigest = {
+    sha256: '7d070f6b64d9bcc530fe99cc21eaaa4b3c364e0b2d367d7735671fa202a03b32'
  }

-  const mockIssuer = async (claims: jose.JWTPayload): Promise<void> => {
-    // Generate JWT signing key
-    const key = await jose.generateKeyPair('PS256')
+  // Fake an OIDC token
+  const oidcPayload = {sub: 'foo@bar.com', iss: ''}
+  const oidcToken = `.${Buffer.from(JSON.stringify(oidcPayload)).toString(
+    'base64'
+  )}.}`

-    // Create JWK, JWKS, and JWT
-    const jwk = await jose.exportJWK(key.publicKey)
-    const jwks = {keys: [jwk]}
-    const jwt = await new jose.SignJWT(claims)
-      .setProtectedHeader({alg: 'PS256'})
-      .sign(key.privateKey)
-
-    // Mock OpenID configuration and JWKS endpoints
-    nock(issuer)
-      .get('/.well-known/openid-configuration')
-      .reply(200, {jwks_uri: `${issuer}${jwksPath}`})
-    nock(issuer).get(jwksPath).reply(200, jwks)
-
-    // Mock OIDC token endpoint for populating the provenance
-    nock(issuer).get(tokenPath).query({audience}).reply(200, {value: jwt})
-  }
+  const tokenURL = 'https://token.url'
+  const attestationID = '1234567890'

  beforeEach(async () => {
+    jest.clearAllMocks()
+
+    nock(tokenURL)
+      .get('/')
+      .query({audience: 'sigstore'})
+      .reply(200, {value: oidcToken})
+
+    // Set-up GHA environment variables
    process.env = {
      ...originalEnv,
-      ACTIONS_ID_TOKEN_REQUEST_URL: `${issuer}${tokenPath}?`,
-      ACTIONS_ID_TOKEN_REQUEST_TOKEN: 'token',
-      GITHUB_SERVER_URL: 'https://foo.ghe.com',
-      GITHUB_REPOSITORY: claims.repository
+      ...env,
+      ACTIONS_ID_TOKEN_REQUEST_URL: tokenURL,
+      ACTIONS_ID_TOKEN_REQUEST_TOKEN: 'token'
    }
-
-    await mockIssuer(claims)
  })

  afterEach(() => {
+    // Restore the original environment
    process.env = originalEnv
  })

-  describe('buildSLSAProvenancePredicate', () => {
-    it('returns a provenance hydrated from an OIDC token', async () => {
-      const predicate = await buildSLSAProvenancePredicate()
-      expect(predicate).toMatchSnapshot()
-    })
-  })
-
-  describe('attestProvenance', () => {
-    // Subject to attest
-    const subjectName = 'subjective'
-    const subjectDigest = {
-      sha256: '7d070f6b64d9bcc530fe99cc21eaaa4b3c364e0b2d367d7735671fa202a03b32'
-    }
-
-    // Fake an OIDC token
-    const oidcPayload = {sub: 'foo@bar.com', iss: ''}
-    const oidcToken = `.${Buffer.from(JSON.stringify(oidcPayload)).toString(
-      'base64'
-    )}.}`
-
-    const attestationID = '1234567890'
+  describe('when using the github Sigstore instance', () => {
+    const {fulcioURL, tsaServerURL} = SIGSTORE_GITHUB

    beforeEach(async () => {
-      nock(issuer)
-        .get(tokenPath)
-        .query({audience: 'sigstore'})
-        .reply(200, {value: oidcToken})
+      // Mock Sigstore
+      await mockFulcio({baseURL: fulcioURL, strict: false})
+      await mockTSA({baseURL: tsaServerURL})
+
+      // Mock GH attestations API
+      nock('https://api.github.com')
+        .post(/^\/repos\/.*\/.*\/attestations$/)
+        .reply(201, {id: attestationID})
    })

-    describe('when using the github Sigstore instance', () => {
-      beforeEach(async () => {
-        const {fulcioURL, tsaServerURL} = signingEndpoints('github')
-
-        // Mock Sigstore
-        await mockFulcio({baseURL: fulcioURL, strict: false})
-        await mockTSA({baseURL: tsaServerURL})
-
-        mockAgent
-          .get('https://api.github.com')
-          .intercept({
-            path: /^\/repos\/.*\/.*\/attestations$/,
-            method: 'post'
-          })
-          .reply(201, {id: attestationID})
-      })
-
-      describe('when the sigstore instance is explicitly set', () => {
-        it('attests provenance', async () => {
-          const attestation = await attestProvenance({
-            subjects: [{name: subjectName, digest: subjectDigest}],
-            token: 'token',
-            sigstore: 'github'
-          })
-
-          expect(attestation).toBeDefined()
-          expect(attestation.bundle).toBeDefined()
-          expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
-          expect(attestation.tlogID).toBeUndefined()
-          expect(attestation.attestationID).toBe(attestationID)
-        })
-      })
-
-      describe('when the sigstore instance is inferred from the repo visibility', () => {
-        const savedRepository = github.context.payload.repository
-
-        beforeEach(() => {
-          /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-          github.context.payload.repository = {visibility: 'private'} as any
+    describe('when the sigstore instance is explicitly set', () => {
+      it('attests provenance', async () => {
+        const attestation = await attestProvenance({
+          subjectName,
+          subjectDigest,
+          token: 'token',
+          sigstore: 'github'
        })

-        afterEach(() => {
-          github.context.payload.repository = savedRepository
-        })
-
-        it('attests provenance', async () => {
-          const attestation = await attestProvenance({
-            subjects: [{name: subjectName, digest: subjectDigest}],
-            token: 'token'
-          })
-
-          expect(attestation).toBeDefined()
-          expect(attestation.bundle).toBeDefined()
-          expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
-          expect(attestation.tlogID).toBeUndefined()
-          expect(attestation.attestationID).toBe(attestationID)
-        })
+        expect(attestation).toBeDefined()
+        expect(attestation.bundle).toBeDefined()
+        expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
+        expect(attestation.tlogID).toBeUndefined()
+        expect(attestation.attestationID).toBe(attestationID)
      })
    })

-    describe('when using the public-good Sigstore instance', () => {
-      const {fulcioURL, rekorURL} = SIGSTORE_PUBLIC_GOOD
+    describe('when the sigstore instance is inferred from the repo visibility', () => {
+      const savedRepository = github.context.payload.repository

-      beforeEach(async () => {
-        // Mock Sigstore
-        await mockFulcio({baseURL: fulcioURL, strict: false})
-        await mockRekor({baseURL: rekorURL})
-
-        // Mock GH attestations API
-        mockAgent
-          .get('https://api.github.com')
-          .intercept({
-            path: /^\/repos\/.*\/.*\/attestations$/,
-            method: 'post'
-          })
-          .reply(201, {id: attestationID})
+      beforeEach(() => {
+        /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+        github.context.payload.repository = {visibility: 'private'} as any
      })

-      describe('when the sigstore instance is explicitly set', () => {
-        it('attests provenance', async () => {
-          const attestation = await attestProvenance({
-            subjects: [{name: subjectName, digest: subjectDigest}],
-            token: 'token',
-            sigstore: 'public-good'
-          })
-
-          expect(attestation).toBeDefined()
-          expect(attestation.bundle).toBeDefined()
-          expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
-          expect(attestation.tlogID).toBeDefined()
-          expect(attestation.attestationID).toBe(attestationID)
-        })
-      })
-
-      describe('when the sigstore instance is inferred from the repo visibility', () => {
-        const savedRepository = github.context.payload.repository
-
-        beforeEach(() => {
-          /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-          github.context.payload.repository = {visibility: 'public'} as any
-        })
-
-        afterEach(() => {
-          github.context.payload.repository = savedRepository
-        })
-
-        it('attests provenance', async () => {
-          const attestation = await attestProvenance({
-            subjects: [{name: subjectName, digest: subjectDigest}],
-            token: 'token'
-          })
-
-          expect(attestation).toBeDefined()
-          expect(attestation.bundle).toBeDefined()
-          expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
-          expect(attestation.tlogID).toBeDefined()
-          expect(attestation.attestationID).toBe(attestationID)
-        })
-      })
-    })
-
-    describe('when skipWrite is set to true', () => {
-      const {fulcioURL, rekorURL} = SIGSTORE_PUBLIC_GOOD
-      beforeEach(async () => {
-        // Mock Sigstore
-        await mockFulcio({baseURL: fulcioURL, strict: false})
-        await mockRekor({baseURL: rekorURL})
+      afterEach(() => {
+        github.context.payload.repository = savedRepository
      })

+      it('attests provenance', async () => {
+        const attestation = await attestProvenance({
+          subjectName,
+          subjectDigest,
+          token: 'token'
+        })
+
+        expect(attestation).toBeDefined()
+        expect(attestation.bundle).toBeDefined()
+        expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
+        expect(attestation.tlogID).toBeUndefined()
+        expect(attestation.attestationID).toBe(attestationID)
+      })
+    })
+  })
+
+  describe('when using the public-good Sigstore instance', () => {
+    const {fulcioURL, rekorURL} = SIGSTORE_PUBLIC_GOOD
+
+    beforeEach(async () => {
+      // Mock Sigstore
+      await mockFulcio({baseURL: fulcioURL, strict: false})
+      await mockRekor({baseURL: rekorURL})
+
+      // Mock GH attestations API
+      nock('https://api.github.com')
+        .post(/^\/repos\/.*\/.*\/attestations$/)
+        .reply(201, {id: attestationID})
+    })
+
+    describe('when the sigstore instance is explicitly set', () => {
      it('attests provenance', async () => {
        const attestation = await attestProvenance({
          subjectName,
          subjectDigest,
          token: 'token',
-          sigstore: 'public-good',
-          skipWrite: true
+          sigstore: 'public-good'
        })

        expect(attestation).toBeDefined()
        expect(attestation.bundle).toBeDefined()
        expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
        expect(attestation.tlogID).toBeDefined()
-        expect(attestation.attestationID).toBeUndefined()
+        expect(attestation.attestationID).toBe(attestationID)
+      })
+    })
+
+    describe('when the sigstore instance is inferred from the repo visibility', () => {
+      const savedRepository = github.context.payload.repository
+
+      beforeEach(() => {
+        /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+        github.context.payload.repository = {visibility: 'public'} as any
+      })
+
+      afterEach(() => {
+        github.context.payload.repository = savedRepository
+      })
+
+      it('attests provenance', async () => {
+        const attestation = await attestProvenance({
+          subjectName,
+          subjectDigest,
+          token: 'token'
+        })
+
+        expect(attestation).toBeDefined()
+        expect(attestation.bundle).toBeDefined()
+        expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
+        expect(attestation.tlogID).toBeDefined()
+        expect(attestation.attestationID).toBe(attestationID)
      })
    })
  })
+
+  describe('when skipWrite is set to true', () => {
+    const {fulcioURL, rekorURL} = SIGSTORE_PUBLIC_GOOD
+    beforeEach(async () => {
+      // Mock Sigstore
+      await mockFulcio({baseURL: fulcioURL, strict: false})
+      await mockRekor({baseURL: rekorURL})
+    })
+
+    it('attests provenance', async () => {
+      const attestation = await attestProvenance({
+        subjectName,
+        subjectDigest,
+        token: 'token',
+        sigstore: 'public-good',
+        skipWrite: true
+      })
+
+      expect(attestation).toBeDefined()
+      expect(attestation.bundle).toBeDefined()
+      expect(attestation.certificate).toMatch(/-----BEGIN CERTIFICATE-----/)
+      expect(attestation.tlogID).toBeDefined()
+      expect(attestation.attestationID).toBeUndefined()
+    })
+  })
 })
@@ -64,11 +64,13 @@ describe('signProvenance', () => {

      expect(att).toBeDefined()
      expect(att.mediaType).toEqual(
-        'application/vnd.dev.sigstore.bundle.v0.3+json'
+        'application/vnd.dev.sigstore.bundle+json;version=0.2'
      )

      expect(att.content.$case).toEqual('dsseEnvelope')
-      expect(att.verificationMaterial.content.$case).toEqual('certificate')
+      expect(att.verificationMaterial.content.$case).toEqual(
+        'x509CertificateChain'
+      )
      expect(att.verificationMaterial.tlogEntries).toHaveLength(1)
      expect(
        att.verificationMaterial.timestampVerificationData?.rfc3161Timestamps
@@ -87,11 +89,13 @@ describe('signProvenance', () => {

      expect(att).toBeDefined()
      expect(att.mediaType).toEqual(
-        'application/vnd.dev.sigstore.bundle.v0.3+json'
+        'application/vnd.dev.sigstore.bundle+json;version=0.2'
      )

      expect(att.content.$case).toEqual('dsseEnvelope')
-      expect(att.verificationMaterial.content.$case).toEqual('certificate')
+      expect(att.verificationMaterial.content.$case).toEqual(
+        'x509CertificateChain'
+      )
      expect(att.verificationMaterial.tlogEntries).toHaveLength(0)
      expect(
        att.verificationMaterial.timestampVerificationData?.rfc3161Timestamps
@@ -1,14 +1,10 @@
-import {MockAgent, setGlobalDispatcher} from 'undici'
+import nock from 'nock'
 import {writeAttestation} from '../src/store'

 describe('writeAttestation', () => {
  const originalEnv = process.env
  const attestation = {foo: 'bar '}
  const token = 'token'
-  const headers = {'X-GitHub-Foo': 'true'}
-
-  const mockAgent = new MockAgent()
-  setGlobalDispatcher(mockAgent)

  beforeEach(() => {
    process.env = {
@@ -23,71 +19,27 @@ describe('writeAttestation', () => {

  describe('when the api call is successful', () => {
    beforeEach(() => {
-      mockAgent
-        .get('https://api.github.com')
-        .intercept({
-          path: '/repos/foo/bar/attestations',
-          method: 'POST',
-          headers: {authorization: `token ${token}`, ...headers},
-          body: JSON.stringify({bundle: attestation})
-        })
+      nock('https://api.github.com')
+        .matchHeader('authorization', `token ${token}`)
+        .post('/repos/foo/bar/attestations', {bundle: attestation})
        .reply(201, {id: '123'})
    })

-    it('persists the attestation', async () => {
-      await expect(
-        writeAttestation(attestation, token, {headers})
-      ).resolves.toEqual('123')
-    })
-  })
-
-  describe('when the api call fails', () => {
-    beforeEach(() => {
-      mockAgent
-        .get('https://api.github.com')
-        .intercept({
-          path: '/repos/foo/bar/attestations',
-          method: 'POST',
-          headers: {authorization: `token ${token}`},
-          body: JSON.stringify({bundle: attestation})
-        })
-        .reply(500, 'oops')
-    })
-
-    it('throws an error', async () => {
-      await expect(
-        writeAttestation(attestation, token, {retry: 0})
-      ).rejects.toThrow(/oops/)
-    })
-  })
-
-  describe('when the api call fails but succeeds on retry', () => {
-    beforeEach(() => {
-      const pool = mockAgent.get('https://api.github.com')
-
-      pool
-        .intercept({
-          path: '/repos/foo/bar/attestations',
-          method: 'POST',
-          headers: {authorization: `token ${token}`},
-          body: JSON.stringify({bundle: attestation})
-        })
-        .reply(500, 'oops')
-        .times(1)
-
-      pool
-        .intercept({
-          path: '/repos/foo/bar/attestations',
-          method: 'POST',
-          headers: {authorization: `token ${token}`},
-          body: JSON.stringify({bundle: attestation})
-        })
-        .reply(201, {id: '123'})
-        .times(1)
-    })
-
    it('persists the attestation', async () => {
      await expect(writeAttestation(attestation, token)).resolves.toEqual('123')
    })
  })
+
+  describe('when the api call fails', () => {
+    beforeEach(() => {
+      nock('https://api.github.com')
+        .matchHeader('authorization', `token ${token}`)
+        .post('/repos/foo/bar/attestations', {bundle: attestation})
+        .reply(500, 'oops')
+    })
+
+    it('persists the attestation', async () => {
+      await expect(writeAttestation(attestation, token)).rejects.toThrow(/oops/)
+    })
+  })
 })
@@ -1,6 +1,6 @@
 {
  "name": "@actions/attest",
-  "version": "2.1.0",
+  "version": "1.0.0",
  "description": "Actions attestation lib",
  "keywords": [
    "github",
@@ -35,24 +35,15 @@
    "url": "https://github.com/actions/toolkit/issues"
  },
  "devDependencies": {
-    "@sigstore/mock": "^0.10.0",
-    "@sigstore/rekor-types": "^3.0.0",
-    "@types/jsonwebtoken": "^9.0.6",
-    "nock": "^13.5.1",
-    "undici": "^6.20.0"
+    "@sigstore/mock": "^0.6.5",
+    "@sigstore/rekor-types": "^2.0.0",
+    "@types/make-fetch-happen": "^10.0.4",
+    "nock": "^13.5.1"
  },
  "dependencies": {
-    "@actions/core": "^1.11.1",
    "@actions/github": "^6.0.0",
-    "@actions/http-client": "^2.2.3",
-    "@octokit/plugin-retry": "^6.0.1",
-    "@sigstore/bundle": "^3.1.0",
-    "@sigstore/sign": "^3.1.0",
-    "jose": "^5.10.0"
-  },
-  "overrides": {
-    "@octokit/plugin-retry": {
-      "@octokit/core": "^5.2.0"
-    }
+    "@sigstore/bundle": "^2.2.0",
+    "@sigstore/sign": "^2.2.3",
+    "make-fetch-happen": "^13.0.0"
  }
 }
@@ -1,85 +0,0 @@
-import * as github from '@actions/github'
-import {retry} from '@octokit/plugin-retry'
-import {RequestHeaders} from '@octokit/types'
-
-const CREATE_STORAGE_RECORD_REQUEST =
-  'POST /orgs/{owner}/artifacts/metadata/storage-record'
-const DEFAULT_RETRY_COUNT = 5
-
-/**
- * Options for creating a storage record for an attested artifact.
- */
-export type ArtifactOptions = {
-  // Includes details about the attested artifact
-  // The name of the artifact
-  name: string
-  // The digest of the artifact
-  digest: string
-  // The version of the artifact
-  version?: string
-  // The status of the artifact
-  status?: string
-}
-// Includes details about the package registry the artifact was published to
-export type PackageRegistryOptions = {
-  // The URL of the package registry
-  registryUrl: string
-  // The URL of the artifact in the package registry
-  artifactUrl?: string
-  // The package registry repository the artifact was published to.
-  repo?: string
-  // The path of the artifact in the package registry repository.
-  path?: string
-}
-
-/**
- * Writes a storage record on behalf of an artifact that has been attested
- * @param artifactOptions - parameters for the storage record API request.
- * @param packageRegistryOptions - parameters for the package registry API request.
- * @param token - GitHub token used to authenticate the request.
- * @param retryAttempts - The number of retries to attempt if the request fails.
- * @param headers - Additional headers to include in the request.
- *
- * @returns The ID of the storage record.
- * @throws Error if the storage record fails to persist.
- */
-export async function createStorageRecord(
-  artifactOptions: ArtifactOptions,
-  packageRegistryOptions: PackageRegistryOptions,
-  token: string,
-  retryAttempts?: number,
-  headers?: RequestHeaders
-): Promise<number[]> {
-  const retries = retryAttempts ?? DEFAULT_RETRY_COUNT
-  const octokit = github.getOctokit(token, {retry: {retries}}, retry)
-  try {
-    const response = await octokit.request(CREATE_STORAGE_RECORD_REQUEST, {
-      owner: github.context.repo.owner,
-      headers,
-      ...buildRequestParams(artifactOptions, packageRegistryOptions)
-    })
-
-    const data =
-      typeof response.data == 'string'
-        ? JSON.parse(response.data)
-        : response.data
-
-    return data?.storage_records.map((r: {id: number}) => r.id)
-  } catch (err) {
-    const message = err instanceof Error ? err.message : err
-    throw new Error(`Failed to persist storage record: ${message}`)
-  }
-}
-
-function buildRequestParams(
-  artifactOptions: ArtifactOptions,
-  packageRegistryOptions: PackageRegistryOptions
-): Record<string, unknown> {
-  const {registryUrl, artifactUrl, ...rest} = packageRegistryOptions
-  return {
-    ...artifactOptions,
-    registry_url: registryUrl,
-    artifact_url: artifactUrl,
-    ...rest
-  }
-}
@@ -1,11 +1,10 @@
-import {bundleToJSON} from '@sigstore/bundle'
+import {Bundle, bundleToJSON} from '@sigstore/bundle'
 import {X509Certificate} from 'crypto'
 import {SigstoreInstance, signingEndpoints} from './endpoints'
 import {buildIntotoStatement} from './intoto'
 import {Payload, signPayload} from './sign'
 import {writeAttestation} from './store'

-import type {Bundle} from '@sigstore/sign'
 import type {Attestation, Predicate, Subject} from './shared.types'

 const INTOTO_PAYLOAD_TYPE = 'application/vnd.in-toto+json'
@@ -14,16 +13,11 @@ const INTOTO_PAYLOAD_TYPE = 'application/vnd.in-toto+json'
 * Options for attesting a subject / predicate.
 */
 export type AttestOptions = {
-  /**
-   * @deprecated Use `subjects` instead.
-   **/
-  subjectName?: string
-  /**
-   * @deprecated Use `subjects` instead.
-   **/
-  subjectDigest?: Record<string, string>
-  // Subjects to be attested.
-  subjects?: Subject[]
+  // The name of the subject to be attested.
+  subjectName: string
+  // The digest of the subject to be attested. Should be a map of digest
+  // algorithms to their hex-encoded values.
+  subjectDigest: Record<string, string>
  // Content type of the predicate being attested.
  predicateType: string
  // Predicate to be attested.
@@ -33,8 +27,6 @@ export type AttestOptions = {
  // Sigstore instance to use for signing. Must be one of "public-good" or
  // "github".
  sigstore?: SigstoreInstance
-  // HTTP headers to include in request to attestations API.
-  headers?: {[header: string]: string | number | undefined}
  // Whether to skip writing the attestation to the GH attestations API.
  skipWrite?: boolean
 }
@@ -47,24 +39,15 @@ export type AttestOptions = {
 * @returns A promise that resolves to the attestation.
 */
 export async function attest(options: AttestOptions): Promise<Attestation> {
-  let subjects: Subject[]
-
-  if (options.subjects) {
-    subjects = options.subjects
-  } else if (options.subjectName && options.subjectDigest) {
-    subjects = [{name: options.subjectName, digest: options.subjectDigest}]
-  } else {
-    throw new Error(
-      'Must provide either subjectName and subjectDigest or subjects'
-    )
+  const subject: Subject = {
+    name: options.subjectName,
+    digest: options.subjectDigest
  }
-
  const predicate: Predicate = {
    type: options.predicateType,
    params: options.predicate
  }
-
-  const statement = buildIntotoStatement(subjects, predicate)
+  const statement = buildIntotoStatement(subject, predicate)

  // Sign the provenance statement
  const payload: Payload = {
@@ -77,11 +60,7 @@ export async function attest(options: AttestOptions): Promise<Attestation> {
  // Store the attestation
  let attestationID: string | undefined
  if (options.skipWrite !== true) {
-    attestationID = await writeAttestation(
-      bundleToJSON(bundle),
-      options.token,
-      {headers: options.headers}
-    )
+    attestationID = await writeAttestation(bundleToJSON(bundle), options.token)
  }

  return toAttestation(bundle, attestationID)
@@ -6,6 +6,9 @@ const GITHUB_ID = 'github'
 const FULCIO_PUBLIC_GOOD_URL = 'https://fulcio.sigstore.dev'
 const REKOR_PUBLIC_GOOD_URL = 'https://rekor.sigstore.dev'

+const FULCIO_INTERNAL_URL = 'https://fulcio.githubapp.com'
+const TSA_INTERNAL_URL = 'https://timestamp.githubapp.com'
+
 export type SigstoreInstance = typeof PUBLIC_GOOD_ID | typeof GITHUB_ID

 export type Endpoints = {
@@ -19,6 +22,11 @@ export const SIGSTORE_PUBLIC_GOOD: Endpoints = {
  rekorURL: REKOR_PUBLIC_GOOD_URL
 }

+export const SIGSTORE_GITHUB: Endpoints = {
+  fulcioURL: FULCIO_INTERNAL_URL,
+  tsaServerURL: TSA_INTERNAL_URL
+}
+
 export const signingEndpoints = (sigstore?: SigstoreInstance): Endpoints => {
  let instance: SigstoreInstance

@@ -37,19 +45,6 @@ export const signingEndpoints = (sigstore?: SigstoreInstance): Endpoints => {
    case PUBLIC_GOOD_ID:
      return SIGSTORE_PUBLIC_GOOD
    case GITHUB_ID:
-      return buildGitHubEndpoints()
-  }
-}
-
-function buildGitHubEndpoints(): Endpoints {
-  const serverURL = process.env.GITHUB_SERVER_URL || 'https://github.com'
-  let host = new URL(serverURL).hostname
-
-  if (host === 'github.com') {
-    host = 'githubapp.com'
-  }
-  return {
-    fulcioURL: `https://fulcio.${host}`,
-    tsaServerURL: `https://timestamp.${host}`
+      return SIGSTORE_GITHUB
  }
 }
@@ -1,4 +1,3 @@
-export {createStorageRecord} from './artifactMetadata'
 export {AttestOptions, attest} from './attest'
 export {
  AttestProvenanceOptions,
@@ -20,12 +20,12 @@ export type InTotoStatement = {
 * @returns The constructed in-toto statement.
 */
 export const buildIntotoStatement = (
-  subjects: Subject[],
+  subject: Subject,
  predicate: Predicate
 ): InTotoStatement => {
  return {
    _type: INTOTO_STATEMENT_V1_TYPE,
-    subject: subjects,
+    subject: [subject],
    predicateType: predicate.type,
    predicate: predicate.params
  }
@@ -1,117 +0,0 @@
-import {getIDToken} from '@actions/core'
-import {HttpClient} from '@actions/http-client'
-import * as jose from 'jose'
-
-const OIDC_AUDIENCE = 'nobody'
-
-const VALID_SERVER_URLS = [
-  'https://github.com',
-  new RegExp('^https://[a-z0-9-]+\\.ghe\\.com$')
-] as const
-
-const REQUIRED_CLAIMS = [
-  'iss',
-  'ref',
-  'sha',
-  'repository',
-  'event_name',
-  'job_workflow_ref',
-  'workflow_ref',
-  'repository_id',
-  'repository_owner_id',
-  'runner_environment',
-  'run_id',
-  'run_attempt'
-] as const
-
-export type ClaimSet = {[K in (typeof REQUIRED_CLAIMS)[number]]: string}
-
-type OIDCConfig = {
-  jwks_uri: string
-}
-
-export const getIDTokenClaims = async (issuer?: string): Promise<ClaimSet> => {
-  issuer = issuer || getIssuer()
-  try {
-    const token = await getIDToken(OIDC_AUDIENCE)
-    const claims = await decodeOIDCToken(token, issuer)
-    assertClaimSet(claims)
-    return claims
-  } catch (error) {
-    throw new Error(`Failed to get ID token: ${error.message}`)
-  }
-}
-
-const decodeOIDCToken = async (
-  token: string,
-  issuer: string
-): Promise<jose.JWTPayload> => {
-  // Verify and decode token
-  const jwks = jose.createLocalJWKSet(await getJWKS(issuer))
-  const {payload} = await jose.jwtVerify(token, jwks, {
-    audience: OIDC_AUDIENCE
-  })
-
-  if (!payload.iss) {
-    throw new Error('Missing "iss" claim')
-  }
-
-  // Check that the issuer STARTS WITH the expected issuer URL to account for
-  // the fact that the value may include an enterprise-specific slug
-  if (!payload.iss.startsWith(issuer)) {
-    throw new Error(`Unexpected "iss" claim: ${payload.iss}`)
-  }
-
-  return payload
-}
-
-const getJWKS = async (issuer: string): Promise<jose.JSONWebKeySet> => {
-  const client = new HttpClient('@actions/attest')
-  const config = await client.getJson<OIDCConfig>(
-    `${issuer}/.well-known/openid-configuration`
-  )
-
-  if (!config.result) {
-    throw new Error('No OpenID configuration found')
-  }
-
-  const jwks = await client.getJson<jose.JSONWebKeySet>(config.result.jwks_uri)
-
-  if (!jwks.result) {
-    throw new Error('No JWKS found for issuer')
-  }
-
-  return jwks.result
-}
-
-function assertClaimSet(claims: jose.JWTPayload): asserts claims is ClaimSet {
-  const missingClaims: string[] = []
-
-  for (const claim of REQUIRED_CLAIMS) {
-    if (!(claim in claims)) {
-      missingClaims.push(claim)
-    }
-  }
-
-  if (missingClaims.length > 0) {
-    throw new Error(`Missing claims: ${missingClaims.join(', ')}`)
-  }
-}
-
-// Derive the current OIDC issuer based on the server URL
-function getIssuer(): string {
-  const serverURL = process.env.GITHUB_SERVER_URL || 'https://github.com'
-
-  // Ensure the server URL is a valid GitHub server URL
-  if (!VALID_SERVER_URLS.some(valid_url => serverURL.match(valid_url))) {
-    throw new Error(`Invalid server URL: ${serverURL}`)
-  }
-
-  let host = new URL(serverURL).hostname
-
-  if (host === 'github.com') {
-    host = 'githubusercontent.com'
-  }
-
-  return `https://token.actions.${host}`
-}
@@ -1,37 +1,36 @@
 import {attest, AttestOptions} from './attest'
-import {getIDTokenClaims} from './oidc'
 import type {Attestation, Predicate} from './shared.types'

 const SLSA_PREDICATE_V1_TYPE = 'https://slsa.dev/provenance/v1'
-const GITHUB_BUILD_TYPE = 'https://actions.github.io/buildtypes/workflow/v1'
+
+const GITHUB_BUILDER_ID_PREFIX = 'https://github.com/actions/runner'
+const GITHUB_BUILD_TYPE =
+  'https://slsa-framework.github.io/github-actions-buildtypes/workflow/v1'

 export type AttestProvenanceOptions = Omit<
  AttestOptions,
  'predicate' | 'predicateType'
-> & {
-  issuer?: string
-}
+>

 /**
 * Builds an SLSA (Supply Chain Levels for Software Artifacts) provenance
 * predicate using the GitHub Actions Workflow build type.
 * https://slsa.dev/spec/v1.0/provenance
 * https://github.com/slsa-framework/github-actions-buildtypes/tree/main/workflow/v1
- * @param issuer - URL for the OIDC issuer. Defaults to the GitHub Actions token
- * issuer.
+ * @param env - The Node.js process environment variables. Defaults to
+ * `process.env`.
 * @returns The SLSA provenance predicate.
 */
-export const buildSLSAProvenancePredicate = async (
-  issuer?: string
-): Promise<Predicate> => {
-  const serverURL = process.env.GITHUB_SERVER_URL
-  const claims = await getIDTokenClaims(issuer)
+export const buildSLSAProvenancePredicate = (
+  env: NodeJS.ProcessEnv = process.env
+): Predicate => {
+  const workflow = env.GITHUB_WORKFLOW_REF || ''

  // Split just the path and ref from the workflow string.
  // owner/repo/.github/workflows/main.yml@main =>
  //   .github/workflows/main.yml, main
-  const [workflowPath] = claims.workflow_ref
-    .replace(`${claims.repository}/`, '')
+  const [workflowPath, workflowRef] = workflow
+    .replace(`${env.GITHUB_REPOSITORY}/`, '')
    .split('@')

  return {
@@ -41,34 +40,33 @@ export const buildSLSAProvenancePredicate = async (
        buildType: GITHUB_BUILD_TYPE,
        externalParameters: {
          workflow: {
-            ref: claims.ref,
-            repository: `${serverURL}/${claims.repository}`,
+            ref: workflowRef,
+            repository: `${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}`,
            path: workflowPath
          }
        },
        internalParameters: {
          github: {
-            event_name: claims.event_name,
-            repository_id: claims.repository_id,
-            repository_owner_id: claims.repository_owner_id,
-            runner_environment: claims.runner_environment
+            event_name: env.GITHUB_EVENT_NAME,
+            repository_id: env.GITHUB_REPOSITORY_ID,
+            repository_owner_id: env.GITHUB_REPOSITORY_OWNER_ID
          }
        },
        resolvedDependencies: [
          {
-            uri: `git+${serverURL}/${claims.repository}@${claims.ref}`,
+            uri: `git+${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}@${env.GITHUB_REF}`,
            digest: {
-              gitCommit: claims.sha
+              gitCommit: env.GITHUB_SHA
            }
          }
        ]
      },
      runDetails: {
        builder: {
-          id: `${serverURL}/${claims.job_workflow_ref}`
+          id: `${GITHUB_BUILDER_ID_PREFIX}/${env.RUNNER_ENVIRONMENT}`
        },
        metadata: {
-          invocationId: `${serverURL}/${claims.repository}/actions/runs/${claims.run_id}/attempts/${claims.run_attempt}`
+          invocationId: `${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}/attempts/${env.GITHUB_RUN_ATTEMPT}`
        }
      }
    }
@@ -86,7 +84,7 @@ export const buildSLSAProvenancePredicate = async (
 export async function attestProvenance(
  options: AttestProvenanceOptions
 ): Promise<Attestation> {
-  const predicate = await buildSLSAProvenancePredicate(options.issuer)
+  const predicate = buildSLSAProvenancePredicate(process.env)
  return attest({
    ...options,
    predicateType: predicate.type,
@@ -1,5 +1,5 @@
+import {Bundle} from '@sigstore/bundle'
 import {
-  Bundle,
  BundleBuilder,
  CIContextProvider,
  DSSEBundleBuilder,
@@ -86,7 +86,7 @@ const initBundleBuilder = (opts: SignOptions): BundleBuilder => {
    witnesses.push(
      new RekorWitness({
        rekorBaseURL: opts.rekorURL,
-        fetchOnConflict: true,
+        entryType: 'dsse',
        timeout,
        retry
      })
@@ -103,7 +103,5 @@ const initBundleBuilder = (opts: SignOptions): BundleBuilder => {
    )
  }

-  // Build the bundle with the singleCertificate option which will
-  // trigger the creation of v0.3 DSSE bundles
  return new DSSEBundleBuilder({signer, witnesses})
 }
@@ -1,14 +1,8 @@
 import * as github from '@actions/github'
-import {retry} from '@octokit/plugin-retry'
-import {RequestHeaders} from '@octokit/types'
+import fetch from 'make-fetch-happen'

 const CREATE_ATTESTATION_REQUEST = 'POST /repos/{owner}/{repo}/attestations'
-const DEFAULT_RETRY_COUNT = 5

-export type WriteOptions = {
-  retry?: number
-  headers?: RequestHeaders
-}
 /**
 * Writes an attestation to the repository's attestations endpoint.
 * @param attestation - The attestation to write.
@@ -18,29 +12,18 @@ export type WriteOptions = {
 */
 export const writeAttestation = async (
  attestation: unknown,
-  token: string,
-  options: WriteOptions = {}
+  token: string
 ): Promise<string> => {
-  const retries = options.retry ?? DEFAULT_RETRY_COUNT
-  const octokit = github.getOctokit(token, {retry: {retries}}, retry)
+  const octokit = github.getOctokit(token, {request: {fetch}})

  try {
    const response = await octokit.request(CREATE_ATTESTATION_REQUEST, {
      owner: github.context.repo.owner,
      repo: github.context.repo.repo,
-      headers: options.headers,
-      bundle: attestation as {
-        mediaType?: string
-        verificationMaterial?: {[key: string]: unknown}
-        dsseEnvelope?: {[key: string]: unknown}
-      }
+      data: {bundle: attestation}
    })

-    const data =
-      typeof response.data == 'string'
-        ? JSON.parse(response.data)
-        : response.data
-    return data?.id
+    return response.data?.id
  } catch (err) {
    const message = err instanceof Error ? err.message : err
    throw new Error(`Failed to persist attestation: ${message}`)
@@ -6,20 +6,6 @@ See ["Caching dependencies to speed up workflows"](https://docs.github.com/en/ac

 Note that GitHub will remove any cache entries that have not been accessed in over 7 days. There is no limit on the number of caches you can store, but the total size of all caches in a repository is limited to 10 GB. If you exceed this limit, GitHub will save your cache but will begin evicting caches until the total size is less than 10 GB.

-## ⚠️ Important changes
-
-The cache backend service has been rewritten from the ground up for improved performance and reliability. The [@actions/cache](https://github.com/actions/toolkit/tree/main/packages/cache) package now integrates with the new cache service (v2) APIs.
-
-The new service will gradually roll out as of **February 1st, 2025**. The legacy service will also be sunset on the same date. Changes in this release are **fully backward compatible**.
-
-**All previous versions of this package will be deprecated**. We recommend upgrading to version `4.0.0` as soon as possible before **February 1st, 2025.**
-
-If you do not upgrade, all workflow runs using any of the deprecated [@actions/cache](https://github.com/actions/toolkit/tree/main/packages/cache) packages will fail.
-
-Upgrading to the recommended version should not break or require any changes to your workflows beyond updating your `package.json` to version `4.0.0`.
-
-Read more about the change & access the migration guide: [reference to the announcement](https://github.com/actions/toolkit/discussions/1890).
-
 ## Usage

 This package is used by the v2+ versions of our first party cache action. You can find an example implementation in the cache repo [here](https://github.com/actions/cache).
@@ -61,3 +47,5 @@ const cacheKey = await cache.restoreCache(paths, key, restoreKeys)
 A cache gets downloaded in multiple segments of fixed sizes (now `128MB` to fail-fast, previously `1GB` for a `32-bit` runner and `2GB` for a `64-bit` runner were used). Sometimes, a segment download gets stuck which causes the workflow job to be stuck forever and fail. Version `v3.0.4` of cache package introduces a segment download timeout. The segment download timeout will allow the segment download to get aborted and hence allow the job to proceed with a cache miss.

 Default value of this timeout is 10 minutes (starting `v3.2.1` and higher, previously 60 minutes in versions between `v.3.0.4` and `v3.2.0`, both included) and can be customized by specifying an [environment variable](https://docs.github.com/en/actions/learn-github-actions/environment-variables) named `SEGMENT_DOWNLOAD_TIMEOUT_MINS` with timeout value in minutes.
+
+
@@ -1,67 +1,9 @@
 # @actions/cache Releases

-### 4.1.0
-
- Remove client side 10GiB cache size limit check & update twirp client [#2118](https://github.com/actions/toolkit/pull/2118)
-
-### 4.0.5
-
- Reintroduce @protobuf-ts/runtime-rpc as a runtime dependency [#2113](https://github.com/actions/toolkit/pull/2113)
-
-### 4.0.4
-
-⚠️ Faulty patch release. Upgrade to 4.0.5 instead.
-
- Optimized cache dependencies by moving `@protobuf-ts/plugin` to dev dependencies [#2106](https://github.com/actions/toolkit/pull/2106)
- Improved cache service availability determination for different cache service versions (v1 and v2) [#2100](https://github.com/actions/toolkit/pull/2100)
- Enhanced server error handling: 5xx HTTP errors are now logged as errors instead of warnings [#2099](https://github.com/actions/toolkit/pull/2099)
- Fixed cache hit logging to properly distinguish between exact key matches and restore key matches [#2101](https://github.com/actions/toolkit/pull/2101)
-
-### 4.0.3
-
- Added masking for Shared Access Signature (SAS) cache entry URLs [#1982](https://github.com/actions/toolkit/pull/1982)
- Improved debugging by logging both the cache version alongside the keys requested when a cache restore fails [#1994](https://github.com/actions/toolkit/pull/1994)
-
-### 4.0.2
-
- Wrap create failures in ReserveCacheError [#1966](https://github.com/actions/toolkit/pull/1966)
-
-### 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
-
-The cache backend service has been rewritten from the ground up for improved performance and reliability. The [@actions/cache](https://github.com/actions/toolkit/tree/main/packages/cache) package now integrates with the new cache service (v2) APIs.
-
-The new service will gradually roll out as of **February 1st, 2025**. The legacy service will also be sunset on the same date. Changes in this release are **fully backward compatible**.
-
-**All previous versions of this package will be deprecated**. We recommend upgrading to version `4.0.0` as soon as possible before **February 1st, 2025.**
-
-If you do not upgrade, all workflow runs using any of the deprecated [@actions/cache](https://github.com/actions/toolkit/tree/main/packages/cache) packages will fail.
-
-Upgrading to the recommended version should not break or require any changes to your workflows beyond updating your `package.json` to version `4.0.0`.
-
-Read more about the change & access the migration guide: [reference to the announcement](https://github.com/actions/toolkit/discussions/1890).
-
-#### Minor changes
-
- Update `@actions/core` to `1.11.0`
- Update `semver` `6.3.1`
- Add `twirp-ts` `2.5.0` to dependencies
-
-### 3.3.0
-
- Update `@actions/core` to `1.11.1`
- Remove dependency on `uuid` package [#1824](https://github.com/actions/toolkit/pull/1824), [#1842](https://github.com/actions/toolkit/pull/1842)
-
 ### 3.2.4

 - Updated `isGhes` check to include `.ghe.com` and `.ghe.localhost` as accepted hosts
-
+  
 ### 3.2.3

 - Fixed a bug that mutated path arguments to `getCacheVersion` [#1378](https://github.com/actions/toolkit/pull/1378)
@@ -3,15 +3,12 @@
 const fs = require('fs');
 const os = require('os');
 const filePath = process.env[`GITHUB_ENV`]
-fs.appendFileSync(filePath, `ACTIONS_CACHE_SERVICE_V2=true${os.EOL}`, {
-    encoding: 'utf8'
-})
-fs.appendFileSync(filePath, `ACTIONS_RESULTS_URL=${process.env.ACTIONS_RESULTS_URL}${os.EOL}`, {
-    encoding: 'utf8'
-})
 fs.appendFileSync(filePath, `ACTIONS_RUNTIME_TOKEN=${process.env.ACTIONS_RUNTIME_TOKEN}${os.EOL}`, {
    encoding: 'utf8'
 })
+fs.appendFileSync(filePath, `ACTIONS_CACHE_URL=${process.env.ACTIONS_CACHE_URL}${os.EOL}`, {
+    encoding: 'utf8'
+})
 fs.appendFileSync(filePath, `GITHUB_RUN_ID=${process.env.GITHUB_RUN_ID}${os.EOL}`, {
    encoding: 'utf8'
 })
@@ -1,69 +1,14 @@
 import * as cache from '../src/cache'

-describe('isFeatureAvailable', () => {
-  const originalEnv = process.env
-
-  beforeEach(() => {
-    jest.resetModules()
-    process.env = {...originalEnv}
-    // Clean cache-related environment variables
+test('isFeatureAvailable returns true if server url is set', () => {
+  try {
+    process.env['ACTIONS_CACHE_URL'] = 'http://cache.com'
+    expect(cache.isFeatureAvailable()).toBe(true)
+  } finally {
    delete process.env['ACTIONS_CACHE_URL']
-    delete process.env['ACTIONS_RESULTS_URL']
-    delete process.env['ACTIONS_CACHE_SERVICE_V2']
-    delete process.env['GITHUB_SERVER_URL']
-  })
-
-  afterAll(() => {
-    process.env = originalEnv
-  })
-
-  test('returns true for cache service v1 when ACTIONS_CACHE_URL is set', () => {
-    process.env['ACTIONS_CACHE_URL'] = 'http://cache.com'
-    expect(cache.isFeatureAvailable()).toBe(true)
-  })
-
-  test('returns false for cache service v1 when only ACTIONS_RESULTS_URL is set', () => {
-    process.env['ACTIONS_RESULTS_URL'] = 'http://results.com'
-    expect(cache.isFeatureAvailable()).toBe(false)
-  })
-
-  test('returns true for cache service v1 when both URLs are set', () => {
-    process.env['ACTIONS_CACHE_URL'] = 'http://cache.com'
-    process.env['ACTIONS_RESULTS_URL'] = 'http://results.com'
-    expect(cache.isFeatureAvailable()).toBe(true)
-  })
-
-  test('returns true for cache service v2 when ACTIONS_RESULTS_URL is set', () => {
-    process.env['ACTIONS_CACHE_SERVICE_V2'] = 'true'
-    process.env['ACTIONS_RESULTS_URL'] = 'http://results.com'
-    expect(cache.isFeatureAvailable()).toBe(true)
-  })
-
-  test('returns false for cache service v2 when only ACTIONS_CACHE_URL is set', () => {
-    process.env['ACTIONS_CACHE_SERVICE_V2'] = 'true'
-    process.env['ACTIONS_CACHE_URL'] = 'http://cache.com'
-    expect(cache.isFeatureAvailable()).toBe(false)
-  })
-
-  test('returns false when no cache URLs are set', () => {
-    expect(cache.isFeatureAvailable()).toBe(false)
-  })
-
-  test('returns false for cache service v2 when no URLs are set', () => {
-    process.env['ACTIONS_CACHE_SERVICE_V2'] = 'true'
-    expect(cache.isFeatureAvailable()).toBe(false)
-  })
-
-  test('returns true for GHES with v1 even when v2 flag is set', () => {
-    process.env['GITHUB_SERVER_URL'] = 'https://my-enterprise.github.com'
-    process.env['ACTIONS_CACHE_SERVICE_V2'] = 'true'
-    process.env['ACTIONS_CACHE_URL'] = 'http://cache.com'
-    expect(cache.isFeatureAvailable()).toBe(true)
-  })
-
-  test('returns false for GHES with only ACTIONS_RESULTS_URL', () => {
-    process.env['GITHUB_SERVER_URL'] = 'https://my-enterprise.github.com'
-    process.env['ACTIONS_RESULTS_URL'] = 'http://results.com'
-    expect(cache.isFeatureAvailable()).toBe(false)
-  })
+  }
+})
+
+test('isFeatureAvailable returns false if server url is not set', () => {
+  expect(cache.isFeatureAvailable()).toBe(false)
 })
@@ -1,5 +1,4 @@
-import {downloadCache} from '../src/internal/cacheHttpClient'
-import {getCacheVersion} from '../src/internal/cacheUtils'
+import {downloadCache, getCacheVersion} from '../src/internal/cacheHttpClient'
 import {CompressionMethod} from '../src/internal/constants'
 import * as downloadUtils from '../src/internal/downloadUtils'
 import {DownloadOptions, getDownloadOptions} from '../src/options'
@@ -42,3 +42,23 @@ test('resolvePaths works on github workspace directory', async () => {
  const paths = await cacheUtils.resolvePaths([workspace])
  expect(paths.length).toBeGreaterThan(0)
 })
+
+test('isGhes returns false for github.com', async () => {
+  process.env.GITHUB_SERVER_URL = 'https://github.com'
+  expect(cacheUtils.isGhes()).toBe(false)
+})
+
+test('isGhes returns false for ghe.com', async () => {
+  process.env.GITHUB_SERVER_URL = 'https://somedomain.ghe.com'
+  expect(cacheUtils.isGhes()).toBe(false)
+})
+
+test('isGhes returns true for enterprise URL', async () => {
+  process.env.GITHUB_SERVER_URL = 'https://my-enterprise.github.com'
+  expect(cacheUtils.isGhes()).toBe(true)
+})
+
+test('isGhes returns false for ghe.localhost', () => {
+  process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.localhost'
+  expect(cacheUtils.isGhes()).toBe(false)
+})
@@ -1,25 +0,0 @@
-import * as config from '../src/internal/config'
-
-beforeEach(() => {
-  jest.resetModules()
-})
-
-test('isGhes returns false for github.com', async () => {
-  process.env.GITHUB_SERVER_URL = 'https://github.com'
-  expect(config.isGhes()).toBe(false)
-})
-
-test('isGhes returns false for ghe.com', async () => {
-  process.env.GITHUB_SERVER_URL = 'https://somedomain.ghe.com'
-  expect(config.isGhes()).toBe(false)
-})
-
-test('isGhes returns true for enterprise URL', async () => {
-  process.env.GITHUB_SERVER_URL = 'https://my-enterprise.github.com'
-  expect(config.isGhes()).toBe(true)
-})
-
-test('isGhes returns false for ghe.localhost', () => {
-  process.env.GITHUB_SERVER_URL = 'https://my.domain.ghe.localhost'
-  expect(config.isGhes()).toBe(false)
-})
@@ -11,6 +11,8 @@ const downloadConcurrency = 8
 const timeoutInMs = 30000
 const segmentTimeoutInMs = 600000
 const lookupOnly = false
+const uploadConcurrency = 4
+const uploadChunkSize = 32 * 1024 * 1024

 test('getDownloadOptions sets defaults', async () => {
  const actualOptions = getDownloadOptions()
@@ -41,21 +43,18 @@ test('getDownloadOptions overrides all settings', async () => {
 })

 test('getUploadOptions sets defaults', async () => {
-  const expectedOptions: UploadOptions = {
-    uploadConcurrency: 4,
-    uploadChunkSize: 32 * 1024 * 1024,
-    useAzureSdk: false
-  }
  const actualOptions = getUploadOptions()

-  expect(actualOptions).toEqual(expectedOptions)
+  expect(actualOptions).toEqual({
+    uploadConcurrency,
+    uploadChunkSize
+  })
 })

 test('getUploadOptions overrides all settings', async () => {
  const expectedOptions: UploadOptions = {
    uploadConcurrency: 2,
-    uploadChunkSize: 16 * 1024 * 1024,
-    useAzureSdk: true
+    uploadChunkSize: 16 * 1024 * 1024
  }

  const actualOptions = getUploadOptions(expectedOptions)
@@ -63,34 +62,6 @@ test('getUploadOptions overrides all settings', async () => {
  expect(actualOptions).toEqual(expectedOptions)
 })

-test('env variables override all getUploadOptions settings', async () => {
-  const expectedOptions: UploadOptions = {
-    uploadConcurrency: 16,
-    uploadChunkSize: 64 * 1024 * 1024,
-    useAzureSdk: true
-  }
-
-  process.env.CACHE_UPLOAD_CONCURRENCY = '16'
-  process.env.CACHE_UPLOAD_CHUNK_SIZE = '64'
-
-  const actualOptions = getUploadOptions(expectedOptions)
-  expect(actualOptions).toEqual(expectedOptions)
-})
-
-test('env variables override all getUploadOptions settings but do not exceed caps', async () => {
-  const expectedOptions: UploadOptions = {
-    uploadConcurrency: 32,
-    uploadChunkSize: 128 * 1024 * 1024,
-    useAzureSdk: true
-  }
-
-  process.env.CACHE_UPLOAD_CONCURRENCY = '64'
-  process.env.CACHE_UPLOAD_CHUNK_SIZE = '256'
-
-  const actualOptions = getUploadOptions(expectedOptions)
-  expect(actualOptions).toEqual(expectedOptions)
-})
-
 test('getDownloadOptions overrides download timeout minutes', async () => {
  const expectedOptions: DownloadOptions = {
    useAzureSdk: false,
@@ -6,8 +6,6 @@ import * as cacheUtils from '../src/internal/cacheUtils'
 import {CacheFilename, CompressionMethod} from '../src/internal/constants'
 import {ArtifactCacheEntry} from '../src/internal/contracts'
 import * as tar from '../src/internal/tar'
-import {HttpClientError} from '@actions/http-client'
-import {CacheServiceClientJSON} from '../src/generated/results/api/v1/cache.twirp-client'

 jest.mock('../src/internal/cacheHttpClient')
 jest.mock('../src/internal/cacheUtils')
@@ -75,28 +73,18 @@ test('restore with no cache found', async () => {
 test('restore with server error should fail', async () => {
  const paths = ['node_modules']
  const key = 'node-test'
-  const logErrorMock = jest.spyOn(core, 'error')
+  const logWarningMock = jest.spyOn(core, 'warning')

-  // Set cache service to V2 to test error logging for server errors
-  process.env['ACTIONS_CACHE_SERVICE_V2'] = 'true'
-  process.env['ACTIONS_RESULTS_URL'] = 'https://results.local/'
-
-  jest
-    .spyOn(CacheServiceClientJSON.prototype, 'GetCacheEntryDownloadURL')
-    .mockImplementation(() => {
-      throw new HttpClientError('HTTP Error Occurred', 500)
-    })
+  jest.spyOn(cacheHttpClient, 'getCacheEntry').mockImplementation(() => {
+    throw new Error('HTTP Error Occurred')
+  })

  const cacheKey = await restoreCache(paths, key)
  expect(cacheKey).toBe(undefined)
-  expect(logErrorMock).toHaveBeenCalledTimes(1)
-  expect(logErrorMock).toHaveBeenCalledWith(
+  expect(logWarningMock).toHaveBeenCalledTimes(1)
+  expect(logWarningMock).toHaveBeenCalledWith(
    'Failed to restore: HTTP Error Occurred'
  )
-
-  // Clean up environment
-  delete process.env['ACTIONS_CACHE_SERVICE_V2']
-  delete process.env['ACTIONS_RESULTS_URL']
 })

 test('restore with restore keys and no cache found', async () => {
@@ -1,426 +0,0 @@
-import * as core from '@actions/core'
-import * as path from 'path'
-import * as tar from '../src/internal/tar'
-import * as config from '../src/internal/config'
-import * as cacheUtils from '../src/internal/cacheUtils'
-import * as cacheHttpClient from '../src/internal/cacheHttpClient'
-import {restoreCache} from '../src/cache'
-import {CacheFilename, CompressionMethod} from '../src/internal/constants'
-import {CacheServiceClientJSON} from '../src/generated/results/api/v1/cache.twirp-client'
-import {DownloadOptions} from '../src/options'
-import {HttpClientError} from '@actions/http-client'
-
-jest.mock('../src/internal/cacheHttpClient')
-jest.mock('../src/internal/cacheUtils')
-jest.mock('../src/internal/config')
-jest.mock('../src/internal/tar')
-
-let logDebugMock: jest.SpyInstance
-let logInfoMock: jest.SpyInstance
-
-beforeAll(() => {
-  jest.spyOn(console, 'log').mockImplementation(() => {})
-  jest.spyOn(core, 'debug').mockImplementation(() => {})
-  jest.spyOn(core, 'info').mockImplementation(() => {})
-  jest.spyOn(core, 'warning').mockImplementation(() => {})
-  jest.spyOn(core, 'error').mockImplementation(() => {})
-
-  jest.spyOn(cacheUtils, 'getCacheFileName').mockImplementation(cm => {
-    const actualUtils = jest.requireActual('../src/internal/cacheUtils')
-    return actualUtils.getCacheFileName(cm)
-  })
-
-  // Ensure that we're using v2 for these tests
-  jest.spyOn(config, 'getCacheServiceVersion').mockReturnValue('v2')
-
-  logDebugMock = jest.spyOn(core, 'debug')
-  logInfoMock = jest.spyOn(core, 'info')
-})
-
-afterEach(() => {
-  expect(logDebugMock).toHaveBeenCalledWith('Cache service version: v2')
-})
-
-test('restore with no path should fail', async () => {
-  const paths: string[] = []
-  const key = 'node-test'
-  await expect(restoreCache(paths, key)).rejects.toThrowError(
-    `Path Validation Error: At least one directory or file path is required`
-  )
-})
-
-test('restore with too many keys should fail', async () => {
-  const paths = ['node_modules']
-  const key = 'node-test'
-  const restoreKeys = [...Array(20).keys()].map(x => x.toString())
-  await expect(restoreCache(paths, key, restoreKeys)).rejects.toThrowError(
-    `Key Validation Error: Keys are limited to a maximum of 10.`
-  )
-})
-
-test('restore with large key should fail', async () => {
-  const paths = ['node_modules']
-  const key = 'foo'.repeat(512) // Over the 512 character limit
-  await expect(restoreCache(paths, key)).rejects.toThrowError(
-    `Key Validation Error: ${key} cannot be larger than 512 characters.`
-  )
-})
-
-test('restore with invalid key should fail', async () => {
-  const paths = ['node_modules']
-  const key = 'comma,comma'
-  await expect(restoreCache(paths, key)).rejects.toThrowError(
-    `Key Validation Error: ${key} cannot contain commas.`
-  )
-})
-
-test('restore with no cache found', async () => {
-  const paths = ['node_modules']
-  const key = 'node-test'
-
-  jest
-    .spyOn(CacheServiceClientJSON.prototype, 'GetCacheEntryDownloadURL')
-    .mockReturnValue(
-      Promise.resolve({
-        ok: false,
-        signedDownloadUrl: '',
-        matchedKey: ''
-      })
-    )
-
-  const cacheKey = await restoreCache(paths, key)
-
-  expect(cacheKey).toBe(undefined)
-})
-
-test('restore with server error should fail', async () => {
-  const paths = ['node_modules']
-  const key = 'node-test'
-  const logErrorMock = jest.spyOn(core, 'error')
-
-  jest
-    .spyOn(CacheServiceClientJSON.prototype, 'GetCacheEntryDownloadURL')
-    .mockImplementation(() => {
-      throw new HttpClientError('HTTP Error Occurred', 500)
-    })
-
-  const cacheKey = await restoreCache(paths, key)
-  expect(cacheKey).toBe(undefined)
-  expect(logErrorMock).toHaveBeenCalledTimes(1)
-  expect(logErrorMock).toHaveBeenCalledWith(
-    'Failed to restore: HTTP Error Occurred'
-  )
-})
-
-test('restore with restore keys and no cache found', async () => {
-  const paths = ['node_modules']
-  const key = 'node-test'
-  const restoreKeys = ['node-']
-  const cacheVersion =
-    'd90f107aaeb22920dba0c637a23c37b5bc497b4dfa3b07fe3f79bf88a273c11b'
-  const getCacheVersionMock = jest.spyOn(cacheUtils, 'getCacheVersion')
-  getCacheVersionMock.mockReturnValue(cacheVersion)
-
-  jest
-    .spyOn(CacheServiceClientJSON.prototype, 'GetCacheEntryDownloadURL')
-    .mockReturnValue(
-      Promise.resolve({
-        ok: false,
-        signedDownloadUrl: '',
-        matchedKey: ''
-      })
-    )
-
-  const cacheKey = await restoreCache(paths, key, restoreKeys)
-
-  expect(cacheKey).toBe(undefined)
-  expect(logDebugMock).toHaveBeenCalledWith(
-    `Cache not found for version ${cacheVersion} of keys: ${[
-      key,
-      ...restoreKeys
-    ].join(', ')}`
-  )
-})
-
-test('restore with gzip compressed cache found', async () => {
-  const paths = ['node_modules']
-  const key = 'node-test'
-  const compressionMethod = CompressionMethod.Gzip
-  const signedDownloadUrl = 'https://blob-storage.local?signed=true'
-  const cacheVersion =
-    'd90f107aaeb22920dba0c637a23c37b5bc497b4dfa3b07fe3f79bf88a273c11b'
-  const options = {useAzureSdk: true} as DownloadOptions
-
-  const getCacheVersionMock = jest.spyOn(cacheUtils, 'getCacheVersion')
-  getCacheVersionMock.mockReturnValue(cacheVersion)
-
-  const compressionMethodMock = jest.spyOn(cacheUtils, 'getCompressionMethod')
-  compressionMethodMock.mockReturnValue(Promise.resolve(compressionMethod))
-
-  const getCacheDownloadURLMock = jest.spyOn(
-    CacheServiceClientJSON.prototype,
-    'GetCacheEntryDownloadURL'
-  )
-  getCacheDownloadURLMock.mockReturnValue(
-    Promise.resolve({
-      ok: true,
-      signedDownloadUrl,
-      matchedKey: key
-    })
-  )
-
-  const tempPath = '/foo/bar'
-
-  const createTempDirectoryMock = jest.spyOn(cacheUtils, 'createTempDirectory')
-  createTempDirectoryMock.mockImplementation(async () => {
-    return Promise.resolve(tempPath)
-  })
-
-  const archivePath = path.join(tempPath, CacheFilename.Gzip)
-  const downloadCacheMock = jest.spyOn(cacheHttpClient, 'downloadCache')
-
-  const fileSize = 142
-  const getArchiveFileSizeInBytesMock = jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValue(fileSize)
-
-  const extractTarMock = jest.spyOn(tar, 'extractTar')
-  const unlinkFileMock = jest.spyOn(cacheUtils, 'unlinkFile')
-
-  const cacheKey = await restoreCache(paths, key, [], options)
-
-  expect(cacheKey).toBe(key)
-  expect(getCacheVersionMock).toHaveBeenCalledWith(
-    paths,
-    compressionMethod,
-    false
-  )
-  expect(getCacheDownloadURLMock).toHaveBeenCalledWith({
-    key,
-    restoreKeys: [],
-    version: cacheVersion
-  })
-  expect(createTempDirectoryMock).toHaveBeenCalledTimes(1)
-  expect(downloadCacheMock).toHaveBeenCalledWith(
-    signedDownloadUrl,
-    archivePath,
-    options
-  )
-  expect(getArchiveFileSizeInBytesMock).toHaveBeenCalledWith(archivePath)
-  expect(logInfoMock).toHaveBeenCalledWith(`Cache Size: ~0 MB (142 B)`)
-
-  expect(extractTarMock).toHaveBeenCalledTimes(1)
-  expect(extractTarMock).toHaveBeenCalledWith(archivePath, compressionMethod)
-
-  expect(unlinkFileMock).toHaveBeenCalledTimes(1)
-  expect(unlinkFileMock).toHaveBeenCalledWith(archivePath)
-
-  expect(compressionMethodMock).toHaveBeenCalledTimes(1)
-})
-
-test('restore with zstd compressed cache found', async () => {
-  const paths = ['node_modules']
-  const key = 'node-test'
-  const compressionMethod = CompressionMethod.Zstd
-  const signedDownloadUrl = 'https://blob-storage.local?signed=true'
-  const cacheVersion =
-    '8e2e96a184cb0cd6b48285b176c06a418f3d7fce14c29d9886fd1bb4f05c513d'
-  const options = {useAzureSdk: true} as DownloadOptions
-
-  const getCacheVersionMock = jest.spyOn(cacheUtils, 'getCacheVersion')
-  getCacheVersionMock.mockReturnValue(cacheVersion)
-
-  const compressionMethodMock = jest.spyOn(cacheUtils, 'getCompressionMethod')
-  compressionMethodMock.mockReturnValue(Promise.resolve(compressionMethod))
-
-  const getCacheDownloadURLMock = jest.spyOn(
-    CacheServiceClientJSON.prototype,
-    'GetCacheEntryDownloadURL'
-  )
-  getCacheDownloadURLMock.mockReturnValue(
-    Promise.resolve({
-      ok: true,
-      signedDownloadUrl,
-      matchedKey: key
-    })
-  )
-
-  const tempPath = '/foo/bar'
-
-  const createTempDirectoryMock = jest.spyOn(cacheUtils, 'createTempDirectory')
-  createTempDirectoryMock.mockImplementation(async () => {
-    return Promise.resolve(tempPath)
-  })
-
-  const archivePath = path.join(tempPath, CacheFilename.Zstd)
-  const downloadCacheMock = jest.spyOn(cacheHttpClient, 'downloadCache')
-
-  const fileSize = 62915000
-  const getArchiveFileSizeInBytesMock = jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValue(fileSize)
-
-  const extractTarMock = jest.spyOn(tar, 'extractTar')
-  const unlinkFileMock = jest.spyOn(cacheUtils, 'unlinkFile')
-
-  const cacheKey = await restoreCache(paths, key, [], options)
-
-  expect(cacheKey).toBe(key)
-  expect(logInfoMock).toHaveBeenCalledWith(`Cache hit for: ${key}`)
-  expect(getCacheVersionMock).toHaveBeenCalledWith(
-    paths,
-    compressionMethod,
-    false
-  )
-  expect(getCacheDownloadURLMock).toHaveBeenCalledWith({
-    key,
-    restoreKeys: [],
-    version: cacheVersion
-  })
-  expect(createTempDirectoryMock).toHaveBeenCalledTimes(1)
-  expect(downloadCacheMock).toHaveBeenCalledWith(
-    signedDownloadUrl,
-    archivePath,
-    options
-  )
-  expect(getArchiveFileSizeInBytesMock).toHaveBeenCalledWith(archivePath)
-  expect(logInfoMock).toHaveBeenCalledWith(`Cache Size: ~60 MB (62915000 B)`)
-
-  expect(extractTarMock).toHaveBeenCalledTimes(1)
-  expect(extractTarMock).toHaveBeenCalledWith(archivePath, compressionMethod)
-
-  expect(unlinkFileMock).toHaveBeenCalledTimes(1)
-  expect(unlinkFileMock).toHaveBeenCalledWith(archivePath)
-
-  expect(compressionMethodMock).toHaveBeenCalledTimes(1)
-})
-
-test('restore with cache found for restore key', async () => {
-  const paths = ['node_modules']
-  const key = 'node-test'
-  const restoreKeys = ['node-']
-  const compressionMethod = CompressionMethod.Gzip
-  const signedDownloadUrl = 'https://blob-storage.local?signed=true'
-  const cacheVersion =
-    'b8b58e9bd7b1e8f83d9f05c7e06ea865ba44a0330e07a14db74ac74386677bed'
-  const options = {useAzureSdk: true} as DownloadOptions
-
-  const getCacheVersionMock = jest.spyOn(cacheUtils, 'getCacheVersion')
-  getCacheVersionMock.mockReturnValue(cacheVersion)
-
-  const compressionMethodMock = jest.spyOn(cacheUtils, 'getCompressionMethod')
-  compressionMethodMock.mockReturnValue(Promise.resolve(compressionMethod))
-
-  const getCacheDownloadURLMock = jest.spyOn(
-    CacheServiceClientJSON.prototype,
-    'GetCacheEntryDownloadURL'
-  )
-  getCacheDownloadURLMock.mockReturnValue(
-    Promise.resolve({
-      ok: true,
-      signedDownloadUrl,
-      matchedKey: restoreKeys[0]
-    })
-  )
-
-  const tempPath = '/foo/bar'
-
-  const createTempDirectoryMock = jest.spyOn(cacheUtils, 'createTempDirectory')
-  createTempDirectoryMock.mockImplementation(async () => {
-    return Promise.resolve(tempPath)
-  })
-
-  const archivePath = path.join(tempPath, CacheFilename.Gzip)
-  const downloadCacheMock = jest.spyOn(cacheHttpClient, 'downloadCache')
-
-  const fileSize = 142
-  const getArchiveFileSizeInBytesMock = jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValue(fileSize)
-
-  const extractTarMock = jest.spyOn(tar, 'extractTar')
-  const unlinkFileMock = jest.spyOn(cacheUtils, 'unlinkFile')
-
-  const cacheKey = await restoreCache(paths, key, restoreKeys, options)
-
-  expect(cacheKey).toBe(restoreKeys[0])
-  expect(logInfoMock).toHaveBeenCalledWith(
-    `Cache hit for restore-key: ${restoreKeys[0]}`
-  )
-  expect(getCacheVersionMock).toHaveBeenCalledWith(
-    paths,
-    compressionMethod,
-    false
-  )
-  expect(getCacheDownloadURLMock).toHaveBeenCalledWith({
-    key,
-    restoreKeys,
-    version: cacheVersion
-  })
-  expect(createTempDirectoryMock).toHaveBeenCalledTimes(1)
-  expect(downloadCacheMock).toHaveBeenCalledWith(
-    signedDownloadUrl,
-    archivePath,
-    options
-  )
-  expect(getArchiveFileSizeInBytesMock).toHaveBeenCalledWith(archivePath)
-  expect(logInfoMock).toHaveBeenCalledWith(`Cache Size: ~0 MB (142 B)`)
-
-  expect(extractTarMock).toHaveBeenCalledTimes(1)
-  expect(extractTarMock).toHaveBeenCalledWith(archivePath, compressionMethod)
-
-  expect(unlinkFileMock).toHaveBeenCalledTimes(1)
-  expect(unlinkFileMock).toHaveBeenCalledWith(archivePath)
-
-  expect(compressionMethodMock).toHaveBeenCalledTimes(1)
-})
-
-test('restore with lookup only enabled', async () => {
-  const paths = ['node_modules']
-  const key = 'node-test'
-  const compressionMethod = CompressionMethod.Gzip
-  const signedDownloadUrl = 'https://blob-storage.local?signed=true'
-  const cacheVersion =
-    'd90f107aaeb22920dba0c637a23c37b5bc497b4dfa3b07fe3f79bf88a273c11b'
-  const options = {lookupOnly: true, useAzureSdk: true} as DownloadOptions
-
-  const getCacheVersionMock = jest.spyOn(cacheUtils, 'getCacheVersion')
-  getCacheVersionMock.mockReturnValue(cacheVersion)
-
-  const compressionMethodMock = jest.spyOn(cacheUtils, 'getCompressionMethod')
-  compressionMethodMock.mockReturnValue(Promise.resolve(compressionMethod))
-
-  const getCacheDownloadURLMock = jest.spyOn(
-    CacheServiceClientJSON.prototype,
-    'GetCacheEntryDownloadURL'
-  )
-  getCacheDownloadURLMock.mockReturnValue(
-    Promise.resolve({
-      ok: true,
-      signedDownloadUrl,
-      matchedKey: key
-    })
-  )
-
-  const createTempDirectoryMock = jest.spyOn(cacheUtils, 'createTempDirectory')
-  const downloadCacheMock = jest.spyOn(cacheHttpClient, 'downloadCache')
-
-  const cacheKey = await restoreCache(paths, key, undefined, options)
-
-  expect(cacheKey).toBe(key)
-  expect(getCacheVersionMock).toHaveBeenCalledWith(
-    paths,
-    compressionMethod,
-    false
-  )
-  expect(getCacheDownloadURLMock).toHaveBeenCalledWith({
-    key,
-    restoreKeys: [],
-    version: cacheVersion
-  })
-  expect(logInfoMock).toHaveBeenCalledWith('Lookup only - skipping download')
-
-  // creating a tempDir and downloading the cache are skipped
-  expect(createTempDirectoryMock).toHaveBeenCalledTimes(0)
-  expect(downloadCacheMock).toHaveBeenCalledTimes(0)
-})
@@ -3,20 +3,17 @@ import * as path from 'path'
 import {saveCache} from '../src/cache'
 import * as cacheHttpClient from '../src/internal/cacheHttpClient'
 import * as cacheUtils from '../src/internal/cacheUtils'
-import * as config from '../src/internal/config'
 import {CacheFilename, CompressionMethod} from '../src/internal/constants'
 import * as tar from '../src/internal/tar'
 import {TypedResponse} from '@actions/http-client/lib/interfaces'
-import {HttpClientError} from '@actions/http-client'
 import {
  ReserveCacheResponse,
  ITypedResponseWithError
 } from '../src/internal/contracts'
-import {CacheServiceClientJSON} from '../src/generated/results/api/v1/cache.twirp-client'
+import {HttpClientError} from '@actions/http-client'

 jest.mock('../src/internal/cacheHttpClient')
 jest.mock('../src/internal/cacheUtils')
-jest.mock('../src/internal/config')
 jest.mock('../src/internal/tar')

 beforeAll(() => {
@@ -97,7 +94,7 @@ test('save with large cache outputs should fail in GHES with error message', asy
    .spyOn(cacheUtils, 'getCompressionMethod')
    .mockReturnValueOnce(Promise.resolve(compression))

-  jest.spyOn(config, 'isGhes').mockReturnValueOnce(true)
+  jest.spyOn(cacheUtils, 'isGhes').mockReturnValueOnce(true)

  const reserveCacheMock = jest
    .spyOn(cacheHttpClient, 'reserveCache')
@@ -149,7 +146,7 @@ test('save with large cache outputs should fail in GHES without error message',
    .spyOn(cacheUtils, 'getCompressionMethod')
    .mockReturnValueOnce(Promise.resolve(compression))

-  jest.spyOn(config, 'isGhes').mockReturnValueOnce(true)
+  jest.spyOn(cacheUtils, 'isGhes').mockReturnValueOnce(true)

  const reserveCacheMock = jest
    .spyOn(cacheHttpClient, 'reserveCache')
@@ -224,55 +221,46 @@ test('save with reserve cache failure should fail', async () => {
 test('save with server error should fail', async () => {
  const filePath = 'node_modules'
  const primaryKey = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  const logErrorMock = jest.spyOn(core, 'error')
-
-  // Mock cache service version to V2
-  const getCacheServiceVersionMock = jest
-    .spyOn(config, 'getCacheServiceVersion')
-    .mockReturnValue('v2')
-
-  // Mock V2 CreateCacheEntry to succeed
-  const createCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockReturnValue(
-      Promise.resolve({
-        ok: true,
-        signedUploadUrl: 'https://blob-storage.local?signed=true',
-        message: ''
-      })
-    )
-
-  // Mock the FinalizeCacheEntryUpload to succeed (since the error should happen in saveCache)
-  jest
-    .spyOn(CacheServiceClientJSON.prototype, 'FinalizeCacheEntryUpload')
-    .mockReturnValue(
-      Promise.resolve({ok: true, entryId: '4', message: 'Success'})
-    )
+  const cachePaths = [path.resolve(filePath)]
+  const logWarningMock = jest.spyOn(core, 'warning')
+  const cacheId = 4
+  const reserveCacheMock = jest
+    .spyOn(cacheHttpClient, 'reserveCache')
+    .mockImplementation(async () => {
+      const response: TypedResponse<ReserveCacheResponse> = {
+        statusCode: 500,
+        result: {cacheId},
+        headers: {}
+      }
+      return response
+    })

  const createTarMock = jest.spyOn(tar, 'createTar')

-  // Mock the saveCache call to throw a server error
  const saveCacheMock = jest
    .spyOn(cacheHttpClient, 'saveCache')
    .mockImplementationOnce(() => {
-      throw new HttpClientError('HTTP Error Occurred', 500)
+      throw new Error('HTTP Error Occurred')
    })
-
  const compression = CompressionMethod.Zstd
  const getCompressionMock = jest
    .spyOn(cacheUtils, 'getCompressionMethod')
    .mockReturnValueOnce(Promise.resolve(compression))

  await saveCache([filePath], primaryKey)
-
-  expect(logErrorMock).toHaveBeenCalledTimes(1)
-  expect(logErrorMock).toHaveBeenCalledWith(
+  expect(logWarningMock).toHaveBeenCalledTimes(1)
+  expect(logWarningMock).toHaveBeenCalledWith(
    'Failed to save: HTTP Error Occurred'
  )

-  expect(createCacheEntryMock).toHaveBeenCalledTimes(1)
+  expect(reserveCacheMock).toHaveBeenCalledTimes(1)
+  expect(reserveCacheMock).toHaveBeenCalledWith(primaryKey, [filePath], {
+    cacheSize: undefined,
+    compressionMethod: compression,
+    enableCrossOsArchive: false
+  })
  const archiveFolder = '/foo/bar'
-  const cachePaths = [path.resolve(filePath)]
+  const archiveFile = path.join(archiveFolder, CacheFilename.Zstd)
  expect(createTarMock).toHaveBeenCalledTimes(1)
  expect(createTarMock).toHaveBeenCalledWith(
    archiveFolder,
@@ -280,10 +268,8 @@ test('save with server error should fail', async () => {
    compression
  )
  expect(saveCacheMock).toHaveBeenCalledTimes(1)
+  expect(saveCacheMock).toHaveBeenCalledWith(cacheId, archiveFile, undefined)
  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-
-  // Restore the getCacheServiceVersion mock to its original state
-  getCacheServiceVersionMock.mockRestore()
 })

 test('save with valid inputs uploads a cache', async () => {
@@ -327,12 +313,7 @@ test('save with valid inputs uploads a cache', async () => {
    compression
  )
  expect(saveCacheMock).toHaveBeenCalledTimes(1)
-  expect(saveCacheMock).toHaveBeenCalledWith(
-    cacheId,
-    archiveFile,
-    '',
-    undefined
-  )
+  expect(saveCacheMock).toHaveBeenCalledWith(cacheId, archiveFile, undefined)
  expect(getCompressionMock).toHaveBeenCalledTimes(1)
 })

@@ -1,587 +0,0 @@
-import * as core from '@actions/core'
-import * as path from 'path'
-import {saveCache} from '../src/cache'
-import * as cacheUtils from '../src/internal/cacheUtils'
-import {CacheFilename, CompressionMethod} from '../src/internal/constants'
-import * as config from '../src/internal/config'
-import * as tar from '../src/internal/tar'
-import {CacheServiceClientJSON} from '../src/generated/results/api/v1/cache.twirp-client'
-import * as cacheHttpClient from '../src/internal/cacheHttpClient'
-import {UploadOptions} from '../src/options'
-
-let logDebugMock: jest.SpyInstance
-
-jest.mock('../src/internal/tar')
-
-const uploadFileMock = jest.fn()
-const blockBlobClientMock = jest.fn().mockImplementation(() => ({
-  uploadFile: uploadFileMock
-}))
-jest.mock('@azure/storage-blob', () => ({
-  BlobClient: jest.fn().mockImplementation(() => {
-    return {
-      getBlockBlobClient: blockBlobClientMock
-    }
-  })
-}))
-
-beforeAll(() => {
-  process.env['ACTIONS_RUNTIME_TOKEN'] = 'token'
-  jest.spyOn(console, 'log').mockImplementation(() => {})
-  jest.spyOn(core, 'debug').mockImplementation(() => {})
-  jest.spyOn(core, 'info').mockImplementation(() => {})
-  jest.spyOn(core, 'warning').mockImplementation(() => {})
-  jest.spyOn(core, 'error').mockImplementation(() => {})
-  jest.spyOn(cacheUtils, 'resolvePaths').mockImplementation(async filePaths => {
-    return filePaths.map(x => path.resolve(x))
-  })
-  jest.spyOn(cacheUtils, 'createTempDirectory').mockImplementation(async () => {
-    return Promise.resolve('/foo/bar')
-  })
-
-  // Ensure that we're using v2 for these tests
-  jest.spyOn(config, 'getCacheServiceVersion').mockReturnValue('v2')
-
-  logDebugMock = jest.spyOn(core, 'debug')
-})
-
-afterEach(() => {
-  expect(logDebugMock).toHaveBeenCalledWith('Cache service version: v2')
-  jest.clearAllMocks()
-})
-
-test('save with missing input should fail', async () => {
-  const paths: string[] = []
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-
-  await expect(saveCache(paths, key)).rejects.toThrowError(
-    `Path Validation Error: At least one directory or file path is required`
-  )
-})
-
-test('create cache entry failure on non-ok response', 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: '', message: ''})
-
-  const createTarMock = jest.spyOn(tar, 'createTar')
-  const finalizeCacheEntryMock = jest.spyOn(
-    CacheServiceClientJSON.prototype,
-    'FinalizeCacheEntryUpload'
-  )
-  const compression = CompressionMethod.Zstd
-  const getCompressionMock = jest
-    .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockResolvedValueOnce(compression)
-  const archiveFileSize = 1024
-  jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValueOnce(archiveFileSize)
-  const cacheVersion = cacheUtils.getCacheVersion(paths, compression)
-  const saveCacheMock = jest.spyOn(cacheHttpClient, 'saveCache')
-
-  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: cacheVersion
-  })
-  expect(createTarMock).toHaveBeenCalledTimes(1)
-  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-  expect(finalizeCacheEntryMock).toHaveBeenCalledTimes(0)
-  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'
-  const cachePaths = [path.resolve(paths)]
-  const signedUploadURL = ''
-  const archiveFileSize = 1024
-  const options: UploadOptions = {
-    archiveSizeBytes: archiveFileSize, // These should always match
-    useAzureSdk: true,
-    uploadChunkSize: 64 * 1024 * 1024,
-    uploadConcurrency: 8
-  }
-
-  const createCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockReturnValue(
-      Promise.resolve({ok: true, signedUploadUrl: signedUploadURL, message: ''})
-    )
-
-  const createTarMock = jest.spyOn(tar, 'createTar')
-  const saveCacheMock = jest.spyOn(cacheHttpClient, 'saveCache')
-
-  const compression = CompressionMethod.Zstd
-  const getCompressionMock = jest
-    .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockReturnValueOnce(Promise.resolve(compression))
-
-  const cacheVersion = cacheUtils.getCacheVersion([paths], compression)
-  jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValueOnce(archiveFileSize)
-
-  const cacheId = await saveCache([paths], key, options)
-
-  expect(cacheId).toBe(-1)
-  expect(createCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheVersion
-  })
-
-  const archiveFolder = '/foo/bar'
-  const archiveFile = path.join(archiveFolder, CacheFilename.Zstd)
-  expect(createTarMock).toHaveBeenCalledWith(
-    archiveFolder,
-    cachePaths,
-    compression
-  )
-
-  expect(saveCacheMock).toHaveBeenCalledWith(
-    -1,
-    archiveFile,
-    signedUploadURL,
-    options
-  )
-  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-})
-
-test('finalize save cache failure', async () => {
-  const paths = 'node_modules'
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  const cachePaths = [path.resolve(paths)]
-  const logWarningMock = jest.spyOn(core, 'warning')
-  const signedUploadURL = 'https://blob-storage.local?signed=true'
-  const archiveFileSize = 1024
-  const options: UploadOptions = {
-    archiveSizeBytes: archiveFileSize, // These should always match
-    useAzureSdk: true,
-    uploadChunkSize: 64 * 1024 * 1024,
-    uploadConcurrency: 8
-  }
-
-  const createCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockReturnValue(
-      Promise.resolve({ok: true, signedUploadUrl: signedUploadURL, message: ''})
-    )
-
-  const createTarMock = jest.spyOn(tar, 'createTar')
-  const saveCacheMock = jest
-    .spyOn(cacheHttpClient, 'saveCache')
-    .mockResolvedValue(Promise.resolve())
-
-  const compression = CompressionMethod.Zstd
-  const getCompressionMock = jest
-    .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockReturnValueOnce(Promise.resolve(compression))
-
-  const cacheVersion = cacheUtils.getCacheVersion([paths], compression)
-  jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValueOnce(archiveFileSize)
-
-  const finalizeCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'FinalizeCacheEntryUpload')
-    .mockReturnValue(Promise.resolve({ok: false, entryId: '', message: ''}))
-
-  const cacheId = await saveCache([paths], key, options)
-
-  expect(createCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheVersion
-  })
-
-  const archiveFolder = '/foo/bar'
-  const archiveFile = path.join(archiveFolder, CacheFilename.Zstd)
-  expect(createTarMock).toHaveBeenCalledWith(
-    archiveFolder,
-    cachePaths,
-    compression
-  )
-
-  expect(saveCacheMock).toHaveBeenCalledWith(
-    -1,
-    archiveFile,
-    signedUploadURL,
-    options
-  )
-  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-
-  expect(finalizeCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheVersion,
-    sizeBytes: archiveFileSize.toString()
-  })
-
-  expect(cacheId).toBe(-1)
-  expect(logWarningMock).toHaveBeenCalledWith(
-    `Failed to save: Unable to finalize cache with key ${key}, another job may be finalizing this cache.`
-  )
-})
-
-test('save with valid inputs uploads a cache', async () => {
-  const paths = 'node_modules'
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  const cachePaths = [path.resolve(paths)]
-  const signedUploadURL = 'https://blob-storage.local?signed=true'
-  const createTarMock = jest.spyOn(tar, 'createTar')
-  const archiveFileSize = 1024
-  const options: UploadOptions = {
-    archiveSizeBytes: archiveFileSize, // These should always match
-    useAzureSdk: true,
-    uploadChunkSize: 64 * 1024 * 1024,
-    uploadConcurrency: 8
-  }
-
-  jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValueOnce(archiveFileSize)
-
-  const cacheId = 4
-  jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockReturnValue(
-      Promise.resolve({ok: true, signedUploadUrl: signedUploadURL, message: ''})
-    )
-
-  const saveCacheMock = jest.spyOn(cacheHttpClient, 'saveCache')
-
-  const compression = CompressionMethod.Zstd
-  const getCompressionMock = jest
-    .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockReturnValue(Promise.resolve(compression))
-  const cacheVersion = cacheUtils.getCacheVersion([paths], compression)
-
-  const finalizeCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'FinalizeCacheEntryUpload')
-    .mockReturnValue(
-      Promise.resolve({ok: true, entryId: cacheId.toString(), message: ''})
-    )
-
-  const expectedCacheId = await saveCache([paths], key)
-
-  const archiveFolder = '/foo/bar'
-  const archiveFile = path.join(archiveFolder, CacheFilename.Zstd)
-  expect(saveCacheMock).toHaveBeenCalledWith(
-    -1,
-    archiveFile,
-    signedUploadURL,
-    options
-  )
-  expect(createTarMock).toHaveBeenCalledWith(
-    archiveFolder,
-    cachePaths,
-    compression
-  )
-
-  expect(finalizeCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheVersion,
-    sizeBytes: archiveFileSize.toString()
-  })
-
-  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-  expect(expectedCacheId).toBe(cacheId)
-})
-
-test('save with extremely large cache should succeed in v2 (no size limit)', async () => {
-  const paths = 'node_modules'
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  const cachePaths = [path.resolve(paths)]
-  const signedUploadURL = 'https://blob-storage.local?signed=true'
-  const createTarMock = jest.spyOn(tar, 'createTar')
-  // Simulate a very large cache (20GB)
-  const archiveFileSize = 20 * 1024 * 1024 * 1024 // 20GB
-  const options: UploadOptions = {
-    archiveSizeBytes: archiveFileSize,
-    useAzureSdk: true,
-    uploadChunkSize: 64 * 1024 * 1024,
-    uploadConcurrency: 8
-  }
-
-  jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValueOnce(archiveFileSize)
-
-  const cacheId = 4
-  jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockReturnValue(
-      Promise.resolve({ok: true, signedUploadUrl: signedUploadURL, message: ''})
-    )
-
-  const saveCacheMock = jest.spyOn(cacheHttpClient, 'saveCache')
-
-  const compression = CompressionMethod.Zstd
-  const getCompressionMock = jest
-    .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockReturnValue(Promise.resolve(compression))
-  const cacheVersion = cacheUtils.getCacheVersion([paths], compression)
-
-  const finalizeCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'FinalizeCacheEntryUpload')
-    .mockReturnValue(
-      Promise.resolve({ok: true, entryId: cacheId.toString(), message: ''})
-    )
-
-  const expectedCacheId = await saveCache([paths], key)
-
-  const archiveFolder = '/foo/bar'
-  const archiveFile = path.join(archiveFolder, CacheFilename.Zstd)
-  expect(saveCacheMock).toHaveBeenCalledWith(
-    -1,
-    archiveFile,
-    signedUploadURL,
-    options
-  )
-  expect(createTarMock).toHaveBeenCalledWith(
-    archiveFolder,
-    cachePaths,
-    compression
-  )
-
-  expect(finalizeCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheVersion,
-    sizeBytes: archiveFileSize.toString()
-  })
-
-  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-  expect(expectedCacheId).toBe(cacheId)
-})
-
-test('save with create cache entry failure and specific error message', async () => {
-  const paths = ['node_modules']
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  const infoLogMock = jest.spyOn(core, 'info')
-  const warningLogMock = jest.spyOn(core, 'warning')
-  const errorMessage = 'Cache storage quota exceeded for repository'
-
-  const createCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockResolvedValue({ok: false, signedUploadUrl: '', message: errorMessage})
-
-  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(warningLogMock).toHaveBeenCalledWith(
-    `Cache reservation failed: ${errorMessage}`
-  )
-  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 with finalize cache entry failure and specific error message', async () => {
-  const paths = 'node_modules'
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  const cachePaths = [path.resolve(paths)]
-  const logWarningMock = jest.spyOn(core, 'warning')
-  const signedUploadURL = 'https://blob-storage.local?signed=true'
-  const archiveFileSize = 1024
-  const errorMessage =
-    'Cache entry finalization failed due to concurrent access'
-  const options: UploadOptions = {
-    archiveSizeBytes: archiveFileSize,
-    useAzureSdk: true,
-    uploadChunkSize: 64 * 1024 * 1024,
-    uploadConcurrency: 8
-  }
-
-  const createCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockReturnValue(
-      Promise.resolve({ok: true, signedUploadUrl: signedUploadURL, message: ''})
-    )
-
-  const createTarMock = jest.spyOn(tar, 'createTar')
-  const saveCacheMock = jest
-    .spyOn(cacheHttpClient, 'saveCache')
-    .mockResolvedValue()
-
-  const compression = CompressionMethod.Zstd
-  const getCompressionMock = jest
-    .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockReturnValueOnce(Promise.resolve(compression))
-
-  const cacheVersion = cacheUtils.getCacheVersion([paths], compression)
-  jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValueOnce(archiveFileSize)
-
-  const finalizeCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'FinalizeCacheEntryUpload')
-    .mockReturnValue(
-      Promise.resolve({ok: false, entryId: '', message: errorMessage})
-    )
-
-  const cacheId = await saveCache([paths], key, options)
-
-  expect(createCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheVersion
-  })
-
-  const archiveFolder = '/foo/bar'
-  const archiveFile = path.join(archiveFolder, CacheFilename.Zstd)
-  expect(createTarMock).toHaveBeenCalledWith(
-    archiveFolder,
-    cachePaths,
-    compression
-  )
-
-  expect(saveCacheMock).toHaveBeenCalledWith(
-    -1,
-    archiveFile,
-    signedUploadURL,
-    options
-  )
-  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-
-  expect(finalizeCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheVersion,
-    sizeBytes: archiveFileSize.toString()
-  })
-
-  expect(cacheId).toBe(-1)
-  expect(logWarningMock).toHaveBeenCalledWith(errorMessage)
-})
-
-test('save with multiple large caches should succeed in v2 (testing 50GB)', async () => {
-  const paths = ['large-dataset', 'node_modules', 'build-artifacts']
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  const cachePaths = paths.map(p => path.resolve(p))
-  const signedUploadURL = 'https://blob-storage.local?signed=true'
-  const createTarMock = jest.spyOn(tar, 'createTar')
-  // Simulate an extremely large cache (50GB)
-  const archiveFileSize = 50 * 1024 * 1024 * 1024 // 50GB
-  const options: UploadOptions = {
-    archiveSizeBytes: archiveFileSize,
-    useAzureSdk: true,
-    uploadChunkSize: 64 * 1024 * 1024,
-    uploadConcurrency: 8
-  }
-
-  jest
-    .spyOn(cacheUtils, 'getArchiveFileSizeInBytes')
-    .mockReturnValueOnce(archiveFileSize)
-
-  const cacheId = 7
-  jest
-    .spyOn(CacheServiceClientJSON.prototype, 'CreateCacheEntry')
-    .mockReturnValue(
-      Promise.resolve({ok: true, signedUploadUrl: signedUploadURL, message: ''})
-    )
-
-  const saveCacheMock = jest.spyOn(cacheHttpClient, 'saveCache')
-
-  const compression = CompressionMethod.Zstd
-  const getCompressionMock = jest
-    .spyOn(cacheUtils, 'getCompressionMethod')
-    .mockReturnValue(Promise.resolve(compression))
-  const cacheVersion = cacheUtils.getCacheVersion(paths, compression)
-
-  const finalizeCacheEntryMock = jest
-    .spyOn(CacheServiceClientJSON.prototype, 'FinalizeCacheEntryUpload')
-    .mockReturnValue(
-      Promise.resolve({ok: true, entryId: cacheId.toString(), message: ''})
-    )
-
-  const expectedCacheId = await saveCache(paths, key)
-
-  const archiveFolder = '/foo/bar'
-  const archiveFile = path.join(archiveFolder, CacheFilename.Zstd)
-  expect(saveCacheMock).toHaveBeenCalledWith(
-    -1,
-    archiveFile,
-    signedUploadURL,
-    options
-  )
-  expect(createTarMock).toHaveBeenCalledWith(
-    archiveFolder,
-    cachePaths,
-    compression
-  )
-
-  expect(finalizeCacheEntryMock).toHaveBeenCalledWith({
-    key,
-    version: cacheVersion,
-    sizeBytes: archiveFileSize.toString()
-  })
-
-  expect(getCompressionMock).toHaveBeenCalledTimes(1)
-  expect(expectedCacheId).toBe(cacheId)
-})
-
-test('save with non existing path should not save cache using v2 saveCache', async () => {
-  const path = 'node_modules'
-  const key = 'Linux-node-bb828da54c148048dd17899ba9fda624811cfb43'
-  jest.spyOn(cacheUtils, 'resolvePaths').mockImplementation(async () => {
-    return []
-  })
-  await expect(saveCache([path], key)).rejects.toThrowError(
-    `Path Validation Error: Path(s) specified in the action for caching do(es) not exist, hence no cache is being saved.`
-  )
-})
@@ -1,58 +0,0 @@
-import * as uploadUtils from '../src/internal/uploadUtils'
-import {TransferProgressEvent} from '@azure/core-rest-pipeline'
-
-test('upload progress tracked correctly', () => {
-  const progress = new uploadUtils.UploadProgress(1000)
-
-  expect(progress.contentLength).toBe(1000)
-  expect(progress.sentBytes).toBe(0)
-  expect(progress.displayedComplete).toBe(false)
-  expect(progress.timeoutHandle).toBeUndefined()
-  expect(progress.getTransferredBytes()).toBe(0)
-  expect(progress.isDone()).toBe(false)
-
-  progress.onProgress()({loadedBytes: 0} as TransferProgressEvent)
-
-  expect(progress.contentLength).toBe(1000)
-  expect(progress.sentBytes).toBe(0)
-  expect(progress.displayedComplete).toBe(false)
-  expect(progress.timeoutHandle).toBeUndefined()
-  expect(progress.getTransferredBytes()).toBe(0)
-  expect(progress.isDone()).toBe(false)
-
-  progress.onProgress()({loadedBytes: 250} as TransferProgressEvent)
-
-  expect(progress.contentLength).toBe(1000)
-  expect(progress.sentBytes).toBe(250)
-  expect(progress.displayedComplete).toBe(false)
-  expect(progress.timeoutHandle).toBeUndefined()
-  expect(progress.getTransferredBytes()).toBe(250)
-  expect(progress.isDone()).toBe(false)
-
-  progress.onProgress()({loadedBytes: 500} as TransferProgressEvent)
-
-  expect(progress.contentLength).toBe(1000)
-  expect(progress.sentBytes).toBe(500)
-  expect(progress.displayedComplete).toBe(false)
-  expect(progress.timeoutHandle).toBeUndefined()
-  expect(progress.getTransferredBytes()).toBe(500)
-  expect(progress.isDone()).toBe(false)
-
-  progress.onProgress()({loadedBytes: 750} as TransferProgressEvent)
-
-  expect(progress.contentLength).toBe(1000)
-  expect(progress.sentBytes).toBe(750)
-  expect(progress.displayedComplete).toBe(false)
-  expect(progress.timeoutHandle).toBeUndefined()
-  expect(progress.getTransferredBytes()).toBe(750)
-  expect(progress.isDone()).toBe(false)
-
-  progress.onProgress()({loadedBytes: 1000} as TransferProgressEvent)
-
-  expect(progress.contentLength).toBe(1000)
-  expect(progress.sentBytes).toBe(1000)
-  expect(progress.displayedComplete).toBe(false)
-  expect(progress.timeoutHandle).toBeUndefined()
-  expect(progress.getTransferredBytes()).toBe(1000)
-  expect(progress.isDone()).toBe(true)
-})
@@ -1,158 +0,0 @@
-import {maskSigUrl, maskSecretUrls} from '../src/internal/shared/util'
-import {setSecret, debug} from '@actions/core'
-
-jest.mock('@actions/core')
-
-describe('maskSigUrl', () => {
-  beforeEach(() => {
-    jest.clearAllMocks()
-  })
-
-  it('does nothing if no sig parameter is present', () => {
-    const url = 'https://example.com'
-    maskSigUrl(url)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('masks the sig parameter in the middle of the URL and sets it as a secret', () => {
-    const url = 'https://example.com/?param1=value1&sig=12345&param2=value2'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('12345')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('12345'))
-  })
-
-  it('does nothing if the URL is empty', () => {
-    const url = ''
-    maskSigUrl(url)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('handles URLs with fragments', () => {
-    const url = 'https://example.com?sig=12345#fragment'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('12345')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('12345'))
-  })
-})
-
-describe('maskSigUrl handles special characters in signatures', () => {
-  beforeEach(() => {
-    jest.clearAllMocks()
-  })
-
-  it('handles signatures with slashes', () => {
-    const url = 'https://example.com/?sig=abc/123'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('abc/123')
-    expect(setSecret).toHaveBeenCalledWith('abc%2F123')
-  })
-
-  it('handles signatures with plus signs', () => {
-    const url = 'https://example.com/?sig=abc+123'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('abc 123')
-    expect(setSecret).toHaveBeenCalledWith('abc%20123')
-  })
-
-  it('handles signatures with equals signs', () => {
-    const url = 'https://example.com/?sig=abc=123'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('abc=123')
-    expect(setSecret).toHaveBeenCalledWith('abc%3D123')
-  })
-
-  it('handles already percent-encoded signatures', () => {
-    const url = 'https://example.com/?sig=abc%2F123%3D'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('abc/123=')
-    expect(setSecret).toHaveBeenCalledWith('abc%2F123%3D')
-  })
-
-  it('handles complex Azure SAS signatures', () => {
-    const url =
-      'https://example.com/container/file.txt?sig=nXyQIUj%2F%2F06Cxt80pBRYiiJlYqtPYg5sz%2FvEh5iHAhw%3D&se=2023-12-31'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith(
-      'nXyQIUj//06Cxt80pBRYiiJlYqtPYg5sz/vEh5iHAhw='
-    )
-    expect(setSecret).toHaveBeenCalledWith(
-      'nXyQIUj%2F%2F06Cxt80pBRYiiJlYqtPYg5sz%2FvEh5iHAhw%3D'
-    )
-  })
-
-  it('handles signatures with multiple special characters', () => {
-    const url = 'https://example.com/?sig=a/b+c=d&e=f'
-    maskSigUrl(url)
-    expect(setSecret).toHaveBeenCalledWith('a/b c=d')
-    expect(setSecret).toHaveBeenCalledWith('a%2Fb%20c%3Dd')
-  })
-})
-
-describe('maskSecretUrls', () => {
-  beforeEach(() => {
-    jest.clearAllMocks()
-  })
-
-  it('masks sig parameters in signed_upload_url and signed_download_url', () => {
-    const body = {
-      signed_upload_url: 'https://upload.com?sig=upload123',
-      signed_download_url: 'https://download.com?sig=download123'
-    }
-    maskSecretUrls(body)
-    expect(setSecret).toHaveBeenCalledWith('upload123')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('upload123'))
-    expect(setSecret).toHaveBeenCalledWith('download123')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('download123'))
-  })
-
-  it('handles case where only upload_url is present', () => {
-    const body = {
-      signed_upload_url: 'https://upload.com?sig=upload123'
-    }
-    maskSecretUrls(body)
-    expect(setSecret).toHaveBeenCalledWith('upload123')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('upload123'))
-  })
-
-  it('handles case where only download_url is present', () => {
-    const body = {
-      signed_download_url: 'https://download.com?sig=download123'
-    }
-    maskSecretUrls(body)
-    expect(setSecret).toHaveBeenCalledWith('download123')
-    expect(setSecret).toHaveBeenCalledWith(encodeURIComponent('download123'))
-  })
-
-  it('handles case where URLs do not contain sig parameters', () => {
-    const body = {
-      signed_upload_url: 'https://upload.com?token=abc',
-      signed_download_url: 'https://download.com?token=xyz'
-    }
-    maskSecretUrls(body)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('handles empty string URLs', () => {
-    const body = {
-      signed_upload_url: '',
-      signed_download_url: ''
-    }
-    maskSecretUrls(body)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('does nothing if body is not an object or is null', () => {
-    maskSecretUrls(null)
-    expect(debug).toHaveBeenCalledWith('body is not an object or is null')
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-
-  it('does nothing if signed_upload_url and signed_download_url are not strings', () => {
-    const body = {
-      signed_upload_url: 123,
-      signed_download_url: 456
-    }
-    maskSecretUrls(body)
-    expect(setSecret).not.toHaveBeenCalled()
-  })
-})
@@ -1,6 +1,6 @@
 {
  "name": "@actions/cache",
-  "version": "5.0.0",
+  "version": "3.2.4",
  "preview": true,
  "description": "Actions cache lib",
  "keywords": [
@@ -37,25 +37,20 @@
    "url": "https://github.com/actions/toolkit/issues"
  },
  "dependencies": {
-    "@actions/core": "^2.0.0",
-    "@actions/exec": "^2.0.0",
-    "@actions/glob": "^0.5.0",
-    "@protobuf-ts/runtime-rpc": "^2.11.1",
-    "@actions/http-client": "^3.0.0",
-    "@actions/io": "^2.0.0",
+    "@actions/core": "^1.10.0",
+    "@actions/exec": "^1.0.1",
+    "@actions/glob": "^0.1.0",
+    "@actions/http-client": "^2.1.1",
+    "@actions/io": "^1.0.1",
    "@azure/abort-controller": "^1.1.0",
-    "@azure/core-rest-pipeline": "^1.22.0",
+    "@azure/ms-rest-js": "^2.6.0",
    "@azure/storage-blob": "^12.13.0",
-    "semver": "^6.3.1"
+    "semver": "^6.3.1",
+    "uuid": "^3.3.3"
  },
  "devDependencies": {
-    "@types/node": "^24.1.0",
    "@types/semver": "^6.0.0",
-    "@protobuf-ts/plugin": "^2.9.4",
+    "@types/uuid": "^3.4.5",
    "typescript": "^5.2.2"
-  },
-  "overrides": {
-    "uri-js": "npm:uri-js-replace@^1.0.1",
-    "node-fetch": "^3.3.2"
  }
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
James M. Greene	6c5b20a89f	core: Add return type to test helper function	2024-03-28 10:38:51 -05:00
James M. Greene	bd74802644	core: Update parameter defaulting behavior for error/warning/notice to honor an empty object passed in	2024-03-28 10:26:41 -05:00
James M. Greene	dfc588096e	core: Extract AnnotationProperties from Error instances when logging with error/warning/notice	2024-03-28 00:34:36 -05:00
James M. Greene	4379135168	core: Add new utility method to extract AnnotationProperties from Error instances	2024-03-28 00:01:09 -05:00