Fix bug with merging vault agent configs that set template_config #29680
+69
−4
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This change fixes #29654, where giving the vault agent multiple config files can cause the resulting merged config to be incorrect when
template_config
is set in one of the config files. Specifically, when the first config file provided to the vault agent has atemplate_config
stanza, and the second one doesn't, the merged config only has defaulttemplate_config
values. This is because we started creating aTemplateConfig
struct even for configs that didn't specify it, to ensure that theMaxConnectionsPerHost
default was being honored (#24989). But we were still doing a nil check forTemplateConfig
during the merge process to determine if it needed to be updated, so we were overwriting it with the defaults if the config being processed didn't specify it.I changed the nil check to checking against the default
TemplateConfig
value, and also moved setting that default from withinparseTemplateConfig
intoNewConfig()
to make sure the default continues to be set when notemplate_config
is specified.TODO only if you're a HashiCorp employee
backport/
label that matches the desired release branch. Note that in the CE repo, the latest release branch will look likebackport/x.x.x
, but older release branches will bebackport/ent/x.x.x+ent
.of a public function, even if that change is in a CE file, double check that
applying the patch for this PR to the ENT repo and running tests doesn't
break any tests. Sometimes ENT only tests rely on public functions in CE
files.
in the PR description, commit message, or branch name.
description. Also, make sure the changelog is in this PR, not in your ENT PR.