Merge pull request #1366 from markphip/issue-1365

iomekam · web-flow · commit 6062de6b0b6f · 2025-07-03T14:28:22.000-04:00
Add support for `--target-api-url` to `rewire-pipeline` command
diff --git a/src/Octoshift/Services/AdoApi.cs b/src/Octoshift/Services/AdoApi.cs
@@ -533,34 +533,59 @@ public virtual async Task ShareServiceConnection(string adoOrg, string adoTeamPr
         return (defaultBranch, clean, checkoutSubmodules);
     }
 
-    public virtual async Task ChangePipelineRepo(string adoOrg, string teamProject, int pipelineId, string defaultBranch, string clean, string checkoutSubmodules, string githubOrg, string githubRepo, string connectedServiceId)
+    public virtual async Task ChangePipelineRepo(string adoOrg, string teamProject, int pipelineId, string defaultBranch, string clean, string checkoutSubmodules, string githubOrg, string githubRepo, string connectedServiceId, string targetApiUrl = null)
     {
         var url = $"{_adoBaseUrl}/{adoOrg.EscapeDataString()}/{teamProject.EscapeDataString()}/_apis/build/definitions/{pipelineId}?api-version=6.0";
 
         var response = await _client.GetAsync(url);
         var data = JObject.Parse(response);
 
+        // Determine base URLs
+        string apiUrl, webUrl, cloneUrl, branchesUrl, refsUrl, manageUrl;
+        if (targetApiUrl.HasValue())
+        {
+            var apiUri = new Uri(targetApiUrl.TrimEnd('/'));
+            var webHost = apiUri.Host.StartsWith("api.") ? apiUri.Host[4..] : apiUri.Host;
+            var webScheme = apiUri.Scheme;
+            var webBase = $"{webScheme}://{webHost}";
+            apiUrl = $"{targetApiUrl.TrimEnd('/')}/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}";
+            webUrl = $"{webBase}/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}";
+            cloneUrl = $"{webBase}/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}.git";
+            branchesUrl = $"{targetApiUrl.TrimEnd('/')}/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}/branches";
+            refsUrl = $"{targetApiUrl.TrimEnd('/')}/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}/git/refs";
+            manageUrl = webUrl;
+        }
+        else
+        {
+            apiUrl = $"https://api.github.com/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}";
+            webUrl = $"https://github.com/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}";
+            cloneUrl = $"https://github.com/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}.git";
+            branchesUrl = $"https://api.github.com/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}/branches";
+            refsUrl = $"https://api.github.com/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}/git/refs";
+            manageUrl = webUrl;
+        }
+
         var newRepo = new
         {
             properties = new
             {
-                apiUrl = $"https://api.github.com/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}",
-                branchesUrl = $"https://api.github.com/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}/branches",
-                cloneUrl = $"https://github.com/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}.git",
+                apiUrl,
+                branchesUrl,
+                cloneUrl,
                 connectedServiceId,
                 defaultBranch,
                 fullName = $"{githubOrg}/{githubRepo}",
-                manageUrl = $"https://github.com/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}",
+                manageUrl,
                 orgName = githubOrg,
-                refsUrl = $"https://api.github.com/repos/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}/git/refs",
+                refsUrl,
                 safeRepository = $"{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}",
                 shortName = githubRepo,
                 reportBuildStatus = true
             },
             id = $"{githubOrg}/{githubRepo}",
             type = "GitHub",
             name = $"{githubOrg}/{githubRepo}",
-            url = $"https://github.com/{githubOrg.EscapeDataString()}/{githubRepo.EscapeDataString()}.git",
+            url = cloneUrl,
             defaultBranch,
             clean,
             checkoutSubmodules
diff --git a/src/OctoshiftCLI.Tests/Octoshift/Services/AdoApiTests.cs b/src/OctoshiftCLI.Tests/Octoshift/Services/AdoApiTests.cs
@@ -1022,6 +1022,88 @@ public async Task ChangePipelineRepo_Should_Send_Correct_Payload()
         _mockAdoClient.Verify(m => m.PutAsync(endpoint, It.Is<object>(y => y.ToJson() == newJson.ToJson())));
     }
 
+    [Fact]
+    public async Task ChangePipelineRepo_Should_Send_Correct_Payload_With_TargetApiUrl()
+    {
+        var githubRepo = "foo-repo";
+        var serviceConnectionId = Guid.NewGuid().ToString();
+        var defaultBranch = "foo-branch";
+        var pipelineId = 123;
+        var clean = "true";
+        var checkoutSubmodules = "false";
+        var targetApiUrl = "https://custom.api.githubenterprise.com";
+
+        var oldJson = new
+        {
+            something = "foo",
+            somethingElse = new
+            {
+                blah = "foo",
+                repository = "blah"
+            },
+            repository = new
+            {
+                testing = true,
+                moreTesting = default(string)
+            },
+            oneLastThing = false
+        };
+
+        var endpoint = $"https://dev.azure.com/{ADO_ORG.EscapeDataString()}/{ADO_TEAM_PROJECT.EscapeDataString()}/_apis/build/definitions/{pipelineId}?api-version=6.0";
+
+        var apiUri = new Uri(targetApiUrl.TrimEnd('/'));
+        var webHost = apiUri.Host.StartsWith("api.") ? apiUri.Host[4..] : apiUri.Host;
+        var webScheme = apiUri.Scheme;
+        var webBase = $"{webScheme}://{webHost}";
+        var apiUrl = $"{targetApiUrl.TrimEnd('/')}/repos/{GITHUB_ORG}/{githubRepo}";
+        var webUrl = $"{webBase}/{GITHUB_ORG}/{githubRepo}";
+        var cloneUrl = $"{webBase}/{GITHUB_ORG}/{githubRepo}.git";
+        var branchesUrl = $"{targetApiUrl.TrimEnd('/')}/repos/{GITHUB_ORG}/{githubRepo}/branches";
+        var refsUrl = $"{targetApiUrl.TrimEnd('/')}/repos/{GITHUB_ORG}/{githubRepo}/git/refs";
+        var manageUrl = webUrl;
+
+        var newJson = new
+        {
+            something = "foo",
+            somethingElse = new
+            {
+                blah = "foo",
+                repository = "blah"
+            },
+            repository = new
+            {
+                properties = new
+                {
+                    apiUrl,
+                    branchesUrl,
+                    cloneUrl,
+                    connectedServiceId = serviceConnectionId,
+                    defaultBranch,
+                    fullName = $"{GITHUB_ORG}/{githubRepo}",
+                    manageUrl,
+                    orgName = GITHUB_ORG,
+                    refsUrl,
+                    safeRepository = $"{GITHUB_ORG}/{githubRepo}",
+                    shortName = githubRepo,
+                    reportBuildStatus = true
+                },
+                id = $"{GITHUB_ORG}/{githubRepo}",
+                type = "GitHub",
+                name = $"{GITHUB_ORG}/{githubRepo}",
+                url = cloneUrl,
+                defaultBranch,
+                clean,
+                checkoutSubmodules
+            },
+            oneLastThing = false
+        };
+
+        _mockAdoClient.Setup(m => m.GetAsync(endpoint).Result).Returns(oldJson.ToJson());
+        await sut.ChangePipelineRepo(ADO_ORG, ADO_TEAM_PROJECT, pipelineId, defaultBranch, clean, checkoutSubmodules, GITHUB_ORG, githubRepo, serviceConnectionId, targetApiUrl);
+
+        _mockAdoClient.Verify(m => m.PutAsync(endpoint, It.Is<object>(y => y.ToJson() == newJson.ToJson())));
+    }
+
     [Fact]
     public async Task GetBoardsGithubRepoId_Should_Return_RepoId()
     {
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Commands/RewirePipeline/RewirePipelineCommandHandlerTests.cs b/src/OctoshiftCLI.Tests/ado2gh/Commands/RewirePipeline/RewirePipelineCommandHandlerTests.cs
@@ -48,6 +48,33 @@ public async Task Happy_Path()
         };
         await _handler.Handle(args);
 
-        _mockAdoApi.Verify(x => x.ChangePipelineRepo(ADO_ORG, ADO_TEAM_PROJECT, pipelineId, defaultBranch, clean, checkoutSubmodules, GITHUB_ORG, GITHUB_REPO, SERVICE_CONNECTION_ID));
+        _mockAdoApi.Verify(x => x.ChangePipelineRepo(ADO_ORG, ADO_TEAM_PROJECT, pipelineId, defaultBranch, clean, checkoutSubmodules, GITHUB_ORG, GITHUB_REPO, SERVICE_CONNECTION_ID, null));
+    }
+
+    [Fact]
+    public async Task Uses_TargetApiUrl_When_Provided()
+    {
+        var pipelineId = 1234;
+        var defaultBranch = "default-branch";
+        var clean = "true";
+        var checkoutSubmodules = "null";
+        var targetApiUrl = "https://api.ghec.example.com";
+
+        _mockAdoApi.Setup(x => x.GetPipelineId(ADO_ORG, ADO_TEAM_PROJECT, ADO_PIPELINE).Result).Returns(pipelineId);
+        _mockAdoApi.Setup(x => x.GetPipeline(ADO_ORG, ADO_TEAM_PROJECT, pipelineId).Result).Returns((defaultBranch, clean, checkoutSubmodules));
+
+        var args = new RewirePipelineCommandArgs
+        {
+            AdoOrg = ADO_ORG,
+            AdoTeamProject = ADO_TEAM_PROJECT,
+            AdoPipeline = ADO_PIPELINE,
+            GithubOrg = GITHUB_ORG,
+            GithubRepo = GITHUB_REPO,
+            ServiceConnectionId = SERVICE_CONNECTION_ID,
+            TargetApiUrl = targetApiUrl
+        };
+        await _handler.Handle(args);
+
+        _mockAdoApi.Verify(x => x.ChangePipelineRepo(ADO_ORG, ADO_TEAM_PROJECT, pipelineId, defaultBranch, clean, checkoutSubmodules, GITHUB_ORG, GITHUB_REPO, SERVICE_CONNECTION_ID, targetApiUrl));
     }
 }
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Commands/RewirePipeline/RewirePipelineCommandTests.cs b/src/OctoshiftCLI.Tests/ado2gh/Commands/RewirePipeline/RewirePipelineCommandTests.cs
@@ -31,7 +31,7 @@ public void Should_Have_Options()
         {
             Assert.NotNull(_command);
             Assert.Equal("rewire-pipeline", _command.Name);
-            Assert.Equal(8, _command.Options.Count);
+            Assert.Equal(9, _command.Options.Count);
 
             TestHelpers.VerifyCommandOption(_command.Options, "ado-org", true);
             TestHelpers.VerifyCommandOption(_command.Options, "ado-team-project", true);
@@ -41,6 +41,7 @@ public void Should_Have_Options()
             TestHelpers.VerifyCommandOption(_command.Options, "service-connection-id", true);
             TestHelpers.VerifyCommandOption(_command.Options, "ado-pat", false);
             TestHelpers.VerifyCommandOption(_command.Options, "verbose", false);
+            TestHelpers.VerifyCommandOption(_command.Options, "target-api-url", false);
         }
 
         [Fact]
diff --git a/src/ado2gh/Commands/RewirePipeline/RewirePipelineCommand.cs b/src/ado2gh/Commands/RewirePipeline/RewirePipelineCommand.cs
@@ -23,6 +23,7 @@ public RewirePipelineCommand() : base(
             AddOption(ServiceConnectionId);
             AddOption(AdoPat);
             AddOption(Verbose);
+            AddOption(TargetApiUrl);
         }
 
         public Option<string> AdoOrg { get; } = new("--ado-org")
@@ -52,6 +53,10 @@ public RewirePipelineCommand() : base(
         };
         public Option<string> AdoPat { get; } = new("--ado-pat");
         public Option<bool> Verbose { get; } = new("--verbose");
+        public Option<string> TargetApiUrl { get; } = new("--target-api-url")
+        {
+            Description = "The URL of the target API, if not migrating to github.com. Defaults to https://api.github.com"
+        };
 
         public override RewirePipelineCommandHandler BuildHandler(RewirePipelineCommandArgs args, IServiceProvider sp)
         {
diff --git a/src/ado2gh/Commands/RewirePipeline/RewirePipelineCommandArgs.cs b/src/ado2gh/Commands/RewirePipeline/RewirePipelineCommandArgs.cs
@@ -12,5 +12,6 @@ public class RewirePipelineCommandArgs : CommandArgs
         public string ServiceConnectionId { get; set; }
         [Secret]
         public string AdoPat { get; set; }
+        public string TargetApiUrl { get; set; }
     }
 }
diff --git a/src/ado2gh/Commands/RewirePipeline/RewirePipelineCommandHandler.cs b/src/ado2gh/Commands/RewirePipeline/RewirePipelineCommandHandler.cs
@@ -27,7 +27,7 @@ public async Task Handle(RewirePipelineCommandArgs args)
 
         var adoPipelineId = await _adoApi.GetPipelineId(args.AdoOrg, args.AdoTeamProject, args.AdoPipeline);
         var (defaultBranch, clean, checkoutSubmodules) = await _adoApi.GetPipeline(args.AdoOrg, args.AdoTeamProject, adoPipelineId);
-        await _adoApi.ChangePipelineRepo(args.AdoOrg, args.AdoTeamProject, adoPipelineId, defaultBranch, clean, checkoutSubmodules, args.GithubOrg, args.GithubRepo, args.ServiceConnectionId);
+        await _adoApi.ChangePipelineRepo(args.AdoOrg, args.AdoTeamProject, adoPipelineId, defaultBranch, clean, checkoutSubmodules, args.GithubOrg, args.GithubRepo, args.ServiceConnectionId, args.TargetApiUrl);
 
         _log.LogSuccess("Successfully rewired pipeline");
     }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void Should_Have_Options()`
`31`	`31`	`{`
`32`	`32`	`Assert.NotNull(_command);`
`33`	`33`	`Assert.Equal("rewire-pipeline", _command.Name);`
`34`		`- Assert.Equal(8, _command.Options.Count);`
	`34`	`+ Assert.Equal(9, _command.Options.Count);`
`35`	`35`
`36`	`36`	`TestHelpers.VerifyCommandOption(_command.Options, "ado-org", true);`
`37`	`37`	`TestHelpers.VerifyCommandOption(_command.Options, "ado-team-project", true);`
`@@ -41,6 +41,7 @@ public void Should_Have_Options()`
`41`	`41`	`TestHelpers.VerifyCommandOption(_command.Options, "service-connection-id", true);`
`42`	`42`	`TestHelpers.VerifyCommandOption(_command.Options, "ado-pat", false);`
`43`	`43`	`TestHelpers.VerifyCommandOption(_command.Options, "verbose", false);`
	`44`	`+ TestHelpers.VerifyCommandOption(_command.Options, "target-api-url", false);`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ public class RewirePipelineCommandArgs : CommandArgs`
`12`	`12`	`public string ServiceConnectionId { get; set; }`
`13`	`13`	`[Secret]`
`14`	`14`	`public string AdoPat { get; set; }`
	`15`	`+ public string TargetApiUrl { get; set; }`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public async Task Handle(RewirePipelineCommandArgs args)`
`27`	`27`
`28`	`28`	`var adoPipelineId = await _adoApi.GetPipelineId(args.AdoOrg, args.AdoTeamProject, args.AdoPipeline);`
`29`	`29`	`var (defaultBranch, clean, checkoutSubmodules) = await _adoApi.GetPipeline(args.AdoOrg, args.AdoTeamProject, adoPipelineId);`
`30`		`- await _adoApi.ChangePipelineRepo(args.AdoOrg, args.AdoTeamProject, adoPipelineId, defaultBranch, clean, checkoutSubmodules, args.GithubOrg, args.GithubRepo, args.ServiceConnectionId);`
	`30`	`+ await _adoApi.ChangePipelineRepo(args.AdoOrg, args.AdoTeamProject, adoPipelineId, defaultBranch, clean, checkoutSubmodules, args.GithubOrg, args.GithubRepo, args.ServiceConnectionId, args.TargetApiUrl);`
`31`	`31`
`32`	`32`	`_log.LogSuccess("Successfully rewired pipeline");`
`33`	`33`	`}`