.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,29 +3,21 @@ name: Bug report
 about: Create a report to help us improve
 title: "[BUG] "
 labels: bug
+assignees: RichiCoder1
 
 ---
 
-## Vault server version
+**Describe the bug**
-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
+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.
-[`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,17 +3,18 @@ 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

@@ -1,32 +0,0 @@
-### 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
-
-## PCI review checklist
-
-<!-- heimdall_github_prtemplate:grc-pci_dss-2024-01-05 -->
-
-- [ ] I have documented a clear reason for, and description of, the change I am making.
-
-- [ ] If applicable, I've documented a plan to revert these changes if they require more than reverting the pull request.
-
-- [ ] If applicable, I've documented the impact of any changes to security controls.
-
-  Examples of changes to security controls include using new access control methods, adding or removing logging pipelines, etc.

.github/dependabot.yml

@@ -1,14 +1,11 @@
+# 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/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 
 version: 2
 updates:
-  - package-ecosystem: "npm"
+  - package-ecosystem: "npm" # See documentation for possible values
     directory: "/" # Location of package manifests
-    open-pull-requests-limit: 0 # only require security updates and exclude version updates
     schedule:
-      interval: "weekly"
+      interval: "daily"
-    # For got, ignore all updates since it is now native ESM
-    # see https://github.com/hashicorp/vault-action/pull/457#issuecomment-1601445634
-    ignore:
-      - dependency-name: "got"

.github/workflows/actionlint.yaml

@@ -8,7 +8,7 @@ jobs:
   actionlint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: "Lint workflow files"
         uses: docker://docker.mirror.hashicorp.services/rhysd/actionlint:latest
         with:

.github/workflows/build.yml

@@ -6,14 +6,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-          node-version: "20.9.0"
+        node-version: '16.14.0'
 
     - name: Setup NPM Cache
-        uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.npm
         key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -33,17 +33,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - name: Run docker compose
+    - name: Run docker-compose
-        run: docker compose up -d vault
+      run: docker-compose up -d vault
 
-      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-          node-version: "20.9.0"
+        node-version: '16.14.0'
 
     - name: Setup NPM Cache
-        uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.npm
         key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -67,19 +67,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - name: Run docker compose
+    - name: Run docker-compose
-        run: docker compose up -d vault-enterprise
+      run: docker-compose up -d vault-enterprise
       env:
         VAULT_LICENSE_CI: ${{ secrets.VAULT_LICENSE_CI }}
 
-      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-          node-version: "20.9.0"
+        node-version: '16.14.0'
 
     - name: Setup NPM Cache
-        uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.npm
         key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -103,17 +103,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - name: Run docker compose
+    - name: Run docker-compose
-        run: docker compose up -d vault
+      run: docker-compose up -d vault
 
-      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-          node-version: "20.9.0"
+        node-version: '16.14.0'
 
     - name: Setup NPM Cache
-        uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.npm
         key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -195,21 +195,22 @@ jobs:
       env:
         OTHER_SECRET_OUTPUT: ${{ steps.kv-secrets.outputs.otherSecret }}
 
+
   e2e-tls:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
-      - name: Run docker compose
+    - name: Run docker-compose
-        run: docker compose up -d vault-tls
+      run: docker-compose up -d vault-tls
 
-      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+    - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
       with:
-          node-version: "20.9.0"
+        node-version: '16.14.0'
 
     - name: Setup NPM Cache
-        uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.npm
         key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}

.github/workflows/local-test.yaml

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

CHANGELOG.md

@@ -1,79 +1,6 @@
 ## Unreleased
 
-## 3.4.0 (June 13, 2025)
+* Add changes here
-
-Bugs:
-
-* replace all dot chars during normalization (https://github.com/hashicorp/vault-action/pull/580)
-
-Improvements:
-
-* Prevent possible DoS via polynomial regex (https://github.com/hashicorp/vault-action/pull/583)
-
-## 3.3.0 (March 3, 2025)
-
-Features:
-* Wildcard secret imports can use `**` to retain case of exported env keys [GH-545](https://github.com/hashicorp/vault-action/pull/545)
-
-## 3.2.0 (March 3, 2025)
-
-Improvements:
-
-* Add retry for jwt auth login to fix intermittent login failures [GH-574](https://github.com/hashicorp/vault-action/pull/574)
-
-## 3.1.0 (January 9, 2025)
-
-Improvements:
-
-* fix wildcard handling when field contains dot [GH-542](https://github.com/hashicorp/vault-action/pull/542)
-* bump body-parser from 1.20.0 to 1.20.3
-* bump braces from 3.0.2 to 3.0.3
-* bump cross-spawn from 7.0.3 to 7.0.6
-* bump micromatch from 4.0.5 to 4.0.8
-
-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)
-* Use `pki` configuration to generate certificates from Vault [GH-564](https://github.com/hashicorp/vault-action/pull/564)
-
-## 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)
 

CODEOWNERS

@@ -1 +0,0 @@
-* @hashicorp/vault-ecosystem

Makefile

@@ -1,3 +1,3 @@
 .PHONY: local-test
 local-test:
-	docker compose down;  docker compose up -d vault && act workflow_dispatch -j local-test -W .github/workflows/local-test.yaml
+	docker compose down;  docker-compose up -d vault && act workflow_dispatch -j local-test

README.md

@@ -8,9 +8,6 @@
 
 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)
@@ -25,12 +22,10 @@ is not meant to modify Vault’s state.
     - [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)
     - [Multiple Secrets](#multiple-secrets)
-    - [KV secrets engine version 2](#kv-secrets-engine-version-2)
   - [Other Secret Engines](#other-secret-engines)
   - [Adding Extra Headers](#adding-extra-headers)
   - [HashiCorp Cloud Platform or Vault Enterprise](#hashicorp-cloud-platform-or-vault-enterprise)
@@ -65,32 +60,27 @@ jobs:
 ```
 
 Retrieved secrets are available as environment variables or outputs for subsequent steps:
-
 ```yaml
 #...
-- name: Step following 'Import Secrets'
+            - name: Step following 'Import Secrets'
               run: |
                 ACCESS_KEY_ID = "${{ env.AWS_ACCESS_KEY_ID }}"
                 SECRET_ACCESS_KEY = "${{ steps.import-secrets.outputs.AWS_SECRET_ACCESS_KEY }}"
-
+            # ...
-# ...
 ```
 
 If your project needs a format other than env vars and step outputs, you can use additional steps to transform them into the desired format. 
 For example, a common pattern is to save all the secrets in a JSON file:
-
 ```yaml
 #...
-- name: Step following 'Import Secrets'
+            - name: Step following 'Import Secrets'
               run: |
                 touch secrets.json
-    echo '${{ toJson(steps.import-secrets.outputs) }}' >> secrets.json
+                echo "${{ toJson(steps.import-secrets.outputs) }}" >> secrets.json
-
+            # ...
-# ...
 ```
 
 Which with our example would yield a file containing:
-
 ```json
 {
   "ACCESS_KEY_ID": "MY_KEY_ID",
@@ -101,6 +91,7 @@ Which with our example would yield a file containing:
 
 Note that all secrets are masked so programs need to read the file themselves otherwise all values will be replaced with a `***` placeholder.
 
+
 ## Authentication Methods
 
 Consider using a [Vault authentication method](https://www.vaultproject.io/docs/auth) such as the JWT auth method with
@@ -114,7 +105,7 @@ and Vault using the
 Each GitHub Actions workflow receives an auto-generated OIDC token with claims
 to establish the identity of the workflow.
 
-**Vault Configuration**
+__Vault Configuration__
 
 <details>
 <summary>Click to toggle instructions for configuring Vault.</summary>
@@ -125,6 +116,7 @@ Pass the following parameters to your auth method configuration:
 - `oidc_discovery_url`: `https://token.actions.githubusercontent.com`
 - `bound_issuer`: `https://token.actions.githubusercontent.com`
 
+
 Configure a [Vault role](https://www.vaultproject.io/api/auth/jwt#create-role) for the auth method.
 
 - `role_type`: `jwt`
@@ -144,7 +136,7 @@ Configure a [Vault role](https://www.vaultproject.io/api/auth/jwt#create-role) f
 
      - `bound_claims`: JSON object. Maps one or more claim names to corresponding wildcard values.
        ```json
-      { "sub": "repo:<orgName>/*" }
+       {"sub": "repo:<orgName>/*"}
        ```
 
   - For exact matches, use `bound_subject`.
@@ -158,7 +150,7 @@ Configure a [Vault role](https://www.vaultproject.io/api/auth/jwt#create-role) f
 
 </details>
 
-**GitHub Actions Workflow**
+__GitHub Actions Workflow__
 
 In the GitHub Actions workflow, the workflow needs permissions to read contents
 and write the ID token.
@@ -305,20 +297,6 @@ 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.
@@ -382,6 +360,7 @@ steps:
     # Import config...
   - name: Sensitive Operation
     run: "my-cli --token '${{ steps.secrets.outputs.NPM_TOKEN }}'"
+
 ```
 
 ### Multiple Secrets
@@ -395,68 +374,12 @@ with:
         secret/data/ci/aws secretKey | AWS_SECRET_ACCESS_KEY
 ```
 
-You can specify a wildcard \* for the key name to get all keys in the path. If you provide an output name with the wildcard, the name will be prepended to the key name:
-
-```yaml
-with:
-  secrets: |
-    secret/data/ci/aws * | MYAPP_ ;
-```
-
-When using the `exportEnv` option all exported keys will be normalized to uppercase. For example, the key `SecretKey` would be exported as `MYAPP_SECRETKEY`.
-You can disable uppercase normalization by specifying double asterisks `**` in the selector path:
-
-```yaml
-with:
-    secrets: |
-        secret/data/ci/aws ** | MYAPP_ ;
-```
-
-### KV secrets engine version 2
-
-When accessing secrets from the KV secrets engine version 2, Vault Action
-requires the full path to the secret. This is the same path that would be used
-in a Vault policy for the secret. You can find the full path to your secret by
-performing a `kv get` command like the following:
-
-```bash
-$ vault kv get secret/test
-== Secret Path ==
-secret/data/test
-
-...
-```
-
-Note that the full path is not `secret/test`, but `secret/data/test`.
-
-## PKI Certificate Requests
-
-You can use the `pki` option to generate a certificate and private key for a given role.
-
-````yaml
-with:
-    pki: |
-        pki/issue/rolename {"common_name": "role.mydomain.com", "ttl": "1h"} ;
-        pki/issue/otherrole {"common_name": "otherrole.mydomain.com", "ttl": "1h"} ;
-```
-
-Resulting in:
-
-```bash
-ROLENAME_CA=-----BEGIN CERTIFICATE-----...
-ROLENAME_CERT=-----BEGIN CERTIFICATE-----...
-ROLENAME_KEY=-----BEGIN RSA PRIVATE KEY-----...
-ROLENAME_CA_CHAIN=-----BEGIN CERTIFICATE-----...
-OTHERROLE_CA=-----BEGIN CERTIFICATE-----...
-OTHERROLE_CERT=-----BEGIN CERTIFICATE-----...
-OTHERROLE_KEY=-----BEGIN RSA PRIVATE KEY-----...
-OTHERROLE_CA_CHAIN=-----BEGIN CERTIFICATE-----...
-````
-
 ## Other Secret Engines
 
 Vault Action currently supports retrieving secrets from any engine where secrets
-are retrieved via `GET` requests, except for the PKI engine as noted above.
+are retrieved via `GET` requests.  This means secret engines such as PKI are currently
+not supported due to their requirement of sending parameters along with the request
+(such as `common_name`).
 
 For example, to request a secret from the `cubbyhole` secret engine:
 
@@ -493,8 +416,8 @@ If you ever need to add extra headers to the vault request, say if you need to a
 ```yaml
 with:
     secrets: |
-    secret/data/ci/aws accessKey | AWS_ACCESS_KEY_ID ;
+        secret/ci/aws accessKey | AWS_ACCESS_KEY_ID ;
-    secret/data/ci/aws secretKey | AWS_SECRET_ACCESS_KEY
+        secret/ci/aws secretKey | AWS_SECRET_ACCESS_KEY
     extraHeaders: |
       X-Secure-Id: ${{ secrets.SECURE_ID }}
       X-Secure-Secret: ${{ secrets.SECURE_SECRET }}
@@ -520,210 +443,48 @@ steps:
       uses: hashicorp/vault-action
       with:
         url: https://vault-enterprise.mycompany.com:8200
+        caCertificate: ${{ secrets.VAULT_CA_CERT }}
         method: token
         token: ${{ secrets.VAULT_TOKEN }}
         namespace: admin
         secrets: |
-        secret/data/ci/aws accessKey | AWS_ACCESS_KEY_ID ;
+            secret/ci/aws accessKey | AWS_ACCESS_KEY_ID ;
-        secret/data/ci/aws secretKey | AWS_SECRET_ACCESS_KEY ;
+            secret/ci/aws secretKey | AWS_SECRET_ACCESS_KEY ;
-        secret/data/ci npm_token
+            secret/ci npm_token
-```
-
-Alternatively, you may need to authenticate to the root namespace and retrieve
-a secret from a different namespace. To do this, do not set the `namespace`
-parameter. Instead set the namespace in the secret path. For example, `<NAMESPACE>/secret/data/app`:
-
-```yaml
-steps:
-  # ...
-  - name: Import Secrets
-    uses: hashicorp/vault-action
-    with:
-      url: https://vault-enterprise.mycompany.com:8200
-      method: token
-      token: ${{ secrets.VAULT_TOKEN }}
-      secrets: |
-        namespace-1/secret/data/ci/aws accessKey | AWS_ACCESS_KEY_ID ;
-        namespace-1/secret/data/ci/aws secretKey | AWS_SECRET_ACCESS_KEY ;
-        namespace-1/secret/data/ci npm_token
 ```
 
 ## Reference
 
 Here are all the inputs available through `with`:
 
-### `url`
+| Input               | Description                                                                                                                                          | Default | Required |
-
+| ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | -------- |
-**Type: `string`**\
+| `url`               | The URL for the vault endpoint                                                                                                                       |         | ✔        |
-**Required**
+| `secrets`           | A semicolon-separated list of secrets to retrieve. These will automatically be converted to environmental variable keys. See README for more details |         |          |
-
+| `namespace`         | The Vault namespace from which to query secrets. Vault Enterprise only, unset by default                                                             |         |          |
-The URL for the Vault endpoint.
+| `method`            | The method to use to authenticate with Vault.                                                                                                        | `token` |          |
-
+| `role`              | Vault role for specified auth method                                                                                                                 |         |          |
-### `secrets`
+| `path`              | Custom vault path, if the auth method was enabled at a different path                                                                                                |         |          |
-
+| `token`             | The Vault Token to be used to authenticate with Vault                                                                                                |         |          |
-**Type: `string`**
+| `roleId`            | The Role Id for App Role authentication                                                                                                              |         |          |
-
+| `secretId`          | The Secret Id for App Role authentication                                                                                                            |         |          |
-A semicolon-separated list of secrets to retrieve. These will automatically be
+| `githubToken`       | The Github Token to be used to authenticate with Vault                                                                                               |         |          |
-converted to environmental variable keys. See [Key Syntax](#key-syntax) for
+| `jwtPrivateKey`     | Base64 encoded Private key to sign JWT                                                                                                               |         |          |
-more details.
+| `jwtKeyPassword`    | Password for key stored in jwtPrivateKey (if needed)                                                                                                 |         |          |
-
+| `jwtGithubAudience` | Identifies the recipient ("aud" claim) that the JWT is intended for                                                                                   |`sigstore`|          |
-### `namespace`
+| `jwtTtl`            | Time in seconds, after which token expires                                                                                                           |         | 3600     |
-
+| `kubernetesTokenPath`         | The path to the service-account secret with the jwt token for kubernetes based authentication                                                                                               |`/var/run/secrets/kubernetes.io/serviceaccount/token`         |          |
-**Type: `string`**
+| `username`          | The username of the user to log in to Vault as. Available to both Userpass and LDAP auth methods                                                     |         |          |
-
+| `password`          | The password of the user to log in to Vault as. Available to both Userpass and LDAP auth methods                                                     |         |          |
-The Vault namespace from which to query secrets. Vault Enterprise only, unset by default.
+| `authPayload`       | The JSON payload to be sent to Vault when using a custom authentication method.                                                                      |         |          |
-
+| `extraHeaders`      | A string of newline separated extra headers to include on every request.                                                                             |         |          |
-### `method`
+| `exportEnv`         | Whether or not export secrets as environment variables.                                                                                              | `true`  |          |
-
+| `exportToken`       | Whether or not export Vault token as environment variables (i.e VAULT_TOKEN).                                                                        | `false` |          |
-**Type: `string`**\
+| `outputToken`       | Whether or not to set the `vault_token` output to contain the Vault token after authentication.                                                      | `false` |          |
-**Default: `token`**
+| `caCertificate`     | Base64 encoded CA certificate the server certificate was signed with.                                                                                |         |          |
-
+| `clientCertificate` | Base64 encoded client certificate the action uses to authenticate with Vault when mTLS is enabled.                                                   |         |          |
-The method to use to authenticate with Vault.
+| `clientKey`         | Base64 encoded client key the action uses to authenticate with Vault when mTLS is enabled.                                                           |         |          |
-
+| `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`**
-
-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
 
@@ -737,10 +498,9 @@ To make it simpler to consume certain secrets as env vars, if no Env/Output Var
 ## Contributing
 
 If you wish to contribute to this project, the following dependencies are recommended for local development:
-
 - [npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) to install dependencies, build project and run tests
 - [docker](https://docs.docker.com/get-docker/) to run the pre-configured vault containers for acceptance tests
-- [docker compose](https://docs.docker.com/compose/) to spin up the pre-configured vault containers for acceptance tests
+- [docker-compose](https://docs.docker.com/compose/) to spin up the pre-configured vault containers for acceptance tests
 - [act](https://github.com/nektos/act) to run the vault-action locally
 
 ### Build
@@ -757,7 +517,7 @@ The Github Action needs access to a working Vault instance to function.
 Multiple docker configurations are available via the docker-compose.yml file to run containers compatible with the various acceptance test suites.
 
 ```sh
-$ docker compose up -d vault # Choose one of: vault, vault-enterprise, vault-tls depending on which tests you would like to run
+$ docker-compose up -d vault # Choose one of: vault, vault-enterprise, vault-tls depending on which tests you would like to run
 ```
 
 Instead of using one of the dockerized instance, you can also use your own local or remote Vault instance by exporting these environment variables:

action.yml

@@ -1,4 +1,4 @@
-name: 'HashiCorp Vault'
+name: 'Vault Secrets'
 description: 'A Github Action that allows you to consume HashiCorp Vault™ secrets as secure environment variables'
 inputs:
   url:
@@ -7,9 +7,6 @@ inputs:
   secrets:
     description: 'A semicolon-separated list of secrets to retrieve. These will automatically be converted to environmental variable keys. See README for more details'
     required: false
-  pki:
-    description: 'A semicolon-separated list of certificates to generate. These will automatically be converted to environment variable keys. Cannot be used with "secrets". See README for more details'
-    required: false
   namespace:
     description: 'The Vault namespace from which to query secrets. Vault Enterprise only, unset by default'
     required: false
@@ -21,16 +18,16 @@ inputs:
     description: 'Vault role for specified auth method'
     required: false
   path:
-    description: 'The Vault path for the auth method.'
+    description: 'Custom Vault path, if the auth method was mounted at a different path'
     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'
@@ -64,7 +61,7 @@ inputs:
     default: 'false'
     required: false
   caCertificate:
-    description: 'Base64 encoded CA certificate the server certificate was signed with. Defaults to CAs provided by Mozilla.'
+    description: 'Base64 encoded CA certificate to verify the Vault server certificate.'
     required: false
   clientCertificate:
     description: 'Base64 encoded client certificate for mTLS communication with the Vault server.'
@@ -92,12 +89,8 @@ 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: 'node20'
+  using: 'node16'
   main: 'dist/index.js'
 branding:
   icon: 'unlock'

integrationTests/basic/integration.test.js

@@ -31,22 +31,6 @@ describe('integration', () => {
             },
         });
 
-        await got(`${vaultUrl}/v1/secret/data/test-with-dot-char`, {
-            method: 'POST',
-            headers: {
-                'X-Vault-Token': vaultToken,
-            },
-            body: `{"data":{"secret.foo":"SUPERSECRET"}}`
-        });
-
-        await got(`${vaultUrl}/v1/secret/data/test-with-multi-dot-chars`, {
-            method: 'POST',
-            headers: {
-                'X-Vault-Token': vaultToken,
-            },
-            body: `{"data":{"secret.foo.bar":"SUPERSECRET"}}`
-        });
-
         await got(`${vaultUrl}/v1/secret/data/nested/test`, {
             method: 'POST',
             headers: {
@@ -120,69 +104,6 @@ describe('integration', () => {
                 "other-Secret-dash": 'OTHERCUSTOMSECRET',
             },
         });
-
-        // Enable pki engine
-        try {
-            await got(`${vaultUrl}/v1/sys/mounts/pki`, {
-                method: 'POST',
-                headers: {
-                    'X-Vault-Token': vaultToken,
-                },
-                json: {
-                    type: 'pki'
-                }
-            });
-        } catch (error) {
-            const {response} = error;
-            if (response.statusCode === 400 && response.body.includes("path is already in use")) {
-                // Engine might already be enabled from previous test runs
-            } else {
-                throw error;
-            }
-        }
-
-        // Configure Root CA
-        try {
-            await got(`${vaultUrl}/v1/pki/root/generate/internal`, {
-                method: 'POST',
-                headers: {
-                    'X-Vault-Token': vaultToken,
-                },
-                json: {
-                    common_name: 'test',
-                    ttl: '24h',
-                },
-            });
-        } catch (error) {
-            const {response} = error;
-            if (response.statusCode === 400 && response.body.includes("already exists")) {
-                // Root CA might already be configured from previous test runs
-            } else {
-                throw error;
-            }
-        }
-
-        // Configure PKI Role
-        try {
-            await got(`${vaultUrl}/v1/pki/roles/Test`, {
-                method: 'POST',
-                headers: {
-                    'X-Vault-Token': vaultToken,
-                },
-                json: {
-                    allowed_domains: ['test'],
-                    allow_bare_domains: true,
-                    max_ttl: '1h',
-                },
-            });
-        } catch (error) {
-            const {response} = error;
-            if (response.statusCode === 400 && response.body.includes("already exists")) {
-                // Role might already be configured from previous test runs
-            } else {
-                throw error;
-            }
-        }
     });
 
     beforeEach(() => {
@@ -203,55 +124,14 @@ describe('integration', () => {
             .mockReturnValueOnce(secrets);
     }
 
-    function mockPkiInput(pki) {
-        when(core.getInput)
-            .calledWith('pki', expect.anything())
-            .mockReturnValueOnce(pki);
-    }
-
-    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 ;`);
 
-        await expect(exportSecrets()).rejects.toEqual(Error(`Unable to retrieve result for "secret/data/notFound" because it was not found: {"errors":[]}`));
+        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('gets a pki certificate', async () => {
-        mockPkiInput('pki/issue/Test {"common_name":"test","ttl":"1h"}');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(4);
-
-        expect(core.exportVariable).toBeCalledWith('TEST_KEY', expect.anything());
-        expect(core.exportVariable).toBeCalledWith('TEST_CERT', expect.anything());
-        expect(core.exportVariable).toBeCalledWith('TEST_CA', expect.anything());
-        expect(core.exportVariable).toBeCalledWith('TEST_CA_CHAIN', expect.anything());
-    });
-
     it('get simple secret', async () => {
         mockInput('secret/data/test secret');
 
@@ -291,46 +171,6 @@ describe('integration', () => {
         expect(core.exportVariable).toBeCalledWith('OTHERSECRETDASH', 'OTHERSUPERSECRET');
     });
 
-    it('get wildcard secrets with dot char', async () => {
-        mockInput(`secret/data/test-with-dot-char * ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('SECRET__FOO', 'SUPERSECRET');
-    });
-
-    it('get secrets with multiple dot chars', async () => {
-        mockInput(`secret/data/test-with-multi-dot-chars * ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('SECRET__FOO__BAR', 'SUPERSECRET');
-    });
-
-    it('get wildcard secrets', async () => {
-        mockInput(`secret/data/test * ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('SECRET', 'SUPERSECRET');
-    });
-
-    it('get wildcard secrets with name prefix', async () => {
-        mockInput(`secret/data/test * | GROUP_ ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('GROUP_SECRET', 'SUPERSECRET');
-    });
-
     it('leading slash kvv2', async () => {
         mockInput('/secret/data/foobar fookv2');
 
@@ -355,34 +195,6 @@ describe('integration', () => {
         expect(core.exportVariable).toBeCalledWith('OTHERSECRETDASH', 'OTHERCUSTOMSECRET');
     });
 
-    it('get K/V v1 wildcard secrets', async () => {
-        mockInput(`secret-kv1/test * ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('SECRET', 'CUSTOMSECRET');
-    });
-
-    it('get K/V v1 wildcard secrets with name prefix', async () => {
-        mockInput(`secret-kv1/test * | GROUP_ ;`);
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledTimes(1);
-
-        expect(core.exportVariable).toBeCalledWith('GROUP_SECRET', 'CUSTOMSECRET');
-    });
-
-    it('get wildcard nested secret from K/V v1', async () => {
-        mockInput('secret-kv1/nested/test *');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('OTHERSECRETDASH', 'OTHERCUSTOMSECRET');
-    });
-
     it('leading slash kvv1', async () => {
         mockInput('/secret-kv1/foobar fookv1');
 
@@ -413,43 +225,6 @@ describe('integration', () => {
             expect(core.exportVariable).toBeCalledWith('FOO', 'bar');
         });
 
-        it('wildcard supports cubbyhole with uppercase transform', async () => {
-            mockInput('/cubbyhole/test *');
-
-            await exportSecrets();
-            
-            expect(core.exportVariable).toBeCalledTimes(2);
-
-            expect(core.exportVariable).toBeCalledWith('FOO', 'bar');
-            expect(core.exportVariable).toBeCalledWith('ZIP', 'zap');
-        });
-
-        it('wildcard supports cubbyhole with no change in case', async () => {
-            mockInput('/cubbyhole/test **');
-
-            await exportSecrets();
-
-            expect(core.exportVariable).toBeCalledTimes(2);
-
-            expect(core.exportVariable).toBeCalledWith('foo', 'bar');
-            expect(core.exportVariable).toBeCalledWith('zip', 'zap');
-        });
-
-        it('wildcard supports cubbyhole with mixed case change', async () => {
-            mockInput(`
-            /cubbyhole/test * ;
-            /cubbyhole/test **`);
-
-            await exportSecrets();
-
-            expect(core.exportVariable).toBeCalledTimes(4);
-
-            expect(core.exportVariable).toBeCalledWith('FOO', 'bar');
-            expect(core.exportVariable).toBeCalledWith('ZIP', 'zap');
-            expect(core.exportVariable).toBeCalledWith('foo', 'bar');
-            expect(core.exportVariable).toBeCalledWith('zip', 'zap');
-        });
-        
         it('caches responses', async () => {            
             mockInput(`
             /cubbyhole/test foo ;

integrationTests/basic/jwt_auth.test.js

@@ -97,8 +97,6 @@ describe('jwt auth', () => {
             }
         });
 
-        // write the jwt config, the jwt role will be written on a per-test
-        // basis since the audience may vary
         await got(`${vaultUrl}/v1/auth/jwt/config`, {
             method: 'POST',
             headers: {
@@ -110,6 +108,22 @@ describe('jwt auth', () => {
             }
         });
 
+        await got(`${vaultUrl}/v1/auth/jwt/role/default`, {
+            method: 'POST',
+            headers: {
+                'X-Vault-Token': vaultToken,
+            },
+            json: {
+                role_type: 'jwt',
+                bound_audiences: null,
+                bound_claims: {
+                    iss: 'vault-action'
+                },
+                user_claim: 'iss',
+                policies: ['reader']
+            }
+        });
+
         await got(`${vaultUrl}/v1/secret/data/test`, {
             method: 'POST',
             headers: {
@@ -124,24 +138,6 @@ describe('jwt auth', () => {
     });
 
     describe('authenticate with private key', () => {
-        beforeAll(async () => {
-            await got(`${vaultUrl}/v1/auth/jwt/role/default`, {
-                method: 'POST',
-                headers: {
-                    'X-Vault-Token': vaultToken,
-                },
-                json: {
-                    role_type: 'jwt',
-                    bound_audiences: null,
-                    bound_claims: {
-                        iss: 'vault-action'
-                    },
-                    user_claim: 'iss',
-                    policies: ['reader']
-                }
-            });
-        });
-
         beforeEach(() => {
             jest.resetAllMocks();
 
@@ -174,22 +170,6 @@ describe('jwt auth', () => {
 
     describe('authenticate with Github OIDC', () => {
         beforeAll(async () => {
-            await got(`${vaultUrl}/v1/auth/jwt/role/default`, {
-                method: 'POST',
-                headers: {
-                    'X-Vault-Token': vaultToken,
-                },
-                json: {
-                    role_type: 'jwt',
-                    bound_audiences: 'https://github.com/hashicorp/vault-action',
-                    bound_claims: {
-                        iss: 'vault-action'
-                    },
-                    user_claim: 'iss',
-                    policies: ['reader']
-                }
-            });
-
             await got(`${vaultUrl}/v1/auth/jwt/role/default-sigstore`, {
                 method: 'POST',
                 headers: {
@@ -197,7 +177,7 @@ describe('jwt auth', () => {
                 },
                 json: {
                     role_type: 'jwt',
-                    bound_audiences: 'sigstore',
+                    bound_audiences: null,
                     bound_claims: {
                         iss: 'vault-action',
                         aud: 'sigstore',

integrationTests/enterprise/enterprise.test.js

@@ -72,22 +72,6 @@ describe('integration', () => {
         expect(core.exportVariable).toBeCalledWith('TEST_KEY', 'SUPERSECRET_IN_NAMESPACE');
     });
 
-    it('get wildcard secrets', async () => {
-        mockInput('secret/data/test *');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('SECRET', 'SUPERSECRET_IN_NAMESPACE');
-    });
-
-    it('get wildcard secrets with name prefix', async () => {
-        mockInput('secret/data/test * | GROUP_');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('GROUP_SECRET', 'SUPERSECRET_IN_NAMESPACE');
-    });
-
     it('get nested secret', async () => {
         mockInput('secret/data/nested/test otherSecret');
 
@@ -119,22 +103,6 @@ describe('integration', () => {
         expect(core.exportVariable).toBeCalledWith('SECRET', 'CUSTOMSECRET_IN_NAMESPACE');
     });
 
-    it('get wildcard secrets from K/V v1', async () => {
-        mockInput('my-secret/test *');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('SECRET', 'CUSTOMSECRET_IN_NAMESPACE');
-    });
-
-    it('get wildcard secrets from K/V v1 with name prefix', async () => {
-        mockInput('my-secret/test * | GROUP_');
-
-        await exportSecrets();
-
-        expect(core.exportVariable).toBeCalledWith('GROUP_SECRET', 'CUSTOMSECRET_IN_NAMESPACE');
-    });
-
     it('get nested secret from K/V v1', async () => {
         mockInput('my-secret/nested/test otherSecret');
 

package.json

@@ -34,18 +34,18 @@
     },
     "homepage": "https://github.com/hashicorp/vault-action#readme",
     "dependencies": {
-        "got": "^11.8.6",
+        "got": "^11.8.5",
         "jsonata": "^2.0.3",
-        "jsrsasign": "^11.1.0"
+        "jsrsasign": "^10.8.6"
     },
     "peerDependencies": {
         "@actions/core": ">=1 <2"
     },
     "devDependencies": {
-        "@actions/core": "^1.10.1",
+        "@actions/core": "^1.10.0",
-        "@vercel/ncc": "^0.38.1",
+        "@vercel/ncc": "^0.36.1",
-        "jest": "^29.7.0",
+        "jest": "^29.5.0",
-        "jest-when": "^3.6.0",
+        "jest-when": "^3.5.2",
         "mock-http-server": "^1.4.5"
     }
 }

src/action.js

@@ -3,10 +3,7 @@ const core = require('@actions/core');
 const command = require('@actions/core/lib/command');
 const got = require('got').default;
 const jsonata = require('jsonata');
-const { normalizeOutputKey } = require('./utils');
+const { auth: { retrieveToken }, secrets: { getSecrets } } = require('./index');
-const { WILDCARD, WILDCARD_UPPERCASE } = require('./constants');
-
-const { auth: { retrieveToken }, secrets: { getSecrets }, pki: { getCertificates } } = require('./index');
 
 const AUTH_METHODS = ['approle', 'token', 'github', 'jwt', 'kubernetes', 'ldap', 'userpass'];
 const ENCODING_TYPES = ['base64', 'hex', 'utf8'];
@@ -22,16 +19,6 @@ async function exportSecrets() {
     const secretsInput = core.getInput('secrets', { required: false });
     const secretRequests = parseSecretsInput(secretsInput);
 
-    const pkiInput = core.getInput('pki', { required: false });
-    let pkiRequests = [];
-    if (pkiInput) {
-        if (secretsInput) {
-            throw Error('You cannot provide both "secrets" and "pki" inputs.');
-        }
-
-        pkiRequests = parsePkiInput(pkiInput);
-    }
-
     const secretEncodingType = core.getInput('secretEncodingType', { required: false });
 
     const vaultMethod = (core.getInput('method', { required: false }) || 'token').toLowerCase();
@@ -94,12 +81,12 @@ async function exportSecrets() {
         core.exportVariable('VAULT_TOKEN', `${vaultToken}`);
     }
 
-    let results = [];
+    const requests = secretRequests.map(request => {
-    if (pkiRequests.length > 0) {
+        const { path, selector } = request;
-        results = await getCertificates(pkiRequests, client);
+        return request;
-    } else {
+    });
-        results = await getSecrets(secretRequests, client);
+
-    }
+    const results = await getSecrets(requests, client);
 
 
     for (const result of results) {
@@ -138,43 +125,6 @@ async function exportSecrets() {
  * @property {string} selector
 */
 
-/**
- * Parses a pki input string into key paths and the request parameters.
- * @param {string} pkiInput
- */
-function parsePkiInput(pkiInput) {
-    if (!pkiInput) {
-        return []
-    }
-
-    const secrets = pkiInput
-        .split(';')
-        .filter(key => !!key)
-        .map(key => key.trim())
-        .filter(key => key.length !== 0);
-
-    return secrets.map(secret => {
-        const path = secret.substring(0, secret.indexOf(' '));
-        const parameters = secret.substring(secret.indexOf(' ') + 1);
-
-        core.debug(`ℹ Parsing PKI: ${path} with parameters: ${parameters}`);
-
-        if (!path || !parameters) {
-            throw Error(`You must provide a valid path and parameters. Input: "${secret}"`);
-        }
-
-        let outputVarName = path.split('/').pop();
-        let envVarName = normalizeOutputKey(outputVarName);
-
-        return { 
-            path, 
-            envVarName, 
-            outputVarName,
-            parameters: JSON.parse(parameters),
-        };
-    });
-}
-
 /**
  * Parses a secrets input string into key paths and their resulting environment variable name.
  * @param {string} secretsInput
@@ -221,7 +171,7 @@ function parseSecretsInput(secretsInput) {
         const selectorAst = jsonata(selectorQuoted).ast();
         const selector = selectorQuoted.replace(new RegExp('"', 'g'), '');
 
-        if (selector !== WILDCARD && selector !== WILDCARD_UPPERCASE && (selectorAst.type !== "path" || selectorAst.steps[0].stages) && selectorAst.type !== "string" && !outputVarName) {
+        if ((selectorAst.type !== "path" || selectorAst.steps[0].stages) && selectorAst.type !== "string" && !outputVarName) {
             throw Error(`You must provide a name for the output key when using json selectors. Input: "${secret}"`);
         }
 
@@ -241,6 +191,20 @@ function parseSecretsInput(secretsInput) {
     return output;
 }
 
+/**
+ * Replaces any dot chars to __ and removes non-ascii charts
+ * @param {string} dataKey
+ * @param {boolean=} isEnvVar
+ */
+function normalizeOutputKey(dataKey, isEnvVar = false) {
+    let outputKey = dataKey
+        .replace('.', '__').replace(new RegExp('-', 'g'), '').replace(/[^\p{L}\p{N}_-]/gu, '');
+    if (isEnvVar) {
+        outputKey = outputKey.toUpperCase();
+    }
+    return outputKey;
+}
+
 /**
  * @param {string} inputKey
  * @param {any} inputOptions
@@ -269,6 +233,6 @@ function parseHeadersInput(inputKey, inputOptions) {
 module.exports = {
     exportSecrets,
     parseSecretsInput,
-    parseHeadersInput,
+    normalizeOutputKey,
+    parseHeadersInput
 };
-

src/auth.js

@@ -5,8 +5,6 @@ const fs = require('fs');
 const { default: got } = require('got');
 
 const defaultKubernetesTokenPath = '/var/run/secrets/kubernetes.io/serviceaccount/token'
-const retries = 5
-const retries_delay = 3000
 /***
  * Authenticate with Vault and retrieve a Vault token that can be used for requests.
  * @param {string} method
@@ -19,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: false });
+            const vaultSecretId = core.getInput('secretId', { required: true });
             return await getClientToken(client, method, path, { role_id: vaultRoleId, secret_id: vaultSecretId });
         }
         case 'github': {
@@ -37,10 +35,7 @@ async function retrieveToken(method, client) {
             const githubAudience = core.getInput('jwtGithubAudience', { required: false });
 
             if (!privateKey) {
-                jwt = await retryAsyncFunction(retries, retries_delay, core.getIDToken, githubAudience)
+                jwt = await core.getIDToken(githubAudience)
-                  .then((result) => {
-                    return result;
-                });
             } else {
                 jwt = generateJwt(privateKey, keyPassword, Number(tokenTtl));
             }
@@ -147,30 +142,6 @@ async function getClientToken(client, method, path, payload) {
     }
 }
 
-/***
- * Generic function for retrying an async function
- * @param {number} retries
- * @param {number} delay
- * @param {Function} func
- * @param {any[]} args
- */
-async function retryAsyncFunction(retries, delay, func, ...args) {
-  let attempt = 0;
-  while (attempt < retries) {
-    try {
-      const result = await func(...args);
-      return result;
-    } catch (error) {
-      attempt++;
-      if (attempt < retries) {
-        await new Promise(resolve => setTimeout(resolve, delay));
-      } else {
-        throw error;
-      }
-    }
-  }
-}
-
 /***
  * @typedef {Object} VaultLoginResponse
  * @property {{

src/auth.test.js

@@ -85,23 +85,4 @@ describe("test retrival for token", () => {
         const url = got.post.mock.calls[0][0]
         expect(url).toContain('differentK8sPath')
     })
-
-    it("test retrieval with jwt", async () => {
-        const method = "jwt"
-        const jwtToken = "someTestToken"
-        const testRole = "testRole"
-        const privateKeyRaw = ""
-
-        mockApiResponse()
-        mockInput("role", testRole)
-        mockInput("jwtPrivateKey", privateKeyRaw)
-        core.getIDToken = jest.fn()
-        core.getIDToken.mockReturnValueOnce(jwtToken)
-        const token = await retrieveToken(method, got)
-        expect(token).toEqual(testToken)
-        const payload = got.post.mock.calls[0][1].json
-        expect(payload).toEqual({ jwt: jwtToken,  role: testRole })
-        const url = got.post.mock.calls[0][0]
-        expect(url).toContain('jwt')
-  })
 })

src/constants.js

@@ -1,7 +0,0 @@
-const WILDCARD_UPPERCASE = '*';
-const WILDCARD = '**';
-
-module.exports = {
-    WILDCARD,
-    WILDCARD_UPPERCASE,
-};

src/index.js

@@ -1,9 +1,7 @@
 const auth = require('./auth');
 const secrets = require('./secrets');
-const pki = require('./pki');
 
 module.exports = {
     auth,
-    secrets,
+    secrets
-    pki
 };

src/pki.js

@@ -1,76 +0,0 @@
-const { normalizeOutputKey } = require('./utils');
-const core = require('@actions/core');
-
-/** A map of postfix values mapped to the key in the certificate response and a transformer function */
-const outputMap = {
-    cert: { key: 'certificate', tx: (v) => v },
-    key: { key: 'private_key', tx: (v) => v },
-    ca: { key: 'issuing_ca', tx: (v) => v },
-    ca_chain: { key: 'ca_chain', tx: (v) => v.join('\n') },
-};
-
-/**
- * @typedef PkiRequest
- * @type {object}
- * @property {string} path - The path to the PKI endpoint
- * @property {Record<string, any>} parameters - The parameters to send to the PKI endpoint
- * @property {string} envVarName - The name of the environment variable to set
- * @property {string} outputVarName - The name of the output variable to set
- */
-
-/**
- * @typedef {Object} PkiResponse
- * @property {PkiRequest} request
- * @property {string} value
- * @property {boolean} cachedResponse
- */
-
-/**
- * Generate and return the certificates from the PKI engine
- * @param {Array<PkiRequest>} pkiRequests
- * @param {import('got').Got} client
- * @return {Promise<Array<PkiResponse>>}
- */
-async function getCertificates(pkiRequests, client) {
-    /** @type Array<PkiResponse> */
-    let results = [];
-
-    for (const pkiRequest of pkiRequests) {
-        const { path, parameters } = pkiRequest;
-
-        const requestPath = `v1/${path}`;
-        let body;
-        try {
-            const result = await client.post(requestPath, {
-                body: JSON.stringify(parameters),
-            });
-            body = result.body;
-        } catch (error) {
-            core.error(`✘ ${error.response?.body ?? error.message}`);
-            throw error;
-        }
-
-        body = JSON.parse(body);
-
-        core.info(`✔ Successfully generated certificate (serial number ${body.data.serial_number})`);
-
-        Object.entries(outputMap).forEach(([key, value]) => {
-            const val = value.tx(body.data[value.key]);
-            results.push({
-                request: {
-                    ...pkiRequest,
-                    envVarName: normalizeOutputKey(`${pkiRequest.envVarName}_${key}`, true),
-                    outputVarName: normalizeOutputKey(`${pkiRequest.outputVarName}_${key}`),
-                },
-                value: val,
-                cachedResponse: false,
-            });
-        });
-    }
-
-    return results;
-}
-
-module.exports = {
-    getCertificates,
-};

src/secrets.js

@@ -1,7 +1,5 @@
 const jsonata = require("jsonata");
-const { WILDCARD, WILDCARD_UPPERCASE} = require("./constants");
+
-const { normalizeOutputKey } = require("./utils");
-const core = require('@actions/core');
 
 /**
  * @typedef {Object} SecretRequest
@@ -23,11 +21,9 @@ const core = require('@actions/core');
   * @param {import('got').Got} client
   * @return {Promise<SecretResponse<TRequest>[]>}
   */
-async function getSecrets(secretRequests, client, ignoreNotFound) {
+async function getSecrets(secretRequests, client) {
     const responseCache = new Map();
-    let results = [];
+    const results = [];
-    let upperCaseEnv = false;
-
     for (const secretRequest of secretRequests) {
         let { path, selector } = secretRequest;
 
@@ -45,72 +41,27 @@ async function getSecrets(secretRequests, client, ignoreNotFound) {
             } catch (error) {
                 const {response} = error;
                 if (response?.statusCode === 404) {
-                    notFoundMsg = `Unable to retrieve result for "${path}" because it was not found: ${response.body.trim()}`;
+                    throw Error(`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
             }
         }
-
+        if (!selector.match(/.*[\.].*/)) {
-        body = JSON.parse(body);
+            selector = '"' + selector + '"'
-
+        }
-        if (selector === WILDCARD || selector === WILDCARD_UPPERCASE) {
+        selector = "data." + selector
-            upperCaseEnv = selector === WILDCARD_UPPERCASE;
+        body = JSON.parse(body)
-            let keys = body.data;
         if (body.data["data"] != undefined) {
-                keys = keys.data;
+            selector = "data." + selector
         }
 
-            for (let key in keys) {
+        const value = await selectData(body, selector);
-                let newRequest = Object.assign({},secretRequest);
+        results.push({
-                newRequest.selector = key;
+            request: secretRequest,
-
+            value,
-                if (secretRequest.selector === secretRequest.outputVarName) {
+            cachedResponse
-                    newRequest.outputVarName = key;
+        });
-                    newRequest.envVarName = key;
-                } else {
-                    newRequest.outputVarName = secretRequest.outputVarName+key;
-                    newRequest.envVarName = secretRequest.envVarName+key;
     }
-
-                newRequest.outputVarName = normalizeOutputKey(newRequest.outputVarName);
-                newRequest.envVarName = normalizeOutputKey(newRequest.envVarName, upperCaseEnv);
-
-                // JSONata field references containing reserved tokens should
-                // be enclosed in backticks
-                // https://docs.jsonata.org/simple#examples
-                if (key.includes(".")) {
-                    const backtick = '`';
-                    key = backtick.concat(key, backtick);
-                }
-                selector = key;
-
-                results = await selectAndAppendResults(
-                  selector,
-                  body,
-                  cachedResponse,
-                  newRequest,
-                  results
-                );
-            }
-        }
-        else {
-          results = await selectAndAppendResults(
-            selector,
-            body,
-            cachedResponse,
-            secretRequest,
-            results
-          );
-        }
-    }
-
     return results;
 }
 
@@ -136,43 +87,6 @@ async function selectData(data, selector) {
     return result;
 }
 
-/**
- * Uses selectData with the selector to get the value and then appends it to the
- * results. Returns a new array with all of the results.
- * @param {string} selector
- * @param {object} body
- * @param {object} cachedResponse
- * @param {TRequest} secretRequest
- * @param {SecretResponse<TRequest>[]} results
- * @return {Promise<SecretResponse<TRequest>[]>}
- */
-const selectAndAppendResults = async (
-  selector,
-  body,
-  cachedResponse,
-  secretRequest,
-  results
-) => {
-  if (!selector.includes(".")) {
-    selector = '"' + selector + '"';
-  }
-  selector = "data." + selector;
-
-  if (body.data["data"] != undefined) {
-    selector = "data." + selector;
-  }
-
-  const value = await selectData(body, selector);
-  return [
-    ...results,
-    {
-      request: secretRequest,
-      value,
-      cachedResponse,
-    },
-  ];
-};
-
 module.exports = {
     getSecrets,
     selectData

src/utils.js

@@ -1,19 +0,0 @@
-/**
- * Replaces any dot chars to __ and removes non-ascii charts
- * @param {string} dataKey
- * @param {boolean=} isEnvVar
- */
-function normalizeOutputKey(dataKey, upperCase = false) {
-  let outputKey = dataKey
-    .replaceAll(".", "__")
-    .replace(new RegExp("-", "g"), "")
-    .replace(/[^\p{L}\p{N}_-]/gu, "");
-  if (upperCase) {
-    outputKey = outputKey.toUpperCase();
-  }
-  return outputKey;
-}
-
-module.exports = { 
-    normalizeOutputKey 
-};