Skip to content

Fixes undefined vars becoming null and erroring in conditions #1356

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 5 commits into from
Oct 4, 2024
Merged

Fixes undefined vars becoming null and erroring in conditions #1356

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6710ebf
fixed null vars
ekohilas Oct 2, 2024
74c91b5
fix: handle rules regex edge case
ANGkeith Oct 3, 2024
d6fddb7
Update tests/rules-regex.test.ts
firecow Oct 3, 2024
841040f
Update tests/rules-regex.test.ts
firecow Oct 3, 2024
3d18240
fix
ANGkeith Oct 3, 2024
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
4 changes: 2 additions & 2 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ Refer to https://docs.gitlab.com/ee/ci/jobs/job_rules.html#unexpected-behavior-f
});

// Convert all null.match functions to false
evalStr = evalStr.replace(/null.match\(.+?\) != null/g, "false");
evalStr = evalStr.replace(/null.match\(.+?\) == null/g, "false");
evalStr = evalStr.replace(/null.match\(.+?\)\s*!=\s*null/g, "false");
evalStr = evalStr.replace(/null.match\(.+?\)\s*==\s*null/g, "false");

let res;
try {
Expand Down
5 changes: 5 additions & 0 deletions tests/rules-regex.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ const tests = [
jsExpression: '"23".match(/1234/) != null',
evalResult: false,
},
{
rule: '$CI_COMMIT_BRANCH && $GITLAB_FEATURES =~ /\bdependency_scanning\b/ && $CI_GITLAB_FIPS_MODE == "true"',
jsExpression: 'null && false&& null == "true"',
evalResult: false,
},
];
/* eslint-enable @typescript-eslint/quotes */

Expand Down