Merge branch 'main' into brianaj/external-pr-1335

Author: brianaj

RELEASENOTES.md

@@ -1 +1,2 @@
 - bbs2gh : Added validation for `--archive-path` and `--bbs-shared-home` options to fail fast with clear error messages if the provided paths do not exist or are not accessible. Archive path is now logged before upload operations to help with troubleshooting
+- ado2gh: Fixed `--rewire-pipelines` for GitHub Enterprise Cloud with data residency by correctly matching GitHubProximaPipelines service connections by team project name instead of GitHub organization name

src/Octoshift/Services/AdoApi.cs

@@ -203,9 +203,10 @@ private async Task<string> GetTeamProjectGithubAppId(string org, string githubOr
         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)));
 
         return endpoint != null ? (string)endpoint["id"] : null;
     }

src/OctoshiftCLI.Tests/Octoshift/Services/AdoApiTests.cs

@@ -262,7 +262,7 @@ public async Task GetGithubAppId_Should_Recognize_GitHubProximaPipelines_Service
             new
             {
                 type = "GitHubProximaPipelines",
-                name = GITHUB_ORG,
+                name = ADO_TEAM_PROJECT,
                 id = appId
             }
         };