8000 Keep user-provided query filters first by cklin · Pull Request #2938 · github/codeql-action · GitHub
[go: up one dir, main page]
Skip to content

Keep user-provided query filters first #2938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 19, 2025
Merged

Keep user-provided query filters first #2938

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1764e3d
Use defaultAugmentationProperties in tests
cklin Apr 21, 2025
f5304e7
Rename defaultQueryFilters
cklin Jun 19, 2025
0b8d151
Keep user-provided query filters first
cklin Jun 19, 2025
65abb79
build: refresh js files
cklin Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename defaultQueryFilters 
This commit renames AugmentationProperties.defaultQueryFilters to
extraQueryExclusions, and changes its type to ExcludeQueryFilter[]. It
matters whether we are adding query inclusions or exclusions, and this
renaming makes that distinction clearer.
  • Loading branch information
@cklin
cklin committed Jun 19, 2025
commit f5304e7bf5e44fb9029b23e13dcaa78d107137d5
2 changes: 1 addition & 1 deletion src/codeql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
14 changes: 8 additions & 6 deletions src/config-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
}

/**
Expand All @@ -201,7 +201,7 @@ export const defaultAugmentationProperties: AugmentationProperties = {
packsInput: undefined,
queriesInput: undefined,
qualityQueriesInput: undefined,
defaultQueryFilters: [],
extraQueryExclusions: [],
};
export type Packs = Partial<Record<Language, string[]>>;

Expand Down Expand Up @@ -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 {
Expand All @@ -682,7 +684,7 @@ export async function calculateAugmentation(
queriesInput,
queriesInputCombines,
qualityQueriesInput,
defaultQueryFilters,
extraQueryExclusions,
};
}

Expand Down
0