bug(cmd): Ensure RunShutdownFuncs is called when an early error occurs (#2333)

* bug(cmd): Ensure RunShutdownFuncs is called when an early error occurs
pull/2339/head
Louis Ruch 4 years ago committed by GitHub
parent 4d966c8eb4
commit dcccaf1bcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -17,6 +17,10 @@ Canonical reference for changes, improvements, and bugfixes for Boundary.
### Bug Fixes
* cli: Correctly cleanup plugins after exiting `boundary dev`, `boundary server`
and `boundary database init`
([Issue](https://github.com/hashicorp/boundary/issues/2332),
[PR](https://github.com/hashicorp/boundary/pull/2333)).
* `boundary accounts change-password`: Fixed being prompted for confirmation of
the current password instead of the new one
([PR](https://github.com/hashicorp/boundary/pull/2325))

@ -177,6 +177,12 @@ func (c *InitCommand) Run(args []string) (retCode int) {
return result
}
defer func() {
if err := c.RunShutdownFuncs(); err != nil {
c.UI.Error(fmt.Errorf("Error running shutdown tasks: %w", err).Error())
}
}()
if c.configWrapperCleanupFunc != nil {
defer func() {
if err := c.configWrapperCleanupFunc(); err != nil {

@ -382,6 +382,12 @@ func (c *Command) Run(args []string) int {
const op = "dev.(Command).Run"
c.CombineLogs = c.flagCombineLogs
defer func() {
if err := c.RunShutdownFuncs(); err != nil {
c.UI.Error(fmt.Errorf("Error running shutdown tasks: %w", err).Error())
}
}()
var err error
f := c.Flags()
@ -615,12 +621,6 @@ func (c *Command) Run(args []string) int {
return base.CommandUserError
}
defer func() {
if err := c.RunShutdownFuncs(); err != nil {
c.UI.Error(fmt.Errorf("Error running shutdown tasks: %w", err).Error())
}
}()
var opts []base.Option
if c.flagCreateLoopbackHostPlugin {
c.DevLoopbackHostPluginId = "pl_1234567890"

@ -138,6 +138,12 @@ func (c *Command) AutocompleteFlags() complete.Flags {
func (c *Command) Run(args []string) int {
c.CombineLogs = c.flagCombineLogs
defer func() {
if err := c.RunShutdownFuncs(); err != nil {
c.UI.Error(fmt.Errorf("Error running shutdown tasks: %w", err).Error())
}
}()
if result := c.ParseFlagsAndConfig(args); result > 0 {
return result
}
@ -471,12 +477,6 @@ func (c *Command) Run(args []string) int {
}
}
defer func() {
if err := c.RunShutdownFuncs(); err != nil {
c.UI.Error(fmt.Errorf("Error running shutdown tasks: %w", err).Error())
}
}()
if c.Config.Controller != nil {
c.EnabledPlugins = append(c.EnabledPlugins, base.EnabledPluginHostAws, base.EnabledPluginHostAzure)
if err := c.StartController(c.Context); err != nil {

Loading…
Cancel
Save