Disable combining runs within a single file #2988
Merged
+6
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
Pull Request Overview
This PR disables the ability to combine multiple SARIF runs within a single file by throwing a ConfigurationError when such scenarios are detected. The change enforces a restriction that each SARIF file should contain only one run per category.
- Removes early return optimization for single SARIF files in the combining logic
- Adds validation to throw an error when multiple runs with the same category exist in a single file
- Updates both TypeScript source and corresponding generated JavaScript files
Reviewed Changes
Copilot reviewed 2 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| src/upload-lib.ts | Removes single-file optimization and adds validation call for single SARIF files |
| lib/upload-lib.js | Generated JavaScript equivalent of the TypeScript changes |
koesie10
commented
Jul 23, 2025
| @@ -206,9 +206,6 @@ async function combineSarifFilesUsingCLI( | |||
| logger: Logger, | |||
| ): Promise<SarifFile> { | |||
| logger.info("Combining SARIF files using the CodeQL CLI"); | |||
| if (sarifFiles.length === 1) { | |||
There was a problem hiding this comment.
This case was never actually hit, so I've removed this.
mbg
previously approved these changes
Jul 23, 2025
mbg
approved these changes
Jul 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will throw a
ConfigurationErrorwhen a single SARIF file contains multiple runs with the same category.Merge / deployment checklist