Merge pull request #1591 from jessehouwing/fix/rewire-pipeline-ghecom

Fix rewire-pipeline command to include target API URL and add unit test for sequential script rewire

Author: jfine

RELEASENOTES.md

@@ -0,0 +1 @@
+- Fixed a bug where `ado2gh generate-script` did not pass `--target-api-url` to the generated `rewire-pipeline` commands. When migrating to GitHub Enterprise Cloud with data residency (ghe.com), rewired Azure Pipelines were incorrectly pointed at github.com URLs instead of the data residency domain.

src/OctoshiftCLI.Tests/ado2gh/Commands/GenerateScript/GenerateScriptCommandHandlerTests.cs

@@ -364,6 +364,39 @@ public async Task SequentialScript_Single_Repo_Two_Pipelines_All_Options()
         _scriptOutput.Should().Be(expected.ToString());
     }
 
+    [Fact]
+    public async Task SequentialScript_Rewire_Pipeline_With_TargetApiUrl_Includes_TargetApiUrl()
+    {
+        // Arrange
+        var targetApiUrl = "https://api.tenant.ghe.com";
+
+        _mockAdoApi.Setup(m => m.GetTeamProjects(ADO_ORG)).ReturnsAsync(ADO_TEAM_PROJECTS);
+        _mockAdoApi.Setup(m => m.GetGithubAppId(ADO_ORG, GITHUB_ORG, ADO_TEAM_PROJECTS)).ReturnsAsync(APP_ID);
+
+        _mockAdoInspector.Setup(m => m.GetRepoCount()).ReturnsAsync(1);
+        _mockAdoInspector.Setup(m => m.GetOrgs()).ReturnsAsync(ADO_ORGS);
+        _mockAdoInspector.Setup(m => m.GetTeamProjects(ADO_ORG)).ReturnsAsync(ADO_TEAM_PROJECTS);
+        _mockAdoInspector.Setup(m => m.GetRepos(ADO_ORG, ADO_TEAM_PROJECT)).ReturnsAsync(ADO_REPOS);
+        _mockAdoInspector.Setup(m => m.GetPipelines(ADO_ORG, ADO_TEAM_PROJECT, FOO_REPO)).ReturnsAsync(ADO_PIPELINES);
+
+        var expectedRewire = $"Exec {{ gh ado2gh rewire-pipeline --target-api-url \"{targetApiUrl}\" --ado-org \"{ADO_ORG}\" --ado-team-project \"{ADO_TEAM_PROJECT}\" --ado-pipeline \"{FOO_PIPELINE}\" --github-org \"{GITHUB_ORG}\" --github-repo \"{ADO_TEAM_PROJECT}-{FOO_REPO}\" --service-connection-id \"{APP_ID}\" }}";
+
+        // Act
+        var args = new GenerateScriptCommandArgs
+        {
+            GithubOrg = GITHUB_ORG,
+            AdoOrg = ADO_ORG,
+            Sequential = true,
+            Output = new FileInfo("unit-test-output"),
+            RewirePipelines = true,
+            TargetApiUrl = targetApiUrl
+        };
+        await _handler.Handle(args);
+
+        // Assert
+        _scriptOutput.Should().Contain(expectedRewire);
+    }
+
     [Fact]
     public async Task SequentialScript_Single_Repo_Two_Pipelines_No_Service_Connection_All_Options()
     {
@@ -1331,6 +1364,38 @@ public async Task ParallelScript_Rewire_Pipelines_Option_Should_Generate_Share_S
         _scriptOutput.Should().Be(expected.ToString());
     }
 
+    [Fact]
+    public async Task ParallelScript_Rewire_Pipeline_With_TargetApiUrl_Includes_TargetApiUrl()
+    {
+        // Arrange
+        var targetApiUrl = "https://api.tenant.ghe.com";
+
+        _mockAdoApi.Setup(m => m.GetTeamProjects(ADO_ORG)).ReturnsAsync(ADO_TEAM_PROJECTS);
+        _mockAdoApi.Setup(m => m.GetGithubAppId(ADO_ORG, GITHUB_ORG, new[] { ADO_TEAM_PROJECT })).ReturnsAsync(APP_ID);
+
+        _mockAdoInspector.Setup(m => m.GetRepoCount()).ReturnsAsync(1);
+        _mockAdoInspector.Setup(m => m.GetOrgs()).ReturnsAsync(ADO_ORGS);
+        _mockAdoInspector.Setup(m => m.GetTeamProjects(ADO_ORG)).ReturnsAsync(ADO_TEAM_PROJECTS);
+        _mockAdoInspector.Setup(m => m.GetRepos(ADO_ORG, ADO_TEAM_PROJECT)).ReturnsAsync(ADO_REPOS);
+        _mockAdoInspector.Setup(m => m.GetPipelines(ADO_ORG, ADO_TEAM_PROJECT, FOO_REPO)).ReturnsAsync(ADO_PIPELINES);
+
+        var expectedRewireWithUrl = $"{{ gh ado2gh rewire-pipeline --target-api-url \"{targetApiUrl}\" --ado-org \"{ADO_ORG}\" --ado-team-project \"{ADO_TEAM_PROJECT}\" --ado-pipeline \"{FOO_PIPELINE}\" --github-org \"{GITHUB_ORG}\" --github-repo \"{ADO_TEAM_PROJECT}-{FOO_REPO}\" --service-connection-id \"{APP_ID}\" }}";
+
+        // Act
+        var args = new GenerateScriptCommandArgs
+        {
+            GithubOrg = GITHUB_ORG,
+            AdoOrg = ADO_ORG,
+            Output = new FileInfo("unit-test-output"),
+            RewirePipelines = true,
+            TargetApiUrl = targetApiUrl
+        };
+        await _handler.Handle(args);
+
+        // Assert
+        _scriptOutput.Should().Contain(expectedRewireWithUrl);
+    }
+
     [Fact]
     public async Task SequentialScript_CreateTeams_With_TargetApiUrl_Should_Include_TargetApiUrl_In_AddTeamToRepo_Commands()
     {

src/ado2gh/Commands/GenerateScript/GenerateScriptCommandHandler.cs

@@ -172,7 +172,7 @@ private async Task<string> GenerateSequentialScript(IDictionary<string, string>
 
                     foreach (var adoPipeline in await _adoInspectorService.GetPipelines(adoOrg, adoTeamProject, adoRepo.Name))
                     {
-                        AppendLine(content, Exec(RewireAzurePipelineScript(adoOrg, adoTeamProject, adoPipeline, githubOrg, githubRepo, appId)));
+                        AppendLine(content, Exec(RewireAzurePipelineScript(adoOrg, adoTeamProject, adoPipeline, githubOrg, githubRepo, appId, targetApiUrl)));
                     }
                 }
             }
@@ -282,7 +282,7 @@ private async Task<string> GenerateParallelScript(IDictionary<string, string> ap
                         appIds.TryGetValue(adoOrg, out var appId);
                         foreach (var adoPipeline in await _adoInspectorService.GetPipelines(adoOrg, adoTeamProject, adoRepo.Name))
                         {
-                            AppendLine(content, "        " + Wrap(RewireAzurePipelineScript(adoOrg, adoTeamProject, adoPipeline, githubOrg, githubRepo, appId)));
+                            AppendLine(content, "        " + Wrap(RewireAzurePipelineScript(adoOrg, adoTeamProject, adoPipeline, githubOrg, githubRepo, appId, targetApiUrl)));
                         }
 
                         AppendLine(content, "    )");
@@ -370,9 +370,9 @@ private string AddAdminsToGithubRepoScript(string adoTeamProject, string githubO
             ? $"gh ado2gh add-team-to-repo{(targetApiUrl.HasValue() ? $" --target-api-url \"{targetApiUrl}\"" : string.Empty)} --github-org \"{githubOrg}\" --github-repo \"{githubRepo}\" --team \"{adoTeamProject.ReplaceInvalidCharactersWithDash()}-Admins\" --role \"admin\"{(_log.Verbose ? " --verbose" : string.Empty)}"
             : null;
 
-    private string RewireAzurePipelineScript(string adoOrg, string adoTeamProject, string adoPipeline, string githubOrg, string githubRepo, string appId) =>
+    private string RewireAzurePipelineScript(string adoOrg, string adoTeamProject, string adoPipeline, string githubOrg, string githubRepo, string appId, string targetApiUrl) =>
         _generateScriptOptions.RewirePipelines && appId.HasValue()
-            ? $"gh ado2gh rewire-pipeline --ado-org \"{adoOrg}\" --ado-team-project \"{adoTeamProject}\" --ado-pipeline \"{adoPipeline}\" --github-org \"{githubOrg}\" --github-repo \"{githubRepo}\" --service-connection-id \"{appId}\"{(_log.Verbose ? " --verbose" : string.Empty)}"
+            ? $"gh ado2gh rewire-pipeline{(targetApiUrl.HasValue() ? $" --target-api-url \"{targetApiUrl}\"" : string.Empty)} --ado-org \"{adoOrg}\" --ado-team-project \"{adoTeamProject}\" --ado-pipeline \"{adoPipeline}\" --github-org \"{githubOrg}\" --github-repo \"{githubRepo}\" --service-connection-id \"{appId}\"{(_log.Verbose ? " --verbose" : string.Empty)}"
             : null;
 
     private string WaitForMigrationScript(string repoMigrationKey, string targetApiUrl) => $"gh ado2gh wait-for-migration{(targetApiUrl.HasValue() ? $" --target-api-url \"{targetApiUrl}\"" : string.Empty)} --migration-id $RepoMigrations[\"{repoMigrationKey}\"]";