robojerk/codeql-action

Stop running ML-powered queries on Windows

Browse source
This commit is contained in:
Henry Mercer 2022-03-30 18:05:12 +01:00
parent 894faced79
commit e83a1d469e
6 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/config-utils.js generated
View file

@ -130,7 +130,10 @@ async function addBuiltinSuiteQueries(languages, codeQL, resultMap, packs, suite
// If we're running the JavaScript security-extended analysis (or a superset of it), the repo is // If we're running the JavaScript security-extended analysis (or a superset of it), the repo is
// opted into the ML-powered queries beta, and a user hasn't already added the ML-powered query // opted into the ML-powered queries beta, and a user hasn't already added the ML-powered query
// pack, then add the ML-powered query pack so that we run ML-powered queries. // pack, then add the ML-powered query pack so that we run ML-powered queries.
if (languages.includes("javascript") && if (
// Disable ML-powered queries on Windows
process.platform !== "win32" &&
languages.includes("javascript") &&
(found === "security-extended" || found === "security-and-quality") && (found === "security-extended" || found === "security-and-quality") &&
!((_a = packs.javascript) === null || _a === void 0 ? void 0 : _a.some((pack) => pack.packName === util_1.ML_POWERED_JS_QUERIES_PACK.packName)) && !((_a = packs.javascript) === null || _a === void 0 ? void 0 : _a.some((pack) => pack.packName === util_1.ML_POWERED_JS_QUERIES_PACK.packName)) &&
(await featureFlags.getValue(feature_flags_1.FeatureFlag.MlPoweredQueriesEnabled)) && (await featureFlags.getValue(feature_flags_1.FeatureFlag.MlPoweredQueriesEnabled)) &&

2
lib/config-utils.js.map
View file

File diff suppressed because one or more lines are too long

8
lib/config-utils.test.js generated
View file

@ -911,11 +911,11 @@ const mlPoweredQueriesMacro = ava_1.default.macro({
? `${expectedVersionString} are` ? `${expectedVersionString} are`
: "aren't"} loaded for packs: ${packsInput}, queries: ${queriesInput} using CLI v${codeQLVersion} when feature flag is ${isMlPoweredQueriesFlagEnabled ? "enabled" : "disabled"}`, : "aren't"} loaded for packs: ${packsInput}, queries: ${queriesInput} using CLI v${codeQLVersion} when feature flag is ${isMlPoweredQueriesFlagEnabled ? "enabled" : "disabled"}`,
}); });
// macro, isMlPoweredQueriesFlagEnabled, packsInput, queriesInput, versionString // macro, codeQLVersion, isMlPoweredQueriesFlagEnabled, packsInput, queriesInput, expectedVersionString
(0, ava_1.default)(mlPoweredQueriesMacro, "2.7.4", true, undefined, "security-extended", undefined); (0, ava_1.default)(mlPoweredQueriesMacro, "2.7.4", true, undefined, "security-extended", undefined);
(0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", false, undefined, "security-extended", undefined); (0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", false, undefined, "security-extended", undefined);
(0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", true, undefined, undefined, undefined); (0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", true, undefined, undefined, undefined);
(0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", true, undefined, "security-extended", "~0.1.0"); (0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", true, undefined, "security-extended", process.platform === "win32" ? undefined : "~0.1.0");
(0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", true, undefined, "security-and-quality", "~0.1.0"); (0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", true, undefined, "security-and-quality", process.platform === "win32" ? undefined : "~0.1.0");
(0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", true, "codeql/javascript-experimental-atm-queries@0.0.1", "security-and-quality", "0.0.1"); (0, ava_1.default)(mlPoweredQueriesMacro, "2.7.5", true, "codeql/javascript-experimental-atm-queries@0.0.1", "security-and-quality", process.platform === "win32" ? undefined : "0.0.1");
//# sourceMappingURL=config-utils.test.js.map //# sourceMappingURL=config-utils.test.js.map

2
lib/config-utils.test.js.map
View file

File diff suppressed because one or more lines are too long

8
src/config-utils.test.ts
View file

@ -1788,7 +1788,7 @@ const mlPoweredQueriesMacro = test.macro({
}`, }`,
}); });
// macro, isMlPoweredQueriesFlagEnabled, packsInput, queriesInput, versionString // macro, codeQLVersion, isMlPoweredQueriesFlagEnabled, packsInput, queriesInput, expectedVersionString
test( test(
mlPoweredQueriesMacro, mlPoweredQueriesMacro,
"2.7.4", "2.7.4",
@ -1812,7 +1812,7 @@ test(
true, true,
undefined, undefined,
"security-extended", "security-extended",
"~0.1.0" process.platform === "win32" ? undefined : "~0.1.0"
); );
test( test(
mlPoweredQueriesMacro, mlPoweredQueriesMacro,
@ -1820,7 +1820,7 @@ test(
true, true,
undefined, undefined,
"security-and-quality", "security-and-quality",
"~0.1.0" process.platform === "win32" ? undefined : "~0.1.0"
); );
test( test(
mlPoweredQueriesMacro, mlPoweredQueriesMacro,
@ -1828,5 +1828,5 @@ test(
true, true,
"codeql/javascript-experimental-atm-queries@0.0.1", "codeql/javascript-experimental-atm-queries@0.0.1",
"security-and-quality", "security-and-quality",
"0.0.1" process.platform === "win32" ? undefined : "0.0.1"
); );

2
src/config-utils.ts
View file

@ -299,6 +299,8 @@ async function addBuiltinSuiteQueries(
// opted into the ML-powered queries beta, and a user hasn't already added the ML-powered query // opted into the ML-powered queries beta, and a user hasn't already added the ML-powered query
// pack, then add the ML-powered query pack so that we run ML-powered queries. // pack, then add the ML-powered query pack so that we run ML-powered queries.
if ( if (
// Disable ML-powered queries on Windows
process.platform !== "win32" &&
languages.includes("javascript") && languages.includes("javascript") &&
(found === "security-extended" || found === "security-and-quality") && (found === "security-extended" || found === "security-and-quality") &&
!packs.javascript?.some( !packs.javascript?.some(