New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix configuration merge for nodes with substitution attributes #56694
Conversation
from_env
/from_zk
attributes
This is an automated comment for commit e0f6c68 with description of existing statuses. It's updated for the latest CI running ❌ Click here to open a full report in a separate page Successful checks
|
224aa5c
to
cc3dfaf
Compare
608b000
to
9edcdf4
Compare
@@ -535,6 +544,9 @@ void ConfigProcessor::doIncludesRecursive( | |||
|
|||
if (attr_nodes["from_env"]) /// we have env subst | |||
{ | |||
if (node->hasChildNodes()) /// only allow substitution for nodes with no value | |||
throw Poco::Exception("Element <" + node->nodeName() + "> has value, can't process from_env substitution"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I used this behavior before (define default value in the xml with replace
attribute and from_env
and override it via env) for development, AFAICS the bug that described in #56537 is fixed by removing SUBSTITUTION_ATTRS
from source node during merging before?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fix unexpected configuration value concatenation in case of overriding an entry having a substitution (
from_env
/from_zk
/incl
) #56537