update jsonata to 2.0.4

addresses CVE-2024-27307

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,21 +3,29 @@ name: Bug report
 about: Create a report to help us improve
 title: "[BUG] "
 labels: bug
-assignees: RichiCoder1
 
 ---
 
-**Describe the bug**
+## Vault server version
+v0.0.0
+
+## vault-action version
+v0.0.0
+
+## Describe the bug
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+## To Reproduce
 The yaml of the `vault-action` step, with any sensitive information masked or removed.
 
-**Expected behavior**
+## Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Log Output**
+## Log Output
-For the most verbose logs, [add a secret called `ACTIONS_STEP_DEBUG` with the value `true`](https://github.com/actions/toolkit/blob/main/docs/action-debugging.md). Then, re-run the workflow if possible and post the *raw logs* for the step here with any sensitive information masked or removed.
+For the most verbose logs, add a secret called
+[`ACTIONS_STEP_DEBUG`](https://github.com/actions/toolkit/blob/main/docs/action-debugging.md)
+with the value `true`. Then, re-run the workflow if possible and post the *raw
+logs* for the step here with any sensitive information masked or removed.
 
-**Additional context**
+## Additional context
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,18 +3,17 @@ name: Feature request
 about: Suggest an idea for this project
 title: "[FEAT] "
 labels: enhancement
-assignees: RichiCoder1
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
+## Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Describe the solution you'd like
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**
+## Describe alternatives you've considered
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
+## Additional context
 Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+### Description
+<!--- Description of the change. For example: This PR updates ABC resource so that we can XYZ --->
+
+
+<!--- If your PR fully resolves and should automatically close the linked issue, use Closes. Otherwise, use Relates --->
+Relates OR Closes #0000
+
+
+### Checklist
+- [ ] Added [CHANGELOG](https://github.com/hashicorp/vault-action/blob/master/CHANGELOG.md) entry (only for user-facing changes)
+
+
+### Community Note
+
+* Please vote on this pull request by adding a 👍
+  [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)
+  to the original pull request comment to help the community and maintainers
+  prioritize this request
+* Please do not leave "+1" comments, they generate extra noise for pull request
+  followers and do not help prioritize the request

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
 
     - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-        node-version: '16.14.0'
+        node-version: '20.9.0'
 
     - name: Setup NPM Cache
       uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
@@ -40,7 +40,7 @@ jobs:
 
     - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-        node-version: '16.14.0'
+        node-version: '20.9.0'
 
     - name: Setup NPM Cache
       uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
@@ -76,7 +76,7 @@ jobs:
 
     - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-        node-version: '16.14.0'
+        node-version: '20.9.0'
 
     - name: Setup NPM Cache
       uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
@@ -110,7 +110,7 @@ jobs:
 
     - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-        node-version: '16.14.0'
+        node-version: '20.9.0'
 
     - name: Setup NPM Cache
       uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
@@ -207,7 +207,7 @@ jobs:
 
     - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-        node-version: '16.14.0'
+        node-version: '20.9.0'
 
     - name: Setup NPM Cache
       uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

.github/workflows/local-test.yaml

@@ -22,7 +22,7 @@ jobs:
 
     - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-        node-version: '16.14.0'
+        node-version: '20.9.0'
 
     - name: NPM Install
       run: npm ci
@@ -48,14 +48,26 @@ jobs:
         token: testtoken
         secrets: |
           secret/data/test-json-string jsonString;
+          secret/data/test-json-data jsonData;
 
-    - name: Check Secrets
+    - uses: actions/github-script@v7
-      run: |
+      with:
-        touch secrets.json
+        github-token: "foobar"
-        echo "${{ steps.import-secrets.outputs.jsonString }}" >> secrets.json
+        script: |
+          const { JSONSTRING, JSONDATA } = process.env
 
-    - name: Check json file format
+          console.log(`string ${JSONSTRING}`)
-      run: |
+          console.log(`data ${JSONDATA}`)
-        echo
+          const str = JSONDATA
-        cat secrets.json
+
-        jq -c . < secrets.json
+          let valid = true
+          try {
+              JSON.parse(str)
+          } catch (e) {
+            valid = false
+          }
+          if (valid) {
+            console.log("valid json")
+          } else {
+            console.log("not valid json")
+          }

CHANGELOG.md

@@ -1,6 +1,47 @@
 ## Unreleased
 
-* Add changes here
+Features:
+
+* `secretId` is no longer required for approle to support advanced use cases like machine login when `bind_secret_id` is false. [GH-522](https://github.com/hashicorp/vault-action/pull/522)
+
+## 3.0.0 (February 15, 2024)
+
+Improvements:
+
+* Bump node runtime from node16 to node20 [GH-529](https://github.com/hashicorp/vault-action/pull/529)
+
+## 2.8.1 (February 15, 2024)
+
+Bugs:
+
+* Revert [GH-509](https://github.com/hashicorp/vault-action/pull/509) which made a backwards incompatible bump of the node runtime from node16 to node20 [GH-527](https://github.com/hashicorp/vault-action/pull/527)
+
+## 2.8.0 (February 1, 2024)
+
+Features:
+
+* Add `ignoreNotFound` input (default: false) to prevent the action from failing when a secret does not exist [GH-518](https://github.com/hashicorp/vault-action/pull/518)
+
+Improvements:
+
+* bump jsrsasign from 10.8.6 to 11.0.0 [GH-513](https://github.com/hashicorp/vault-action/pull/513)
+* bump @actions/core from 1.10.0 to 1.10.1 [GH-489](https://github.com/hashicorp/vault-action/pull/489)
+* bump jest-when from 3.5.2 to 3.6.0 [GH-484](https://github.com/hashicorp/vault-action/pull/484)
+* bump jest from 29.5.0 to 29.7.0 [GH-490](https://github.com/hashicorp/vault-action/pull/490)
+* bump @vercel/ncc from 0.36.1 to 0.38.1 [GH-503](https://github.com/hashicorp/vault-action/pull/503)
+
+## 2.7.5 (January 30, 2024)
+
+Improvements:
+
+* Bump node runtime from node16 to node20 [GH-509](https://github.com/hashicorp/vault-action/pull/509)
+* Bump got from 11.8.5 to 11.8.6 [GH-492](https://github.com/hashicorp/vault-action/pull/492)
+
+## 2.7.4 (October 26, 2023)
+
+Features:
+
+* Add ability to specify a wildcard for the key name to get all keys in the path [GH-488](https://github.com/hashicorp/vault-action/pull/488)
 
 ## 2.7.3 (July 13, 2023)
 

README.md

@@ -8,6 +8,9 @@
 
 A helper action for easily pulling secrets from HashiCorp Vault™.
 
+Note: The Vault Github Action is a read-only action, and in general
+is not meant to modify Vault’s state.
+
 <!-- TOC -->
 
 - [Vault GitHub Action](#vault-github-action)
@@ -22,6 +25,7 @@ A helper action for easily pulling secrets from HashiCorp Vault™.
     - [Userpass](#userpass)
     - [Ldap](#ldap)
     - [Other Auth Methods](#other-auth-methods)
+    - [Custom Path](#custom-path-name)
   - [Key Syntax](#key-syntax)
     - [Simple Key](#simple-key)
     - [Set Output Variable Name](#set-output-variable-name)
@@ -297,6 +301,20 @@ with:
 If any other method is specified and you provide an `authPayload`, the action will
 attempt to `POST` to `auth/${method}/login` with the provided payload and parse out the client token.
 
+### Custom Path Name
+
+Auth methods at custom path names can be configured using the [`path`](#path) parameter
+
+```yaml
+with:
+  url: https://vault.mycompany.com:8200
+  caCertificate: ${{ secrets.VAULT_CA_CERT }}
+  path: my-custom-path
+  method: userpass
+  username: ${{ secrets.VAULT_USERNAME }}
+  password: ${{ secrets.VAULT_PASSWORD }}
+```
+
 ## Key Syntax
 
 The `secrets` parameter is a set of multiple secret requests separated by the `;` character.
@@ -464,34 +482,179 @@ steps:
 
 Here are all the inputs available through `with`:
 
-| Input               | Description                                                                                                                                          | Default | Required |
+### `url`
-| ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | -------- |
+
-| `url`               | The URL for the vault endpoint                                                                                                                       |         | ✔        |
+**Type: `string`**\
-| `secrets`           | A semicolon-separated list of secrets to retrieve. These will automatically be converted to environmental variable keys. See README for more details |         |          |
+**Required**
-| `namespace`         | The Vault namespace from which to query secrets. Vault Enterprise only, unset by default                                                             |         |          |
+
-| `method`            | The method to use to authenticate with Vault.                                                                                                        | `token` |          |
+The URL for the Vault endpoint.
-| `role`              | Vault role for specified auth method                                                                                                                 |         |          |
+
-| `path`              | Custom vault path, if the auth method was enabled at a different path                                                                                                |         |          |
+### `secrets`
-| `token`             | The Vault Token to be used to authenticate with Vault                                                                                                |         |          |
+
-| `roleId`            | The Role Id for App Role authentication                                                                                                              |         |          |
+**Type: `string`**
-| `secretId`          | The Secret Id for App Role authentication                                                                                                            |         |          |
+
-| `githubToken`       | The Github Token to be used to authenticate with Vault                                                                                               |         |          |
+A semicolon-separated list of secrets to retrieve. These will automatically be
-| `jwtPrivateKey`     | Base64 encoded Private key to sign JWT                                                                                                               |         |          |
+converted to environmental variable keys. See [Key Syntax](#key-syntax) for
-| `jwtKeyPassword`    | Password for key stored in jwtPrivateKey (if needed)                                                                                                 |         |          |
+more details.
-| `jwtGithubAudience` | Identifies the recipient ("aud" claim) that the JWT is intended for                                                                                   |`sigstore`|          |
+
-| `jwtTtl`            | Time in seconds, after which token expires                                                                                                           |         | 3600     |
+### `namespace`
-| `kubernetesTokenPath`         | The path to the service-account secret with the jwt token for kubernetes based authentication                                                                                               |`/var/run/secrets/kubernetes.io/serviceaccount/token`         |          |
+
-| `username`          | The username of the user to log in to Vault as. Available to both Userpass and LDAP auth methods                                                     |         |          |
+**Type: `string`**
-| `password`          | The password of the user to log in to Vault as. Available to both Userpass and LDAP auth methods                                                     |         |          |
+
-| `authPayload`       | The JSON payload to be sent to Vault when using a custom authentication method.                                                                      |         |          |
+The Vault namespace from which to query secrets. Vault Enterprise only, unset by default.
-| `extraHeaders`      | A string of newline separated extra headers to include on every request.                                                                             |         |          |
+
-| `exportEnv`         | Whether or not export secrets as environment variables.                                                                                              | `true`  |          |
+### `method`
-| `exportToken`       | Whether or not export Vault token as environment variables (i.e VAULT_TOKEN).                                                                        | `false` |          |
+
-| `outputToken`       | Whether or not to set the `vault_token` output to contain the Vault token after authentication.                                                      | `false` |          |
+**Type: `string`**\
-| `caCertificate`     | Base64 encoded CA certificate the server certificate was signed with.                                                                                |         |          |
+**Default: `token`**
-| `clientCertificate` | Base64 encoded client certificate the action uses to authenticate with Vault when mTLS is enabled.                                                   |         |          |
+
-| `clientKey`         | Base64 encoded client key the action uses to authenticate with Vault when mTLS is enabled.                                                           |         |          |
+The method to use to authenticate with Vault.
-| `tlsSkipVerify`     | When set to true, disables verification of server certificates when testing the action.                                                              | `false` |          |
+
+### `role`
+
+**Type: `string`**
+
+Vault role for the specified auth method.
+
+### `path`
+
+**Type: `string`**
+
+The Vault path for the auth method.
+
+### `token`
+
+**Type: `string`**
+
+The Vault token to be used to authenticate with Vault.
+
+### `roleId`
+
+**Type: `string`**
+
+The role ID for App Role authentication.
+
+### `secretId`
+
+**Type: `string`**
+
+The secret ID for App Role authentication.
+
+### `githubToken`
+
+**Type: `string`**
+
+The Github Token to be used to authenticate with Vault.
+
+### `jwtPrivateKey`
+
+**Type: `string`**
+
+Base64 encoded private key to sign the JWT.
+
+### `jwtKeyPassword`
+
+**Type: `string`**
+
+Password for key stored in `jwtPrivateKey` (if needed).
+
+### `jwtGithubAudience`
+
+**Type: `string`**\
+**Default: `sigstore`**
+
+Identifies the recipient ("aud" claim) that the JWT is intended for.
+
+### `jwtTtl`
+
+**Type: `string`**\
+**Default: `3600`**
+
+Time in seconds, after which token expires.
+
+### `kubernetesTokenPath`
+
+**Type: `string`**\
+**Default: `/var/run/secrets/kubernetes.io/serviceaccount/token`**
+
+The path to the service-account secret with the jwt token for kubernetes based authentication.
+
+### `username`
+
+**Type: `string`**
+
+The username of the user to log in to Vault as. Available to both Userpass and LDAP auth methods.
+
+### `password`
+
+**Type: `string`**
+
+The password of the user to log in to Vault as. Available to both Userpass and LDAP auth methods.
+
+### `authPayload`
+
+**Type: `string`**
+
+The JSON payload to be sent to Vault when using a custom authentication method.
+
+### `extraHeaders`
+
+**Type: `string`**
+
+A string of newline separated extra headers to include on every request.
+
+### `exportEnv`
+
+**Type: `string`**\
+**Default: `true`**
+
+Whether or not to export secrets as environment variables.
+
+### `exportToken`
+
+**Type: `string`**\
+**Default: `false`**
+
+Whether or not export Vault token as environment variables (i.e VAULT_TOKEN).
+
+### `outputToken`
+
+**Type: `string`**\
+**Default: `false`**
+
+Whether or not to set the `vault_token` output to contain the Vault token after authentication.
+
+### `caCertificate`
+
+**Type: `string`**
+
+Base64 encoded CA certificate the server certificate was signed with. Defaults to CAs provided by Mozilla.
+
+### `clientCertificate`
+
+**Type: `string`**
+
+Base64 encoded client certificate the action uses to authenticate with Vault when mTLS is enabled.
+
+### `clientKey`
+
+**Type: `string`**
+
+Base64 encoded client key the action uses to authenticate with Vault when mTLS is enabled.
+
+### `tlsSkipVerify`
+
+**Type: `string`**\
+**Default: `false`**
+
+When set to true, disables verification of server certificates when testing the action.
+
+### `ignoreNotFound`
+
+**Type: `string`**\
+**Default: `false`**
+
+When set to true, prevents the action from failing when a secret does not exist.
 
 ## Masking - Hiding Secrets from Logs
 

action.yml

@@ -1,4 +1,4 @@
-name: 'Vault Secrets'
+name: 'HashiCorp Vault'
 description: 'A Github Action that allows you to consume HashiCorp Vault™ secrets as secure environment variables'
 inputs:
   url:
@@ -18,16 +18,16 @@ inputs:
     description: 'Vault role for specified auth method'
     required: false
   path:
-    description: 'Custom Vault path, if the auth method was mounted at a different path'
+    description: 'The Vault path for the auth method.'
     required: false
   token:
-    description: 'The Vault Token to be used to authenticate with Vault'
+    description: 'The Vault token to be used to authenticate with Vault'
     required: false
   roleId:
-    description: 'The Role Id for App Role authentication'
+    description: 'The role ID for App Role authentication'
     required: false
   secretId:
-    description: 'The Secret Id for App Role authentication'
+    description: 'The secret ID for App Role authentication'
     required: false
   githubToken:
     description: 'The Github Token to be used to authenticate with Vault'
@@ -61,7 +61,7 @@ inputs:
     default: 'false'
     required: false
   caCertificate:
-    description: 'Base64 encoded CA certificate to verify the Vault server certificate.'
+    description: 'Base64 encoded CA certificate the server certificate was signed with. Defaults to CAs provided by Mozilla.'
     required: false
   clientCertificate:
     description: 'Base64 encoded client certificate for mTLS communication with the Vault server.'
@@ -89,8 +89,12 @@ inputs:
   secretEncodingType:
     description: 'The encoding type of the secret to decode. If not specified, the secret will not be decoded. Supported values: base64, hex, utf8'
     required: false
+  ignoreNotFound:
+    description: 'Whether or not the action should exit successfully if some requested secrets were not found.'
+    required: false
+    default: 'false'
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'dist/index.js'
 branding:
   icon: 'unlock'

dist/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

integrationTests/basic/approle_auth.test.js

@@ -1,11 +1,12 @@
-jest.mock('@actions/core');
+import { vi, describe, test, expect } from 'vitest';
-jest.mock('@actions/core/lib/command');
-const core = require('@actions/core');
 
-const got = require('got');
+vi.mock('@actions/core');
-const { when } = require('jest-when');
+import core from '@actions/core';
 
-const { exportSecrets } = require('../../src/action');
+import got from 'got';
+import { when } from 'jest-when'
+
+import { exportSecrets } from  '../../src/action.js';
 
 const vaultUrl = `http://${process.env.VAULT_HOST || 'localhost'}:${process.env.VAULT_PORT || '8200'}`;
 const vaultToken = `${process.env.VAULT_TOKEN || 'testtoken'}`
@@ -102,7 +103,7 @@ describe('authenticate with approle', () => {
     });
 
     beforeEach(() => {
-        jest.resetAllMocks();
+        vi.resetAllMocks();
 
         when(core.getInput)
             .calledWith('method', expect.anything())

integrationTests/basic/integration.test.js

@@ -1,11 +1,12 @@
-jest.mock('@actions/core');
+import { vi, describe, test, expect } from 'vitest';
-jest.mock('@actions/core/lib/command');
-const core = require('@actions/core');
 
-const got = require('got');
+vi.mock('@actions/core');
-const { when } = require('jest-when');
+import core from '@actions/core';
 
-const { exportSecrets } = require('../../src/action');
+import got from 'got';
+import { when } from 'jest-when'
+
+import { exportSecrets } from  '../../src/action.js';
 
 const vaultUrl = `http://${process.env.VAULT_HOST || 'localhost'}:${process.env.VAULT_PORT || '8200'}`;
 const vaultToken = `${process.env.VAULT_TOKEN || 'testtoken'}`
@@ -107,7 +108,7 @@ describe('integration', () => {
     });
 
     beforeEach(() => {
-        jest.resetAllMocks();
+        vi.resetAllMocks();
 
         when(core.getInput)
             .calledWith('url', expect.anything())
@@ -124,12 +125,34 @@ describe('integration', () => {
             .mockReturnValueOnce(secrets);
     }
 
+    function mockIgnoreNotFound(shouldIgnore) {
+        when(core.getInput)
+            .calledWith('ignoreNotFound', expect.anything())
+            .mockReturnValueOnce(shouldIgnore);
+    }
+
+
     it('prints a nice error message when secret not found', async () => {
         mockInput(`secret/data/test secret ;
         secret/data/test secret | NAMED_SECRET ;
         secret/data/notFound kehe | NO_SIR ;`);
 
-        expect(exportSecrets()).rejects.toEqual(Error(`Unable to retrieve result for "secret/data/notFound" because it was not found: {"errors":[]}`));
+        await expect(exportSecrets()).rejects.toEqual(Error(`Unable to retrieve result for "secret/data/notFound" because it was not found: {"errors":[]}`));
+    })
+
+    it('does not error when secret not found and ignoreNotFound is true', async () => {
+        mockInput(`secret/data/test secret ;
+        secret/data/test secret | NAMED_SECRET ;
+        secret/data/notFound kehe | NO_SIR ;`);
+
+        mockIgnoreNotFound("true");
+
+        await exportSecrets();
+
+        expect(core.exportVariable).toBeCalledTimes(2);
+
+        expect(core.exportVariable).toBeCalledWith('SECRET', 'SUPERSECRET');
+        expect(core.exportVariable).toBeCalledWith('NAMED_SECRET', 'SUPERSECRET');
     })
 
     it('get simple secret', async () => {

integrationTests/basic/jest.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-    verbose: true
-};

integrationTests/basic/jwt_auth.test.js

@@ -1,17 +1,18 @@
-jest.mock('@actions/core');
+import { vi, describe, test, expect } from 'vitest';
-jest.mock('@actions/core/lib/command');
+
-const core = require('@actions/core');
+vi.mock('@actions/core');
-const rsasign = require('jsrsasign');
+import core from '@actions/core';
-const {
+import rsasign from 'jsrsasign';
+import {
     privateRsaKey,
     privateRsaKeyBase64,
     publicRsaKey
-} = require('./rsa_keys');
+} from './rsa_keys.js';
 
-const got = require('got');
+import got from 'got';
-const { when } = require('jest-when');
+import { when } from 'jest-when'
 
-const { exportSecrets } = require('../../src/action');
+import { exportSecrets } from  '../../src/action.js';
 
 const vaultUrl = `http://${process.env.VAULT_HOST || 'localhost'}:${process.env.VAULT_PORT || '8200'}`;
 const vaultToken = `${process.env.VAULT_TOKEN || 'testtoken'}`
@@ -139,7 +140,7 @@ describe('jwt auth', () => {
 
     describe('authenticate with private key', () => {
         beforeEach(() => {
-            jest.resetAllMocks();
+            vi.resetAllMocks();
 
             when(core.getInput)
                 .calledWith('url', expect.anything())
@@ -189,7 +190,7 @@ describe('jwt auth', () => {
         })
 
         beforeEach(() => {
-            jest.resetAllMocks();
+            vi.resetAllMocks();
 
             when(core.getInput)
                 .calledWith('url', expect.anything())

integrationTests/basic/rsa_keys.js

@@ -42,7 +42,7 @@ LrJEY9tZaRF8xraMZiOcBcyAt6S/TS29HttJ6+zlhcWx34fItEZ8jA5gzhTmspOY
 -----END PUBLIC KEY-----
 `;
 
-module.exports = {
+export {
     privateRsaKey,
     privateRsaKeyBase64,
     publicRsaKey

integrationTests/basic/userpass_auth.test.js

@@ -1,11 +1,12 @@
-jest.mock('@actions/core');
+import { vi, describe, test, expect } from 'vitest';
-jest.mock('@actions/core/lib/command');
-const core = require('@actions/core');
 
-const got = require('got');
+vi.mock('@actions/core');
-const { when } = require('jest-when');
+import core from '@actions/core';
 
-const { exportSecrets } = require('../../src/action');
+import got from 'got';
+import { when } from 'jest-when'
+
+import { exportSecrets } from  '../../src/action.js';
 
 const vaultUrl = `http://${process.env.VAULT_HOST || 'localhost'}:${process.env.VAULT_PORT || '8200'}`;
 const vaultToken = `${process.env.VAULT_TOKEN || 'testtoken'}`
@@ -84,7 +85,7 @@ describe('authenticate with userpass', () => {
     });
 
     beforeEach(() => {
-        jest.resetAllMocks();
+        vi.resetAllMocks();
 
         when(core.getInput)
             .calledWith('method', expect.anything())

integrationTests/basic/vitest.config.js

@@ -0,0 +1,11 @@
+import { defineConfig, configDefaults } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    // required to make jest-when work with vitest
+    globals: true,
+    include: [
+        '**/integrationTests/basic/**.{test,spec}.?(c|m)[jt]s?(x)',
+    ],
+  },
+})

integrationTests/e2e-tls/e2e-tls.test.js

@@ -1,3 +1,5 @@
+import { describe, test, expect } from 'vitest';
+
 describe('e2e-tls', () => {
     it('verify', () => {
         expect(process.env.SECRET).toBe("SUPERSECRET");

integrationTests/e2e-tls/jest.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-    verbose: true
-};

integrationTests/e2e-tls/setup.js

@@ -1,5 +1,5 @@
-const got = require('got');
+import got from 'got';
-const core = require('@actions/core');
+import core from '@actions/core';
 
 const vaultUrl = `${process.env.VAULT_HOST}:${process.env.VAULT_PORT}`;
 const caCertificateRaw = `${process.env.VAULTCA}`;

integrationTests/e2e-tls/vitest.config.js

@@ -0,0 +1,11 @@
+import { defineConfig, configDefaults } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    // required to make jest-when work with vitest
+    globals: true,
+    include: [
+        '**/integrationTests/e2e-tls/**.{test,spec}.?(c|m)[jt]s?(x)',
+    ],
+  },
+})

integrationTests/e2e/e2e.test.js

@@ -1,3 +1,5 @@
+import { describe, test, expect } from 'vitest';
+
 describe('e2e', () => {
     it('verify', () => {
         expect(process.env.SECRET).toBe("SUPERSECRET");

integrationTests/e2e/jest.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-    verbose: true
-};

integrationTests/e2e/setup.js

@@ -1,4 +1,4 @@
-const got = require('got');
+import got from 'got';
 
 const vaultUrl = `${process.env.VAULT_HOST}:${process.env.VAULT_PORT}`;
 const vaultToken = `${process.env.VAULT_TOKEN}` === undefined ? `${process.env.VAULT_TOKEN}` : "testtoken";

integrationTests/e2e/vitest.config.js

@@ -0,0 +1,11 @@
+import { defineConfig, configDefaults } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    // required to make jest-when work with vitest
+    globals: true,
+    include: [
+        '**/integrationTests/e2e/**.{test,spec}.?(c|m)[jt]s?(x)',
+    ],
+  },
+})

integrationTests/enterprise/enterprise.test.js

@@ -1,11 +1,12 @@
-jest.mock('@actions/core');
+import { vi, describe, test, expect } from 'vitest';
-jest.mock('@actions/core/lib/command');
-const core = require('@actions/core');
 
-const got = require('got');
+vi.mock('@actions/core');
-const { when } = require('jest-when');
+import core from '@actions/core';
 
-const { exportSecrets } = require('../../src/action');
+import got from 'got';
+import { when } from 'jest-when'
+
+import { exportSecrets } from  '../../src/action.js';
 
 const vaultUrl = `http://${process.env.VAULT_HOST || 'localhost'}:${process.env.VAULT_PORT || '8201'}`;
 const vaultToken = `${process.env.VAULT_TOKEN || 'testtoken'}`
@@ -41,7 +42,7 @@ describe('integration', () => {
     });
 
     beforeEach(() => {
-        jest.resetAllMocks();
+        vi.resetAllMocks();
 
         when(core.getInput)
             .calledWith('url', expect.anything())
@@ -238,7 +239,7 @@ describe('authenticate with approle', () => {
     });
 
     beforeEach(() => {
-        jest.resetAllMocks();
+        vi.resetAllMocks();
 
         when(core.getInput)
             .calledWith('method', expect.anything())

integrationTests/enterprise/jest.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-    verbose: true
-};

integrationTests/enterprise/vitest.config.js

@@ -0,0 +1,11 @@
+import { defineConfig, configDefaults } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    // required to make jest-when work with vitest
+    globals: true,
+    include: [
+        '**/integrationTests/enterprise/**.{test,spec}.?(c|m)[jt]s?(x)',
+    ],
+  },
+})

jest.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-    testPathIgnorePatterns: ['/node_modules/', '<rootDir>/integrationTests/'],
-};

package.json

@@ -2,14 +2,15 @@
     "name": "vault-action",
     "version": "0.1.0",
     "description": "A Github Action that allows you to consume vault secrets as secure environment variables.",
+    "type": "module",
     "main": "dist/index.js",
     "scripts": {
         "build": "ncc build src/entry.js -o dist",
-        "test": "jest",
+        "test": "vitest run",
-        "test:integration:basic": "jest -c integrationTests/basic/jest.config.js",
+        "test:integration:basic": "vitest run -c integrationTests/basic/vitest.config.js",
-        "test:integration:enterprise": "jest -c integrationTests/enterprise/jest.config.js",
+        "test:integration:enterprise": "vitest run -c integrationTests/enterprise/vitest.config.js",
-        "test:integration:e2e": "jest -c integrationTests/e2e/jest.config.js",
+        "test:integration:e2e": "vitest run -c integrationTests/e2e/vitest.config.js",
-        "test:integration:e2e-tls": "jest -c integrationTests/e2e-tls/jest.config.js"
+        "test:integration:e2e-tls": "vitest run -c integrationTests/e2e-tls/vitest.config.js"
     },
     "files": [
         "src/**/*",
@@ -34,18 +35,15 @@
     },
     "homepage": "https://github.com/hashicorp/vault-action#readme",
     "dependencies": {
-        "got": "^11.8.5",
+        "@actions/core": "^1.10.1",
-        "jsonata": "^2.0.3",
+        "got": "^14.2.1",
-        "jsrsasign": "^10.8.6"
+        "jsonata": "^2.0.4",
-    },
+        "jsrsasign": "^11.0.0"
-    "peerDependencies": {
-        "@actions/core": ">=1 <2"
     },
     "devDependencies": {
-        "@actions/core": "^1.10.0",
+        "@vercel/ncc": "^0.38.1",
-        "@vercel/ncc": "^0.36.1",
+        "jest-when": "^3.6.0",
-        "jest": "^29.5.0",
+        "mock-http-server": "^1.4.5",
-        "jest-when": "^3.5.2",
+        "vitest": "^1.3.1"
-        "mock-http-server": "^1.4.5"
     }
 }

src/action.js

@@ -1,12 +1,14 @@
-// @ts-check
+import core from '@actions/core';
-const core = require('@actions/core');
+import got from 'got';
-const command = require('@actions/core/lib/command');
-const got = require('got').default;
-const jsonata = require('jsonata');
-const { normalizeOutputKey } = require('./utils');
-const { WILDCARD } = require('./constants');
 
-const { auth: { retrieveToken }, secrets: { getSecrets } } = require('./index');
+import { normalizeOutputKey } from './utils.js';
+import { WILDCARD } from './constants.js';
+import { retrieveToken } from './auth.js';
+import { getSecrets } from './secrets.js';
+
+// ncc doesn't compile jsonata imports properly, so we must use our own custom require
+import require from "./cjs-require.js";
+const jsonata = require('jsonata');
 
 const AUTH_METHODS = ['approle', 'token', 'github', 'jwt', 'kubernetes', 'ldap', 'userpass'];
 const ENCODING_TYPES = ['base64', 'hex', 'utf8'];
@@ -219,9 +221,8 @@ function parseHeadersInput(inputKey, inputOptions) {
         }, new Map());
 }
 
-module.exports = {
+export {
     exportSecrets,
     parseSecretsInput,
     parseHeadersInput,
-};
+}
-

src/action.test.js

@@ -1,17 +1,17 @@
-jest.mock('got');
+import { vi, describe, test, expect } from 'vitest';
-jest.mock('@actions/core');
-jest.mock('@actions/core/lib/command');
 
-const command = require('@actions/core/lib/command');
+vi.mock('got');
-const core = require('@actions/core');
+vi.mock('@actions/core');
-const got = require('got');
+
-const {
+import core from '@actions/core';
+import got from 'got';
+import {
     exportSecrets,
     parseSecretsInput,
     parseHeadersInput
-} = require('./action');
+} from './action.js';
 
-const { when } = require('jest-when');
+import { when } from 'jest-when'
 
 describe('parseSecretsInput', () => {
     it('parses simple secret', () => {
@@ -132,7 +132,7 @@ describe('parseHeaders', () => {
 
 describe('exportSecrets', () => {
     beforeEach(() => {
-        jest.resetAllMocks();
+        vi.resetAllMocks();
 
         when(core.getInput)
             .calledWith('url', expect.anything())

src/auth.js

@@ -1,8 +1,8 @@
 // @ts-check
-const core = require('@actions/core');
+import core from '@actions/core';
-const rsasign = require('jsrsasign');
+import * as fs from 'fs';
-const fs = require('fs');
+import got from 'got';
-const { default: got } = require('got');
+import rsasign from 'jsrsasign';
 
 const defaultKubernetesTokenPath = '/var/run/secrets/kubernetes.io/serviceaccount/token'
 /***
@@ -17,7 +17,7 @@ async function retrieveToken(method, client) {
     switch (method) {
         case 'approle': {
             const vaultRoleId = core.getInput('roleId', { required: true });
-            const vaultSecretId = core.getInput('secretId', { required: true });
+            const vaultSecretId = core.getInput('secretId', { required: false });
             return await getClientToken(client, method, path, { role_id: vaultRoleId, secret_id: vaultSecretId });
         }
         case 'github': {
@@ -154,6 +154,6 @@ async function getClientToken(client, method, path, payload) {
  * }} auth
  */
 
-module.exports = {
+export {
     retrieveToken,
 };

src/auth.test.js

@@ -1,22 +1,20 @@
-jest.mock('got');
+import { vi, describe, test, expect } from 'vitest';
-jest.mock('@actions/core');
+
-jest.mock('@actions/core/lib/command');
+vi.mock('got');
-jest.mock('fs', () => ({
+vi.mock('@actions/core');
-    stat: jest.fn().mockResolvedValue(null),
+vi.mock('fs', () => ({
+    stat: vi.fn().mockResolvedValue(null),
     promises: {
-        access: jest.fn().mockResolvedValue(null),
+        access: vi.fn().mockResolvedValue(null),
     }
 }));
 
-const core = require('@actions/core');
+import core from '@actions/core';
-const got = require('got');
+import got from 'got'
-const fs = require("fs")
+import * as fs from 'fs';
-const { when } = require('jest-when');
+import { when } from 'jest-when'
 
-
+import { retrieveToken } from './auth.js';
-const {
-    retrieveToken
-} = require('./auth');
 
 
 function mockInput(name, key) {
@@ -27,7 +25,7 @@ function mockInput(name, key) {
 
 function mockApiResponse() {
     const response = { body: { auth: { client_token: testToken, renewable: true, policies: [], accessor: "accessor" } } }
-    got.post = jest.fn()
+    got.post = vi.fn()
     got.post.mockReturnValue(response)
 }
 const testToken = "testoken";
@@ -35,7 +33,7 @@ const testToken = "testoken";
 describe("test retrival for token", () => {
 
     beforeEach(() => {
-        jest.resetAllMocks();
+        vi.resetAllMocks();
     });
 
     it("test retrival with approle", async () => {
@@ -76,7 +74,7 @@ describe("test retrival for token", () => {
         mockInput("kubernetesTokenPath", testTokenPath)
         mockInput("role", testRole)
         mockInput("path", testPath)
-        fs.readFileSync = jest.fn()
+        fs.readFileSync = vi.fn()
         fs.readFileSync.mockReturnValueOnce(jwtToken)
         const token = await retrieveToken(method, got)
         expect(token).toEqual(testToken)

src/cjs-require.js

@@ -0,0 +1,7 @@
+// This allows us to use `require` in our ECMAScript module
+// See: https://github.com/vercel/ncc/issues/791
+// https://nodejs.org/api/module.html#modulecreaterequirefilename
+import { createRequire } from "module";
+const require = createRequire(import.meta.url);
+
+export default require;

src/constants.js

@@ -1,5 +1,5 @@
 const WILDCARD = '*';
 
-module.exports = {
+export {
     WILDCARD
 };

src/entry.js

@@ -1,5 +1,5 @@
-const core = require('@actions/core');
+import core from '@actions/core';
-const { exportSecrets } = require('./action');
+import { exportSecrets } from './action.js';
 
 (async () => {
     try {

src/index.js

@@ -1,7 +1,7 @@
-const auth = require('./auth');
+import auth from './auth.js';
-const secrets = require('./secrets');
+import secrets from './secrets.js';
 
-module.exports = {
+export default {
     auth,
     secrets
 };

src/retries.test.js

@@ -1,17 +1,19 @@
-jest.mock('@actions/core');
+import { vi, describe, test, expect } from 'vitest';
 
-const core = require('@actions/core');
+vi.mock('@actions/core');
-const ServerMock = require("mock-http-server");
+
-const { exportSecrets } = require("./action");
+import core from '@actions/core';
-const { when } = require('jest-when');
+import ServerMock from 'mock-http-server';
+import { exportSecrets } from './action.js';
+import { when } from 'jest-when';
 
 describe('exportSecrets retries', () => {
     var server = new ServerMock({ host: "127.0.0.1", port: 0 });
     var calls = 0;
 
-    beforeEach((done) => {
+    beforeEach(() => new Promise(done => {
         calls = 0;
-        jest.resetAllMocks();
+        vi.resetAllMocks();
 
         when(core.getInput)
             .calledWith('token', expect.anything())
@@ -28,11 +30,11 @@ describe('exportSecrets retries', () => {
                 .mockReturnValueOnce('http://127.0.0.1:' + server.getHttpPort());
             done();
         });
-    });
+    }));
 
-    afterEach((done) => {
+    afterEach(() => new Promise(done => {
         server.stop(done);
-    });
+    }));
 
     function mockStatusCodes(statusCodes) {
         server.on({
@@ -51,19 +53,19 @@ describe('exportSecrets retries', () => {
         });
     }
 
-    it('retries on 412 status code', (done) => {
+    it('retries on 412 status code', () => new Promise(done => {
         mockStatusCodes([412, 200])
         exportSecrets().then(() => {
             expect(calls).toEqual(2);
             done();
         });
-    });
+    }));
 
-    it('retries on 500 status code', (done) => {
+    it('retries on 500 status code', () => new Promise(done => {
         mockStatusCodes([500, 200])
         exportSecrets().then(() => {
             expect(calls).toEqual(2);
             done();
         });
-    });
+    }));
 });

src/secrets.js

@@ -1,6 +1,12 @@
-const jsonata = require("jsonata");
+import core from '@actions/core';
-const { WILDCARD } = require("./constants");
+import { WILDCARD } from './constants.js';
-const { normalizeOutputKey } = require("./utils");
+import { normalizeOutputKey } from './utils.js';
+
+// ncc doesn't compile jsonata imports properly, so we must use our own custom require
+import require from "./cjs-require.js";
+const jsonata = require('jsonata');
+
+
 /**
  * @typedef {Object} SecretRequest
  * @property {string} path
@@ -21,7 +27,7 @@ const { normalizeOutputKey } = require("./utils");
   * @param {import('got').Got} client
   * @return {Promise<SecretResponse<TRequest>[]>}
   */
-async function getSecrets(secretRequests, client) {
+async function getSecrets(secretRequests, client, ignoreNotFound) {
     const responseCache = new Map();
     let results = [];
 
@@ -42,7 +48,14 @@ async function getSecrets(secretRequests, client) {
             } catch (error) {
                 const {response} = error;
                 if (response?.statusCode === 404) {
-                    throw Error(`Unable to retrieve result for "${path}" because it was not found: ${response.body.trim()}`)
+                    let notFoundMsg = `Unable to retrieve result for "${path}" because it was not found: ${response.body.trim()}`;
+                    const ignoreNotFound = (core.getInput('ignoreNotFound', { required: false }) || 'false').toLowerCase() != 'false';
+                    if (ignoreNotFound) {
+                        core.error(`✘ ${notFoundMsg}`);
+                        continue;
+                    } else {
+                        throw Error(notFoundMsg)
+                    }
                 }
                 throw error
             }
@@ -156,7 +169,7 @@ const selectAndAppendResults = async (
   ];
 };
 
-module.exports = {
+export {
     getSecrets,
     selectData
 }

src/utils.js

@@ -14,6 +14,6 @@ function normalizeOutputKey(dataKey, isEnvVar = false) {
   return outputKey;
 }
 
-module.exports = { 
+export {
     normalizeOutputKey
 };

vitest.config.js

@@ -0,0 +1,12 @@
+import { defineConfig, configDefaults } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    // required to make jest-when work with vitest
+    globals: true,
+    exclude:[
+      ...configDefaults.exclude,
+      '**/integrationTests/**'
+    ]
+  },
+})