upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-03 20:40:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

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

Browse source
This commit is contained in:
hc-github-team-secure-vault-core 2026-01-28 18:04:47 +00:00
commit 99d8cb345a
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ui/lib/core/addon/components/sidebar/frame.hbs
View file

@ -33,7 +33,17 @@
{{on "click" (fn (mut this.console.isOpen) (not this.console.isOpen))}}
{{on "click" this.trackReplToggle}}
/>
{{! TODO: insert help button }}
<Hds::Dropdown @enableCollisionDetection={{true}} data-test-dropdown="help menu" as |dd|>
<dd.ToggleIcon @icon="help" @text="help menu" />
<dd.Title @text="Help & Support" />
<dd.Interactive @href="https://developer.hashicorp.com/vault/docs">Documentation</dd.Interactive>
<dd.Interactive @href="https://developer.hashicorp.com/vault/tutorials">Tutorials</dd.Interactive>
<dd.Interactive @href="https://www.hashicorp.com/en/blog/products/vault">Blogs</dd.Interactive>
<dd.Interactive @href="https://github.com/hashicorp/vault/blob/main/CHANGELOG.md">Changelog</dd.Interactive>
<dd.Separator />
<dd.Interactive @href="https://support.hashicorp.com/hc/en-us/requests/new">Create support ticket</dd.Interactive>
</Hds::Dropdown>
<Sidebar::UserMenu />
</:utilityActions>
</Hds::AppHeader>

1
ui/tests/integration/components/sidebar/frame-test.js
View file

@ -86,6 +86,7 @@ module('Integration | Component | sidebar-frame', function (hooks) {
assert.dom('.panel-open').exists('Console ui panel opens');
assert.dom('[data-test-user-menu]').exists('User menu renders');
assert.dom(GENERAL.dropdownToggle('help menu')).exists('Help menu renders');
await click('[data-test-console-toggle]');
assert.dom('.panel-open').doesNotExist('Console ui panel closes');
});

9
vault/core_test.go
View file

@ -950,15 +950,16 @@ func TestCore_ShutdownDone(t *testing.T) {
c := TestCoreWithSealAndUINoCleanup(t, &CoreConfig{})
testCoreUnsealed(t, c)
doneCh := c.ShutdownDone()
errCh := make(chan error)
go func() {
time.Sleep(100 * time.Millisecond)
err := c.Shutdown()
if err != nil {
t.Fatal(err)
}
errCh <- c.Shutdown()
}()
select {
case err := <-errCh:
t.Fatal(err)
case <-doneCh:
if !c.Sealed() {
t.Fatalf("shutdown done called prematurely!")