template: preserve replacement config for nested substitutions#861
Open
WyRainBow wants to merge 2 commits into
Open
template: preserve replacement config for nested substitutions#861WyRainBow wants to merge 2 commits into
WyRainBow wants to merge 2 commits into
Conversation
Signed-off-by: wyRainBow <weiyu9484@gmail.com>
Signed-off-by: wyRainBow <weiyu9484@gmail.com>
69f14dd to
e9ae694
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Preserve interpolation config when recursively substituting the
restportion of braced expressions inDefaultReplacementAppliedFunc.Before this change, the recursive call used
SubstituteWith(rest, mapping, pattern), which dropped caller-provided options such as customReplacementFuncandWithoutLogging. This caused mixed expressions like${FILE:-...} ${ENTRY_ID}to incorrectly process${ENTRY_ID}with default behavior.What changed
SubstituteWithOptionswith:WithPattern(cfg.pattern)WithReplacementFunction(cfg.replacementFunc)when setWithSubstitutionFunction(cfg.substituteFunc)when setWithoutLoggingwhen logging is disabledVerification
go test ./template -count=1go test ./... -count=1Fixes #856