Sync Main (autogenerated) #195
Closed
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
Rust: accept test changes for now
… query with a PrintAst name from QlRefInlineExpectations.
This allows the string of package feeds to be constructed once and used repeatedly in the parallel restore loop as well.
…a given set of feeds.
…us-id Docs: add guidance for `previous-id` metadata
JS: `got` package modeling
…stinlineexpect QL4QL: Exclude PrintAst like tests from being reported as having missing InlineExpectations.
In particular for `postForm` `putForm` `patchForm` `getUri`.
Co-authored-by: Asger F <[email protected]>
…rof-rewriting Java buildless: add buildless-maven variant with a wildcard mirrorOf spec
…-swift Misc: Add another path prefix to accept-expected-changes-from-ci.py
Rust: rename several entities to their more natural names
…e-bom-downloads Java: add test exercising Gradle download pruning
Merge rc/3.17 into main
Actions: rename changenote file
Javascript, add missing `*` to changenote
Release preparation for version 2.21.0
Compatible with the latest released version of the CodeQL CLI
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+821
to
+845
| if (nugetConfigs.Count > 0) | ||
| { | ||
| // We don't have to get the feeds from each of the folders from below, it would be enought to check the folders that recursively contain the others. | ||
| allFeeds = nugetConfigs | ||
| .Select(config => | ||
| { | ||
| logger.LogWarning($"Failed to get directory of '{config}': {exc}"); | ||
| } | ||
| return null; | ||
| }) | ||
| .Where(folder => folder != null) | ||
| .SelectMany(folder => GetFeeds(() => dotnet.GetNugetFeedsFromFolder(folder!))) | ||
| .ToHashSet(); | ||
| try | ||
| { | ||
| return new FileInfo(config).Directory?.FullName; | ||
| } | ||
| catch (Exception exc) | ||
| { | ||
| logger.LogWarning($"Failed to get directory of '{config}': {exc}"); | ||
| } | ||
| return null; | ||
| }) | ||
| .Where(folder => folder != null) | ||
| .SelectMany(folder => GetFeeds(() => dotnet.GetNugetFeedsFromFolder(folder!))) | ||
| .ToHashSet(); | ||
| } | ||
| else | ||
| { | ||
| // If we haven't found any `nuget.config` files, then obtain a list of feeds from the root source directory. | ||
| allFeeds = GetFeeds(() => dotnet.GetNugetFeedsFromFolder(this.fileProvider.SourceDir.FullName)).ToHashSet(); | ||
| } |
Check notice
Code scanning / CodeQL
Missed ternary opportunity Note
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI 4 months ago
To fix the problem, we will replace the if statement with a ternary operator to assign the value to the allFeeds variable. We will also move the logging statements outside the ternary operator to ensure they are executed appropriately based on the condition.
- Replace the
ifstatement on lines 821-845 with a ternary operator. - Move the logging statements to be executed based on the condition separately.
Suggested changeset
1
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
| @@ -818,8 +818,4 @@ | ||
| // todo: this could be improved. | ||
| HashSet<string>? allFeeds = null; | ||
|
|
||
| if (nugetConfigs.Count > 0) | ||
| { | ||
| // We don't have to get the feeds from each of the folders from below, it would be enought to check the folders that recursively contain the others. | ||
| allFeeds = nugetConfigs | ||
| HashSet<string>? allFeeds = nugetConfigs.Count > 0 | ||
| ? nugetConfigs | ||
| .Select(config => | ||
| @@ -838,3 +834,8 @@ | ||
| .SelectMany(folder => GetFeeds(() => dotnet.GetNugetFeedsFromFolder(folder!))) | ||
| .ToHashSet(); | ||
| .ToHashSet() | ||
| : GetFeeds(() => dotnet.GetNugetFeedsFromFolder(this.fileProvider.SourceDir.FullName)).ToHashSet(); | ||
|
|
||
| if (nugetConfigs.Count > 0) | ||
| { | ||
| logger.LogInfo($"Found {allFeeds.Count} Nuget feeds (with inherited ones) in nuget.config files: {string.Join(", ", allFeeds.OrderBy(f => f))}"); | ||
| } | ||
| @@ -842,8 +843,5 @@ | ||
| { | ||
| // If we haven't found any `nuget.config` files, then obtain a list of feeds from the root source directory. | ||
| allFeeds = GetFeeds(() => dotnet.GetNugetFeedsFromFolder(this.fileProvider.SourceDir.FullName)).ToHashSet(); | ||
| logger.LogDebug("No Nuget feeds found in nuget.config files."); | ||
| } | ||
|
|
||
| logger.LogInfo($"Found {allFeeds.Count} Nuget feeds (with inherited ones) in nuget.config files: {string.Join(", ", allFeeds.OrderBy(f => f))}"); | ||
|
|
||
| return (explicitFeeds, allFeeds); |
Copilot is powered by AI and may make mistakes. Always verify output.
Comment on lines
+831
to
+834
| catch (Exception exc) | ||
| { | ||
| logger.LogWarning($"Failed to get directory of '{config}': {exc}"); | ||
| } |
Check notice
Code scanning / CodeQL
Generic catch clause Note
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI 4 months ago
To fix the problem, we should catch only specific exceptions that are relevant to the operation being performed. In this case, since the code is dealing with file I/O operations, we should catch exceptions such as IOException and UnauthorizedAccessException. This will ensure that only relevant exceptions are caught, and other exceptions are not unintentionally masked.
- Identify the specific exceptions that are relevant to the file I/O operations.
- Replace the generic
catch (Exception exc)block with specific catch blocks forIOExceptionandUnauthorizedAccessException. - Ensure that the logging functionality remains the same to provide useful information in case of an exception.
Suggested changeset
1
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetPackageRestorer.cs
| @@ -830,5 +830,9 @@ | ||
| } | ||
| catch (Exception exc) | ||
| catch (IOException ioExc) | ||
| { | ||
| logger.LogWarning($"Failed to get directory of '{config}': {exc}"); | ||
| logger.LogWarning($"Failed to get directory of '{config}' due to I/O error: {ioExc}"); | ||
| } | ||
| catch (UnauthorizedAccessException authExc) | ||
| { | ||
| logger.LogWarning($"Failed to get directory of '{config}' due to unauthorized access: {authExc}"); | ||
| } |
Copilot is powered by AI and may make mistakes. Always verify output.
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 PR syncs the latest changes from
codeql-cli/latestintomain.