Allow escaping $ in config files that use expand env #5576
Merged
Conversation
This file contains 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
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
kfox1111
requested review from
evan2645,
amartinezfayo,
azdagron,
MarcosDY and
rturner3
as code owners
azdagron
reviewed
Oct 15, 2024
There was a problem hiding this comment.
SPIRE for better or worse accommodates a bring-your-own-main approach so main isn't quite the right place for this. Further, we can leverage the [os.Expand] function instead of os.ExpandEnv to avoid having to set/unset an environment variable.
I'd suggest adding a function in pkg/common/config or something called ExpandEnv that:
- Called os.Getenv to gather the current environment
- Added the '$' entry
- called os.Expand
This function could then be called in place of os.ExpandEnv in the agent/server run packages.
Signed-off-by: Kevin Fox <Kevin.Fox@pnnl.gov>
…o expand-escape
azdagron
approved these changes
Oct 16, 2024
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.
Fixes #5574.
$$ will match an env var named '$' which resolves to '$', allowing passing through '$'s.