From 1eb31a2d1198f6de5fee5e88f0a7848102dff0f7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Oct 2022 20:50:23 +0000 Subject: [PATCH 1/3] deps: Update dependency Octokit to version 3.0.1 Updates-dependency: Octokit Updates-dependency-from-version: 3.0.0 Updates-dependency-to-version: 3.0.1 --- src/ChangeLog/Grynwald.ChangeLog.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ChangeLog/Grynwald.ChangeLog.csproj b/src/ChangeLog/Grynwald.ChangeLog.csproj index 4c5e8b8d..91726567 100644 --- a/src/ChangeLog/Grynwald.ChangeLog.csproj +++ b/src/ChangeLog/Grynwald.ChangeLog.csproj @@ -46,7 +46,7 @@ - + From b2441627a9045fe8659e8b6e1c4b911f14464925 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 7 Oct 2022 20:51:11 +0000 Subject: [PATCH 2/3] Update NuGet lock file --- src/ChangeLog.Test/packages.lock.json | 18 +++++++++--------- src/ChangeLog/packages.lock.json | 18 +++++++++--------- utilities/docs/packages.lock.json | 6 +++--- utilities/schema/packages.lock.json | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/ChangeLog.Test/packages.lock.json b/src/ChangeLog.Test/packages.lock.json index a6e88e16..132dfa92 100644 --- a/src/ChangeLog.Test/packages.lock.json +++ b/src/ChangeLog.Test/packages.lock.json @@ -491,8 +491,8 @@ }, "Octokit": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "IM7sDD1DSu+6jiFKcRyB8Tb0CZlPJ7nnBdPnhCXEToEZWJAlr/01PVk/UTRiCutF62Dni3n2gZWJrusLytxzpw==" + "resolved": "3.0.1", + "contentHash": "YMlCfdajpmU+Ar+3SH0MThU1OCi0h9ovtCJTEQEGRJZyLdiL/DCFLhhNr7jsIFPANFogEXEAy1iZLfOC3UxZow==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1519,7 +1519,7 @@ "Microsoft.Extensions.Configuration.Json": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", "NuGet.Versioning": "6.3.0", - "Octokit": "3.0.0", + "Octokit": "3.0.1", "Scriban": "5.5.0", "Zio": "0.15.0" } @@ -2010,8 +2010,8 @@ }, "Octokit": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "IM7sDD1DSu+6jiFKcRyB8Tb0CZlPJ7nnBdPnhCXEToEZWJAlr/01PVk/UTRiCutF62Dni3n2gZWJrusLytxzpw==" + "resolved": "3.0.1", + "contentHash": "YMlCfdajpmU+Ar+3SH0MThU1OCi0h9ovtCJTEQEGRJZyLdiL/DCFLhhNr7jsIFPANFogEXEAy1iZLfOC3UxZow==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -3030,7 +3030,7 @@ "Microsoft.Extensions.Configuration.Json": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", "NuGet.Versioning": "6.3.0", - "Octokit": "3.0.0", + "Octokit": "3.0.1", "Scriban": "5.5.0", "Zio": "0.15.0" } @@ -3517,8 +3517,8 @@ }, "Octokit": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "IM7sDD1DSu+6jiFKcRyB8Tb0CZlPJ7nnBdPnhCXEToEZWJAlr/01PVk/UTRiCutF62Dni3n2gZWJrusLytxzpw==" + "resolved": "3.0.1", + "contentHash": "YMlCfdajpmU+Ar+3SH0MThU1OCi0h9ovtCJTEQEGRJZyLdiL/DCFLhhNr7jsIFPANFogEXEAy1iZLfOC3UxZow==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -4533,7 +4533,7 @@ "Microsoft.Extensions.Configuration.Json": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", "NuGet.Versioning": "6.3.0", - "Octokit": "3.0.0", + "Octokit": "3.0.1", "Scriban": "5.5.0", "Zio": "0.15.0" } diff --git a/src/ChangeLog/packages.lock.json b/src/ChangeLog/packages.lock.json index a879f9b2..2a95ddd9 100644 --- a/src/ChangeLog/packages.lock.json +++ b/src/ChangeLog/packages.lock.json @@ -150,9 +150,9 @@ }, "Octokit": { "type": "Direct", - "requested": "[3.0.0, )", - "resolved": "3.0.0", - "contentHash": "IM7sDD1DSu+6jiFKcRyB8Tb0CZlPJ7nnBdPnhCXEToEZWJAlr/01PVk/UTRiCutF62Dni3n2gZWJrusLytxzpw==" + "requested": "[3.0.1, )", + "resolved": "3.0.1", + "contentHash": "YMlCfdajpmU+Ar+3SH0MThU1OCi0h9ovtCJTEQEGRJZyLdiL/DCFLhhNr7jsIFPANFogEXEAy1iZLfOC3UxZow==" }, "Scriban": { "type": "Direct", @@ -714,9 +714,9 @@ }, "Octokit": { "type": "Direct", - "requested": "[3.0.0, )", - "resolved": "3.0.0", - "contentHash": "IM7sDD1DSu+6jiFKcRyB8Tb0CZlPJ7nnBdPnhCXEToEZWJAlr/01PVk/UTRiCutF62Dni3n2gZWJrusLytxzpw==" + "requested": "[3.0.1, )", + "resolved": "3.0.1", + "contentHash": "YMlCfdajpmU+Ar+3SH0MThU1OCi0h9ovtCJTEQEGRJZyLdiL/DCFLhhNr7jsIFPANFogEXEAy1iZLfOC3UxZow==" }, "Scriban": { "type": "Direct", @@ -1263,9 +1263,9 @@ }, "Octokit": { "type": "Direct", - "requested": "[3.0.0, )", - "resolved": "3.0.0", - "contentHash": "IM7sDD1DSu+6jiFKcRyB8Tb0CZlPJ7nnBdPnhCXEToEZWJAlr/01PVk/UTRiCutF62Dni3n2gZWJrusLytxzpw==" + "requested": "[3.0.1, )", + "resolved": "3.0.1", + "contentHash": "YMlCfdajpmU+Ar+3SH0MThU1OCi0h9ovtCJTEQEGRJZyLdiL/DCFLhhNr7jsIFPANFogEXEAy1iZLfOC3UxZow==" }, "Scriban": { "type": "Direct", diff --git a/utilities/docs/packages.lock.json b/utilities/docs/packages.lock.json index e5ab2520..c30d5212 100644 --- a/utilities/docs/packages.lock.json +++ b/utilities/docs/packages.lock.json @@ -245,8 +245,8 @@ }, "Octokit": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "IM7sDD1DSu+6jiFKcRyB8Tb0CZlPJ7nnBdPnhCXEToEZWJAlr/01PVk/UTRiCutF62Dni3n2gZWJrusLytxzpw==" + "resolved": "3.0.1", + "contentHash": "YMlCfdajpmU+Ar+3SH0MThU1OCi0h9ovtCJTEQEGRJZyLdiL/DCFLhhNr7jsIFPANFogEXEAy1iZLfOC3UxZow==" }, "Scriban": { "type": "Transitive", @@ -310,7 +310,7 @@ "Microsoft.Extensions.Configuration.Json": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", "NuGet.Versioning": "6.3.0", - "Octokit": "3.0.0", + "Octokit": "3.0.1", "Scriban": "5.5.0", "Zio": "0.15.0" } diff --git a/utilities/schema/packages.lock.json b/utilities/schema/packages.lock.json index c78ce433..ee93008a 100644 --- a/utilities/schema/packages.lock.json +++ b/utilities/schema/packages.lock.json @@ -371,8 +371,8 @@ }, "Octokit": { "type": "Transitive", - "resolved": "3.0.0", - "contentHash": "IM7sDD1DSu+6jiFKcRyB8Tb0CZlPJ7nnBdPnhCXEToEZWJAlr/01PVk/UTRiCutF62Dni3n2gZWJrusLytxzpw==" + "resolved": "3.0.1", + "contentHash": "YMlCfdajpmU+Ar+3SH0MThU1OCi0h9ovtCJTEQEGRJZyLdiL/DCFLhhNr7jsIFPANFogEXEAy1iZLfOC3UxZow==" }, "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { "type": "Transitive", @@ -1301,7 +1301,7 @@ "Microsoft.Extensions.Configuration.Json": "6.0.0", "Microsoft.Extensions.Logging": "6.0.0", "NuGet.Versioning": "6.3.0", - "Octokit": "3.0.0", + "Octokit": "3.0.1", "Scriban": "5.5.0", "Zio": "0.15.0" } From b4afcad492d7f2f4f49d72625cccf35f1c1fc5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Gr=C3=BCnwald?= Date: Sun, 9 Oct 2022 18:56:33 +0200 Subject: [PATCH 3/3] Use new Octokit API to retriece reate limit (previous API has been marked obsolete) --- .../Integrations/GitHub/_Helpers/GitHubClientMock.cs | 6 +++--- src/ChangeLog/Integrations/GitHub/GitHubLinkTask.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog.Test/Integrations/GitHub/_Helpers/GitHubClientMock.cs b/src/ChangeLog.Test/Integrations/GitHub/_Helpers/GitHubClientMock.cs index de946e68..1b4dedbc 100644 --- a/src/ChangeLog.Test/Integrations/GitHub/_Helpers/GitHubClientMock.cs +++ b/src/ChangeLog.Test/Integrations/GitHub/_Helpers/GitHubClientMock.cs @@ -30,21 +30,21 @@ public RepositoriesClientMock() public Mock PullRequest { get; } = new(MockBehavior.Strict); - public Mock Miscellaneous { get; } = new(MockBehavior.Strict); + public Mock RateLimit { get; } = new(MockBehavior.Strict); public RepositoriesClientMock Repository { get; } = new(); public GitHubClientMock() { - Miscellaneous + RateLimit .Setup(x => x.GetRateLimits()) .ReturnsAsync(new MiscellaneousRateLimit(new ResourceRateLimit(), new RateLimit())); m_Mock.Setup(x => x.Repository).Returns(Repository.Object); m_Mock.Setup(x => x.Issue).Returns(Issue.Object); m_Mock.Setup(x => x.PullRequest).Returns(PullRequest.Object); - m_Mock.Setup(x => x.Miscellaneous).Returns(Miscellaneous.Object); + m_Mock.Setup(x => x.RateLimit).Returns(RateLimit.Object); } } } diff --git a/src/ChangeLog/Integrations/GitHub/GitHubLinkTask.cs b/src/ChangeLog/Integrations/GitHub/GitHubLinkTask.cs index 3131bb4b..893bfa88 100644 --- a/src/ChangeLog/Integrations/GitHub/GitHubLinkTask.cs +++ b/src/ChangeLog/Integrations/GitHub/GitHubLinkTask.cs @@ -57,7 +57,7 @@ public async Task RunAsync(ApplicationChangeLog changeLog) var githubClient = m_GitHubClientFactory.CreateClient(projectInfo.Host); - var rateLimit = await githubClient.Miscellaneous.GetRateLimits(); + var rateLimit = await githubClient.RateLimit.GetRateLimits(); m_Logger.LogDebug($"GitHub rate limit: {rateLimit.Rate.Remaining} requests of {rateLimit.Rate.Limit} remaining");