Only add ML-powered queries pack if the user didn't manually request it

github · henrymercer · Feb 7, 2022 · Feb 3, 2022 · Feb 3, 2022 · Feb 4, 2022
commit 9f32fc9b9de4109ef781ed425f1c913f4fd8d354
@@ -1713,8 +1713,9 @@ const mlPoweredQueriesMacro = test.macro({
     t: ExecutionContext,
     codeQLVersion: string,
     isMlPoweredQueriesFlagEnabled: boolean,
+    packsInput: string | undefined,
     queriesInput: string | undefined,
-    shouldRunMlPoweredQueries: boolean
+    expectedVersionString: string | undefined
   ) => {
     return await util.withTmpDir(async (tmpDir) => {
       const codeQL = setCodeQL({
@@ -1735,7 +1736,7 @@ const mlPoweredQueriesMacro = test.macro({
       const { packs } = await configUtils.initConfig(
         "javascript",
         queriesInput,
-        undefined,
+        packsInput,
         undefined,
         undefined,
         false,
@@ -1755,12 +1756,12 @@ const mlPoweredQueriesMacro = test.macro({
         ),
         getRunnerLogger(true)
       );
-      if (shouldRunMlPoweredQueries) {
+      if (expectedVersionString !== undefined) {
         t.deepEqual(packs as unknown, {
           [Language.javascript]: [
             {
               packName: "codeql/javascript-experimental-atm-queries",
-              version: "~0.0.2",
+              version: expectedVersionString,
             },
           ],
         });
@@ -1773,24 +1774,58 @@ const mlPoweredQueriesMacro = test.macro({
     _providedTitle: string | undefined,
     codeQLVersion: string,
     isMlPoweredQueriesFlagEnabled: boolean,
+    packsInput: string | undefined,
     queriesInput: string | undefined,
-    shouldRunMlPoweredQueries: boolean
-  ) => {
-    const queriesInputDescription = queriesInput
-      ? `'queries: ${queriesInput}'`
-      : "default config";
-
-    return `ML-powered queries ${
-      shouldRunMlPoweredQueries ? "are" : "aren't"
-    } loaded for ${queriesInputDescription} using CLI v${codeQLVersion} when feature flag is ${
+    expectedVersionString: string | undefined
+  ) =>
+    `ML-powered queries ${
+      expectedVersionString !== undefined
+        ? `${expectedVersionString} are`
+        : "aren't"
+    } loaded for packs: ${packsInput}, queries: ${queriesInput} using CLI v${codeQLVersion} when feature flag is ${
       isMlPoweredQueriesFlagEnabled ? "enabled" : "disabled"
-    }`;
-  },
+    }`,
 });
 
-// macro, isMlPoweredQueriesFlagEnabled, queriesInput, shouldRunMlPoweredQueries
-test(mlPoweredQueriesMacro, "2.7.4", true, "security-extended", false);
-test(mlPoweredQueriesMacro, "2.7.5", false, "security-extended", false);
-test(mlPoweredQueriesMacro, "2.7.5", true, undefined, false);
-test(mlPoweredQueriesMacro, "2.7.5", true, "security-extended", true);
-test(mlPoweredQueriesMacro, "2.7.5", true, "security-and-quality", true);
+// macro, isMlPoweredQueriesFlagEnabled, packsInput, queriesInput, versionString
+test(
+  mlPoweredQueriesMacro,
+  "2.7.4",
+  true,
+  undefined,
+  "security-extended",
+  undefined
+);
+test(
+  mlPoweredQueriesMacro,
+  "2.7.5",
+  false,
+  undefined,
+  "security-extended",
+  undefined
+);
+test(mlPoweredQueriesMacro, "2.7.5", true, undefined, undefined, undefined);
+test(
+  mlPoweredQueriesMacro,
+  "2.7.5",
+  true,
+  undefined,
+  "security-extended",
+  "~0.0.2"
+);
+test(
+  mlPoweredQueriesMacro,
+  "2.7.5",
+  true,
+  undefined,
+  "security-and-quality",
+  "~0.0.2"
+);
+test(
+  mlPoweredQueriesMacro,
+  "2.7.5",
+  true,
+  "codeql/javascript-experimental-atm-queries@0.0.1",
+  "security-and-quality",
+  "0.0.1"
+);
@@ -289,12 +289,18 @@ async function addBuiltinSuiteQueries(
     throw new Error(getQueryUsesInvalid(configFile, suiteName));
   }
 
-  // If we're running the JavaScript security-extended analysis (or a superset of it) and the repo
-  // is opted into the ML-powered queries beta, then add the ML-powered query pack so that we run
-  // the ML-powered queries.
+  // 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
+  // pack, then add the ML-powered query pack so that we run ML-powered queries.
   if (
     languages.includes("javascript") &&
     (found === "security-extended" || found === "security-and-quality") &&
+    !(
+      packs.javascript &&
+      packs.javascript.some(
+        (pack) => pack.packName === ML_POWERED_JS_QUERIES_PACK_NAME
+      )
+    ) &&
     (await featureFlags.getValue(FeatureFlag.MlPoweredQueriesEnabled)) &&
     (await codeQlVersionAbove(codeQL, CODEQL_VERSION_ML_POWERED_QUERIES))
   ) {