- Notifications
You must be signed in to change notification settings - Fork373
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
Using defaultAugmentationProperties to generated expected test outputeliminates the need to change individual tests when we add a new fieldto AugmentationProperties.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Pull Request Overview
This PR ensures that user-defined query filters are applied before any automatically added exclusions, fixing a bug where user “include” filters were overridden.
- Renamed
defaultQueryFilterstoextraQueryExclusionsacross the config API. - Updated
calculateAugmentationandgenerateCodeScanningConfigto use the new property and preserve user filter ordering. - Adjusted tests, generated JS files, and the changelog to match the renaming and logic changes.
Reviewed Changes
Copilot reviewed 9 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/config-utils.ts | Renamed property and updated augmentation logic. |
| src/config-utils.test.ts | Simplified test fixtures by spreadingdefaultAugmentationProperties. |
| src/codeql.ts | reorderedquery-filters array and added explanatory comment. |
| src/codeql.test.ts | Imported and useddefaultAugmentationProperties in tests. |
| lib/config-utils.js | Propagated renaming and logic updates to compiled output. |
| lib/codeql.js | Updated filter ordering logic and comments in compiled output. |
| CHANGELOG.md | Added release note for the bug fix. |
Comments suppressed due to low confidence (1)
src/codeql.ts:1273
- Add a unit test that verifies user-provided query filters appear before extra query exclusions in the generated CodeQL configuration.
...(augmentedConfig["query-filters"] || []),Uh oh!
There was an error while loading.Please reload this page.
This commit renames AugmentationProperties.defaultQueryFilters toextraQueryExclusions, and changes its type to ExcludeQueryFilter[]. Itmatters whether we are adding query inclusions or exclusions, and thisrenaming makes that distinction clearer.
1b923a3 to65abb79CompareThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Good catch. This makes sense.
66d7255 intomainUh oh!
There was an error while loading.Please reload this page.
This PR fixes a bug in PR analysis where user-provided
includequery filter fails to exclude non-included queries.Merge / deployment checklist