Stop propagating quality-queries input

Author: mbg

lib/config-utils.js

@@ -763,15 +763,13 @@ const calculateAugmentationMacro = test.macro({
     _title: string,
     rawPacksInput: string | undefined,
     rawQueriesInput: string | undefined,
-    rawQualityQueriesInput: string | undefined,
     languages: Language[],
     expectedAugmentationProperties: configUtils.AugmentationProperties,
   ) => {
     const actualAugmentationProperties =
       await configUtils.calculateAugmentation(
         rawPacksInput,
         rawQueriesInput,
-        rawQualityQueriesInput,
         languages,
       );
     t.deepEqual(actualAugmentationProperties, expectedAugmentationProperties);
@@ -784,7 +782,6 @@ test(
   "All empty",
   undefined,
   undefined,
-  undefined,
   [KnownLanguage.javascript],
   {
     ...configUtils.defaultAugmentationProperties,
@@ -796,7 +793,6 @@ test(
   "With queries",
   undefined,
   " a, b , c, d",
-  undefined,
   [KnownLanguage.javascript],
   {
     ...configUtils.defaultAugmentationProperties,
@@ -809,7 +805,6 @@ test(
   "With queries combining",
   undefined,
   "   +   a, b , c, d ",
-  undefined,
   [KnownLanguage.javascript],
   {
     ...configUtils.defaultAugmentationProperties,
@@ -818,49 +813,11 @@ test(
   },
 );
 
-test(
-  calculateAugmentationMacro,
-  "With quality queries",
-  undefined,
-  undefined,
-  " a, b , c, d",
-  [KnownLanguage.javascript],
-  {
-    ...configUtils.defaultAugmentationProperties,
-    qualityQueriesInput: [
-      { uses: "a" },
-      { uses: "b" },
-      { uses: "c" },
-      { uses: "d" },
-    ],
-  },
-);
-
-test(
-  calculateAugmentationMacro,
-  "With security and quality queries",
-  undefined,
-  " a, b , c, d",
-  "e, f , g,h",
-  [KnownLanguage.javascript],
-  {
-    ...configUtils.defaultAugmentationProperties,
-    queriesInput: [{ uses: "a" }, { uses: "b" }, { uses: "c" }, { uses: "d" }],
-    qualityQueriesInput: [
-      { uses: "e" },
-      { uses: "f" },
-      { uses: "g" },
-      { uses: "h" },
-    ],
-  },
-);
-
 test(
   calculateAugmentationMacro,
   "With packs",
   "   codeql/a , codeql/b   , codeql/c  , codeql/d  ",
   undefined,
-  undefined,
   [KnownLanguage.javascript],
   {
     ...configUtils.defaultAugmentationProperties,
@@ -873,7 +830,6 @@ test(
   "With packs combining",
   "   +   codeql/a, codeql/b, codeql/c, codeql/d",
   undefined,
-  undefined,
   [KnownLanguage.javascript],
   {
     ...configUtils.defaultAugmentationProperties,
@@ -888,7 +844,6 @@ const calculateAugmentationErrorMacro = test.macro({
     _title: string,
     rawPacksInput: string | undefined,
     rawQueriesInput: string | undefined,
-    rawQualityQueriesInput: string | undefined,
     languages: Language[],
     expectedError: RegExp | string,
   ) => {
@@ -897,7 +852,6 @@ const calculateAugmentationErrorMacro = test.macro({
         configUtils.calculateAugmentation(
           rawPacksInput,
           rawQueriesInput,
-          rawQualityQueriesInput,
           languages,
         ),
       { message: expectedError },
@@ -911,7 +865,6 @@ test(
   "Plus (+) with nothing else (queries)",
   undefined,
   "   +   ",
-  undefined,
   [KnownLanguage.javascript],
   /The workflow property "queries" is invalid/,
 );
@@ -921,7 +874,6 @@ test(
   "Plus (+) with nothing else (packs)",
   "   +   ",
   undefined,
-  undefined,
   [KnownLanguage.javascript],
   /The workflow property "packs" is invalid/,
 );
@@ -931,7 +883,6 @@ test(
   "Packs input with multiple languages",
   "   +  a/b, c/d ",
   undefined,
-  undefined,
   [KnownLanguage.javascript, KnownLanguage.java],
   /Cannot specify a 'packs' input in a multi-language analysis/,
 );
@@ -941,7 +892,6 @@ test(
   "Packs input with no languages",
   "   +  a/b, c/d ",
   undefined,
-  undefined,
   [],
   /No languages specified/,
 );
@@ -951,7 +901,6 @@ test(
   "Invalid packs",
   " a-pack-without-a-scope ",
   undefined,
-  undefined,
   [KnownLanguage.javascript],
   /"a-pack-without-a-scope" is not a valid pack/,
 );

lib/config-utils.js.map

@@ -183,11 +183,6 @@ export interface AugmentationProperties {
    */
   queriesInput?: Array<{ uses: string }>;
 
-  /**
-   * The quality queries input from the `with` block of the action declaration.
-   */
-  qualityQueriesInput?: Array<{ uses: string }>;
-
   /**
    * Whether or not the packs input combines with the packs in the config.
    */
@@ -230,7 +225,6 @@ export const defaultAugmentationProperties: AugmentationProperties = {
   packsInputCombines: false,
   packsInput: undefined,
   queriesInput: undefined,
-  qualityQueriesInput: undefined,
   extraQueryExclusions: [],
   overlayDatabaseMode: OverlayDatabaseMode.None,
   useOverlayDatabaseCaching: false,
@@ -567,7 +561,6 @@ export async function getDefaultConfig({
   const augmentationProperties = await calculateAugmentation(
     packsInput,
     queriesInput,
-    qualityQueriesInput,
     languages,
   );
 
@@ -661,7 +654,6 @@ async function loadUserConfig(
 export async function calculateAugmentation(
   rawPacksInput: string | undefined,
   rawQueriesInput: string | undefined,
-  rawQualityQueriesInput: string | undefined,
   languages: Language[],
 ): Promise<AugmentationProperties> {
   const packsInputCombines = shouldCombine(rawPacksInput);
@@ -676,17 +668,11 @@ export async function calculateAugmentation(
     queriesInputCombines,
   );
 
-  const qualityQueriesInput = parseQueriesFromInput(
-    rawQualityQueriesInput,
-    false,
-  );
-
   return {
     packsInputCombines,
     packsInput: packsInput?.[languages[0]],
     queriesInput,
     queriesInputCombines,
-    qualityQueriesInput,
     extraQueryExclusions: [],
     overlayDatabaseMode: OverlayDatabaseMode.None,
     useOverlayDatabaseCaching: false,
@@ -1499,8 +1485,6 @@ export function isCodeScanningEnabled(config: Config): boolean {
 /**
  * Returns `true` if Code Quality analysis is enabled, or `false` if not.
  */
-export function isCodeQualityEnabled(config: Config): config is Config & {
-  augmentationProperties: { qualityQueriesInput: string };
-} {
+export function isCodeQualityEnabled(config: Config): boolean {
   return config.analysisKinds.includes(AnalysisKind.CodeQuality);
 }