fix: substitute every ${VAR} reference when merging env files - #1829
Merged
Eduardo Villalpando Mello (edvilme) merged 1 commit intoOct 1, 2026
Conversation
Eleanor Boyd (eleanorjboyd)
approved these changes
Sep 30, 2026
Eleanor Boyd (eleanorjboyd)
enabled auto-merge (squash)
September 30, 2026 16:01
Eleanor Boyd (eleanorjboyd)
disabled auto-merge
September 30, 2026 16:01
Eduardo Villalpando Mello (edvilme)
approved these changes
Oct 1, 2026
Contributor
|
🔒 Automated review in progress — Rich Chiodo (@rchiodo) is auto-reviewing this PR. |
Contributor
|
Result: 🔴 Verification detailsVerification: The relevant tests could not be fully run in the isolated environment; this review is not fully verified. Summary: [unavailable] Container verification could not start and local execution was not authorized for this PR HEAD: Podman machine 'pyrx-automation' is not running. Test runs: none recorded. |
Rich Chiodo (rchiodo)
approved these changes
Oct 1, 2026
Rich Chiodo (rchiodo)
left a comment
Contributor
There was a problem hiding this comment.
Approved via Review Center.
Contributor
|
Hello Alexandre Kohler (@kwy404) thank you so much for working on this. Changes look good :) |
Eduardo Villalpando Mello (edvilme)
merged commit Oct 1, 2026
4ab81cf
into
microsoft:main
47 of 48 checks passed
Alexandre Kohler (kwy404)
added a commit
to kwy404/kwy404
that referenced
this pull request
Oct 1, 2026
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.
Problem
mergeEnvVariablesexpands${VAR}references in env file values (thepython.envFilefile, the project.envand API overrides) withString.prototype.replaceand a string pattern. That has two effects:ROOT=/home/userin the base environment,PATHS=${ROOT}/a:${ROOT}/bbecomes/home/user/a:${ROOT}/b.$sequences in the substituted value are read as replacement patterns. A base value ofpa$$wordcomes out aspa$word.Fix
Use
split(token).join(value), which replaces every occurrence and inserts the value as is. (replaceAllis not available with the ES2020 lib target.)Tests
Added
src/test/features/execution/envVarUtils.unit.test.ts, which merges a value with a repeated${ROOT}reference and a${SECRET}whose base value contains$$. It fails before the fix (actual/home/user/a:${ROOT}/b) and passes after it.npm run unittest(Windows, Node 24): 2430 passing, 4 pending.