fix consul stanza parsing when a configuration directory is used #5817
Conversation
langmartin
force-pushed
the
b-consul-stanza
branch
from
8d684ef to
d1ee78a
Compare
| @@ -14,6 +14,15 @@ import ( | |||
| "github.com/hashicorp/nomad/nomad/structs/config" | |||
| ) | |||
|
|
|||
| // ParseConfigDefault returns the configuration base | |||
| func ParseConfigDefault() *Config { | |||
| return &Config{ | |||
There was a problem hiding this comment.
Are there more than just these three that need to have defaults set correctly?
Would be good to add a comment clarifying when new fields with defaults should be added to this return struct.
There was a problem hiding this comment.
These are the only three where the defaults are required before decoding, other defaults are set in command.readConfig
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return defaults.Merge(config), nil |
There was a problem hiding this comment.
nitpick: I would consider moving this logic into LoadConfigDir.
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
When parsing a configuration directory, consul, vault, and autopilot stanzas are parsed correctly only if they are in the last file loaded. This change restores correct default merging behavior.