Skip to content

Refine GitHub endpoint filtering logic #1458

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

Closed
EricSoder wants to merge 7 commits into from
+5 −4
Closed

Refine GitHub endpoint filtering logic #1458

Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6dbc67f
Remove check for GitHub organization name
EricSoder Nov 21, 2025
c6561b9
Add missing parentheses
EricSoder Nov 21, 2025
78bcb09
Refine GitHub endpoint filtering logic
EricSoder Nov 21, 2025
e76556e
Remove unnecessary whitespace in GetTeamProjectGithubAppId
EricSoder Nov 21, 2025
d5b7bed
Change name from GITHUB_ORG to ADO_TEAM_PROJECT
EricSoder Nov 21, 2025
5157706
Merge branch 'main' into main
brianaj Dec 2, 2025
a0ae542
Merge branch 'main' into main
brianaj Dec 4, 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
11 changes: 6 additions & 5 deletions src/Octoshift/Services/AdoApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,13 @@ 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["type"]).Equals("GitHubProximaPipelines", StringComparison.OrdinalIgnoreCase)) &&
((string)x["name"]).Equals(githubOrg, StringComparison.OrdinalIgnoreCase));

(((string)x["type"]).Equals("GitHub", StringComparison.OrdinalIgnoreCase) &&
((string)x["name"]).Equals(githubOrg, StringComparison.OrdinalIgnoreCase)) ||
(((string)x["type"]).Equals("GitHubProximaPipelines", StringComparison.OrdinalIgnoreCase) &&
((string)x["name"]).Equals(teamProject, StringComparison.OrdinalIgnoreCase)));
Comment on lines +206 to +209
Copy link

Copilot AI Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] This logic change refines how GitHubProximaPipelines endpoints are matched and appears to be a bug fix (matching against teamProject instead of githubOrg). According to the coding guidelines (item 5), changes that impact users such as bug fixes should have a bullet point added to RELEASENOTES.md with a user-friendly description. Consider adding a note about this fix.

Copilot uses AI. Check for mistakes.
Copy link
Collaborator Author

@EricSoder EricSoder Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot open a new pull request to apply changes based on this feedback

Copy link
Collaborator

@brianaj brianaj Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@EricSoder can you add release notes


return endpoint != null ? (string)endpoint["id"] : null;
}

Expand Down
Loading