Merge pull request #1087 from github/tombolton/update-ml-pack

Run ML-powered query pack `~0.3.0` on v2.9.3+ of the CLI
github · Jun 15, 2022 · df05122 · df05122
2 parents 81b419c + a27dc4f
commit df05122
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 4 deletions.
diff --git a/lib/config-utils.test.js b/lib/config-utils.test.js
diff --git a/lib/config-utils.test.js.map b/lib/config-utils.test.js.map
diff --git a/lib/util.js b/lib/util.js
diff --git a/lib/util.js.map b/lib/util.js.map
diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts
@@ -1865,3 +1865,23 @@ test(
   "security-and-quality",
   "0.0.1"
 );
+// Test that ML-powered queries are run on all platforms running `security-extended` on CodeQL
+// CLI 2.9.3+.
+test(
+  mlPoweredQueriesMacro,
+  "2.9.3",
+  true,
+  undefined,
+  "security-extended",
+  "~0.3.0"
+);
+// Test that ML-powered queries are run on all platforms running `security-and-quality` on CodeQL
+// CLI 2.9.3+.
+test(
+  mlPoweredQueriesMacro,
+  "2.9.3",
+  true,
+  undefined,
+  "security-and-quality",
+  "~0.3.0"
+);
diff --git a/src/util.ts b/src/util.ts
@@ -664,7 +664,9 @@ export const ML_POWERED_JS_QUERIES_PACK_NAME =
 export async function getMlPoweredJsQueriesPack(
   codeQL: CodeQL
 ): Promise<string> {
-  if (await codeQlVersionAbove(codeQL, "2.8.4")) {
+  if (await codeQlVersionAbove(codeQL, "2.9.3")) {
+    return `${ML_POWERED_JS_QUERIES_PACK_NAME}@~0.3.0`;
+  } else if (await codeQlVersionAbove(codeQL, "2.8.4")) {
     return `${ML_POWERED_JS_QUERIES_PACK_NAME}@~0.2.0`;
   }
   return `${ML_POWERED_JS_QUERIES_PACK_NAME}@~0.1.0`;