Skip to content

Fix regex expression in env file #19244

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

Merged
merged 4 commits into from
Jun 7, 2022
Merged

Fix regex expression in env file #19244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe5493c
Fix regex expression
paulacamargo25 Jun 6, 2022
276b9db
Fix tests
paulacamargo25 Jun 7, 2022
9cd7b0a
Fix reg exp
paulacamargo25 Jun 7, 2022
706e4f3
Fix test
paulacamargo25 Jun 7, 2022
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/client/common/variables/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ function parseEnvLine(line: string): [string, string] {
// https://github.com/motdotla/dotenv/blob/master/lib/main.js#L32
// We don't use dotenv here because it loses ordering, which is
// significant for substitution.
const match = line.match(/^\s*([a-zA-Z]\w*)\s*=\s*(.*?)?\s*$/);
const match = line.match(/^\s*(_*[a-zA-Z]\w*)\s*=\s*(.*?)?\s*$/);
if (!match) {
return ['', ''];
}
Expand Down
5 changes: 3 additions & 2 deletions src/test/common/variables/envVarsService.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,23 +395,24 @@ Path=/usr/x:/usr/y
SPAM=1234
ham=5678
Eggs=9012
_bogus1=...
1bogus2=...
bogus 3=...
bogus.4=...
bogus-5=...
bogus~6=...
VAR1=3456
VAR_2=7890
_VAR_3=1234
`);

expect(vars).to.not.equal(undefined, 'Variables is undefiend');
expect(Object.keys(vars!)).lengthOf(5, 'Incorrect number of variables');
expect(Object.keys(vars!)).lengthOf(6, 'Incorrect number of variables');
expect(vars).to.have.property('SPAM', '1234', 'value is invalid');
expect(vars).to.have.property('ham', '5678', 'value is invalid');
expect(vars).to.have.property('Eggs', '9012', 'value is invalid');
expect(vars).to.have.property('VAR1', '3456', 'value is invalid');
expect(vars).to.have.property('VAR_2', '7890', 'value is invalid');
expect(vars).to.have.property('_VAR_3', '1234', 'value is invalid');
});

test('Empty values become empty string', () => {
Expand Down