mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-07 21:36:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/from/ce/main'

Browse Source
This commit is contained in:
hc-github-team-secure-vault-core 2026-04-01 17:17:38 +00:00
commit 65dc1a41e0
7 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/components/recovery/page/snapshots.hbs
View File

@ -3,7 +3,7 @@
SPDX-License-Identifier: BUSL-1.1
}}
<Page::Header @title="Secrets recovery" class="bottom-margin-16">
<Page::Header @title="Secrets recovery">
<:breadcrumbs>
<Page::Breadcrumbs @breadcrumbs={{@breadcrumbs}} />
</:breadcrumbs>

2
ui/app/components/recovery/page/snapshots/snapshot-details.hbs
View File

@ -25,7 +25,7 @@
</:actions>
</Page::Header>
<Hds::Table class="top-margin-16" data-test-table="details">
<Hds::Table data-test-table="details">
<:head as |H|>
<H.Tr>
{{#each this.tableColumns as |col|}}

2
ui/app/components/secret-engine/list.hbs
View File

@ -37,7 +37,7 @@
{{#if this.showContent}}
{{! Filters section }}
<Hds::SegmentedGroup class="has-top-margin-m" as |SG|>
<Hds::SegmentedGroup class="top-margin-12" as |SG|>
<SG.TextInput
@width="300px"
@type="search"

8
ui/app/styles/helper-classes/spacing.scss
View File

@ -171,6 +171,10 @@
margin-bottom: size_variables.$spacing-8 !important;
}
.bottom-margin-8 {
margin-bottom: size_variables.$spacing-8;
}
.has-bottom-margin-s {
margin-bottom: size_variables.$spacing-12;
}
@ -203,6 +207,10 @@
margin-top: size_variables.$spacing-12;
}
.top-margin-12 {
margin-top: size_variables.$spacing-12;
}
.has-top-margin-xs {
margin-top: size_variables.$spacing-8;
}

2
ui/app/templates/vault/cluster/access/mfa/methods/create.hbs
View File

@ -21,7 +21,7 @@
</:description>
</Page::Header>
<div class="has-top-padding-l">
<div>
{{#if this.showForms}}
<h3 class="is-size-4 has-text-weight-semibold">Settings</h3>
<p class="has-border-top-light has-top-padding-l">

2
ui/lib/core/addon/components/page/header.hbs
View File

@ -3,7 +3,7 @@
SPDX-License-Identifier: BUSL-1.1
}}
<Hds::PageHeader class="page-header" ...attributes as |PH|>
<Hds::PageHeader class="page-header bottom-margin-8" ...attributes as |PH|>
<PH.Title>{{@title}}</PH.Title>
{{#if (has-block "breadcrumbs")}}
<PH.Breadcrumb>

4
vault/core.go
View File

@ -359,6 +359,10 @@ type Core struct {
keepHALockOnStepDown *uint32
heldHALock physical.Lock
// enterpriseTokenGetAuthRegisterFunc is an optional per-core test seam for
// enterprise token auth registration lookup.
enterpriseTokenGetAuthRegisterFunc func(*Core) (RegisterAuthFunc, error)
// shutdownDoneCh is used to notify when core.Shutdown() completes.
// core.Shutdown() is typically issued in a goroutine to allow Vault to
// release the stateLock. This channel is marked atomic to prevent race