upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-06-14 20:04:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'remotes/from/ce/main'
Some checks failed
build / setup (push) Has been cancelled
Details
build / hcp-setup (push) Has been cancelled
Details
CI / setup (push) Has been cancelled
Details
Run linters / Setup (push) Has been cancelled
Details
Run linters / Semgrep (push) Has been cancelled
Details
Check Copywrite Headers / copywrite (push) Has been cancelled
Details
Security Scan / scan (push) Has been cancelled
Details
build / Check ce/* Pull Requests (push) Has been cancelled
Details
build / ui (push) Has been cancelled
Details
build / artifacts-ce (push) Has been cancelled
Details
build / artifacts-ent (push) Has been cancelled
Details
build / hcp-image (push) Has been cancelled
Details
build / test (push) Has been cancelled
Details
build / test-hcp-image (push) Has been cancelled
Details
build / completed-successfully (push) Has been cancelled
Details
CI / Run Autopilot upgrade tool (push) Has been cancelled
Details
CI / Run Go tests (push) Has been cancelled
Details
CI / Run Go tests tagged with testonly (push) Has been cancelled
Details
CI / Run Go tests with data race detection (push) Has been cancelled
Details
CI / Run Go tests with FIPS configuration (push) Has been cancelled
Details
CI / Test UI (push) Has been cancelled
Details
CI / tests-completed (push) Has been cancelled
Details
Run linters / Deprecated functions (push) Has been cancelled
Details
Run linters / Code checks (push) Has been cancelled
Details
Run linters / Protobuf generate delta (push) Has been cancelled
Details
Run linters / Format (push) Has been cancelled
Details

Browse source
This commit is contained in:
hc-github-team-secure-vault-core 2026-03-27 16:15:32 +00:00
commit 65a714d7cb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ui/pnpm-lock.yaml
View file

@ -56,7 +56,7 @@ importers:
version: 3.0.0
'@hashicorp/vault-client-typescript':
specifier: github:hashicorp/vault-client-typescript
version: https://codeload.github.com/hashicorp/vault-client-typescript/tar.gz/5f320eb200ed107202eb3932f66cc9efb693204e
version: https://codeload.github.com/hashicorp/vault-client-typescript/tar.gz/89117e7ceca84680eca76d6f99041140fa45ca1a
ember-auto-import:
specifier: 2.10.0
version: 2.10.0(@glint/template@1.7.3)(webpack@5.105.4)
@ -1610,8 +1610,8 @@ packages:
'@hashicorp/flight-icons@3.14.0':
resolution: {integrity: sha512-nyLDApaZsAHpAf2sRNwYX1MnJQU9UI3euiwE6wHPl2l/+Yt8wba1oXkmWL/Ptc4QgJxxnRUUhf66jGcB/AIOyQ==}
'@hashicorp/vault-client-typescript@https://codeload.github.com/hashicorp/vault-client-typescript/tar.gz/5f320eb200ed107202eb3932f66cc9efb693204e':
resolution: {tarball: https://codeload.github.com/hashicorp/vault-client-typescript/tar.gz/5f320eb200ed107202eb3932f66cc9efb693204e}
'@hashicorp/vault-client-typescript@https://codeload.github.com/hashicorp/vault-client-typescript/tar.gz/89117e7ceca84680eca76d6f99041140fa45ca1a':
resolution: {tarball: https://codeload.github.com/hashicorp/vault-client-typescript/tar.gz/89117e7ceca84680eca76d6f99041140fa45ca1a}
version: 0.0.0
'@humanwhocodes/config-array@0.13.0':
@ -11155,7 +11155,7 @@ snapshots:
'@hashicorp/flight-icons@3.14.0': {}
'@hashicorp/vault-client-typescript@https://codeload.github.com/hashicorp/vault-client-typescript/tar.gz/5f320eb200ed107202eb3932f66cc9efb693204e': {}
'@hashicorp/vault-client-typescript@https://codeload.github.com/hashicorp/vault-client-typescript/tar.gz/89117e7ceca84680eca76d6f99041140fa45ca1a': {}
'@humanwhocodes/config-array@0.13.0':
dependencies:

2
vault/expiration.go
View file

@ -1094,7 +1094,7 @@ func (m *ExpirationManager) revokeCommon(ctx context.Context, leaseID string, fo
// Delete the secondary index, but only if it's a leased secret (not auth)
if le.Secret != nil {
var indexToken string
// Maintain secondary index by token, except for orphan batch tokens and ent tokens
// Maintain secondary index by token, except for orphan batch tokens and enterprise tokens
switch le.ClientTokenType {
case logical.TokenTypeBatch:
te, err := m.tokenStore.lookupBatchTokenInternal(ctx, le.ClientToken)