Add SecondaryRateLimitHandler to int tests

src/OctoshiftCLI.IntegrationTests/AdoBasicToGithub.cs

@@ -1,4 +1,6 @@
+using System.Net.Http;
 using System.Threading.Tasks;
+using OctoshiftCLI.Services;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +9,10 @@
     [Collection("Integration Tests")]
     public class AdoBasicToGithub : AdoToGithub
     {
-        public AdoBasicToGithub(ITestOutputHelper output) : base(output)
+        public AdoBasicToGithub(ITestOutputHelper output) : base(output) { }
+        protected override HttpClient CreateGithubHttpClient()
         {
+            return new HttpClient(new SecondaryRateLimitHandler(new HttpClientHandler()), disposeHandler: true);
         }
 
         [Fact]
@@ -39,7 +43,9 @@
                 await Helper.CreatePipeline(adoOrg, teamProject2, adoRepo2, pipeline2, commitId);
             });
 
-            await Helper.RunAdoToGithubCliMigration($"generate-script --github-org {githubOrg} --ado-org {adoOrg} --all", Tokens);
+            await Helper.RunAdoToGithubCliMigration(
+                $"generate-script --github-org {githubOrg} --ado-org {adoOrg} --all",
+                Tokens);
 
             Helper.AssertNoErrorInLogs(StartTime);
 

src/OctoshiftCLI.IntegrationTests/AdoCsvToGithub.cs

@@ -1,4 +1,6 @@
+using System.Net.Http;
 using System.Threading.Tasks;
+using OctoshiftCLI.Services;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -7,8 +9,11 @@
     [Collection("Integration Tests")]
     public class AdoCsvToGithub : AdoToGithub
     {
-        public AdoCsvToGithub(ITestOutputHelper output) : base(output)
+        public AdoCsvToGithub(ITestOutputHelper output) : base(output) { }
+
+        protected override HttpClient CreateGithubHttpClient()
         {
+            return new HttpClient(new SecondaryRateLimitHandler(new HttpClientHandler()), disposeHandler: true);
         }
 
         [Fact]
@@ -40,7 +45,9 @@
             });
 
             await Helper.RunCliCommand($"ado2gh inventory-report --ado-org {adoOrg}", "gh", Tokens);
-            await Helper.RunAdoToGithubCliMigration($"generate-script --github-org {githubOrg} --ado-org {adoOrg} --all --repo-list repos.csv", Tokens);
+            await Helper.RunAdoToGithubCliMigration(
+                $"generate-script --github-org {githubOrg} --ado-org {adoOrg} --all --repo-list repos.csv",
+                Tokens);
 
             Helper.AssertNoErrorInLogs(StartTime);
 

src/OctoshiftCLI.IntegrationTests/AdoServerToGithub.cs

@@ -1,4 +1,6 @@
+using System.Net.Http;
 using System.Threading.Tasks;
+using OctoshiftCLI.Services;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -9,8 +11,10 @@
     {
         private const string ADO_SERVER_URL = "http://octoshift-ado-server-2022.eastus.cloudapp.azure.com/";
 
-        public AdoServerToGithub(ITestOutputHelper output) : base(output, ADO_SERVER_URL, "ADO_SERVER_PAT")
+        public AdoServerToGithub(ITestOutputHelper output) : base(output, ADO_SERVER_URL, "ADO_SERVER_PAT") { }
+        protected override HttpClient CreateGithubHttpClient()
         {
+            return new HttpClient(new SecondaryRateLimitHandler(new HttpClientHandler()), disposeHandler: true);
         }
 
         [Fact(Skip = "ADO Server is not a supported feature in GEI")]
@@ -41,7 +45,9 @@
                 await Helper.CreatePipeline(adoOrg, teamProject2, adoRepo2, pipeline2, commitId, ADO_SERVER_URL);
             });
 
-            await Helper.RunAdoToGithubCliMigration($"generate-script --github-org {githubOrg} --ado-org {adoOrg} --ado-server-url {ADO_SERVER_URL} --download-migration-logs --create-teams --link-idp-groups", Tokens);
+            await Helper.RunAdoToGithubCliMigration(
+                $"generate-script --github-org {githubOrg} --ado-org {adoOrg} --ado-server-url {ADO_SERVER_URL} --download-migration-logs --create-teams --link-idp-groups",
+                Tokens);
 
             Helper.AssertNoErrorInLogs(StartTime);
 

src/OctoshiftCLI.IntegrationTests/AdoToGithub.cs

@@ -18,6 +18,8 @@
         protected Dictionary<string, string> Tokens { get; }
         protected DateTime StartTime { get; }
 
+        protected virtual HttpClient CreateGithubHttpClient() => new HttpClient();
+
         protected AdoToGithub(ITestOutputHelper output, string adoServerUrl = "https://dev.azure.com", string adoPatEnvVar = "ADO_PAT")
         {
             StartTime = DateTime.Now;
@@ -33,7 +35,8 @@
             var adoApi = new AdoApi(adoClient, adoServerUrl, logger);
 
             var githubToken = Environment.GetEnvironmentVariable("GHEC_PAT");
-            _githubHttpClient = new HttpClient();
+            _githubHttpClient = CreateGithubHttpClient();
+
             var githubClient = new GithubClient(logger, _githubHttpClient, new VersionChecker(_versionClient, logger), new RetryPolicy(logger), new DateTimeProvider(), githubToken);
             var githubApi = new GithubApi(githubClient, "https://api.github.com", new RetryPolicy(logger), null);
 

src/OctoshiftCLI.IntegrationTests/BbsToGithub.cs

@@ -58,7 +58,7 @@
         _sourceBbsHttpClient = new HttpClient();
         _sourceBbsClient = new BbsClient(_logger, _sourceBbsHttpClient, new VersionChecker(_versionClient, _logger), new RetryPolicy(_logger), sourceBbsUsername, sourceBbsPassword);
 
-        _targetGithubHttpClient = new HttpClient();
+        _targetGithubHttpClient = new HttpClient(new SecondaryRateLimitHandler(new HttpClientHandler()), disposeHandler: true);
         _targetGithubClient = new GithubClient(_logger, _targetGithubHttpClient, new VersionChecker(_versionClient, _logger), new RetryPolicy(_logger), new DateTimeProvider(), targetGithubToken);
         var retryPolicy = new RetryPolicy(_logger);
         _archiveUploader = new ArchiveUploader(_targetGithubClient, UPLOADS_URL, _logger, retryPolicy);
@@ -154,7 +154,6 @@
         var sshKey = Environment.GetEnvironmentVariable(GetSshKeyName(bbsServer));
         await File.WriteAllTextAsync(Path.Join(TestHelper.GetOsDistPath(), SSH_KEY_FILE), sshKey);
 
-
         var retryPolicy = new RetryPolicy(null);
         await retryPolicy.Retry(async () =>
         {

src/OctoshiftCLI.IntegrationTests/GhesToGithub.cs

@@ -49,13 +49,15 @@
 
         _versionClient = new HttpClient();
         var retryPolicy = new RetryPolicy(logger);
-        _archiveUploader = new ArchiveUploader(_targetGithubClient, UPLOADS_URL, logger, retryPolicy);
 
-        _sourceGithubHttpClient = new HttpClient();
+        // Source GitHub client (GHES)
+        _sourceGithubHttpClient = new HttpClient(new SecondaryRateLimitHandler(new HttpClientHandler()), disposeHandler: true);
         _sourceGithubClient = new GithubClient(logger, _sourceGithubHttpClient, new VersionChecker(_versionClient, logger), new RetryPolicy(logger), new DateTimeProvider(), sourceGithubToken);
+        _archiveUploader = new ArchiveUploader(_sourceGithubClient, UPLOADS_URL, logger, retryPolicy);
         _sourceGithubApi = new GithubApi(_sourceGithubClient, GHES_API_URL, new RetryPolicy(logger), _archiveUploader);
 
-        _targetGithubHttpClient = new HttpClient();
+        // Target GitHub client (GHEC)
+        _targetGithubHttpClient = new HttpClient(new SecondaryRateLimitHandler(new HttpClientHandler()), disposeHandler: true);
         _targetGithubClient = new GithubClient(logger, _targetGithubHttpClient, new VersionChecker(_versionClient, logger), new RetryPolicy(logger), new DateTimeProvider(), targetGithubToken);
         _targetGithubApi = new GithubApi(_targetGithubClient, "https://api.github.com", new RetryPolicy(logger), _archiveUploader);
 

src/OctoshiftCLI.IntegrationTests/GithubToGithub.cs

@@ -31,9 +31,18 @@
             var githubToken = Environment.GetEnvironmentVariable("GHEC_PAT");
             _tokens = new Dictionary<string, string> { ["GH_PAT"] = githubToken };
 
-            _githubHttpClient = new HttpClient();
+
+            _githubHttpClient = new HttpClient(new SecondaryRateLimitHandler(new HttpClientHandler()), disposeHandler: true);
+
             _versionClient = new HttpClient();
-            _githubClient = new GithubClient(logger, _githubHttpClient, new VersionChecker(_versionClient, logger), new RetryPolicy(logger), new DateTimeProvider(), githubToken);
+            _githubClient = new GithubClient(
+                logger,
+                _githubHttpClient,
+                new VersionChecker(_versionClient, logger),
+                new RetryPolicy(logger),
+                new DateTimeProvider(),
+                githubToken);
+
             _githubApi = new GithubApi(_githubClient, "https://api.github.com", new RetryPolicy(logger), null);
 
             _helper = new TestHelper(_output, _githubApi, _githubClient);
@@ -58,7 +67,9 @@
                 await _helper.CreateGithubRepo(githubSourceOrg, repo2);
             });
 
-            await _helper.RunGeiCliMigration($"generate-script --github-source-org {githubSourceOrg} --github-target-org {githubTargetOrg} --download-migration-logs", _tokens);
+            await _helper.RunGeiCliMigration(
+                $"generate-script --github-source-org {githubSourceOrg} --github-target-org {githubTargetOrg} --download-migration-logs",
+                _tokens);
 
             _helper.AssertNoErrorInLogs(_startTime);