Skip to content

Commit

Permalink
Merge branch 'ui-generated-items' of https://github.com/hashicorp/vault
Browse files Browse the repository at this point in the history
… into ui-generated-items
  • Loading branch information
andaley committed Oct 16, 2019
2 parents 47b44b9 + 75c461e commit 31bcd09
Show file tree
Hide file tree
Showing 144 changed files with 27,103 additions and 18 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ IMPROVEMENTS:
* auth/jwt: Bound claims may now contain boolean values [JWT-73]
* auth/jwt: CLI logins can now open the browser when running in WSL [JWT-77]
* core: Exit ScanView if context has been cancelled [GH-7419]
* core: re-encrypt barrier and recovery keys if the unseal key is updated
[GH-7493]
* core (enterprise): Add background seal re-wrap
* core/metrics: Add config parameter to allow unauthenticated sys/metrics
access. [GH-7550]
* replication (enterprise): Write-Ahead-Log entries will not duplicate the
Expand Down Expand Up @@ -84,6 +87,8 @@ BUG FIXES:

* agent: Fix handling of gzipped responses [GH-7470]
* cli: Fix panic when pgp keys list is empty [GH-7546]
* core: add hook for initializing seals for migration [GH-7666]
* core (enterprise): Fix seal migration in enterprise
* identity: Add required field `response_types_supported` to identity token
`.well-known/openid-configuration` response [GH-7533]
* secrets/database: Fix bug in combined DB secrets engine that can result in
Expand Down
11 changes: 11 additions & 0 deletions command/base_predict.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,17 @@ func (b *BaseCommand) PredictVaultPolicies() complete.Predictor {
return NewPredict().VaultPolicies()
}

func (b *BaseCommand) PredictVaultDebugTargets() complete.Predictor {
return complete.PredictSet(
"config",
"host",
"metrics",
"pprof",
"replication-status",
"server-status",
)
}

// VaultFiles returns a predictor for Vault "files". This is a public API for
// consumers, but you probably want BaseCommand.PredictVaultFiles instead.
func (p *Predict) VaultFiles() complete.Predictor {
Expand Down
6 changes: 6 additions & 0 deletions command/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,12 @@ func initCommands(ui, serverCmdUi cli.Ui, runOpts *RunOptions) {
BaseCommand: getBaseCommand(),
}, nil
},
"debug": func() (cli.Command, error) {
return &DebugCommand{
BaseCommand: getBaseCommand(),
ShutdownCh: MakeShutdownCh(),
}, nil
},
"delete": func() (cli.Command, error) {
return &DeleteCommand{
BaseCommand: getBaseCommand(),
Expand Down
Loading

0 comments on commit 31bcd09

Please sign in to comment.