add support both $VAR and ${VAR} variable formats in modextravars
#5049
+69
−14
Conversation
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
boegel
requested changes
Nov 19, 2025
|
|
||
| def wrap_shell_vars(strng, wrap_prefix, wrap_suffix): | ||
| """ | ||
| Wrap variables $VAR or ${VAR} in wrap_tmpl template string |
Member
There was a problem hiding this comment.
There's no such thing as wrap_tmpl?
| return mods | ||
|
|
||
|
|
||
| def wrap_shell_vars(strng, wrap_prefix, wrap_suffix): |
Member
There was a problem hiding this comment.
Let's add a dedicated unit test for this new function, along with the end-to-end tests you've already added?
| # shell environment variable name: ${__}VAR_NAME_00_SUFFIX | ||
| REGEX_SHELL_VAR_PATTERN = r'[A-Z_]+[A-Z0-9_]+' | ||
| REGEX_SHELL_VAR = re.compile(rf'\$({REGEX_SHELL_VAR_PATTERN})') | ||
| REGEX_QUOTE_SHELL_VAR = re.compile(rf'[\"\']\$({REGEX_SHELL_VAR_PATTERN})[\"\']') |
Member
There was a problem hiding this comment.
Strictly speaking this is part of the API, so we shouldn't just remove these constants, people may be using them (in hooks for example)
| LOAD_TEMPLATE_DEPENDS_ON = 'depends_on("%(mod_name)s")' | ||
| IS_LOADED_TEMPLATE = 'isloaded("%s")' | ||
|
|
||
| OS_GETENV_TEMPLATE = r'os.getenv("%s")' |
Member
There was a problem hiding this comment.
Same here, this is part of the API, we shouldn't just remove this...
boegel
changed the title
$VAR and ${VAR} variable formats in modextravars
boegel
changed the title
$VAR and ${VAR} variable formats in modextravars$VAR and ${VAR} variable formats in modextravars
boegel
changed the title
$VAR and ${VAR} variable formats in modextravars$VAR and ${VAR} variable formats in modextravars
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.