diff --git a/src/codeql.ts b/src/codeql.ts index 4826ff7f2..1de541cd8 100644 --- a/src/codeql.ts +++ b/src/codeql.ts @@ -1266,7 +1266,7 @@ async function generateCodeScanningConfig( } augmentedConfig["query-filters"] = [ - ...(config.augmentationProperties.defaultQueryFilters || []), + ...(config.augmentationProperties.extraQueryExclusions || []), ...(augmentedConfig["query-filters"] || []), ]; if (augmentedConfig["query-filters"]?.length === 0) { diff --git a/src/config-utils.ts b/src/config-utils.ts index 9d50a2dd5..d08ebb656 100644 --- a/src/config-utils.ts +++ b/src/config-utils.ts @@ -186,9 +186,9 @@ export interface AugmentationProperties { packsInput?: string[]; /** - * Default query filters to apply to the queries in the config. + * Extra query exclusions to append to the config. */ - defaultQueryFilters?: QueryFilter[]; + extraQueryExclusions?: ExcludeQueryFilter[]; } /** @@ -201,7 +201,7 @@ export const defaultAugmentationProperties: AugmentationProperties = { packsInput: undefined, queriesInput: undefined, qualityQueriesInput: undefined, - defaultQueryFilters: [], + extraQueryExclusions: [], }; export type Packs = Partial>; @@ -671,9 +671,11 @@ export async function calculateAugmentation( false, ); - const defaultQueryFilters: QueryFilter[] = []; + const extraQueryExclusions: ExcludeQueryFilter[] = []; if (await shouldPerformDiffInformedAnalysis(codeql, features, logger)) { - defaultQueryFilters.push({ exclude: { tags: "exclude-from-incremental" } }); + extraQueryExclusions.push({ + exclude: { tags: "exclude-from-incremental" }, + }); } return { @@ -682,7 +684,7 @@ export async function calculateAugmentation( queriesInput, queriesInputCombines, qualityQueriesInput, - defaultQueryFilters, + extraQueryExclusions, }; }