Skip to content

fix: substitute every ${VAR} reference when merging env files #1829

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.

Sign up for GitHub

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

Open
Alexandre Kohler (kwy404) wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −1
Open

fix: substitute every ${VAR} reference when merging env files #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/features/execution/envVarUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export function mergeEnvVariables(
Object.keys(base).forEach((baseKey) => {
const baseValue = base[baseKey];
if (baseValue) {
value = value?.replace(`\${${baseKey}}`, baseValue);
value = value?.split(`\${${baseKey}}`).join(baseValue);
}
});
env[otherKey] = value;
Expand Down
13 changes: 13 additions & 0 deletions src/test/features/execution/envVarUtils.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import * as assert from 'assert';
import { mergeEnvVariables } from '../../../features/execution/envVarUtils';

suite('Env Var Utils Tests', () => {
test('mergeEnvVariables substitutes every reference to a base variable', () => {
const env = mergeEnvVariables(
{ ROOT: '/home/user', SECRET: 'pa$$word' },
{ A: '${ROOT}/a:${ROOT}/b', B: '${SECRET}' },
);
assert.strictEqual(env.A, '/home/user/a:/home/user/b');
assert.strictEqual(env.B, 'pa$$word');
});
});