From a21fa72e90b898486cef49d4d102aab6eba109a5 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Thu, 28 Aug 2025 18:02:22 +0100 Subject: [PATCH] Stop propagating `quality-queries` input --- lib/analyze-action-post.js | 1 - lib/analyze-action.js | 1 - lib/autobuild-action.js | 1 - lib/init-action-post.js | 1 - lib/init-action.js | 9 +----- lib/resolve-environment-action.js | 1 - lib/start-proxy-action-post.js | 1 - lib/upload-lib.js | 1 - lib/upload-sarif-action-post.js | 1 - lib/upload-sarif-action.js | 1 - src/config-utils.test.ts | 51 ------------------------------- src/config-utils.ts | 18 +---------- 12 files changed, 2 insertions(+), 85 deletions(-) diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js index 00f43c5ca..78bf97c9f 100644 --- a/lib/analyze-action-post.js +++ b/lib/analyze-action-post.js @@ -126200,7 +126200,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/analyze-action.js b/lib/analyze-action.js index 7252eb29b..bd0e8bdb4 100644 --- a/lib/analyze-action.js +++ b/lib/analyze-action.js @@ -94104,7 +94104,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js index 90bdda525..3b97b29fe 100644 --- a/lib/autobuild-action.js +++ b/lib/autobuild-action.js @@ -88023,7 +88023,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/init-action-post.js b/lib/init-action-post.js index 4340c5587..a1b43a83f 100644 --- a/lib/init-action-post.js +++ b/lib/init-action-post.js @@ -131261,7 +131261,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/init-action.js b/lib/init-action.js index 25a979f40..af2cabb27 100644 --- a/lib/init-action.js +++ b/lib/init-action.js @@ -89637,7 +89637,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false @@ -89805,7 +89804,6 @@ async function getDefaultConfig({ const augmentationProperties = await calculateAugmentation( packsInput, queriesInput, - qualityQueriesInput, languages ); const { trapCaches, trapCacheDownloadTime } = await downloadCacheWithTime( @@ -89857,7 +89855,7 @@ async function loadUserConfig(configFile, workspacePath, apiDetails, tempDir) { return await getRemoteConfig(configFile, apiDetails); } } -async function calculateAugmentation(rawPacksInput, rawQueriesInput, rawQualityQueriesInput, languages) { +async function calculateAugmentation(rawPacksInput, rawQueriesInput, languages) { const packsInputCombines = shouldCombine(rawPacksInput); const packsInput = parsePacksFromInput( rawPacksInput, @@ -89869,16 +89867,11 @@ async function calculateAugmentation(rawPacksInput, rawQueriesInput, rawQualityQ rawQueriesInput, queriesInputCombines ); - const qualityQueriesInput = parseQueriesFromInput( - rawQualityQueriesInput, - false - ); return { packsInputCombines, packsInput: packsInput?.[languages[0]], queriesInput, queriesInputCombines, - qualityQueriesInput, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js index 1afc95e7e..ecbbc698c 100644 --- a/lib/resolve-environment-action.js +++ b/lib/resolve-environment-action.js @@ -87750,7 +87750,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js index 8907df03f..1a28bad4d 100644 --- a/lib/start-proxy-action-post.js +++ b/lib/start-proxy-action-post.js @@ -125609,7 +125609,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/upload-lib.js b/lib/upload-lib.js index 54416cf6a..c52521fbb 100644 --- a/lib/upload-lib.js +++ b/lib/upload-lib.js @@ -91922,7 +91922,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js index 22038904f..84a45d5e5 100644 --- a/lib/upload-sarif-action-post.js +++ b/lib/upload-sarif-action-post.js @@ -125776,7 +125776,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js index b3f5115e9..912586cf0 100644 --- a/lib/upload-sarif-action.js +++ b/lib/upload-sarif-action.js @@ -92607,7 +92607,6 @@ var defaultAugmentationProperties = { packsInputCombines: false, packsInput: void 0, queriesInput: void 0, - qualityQueriesInput: void 0, extraQueryExclusions: [], overlayDatabaseMode: "none" /* None */, useOverlayDatabaseCaching: false diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts index 607e73217..e57cb5f6f 100644 --- a/src/config-utils.test.ts +++ b/src/config-utils.test.ts @@ -763,7 +763,6 @@ const calculateAugmentationMacro = test.macro({ _title: string, rawPacksInput: string | undefined, rawQueriesInput: string | undefined, - rawQualityQueriesInput: string | undefined, languages: Language[], expectedAugmentationProperties: configUtils.AugmentationProperties, ) => { @@ -771,7 +770,6 @@ const calculateAugmentationMacro = test.macro({ 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/, ); diff --git a/src/config-utils.ts b/src/config-utils.ts index 58146808d..a3d292990 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -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 { 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); }