Skip to content

Commit

Permalink
Only warn against BootstrapExpect set in CLI flag
Browse files Browse the repository at this point in the history
If server.enabled is false, we ought to ignore all other values in
the server stanza.

However, I opted to preserve current error when `--bootstrap-expect` is
passed to the CLI when server is not enabled, to maintain current
behavior.
  • Loading branch information
Mahmood Ali committed Jul 31, 2019
1 parent 19cdfb6 commit 92c369c
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions command/agent/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,14 +270,14 @@ func (c *Command) readConfig() *Config {
config.PluginDir = filepath.Join(config.DataDir, "plugins")
}

if !c.isValidConfig(config) {
if !c.isValidConfig(config, cmdConfig) {
return nil
}

return config
}

func (c *Command) isValidConfig(config *Config) bool {
func (c *Command) isValidConfig(config, cmdConfig *Config) bool {

// Check that the server is running in at least one mode.
if !(config.Server.Enabled || config.Client.Enabled) {
Expand Down Expand Up @@ -353,11 +353,12 @@ func (c *Command) isValidConfig(config *Config) bool {
}

// Check the bootstrap flags
if config.Server.BootstrapExpect > 0 && !config.Server.Enabled {
if !config.Server.Enabled && cmdConfig.Server.BootstrapExpect > 0 {
// report an error if BootstrapExpect is set in CLI but server is disabled
c.Ui.Error("Bootstrap requires server mode to be enabled")
return false
}
if config.Server.BootstrapExpect == 1 {
if config.Server.Enabled && config.Server.BootstrapExpect == 1 {
c.Ui.Error("WARNING: Bootstrap mode enabled! Potentially unsafe operation.")
}

Expand Down

0 comments on commit 92c369c

Please sign in to comment.