-
Notifications
You must be signed in to change notification settings - Fork 2.1k
C#: Rename Dependabot to Registry and update log messages. #22542
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
michaelnebel
wants to merge
2
commits into
github:main
Choose a base branch
from
michaelnebel:csharp/dependabottoregistryrename
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,12 +13,12 @@ namespace Semmle.Extraction.CSharp.DependencyFetching | |
| public class FeedManagerIO : IFeedManagerIO | ||
| { | ||
| private readonly ILogger logger; | ||
| private readonly IDependabotProxy? dependabotProxy; | ||
| private readonly IRegistryProxy? registryProxy; | ||
|
|
||
| public FeedManagerIO(ILogger logger, IDependabotProxy? dependabotProxy) | ||
| public FeedManagerIO(ILogger logger, IRegistryProxy? registryProxy) | ||
| { | ||
| this.logger = logger; | ||
| this.dependabotProxy = dependabotProxy; | ||
| this.registryProxy = registryProxy; | ||
| } | ||
|
|
||
| public string? GetDirectoryName(string path) | ||
|
|
@@ -43,13 +43,13 @@ public bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount) | |
| { | ||
| logger.LogInfo($"Checking if NuGet feed '{feed}' is reachable..."); | ||
|
|
||
| // Configure the HttpClient to be aware of the Dependabot Proxy, if used. | ||
| // Configure the HttpClient to be aware of the Registry proxy, if used. | ||
| HttpClientHandler httpClientHandler = new(); | ||
| if (dependabotProxy != null) | ||
| if (registryProxy != null) | ||
| { | ||
| httpClientHandler.Proxy = new WebProxy(dependabotProxy.Address); | ||
| httpClientHandler.Proxy = new WebProxy(registryProxy.Address); | ||
|
|
||
| if (dependabotProxy.Certificate != null) | ||
| if (registryProxy.Certificate != null) | ||
| { | ||
| httpClientHandler.ServerCertificateCustomValidationCallback = (message, cert, chain, _) => | ||
| { | ||
|
|
@@ -60,11 +60,11 @@ public bool IsFeedReachable(string feed, int timeoutMilliSeconds, int tryCount) | |
| : chain is null | ||
| ? "chain" | ||
| : "certificate"; | ||
| logger.LogWarning($"Dependabot proxy certificate validation failed due to missing {msg}"); | ||
| logger.LogWarning($"Registry proxy certificate validation failed due to missing {msg}"); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (Here the upper-case "Registry" is fine since it's at the start of a sentence.) |
||
| return false; | ||
| } | ||
| chain.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust; | ||
| chain.ChainPolicy.CustomTrustStore.Add(dependabotProxy.Certificate); | ||
| chain.ChainPolicy.CustomTrustStore.Add(registryProxy.Certificate); | ||
| return chain.Build(cert); | ||
| }; | ||
| } | ||
|
|
||
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
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.
Minor: Use lower-case
registry proxyinstead ofRegistry proxyin log messages, comments, etc. when it doesn't appear at the start of a sentence since unlike "Dependabot", "Registry" is not a product name and so shouldn't be capitalised.