Merge branch 'main' into consume-gei-uri-in-multipart-response

Author: synthead

LATEST-VERSION.txt

@@ -1 +1 @@
-v1.15.1
+v1.17.0

RELEASENOTES.md

@@ -1,3 +1 @@
-- Fixed `ado2gh integrate-boards` command to properly report errors when GitHub PAT permissions are incorrect, instead of incorrectly reporting success.
-- Added `--target-api-url` option to `gh ado2gh rewire-pipeline` command to support customers migrating to [GitHub Enterprise Cloud with data residency](https://docs.github.com/en/enterprise-cloud@latest/admin/data-residency/about-github-enterprise-cloud-with-data-residency)
-- Updated `ado2gh generate-script` to no longer include ADO Boards integration commands in the generated script. This is a temporary change to fix broken functionality until we can ship a longer term fix. More details can be found [here](https://github.com/github/gh-gei/issues/1357)
+- Add --target-uploads-url option to support GitHub-owned storage uploads to locations other than uploads.github.com.

releasenotes/v1.16.0.md

@@ -0,0 +1,3 @@
+- Fixed `ado2gh integrate-boards` command to properly report errors when GitHub PAT permissions are incorrect, instead of incorrectly reporting success.
+- Added `--target-api-url` option to `gh ado2gh rewire-pipeline` command to support customers migrating to [GitHub Enterprise Cloud with data residency](https://docs.github.com/en/enterprise-cloud@latest/admin/data-residency/about-github-enterprise-cloud-with-data-residency)
+- Updated `ado2gh generate-script` to no longer include ADO Boards integration commands in the generated script. This is a temporary change to fix broken functionality until we can ship a longer term fix. More details can be found [here](https://github.com/github/gh-gei/issues/1357)

releasenotes/v1.16.2.md

@@ -0,0 +1,3 @@
+- Updated `ado2gh integrate-boards` command help text to clarify that the ADO PAT token must have 'All organizations' access selected.
+- If `create-team` fails with 5xx errors, it will now retry the API call.
+- Fixed `gh gei migrate-secret-alerts` command to handle long resolution comments by truncating them to fit within GitHub's 270 character limit while preserving the resolver name prefix.

releasenotes/v1.17.0.md

@@ -0,0 +1 @@
+- Poll migration status every 60 seconds when waiting for migrations to complete.

src/Octoshift/Commands/CreateTeam/CreateTeamCommandBase.cs

@@ -43,7 +43,7 @@ public override CreateTeamCommandHandler BuildHandler(CreateTeamCommandArgs args
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
 
-        var githubApi = githubApiFactory.Create(args.TargetApiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(args.TargetApiUrl, null, args.GithubPat);
 
         return new CreateTeamCommandHandler(log, githubApi);
     }

src/Octoshift/Commands/DownloadLogs/DownloadLogsCommandBase.cs

@@ -67,7 +67,7 @@ public override DownloadLogsCommandHandler BuildHandler(DownloadLogsCommandArgs
 
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-        var githubApi = githubApiFactory.Create(args.GithubApiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(args.GithubApiUrl, null, args.GithubPat);
         var httpDownloadServiceFactory = sp.GetRequiredService<HttpDownloadServiceFactory>();
         var httpDownloadService = httpDownloadServiceFactory.CreateDefaultWithRedirects();
         var retryPolicy = sp.GetRequiredService<RetryPolicy>();

src/Octoshift/Commands/GenerateMannequinCsv/GenerateMannequinCsvCommandBase.cs

@@ -56,7 +56,7 @@ public override GenerateMannequinCsvCommandHandler BuildHandler(GenerateMannequi
 
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-        var githubApi = githubApiFactory.Create(args.TargetApiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(args.TargetApiUrl, null, args.GithubPat);
 
         return new GenerateMannequinCsvCommandHandler(log, githubApi);
     }

src/Octoshift/Commands/GrantMigratorRole/GrantMigratorRoleCommandBase.cs

@@ -53,7 +53,7 @@ public override GrantMigratorRoleCommandHandler BuildHandler(GrantMigratorRoleCo
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
         var apiUrl = args.TargetApiUrl ?? args.GhesApiUrl;
-        var githubApi = githubApiFactory.Create(apiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(apiUrl, null, args.GithubPat);
 
         return new GrantMigratorRoleCommandHandler(log, githubApi);
     }

src/Octoshift/Commands/ReclaimMannequin/ReclaimMannequinCommandBase.cs

@@ -88,7 +88,7 @@ public override ReclaimMannequinCommandHandler BuildHandler(ReclaimMannequinComm
 
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-        var githubApi = githubApiFactory.Create(args.TargetApiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(args.TargetApiUrl, null, args.GithubPat);
         var reclaimService = new ReclaimService(githubApi, log);
         var confirmationService = sp.GetRequiredService<ConfirmationService>();