Run version ~0.2.0 of the ML-powered query pack for v2.8.4+ of the CLI

github · Mar 31, 2022 · e26813c · e26813c
1 parent 2c03704
commit e26813c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 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
@@ -1837,3 +1837,12 @@ test(
   "security-and-quality",
   process.platform === "win32" ? undefined : "0.0.1"
 );
+// Test that the ~0.2.0 version of ML-powered queries is run on v2.8.4 of the CLI.
+test(
+  mlPoweredQueriesMacro,
+  "2.8.4",
+  true,
+  undefined,
+  "security-extended",
+  process.platform === "win32" ? undefined : "~0.2.0"
+);
diff --git a/src/util.ts b/src/util.ts
@@ -661,9 +661,11 @@ export const ML_POWERED_JS_QUERIES_PACK_NAME =
  * queries beta.
  */
 export async function getMlPoweredJsQueriesPack(
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _codeQL: CodeQL
+  codeQL: CodeQL
 ): Promise<PackWithVersion> {
+  if (await codeQlVersionAbove(codeQL, "2.8.4")) {
+    return { packName: ML_POWERED_JS_QUERIES_PACK_NAME, version: "~0.2.0" };
+  }
   return { packName: ML_POWERED_JS_QUERIES_PACK_NAME, version: "~0.1.0" };
 }