Skip to content

ado2gh: Support GitHubProximaPipelines service connections for --rewire-pipelines #1454

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.

Sign up for GitHub

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

ado2gh: Support GitHubProximaPipelines service connections for --rewire-pipelines #1454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fd1837
Initial plan
Copilot Nov 12, 2025
4afad10
Add support for GitHubProximaPipelines service connection type in ado…
Copilot Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions RELEASENOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Release Notes

## Unreleased
- **ado2gh**: Added support for GitHub Enterprise cloud with data residency app service connections when using `--rewire-pipelines`. The tool now recognizes both `GitHub` and `GitHubProximaPipelines` service connection types.
5 changes: 4 additions & 1 deletion src/Octoshift/Services/AdoApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,10 @@ private async Task<string> GetTeamProjectGithubAppId(string org, string githubOr
var url = $"{_adoBaseUrl}/{org.EscapeDataString()}/{teamProject.EscapeDataString()}/_apis/serviceendpoint/endpoints?api-version=6.0-preview.4";
var response = await _client.GetWithPagingAsync(url);

var endpoint = response.FirstOrDefault(x => ((string)x["type"]).Equals("GitHub", StringComparison.OrdinalIgnoreCase) && ((string)x["name"]).Equals(githubOrg, StringComparison.OrdinalIgnoreCase));
var endpoint = response.FirstOrDefault(x =>
(((string)x["type"]).Equals("GitHub", StringComparison.OrdinalIgnoreCase) ||
((string)x["type"]).Equals("GitHubProximaPipelines", StringComparison.OrdinalIgnoreCase)) &&
((string)x["name"]).Equals(githubOrg, StringComparison.OrdinalIgnoreCase));

return endpoint != null ? (string)endpoint["id"] : null;
}
Expand Down
24 changes: 24 additions & 0 deletions src/OctoshiftCLI.Tests/Octoshift/Services/AdoApiTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,30 @@ public async Task GetGithubAppId_Should_Return_Null_When_No_Team_Projects_Have_E
result.Should().BeNull();
}

[Fact]
public async Task GetGithubAppId_Should_Recognize_GitHubProximaPipelines_Service_Connection()
{
var teamProjects = new List<string>() { ADO_TEAM_PROJECT };
var appId = Guid.NewGuid().ToString();

var json = new object[]
{
new
{
type = "GitHubProximaPipelines",
name = GITHUB_ORG,
id = appId
}
};
var response = JArray.Parse(json.ToJson());

_mockAdoClient.Setup(x => x.GetWithPagingAsync($"https://dev.azure.com/{ADO_ORG.EscapeDataString()}/{ADO_TEAM_PROJECT.EscapeDataString()}/_apis/serviceendpoint/endpoints?api-version=6.0-preview.4").Result).Returns(response);

var result = await sut.GetGithubAppId(ADO_ORG, GITHUB_ORG, teamProjects);

result.Should().Be(appId);
}

[Fact]
public async Task GetGithubHandle_Should_Return_Handle()
{
Expand Down
Loading