Merge pull request #1405 from github/add-uploads-url-option

Add options for target uploads URL

Author: synthead

RELEASENOTES.md

@@ -1 +1 @@
-
+- Add --target-uploads-url option to support GitHub-owned storage uploads to locations other than uploads.github.com.

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>();
 

src/Octoshift/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandBase.cs

@@ -42,7 +42,7 @@ public override RevokeMigratorRoleCommandHandler BuildHandler(RevokeMigratorRole
         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 RevokeMigratorRoleCommandHandler(log, githubApi);
     }

src/Octoshift/Contracts/ISourceGithubApiFactory.cs

@@ -4,6 +4,6 @@ namespace OctoshiftCLI.Contracts;
 
 public interface ISourceGithubApiFactory
 {
-    GithubApi Create(string apiUrl = null, string sourcePersonalAccessToken = null);
-    GithubApi CreateClientNoSsl(string apiUrl = null, string sourcePersonalAccessToken = null);
+    GithubApi Create(string apiUrl = null, string uploadsUrl = null, string sourcePersonalAccessToken = null);
+    GithubApi CreateClientNoSsl(string apiUrl = null, string uploadsUrl = null, string sourcePersonalAccessToken = null);
 }

src/Octoshift/Contracts/ITargetGithubApiFactory.cs

@@ -4,5 +4,5 @@ namespace OctoshiftCLI.Contracts;
 
 public interface ITargetGithubApiFactory
 {
-    GithubApi Create(string apiUrl = null, string targetPersonalAccessToken = null);
+    GithubApi Create(string apiUrl = null, string uploadsUrl = null, string targetPersonalAccessToken = null);
 }

src/Octoshift/Factories/GithubApiFactory.cs

@@ -7,6 +7,7 @@ namespace OctoshiftCLI.Factories;
 public sealed class GithubApiFactory : ISourceGithubApiFactory, ITargetGithubApiFactory
 {
     private const string DEFAULT_API_URL = "https://api.github.com";
+    private const string DEFAULT_UPLOADS_URL = "https://uploads.github.com";
 
     private readonly OctoLogger _octoLogger;
     private readonly IHttpClientFactory _clientFactory;
@@ -25,30 +26,33 @@ public GithubApiFactory(OctoLogger octoLogger, IHttpClientFactory clientFactory,
         _versionProvider = versionProvider;
     }
 
-    GithubApi ISourceGithubApiFactory.Create(string apiUrl, string sourcePersonalAccessToken)
+    GithubApi ISourceGithubApiFactory.Create(string apiUrl, string uploadsUrl, string sourcePersonalAccessToken)
     {
         apiUrl ??= DEFAULT_API_URL;
+        uploadsUrl ??= DEFAULT_UPLOADS_URL;
         sourcePersonalAccessToken ??= _environmentVariableProvider.SourceGithubPersonalAccessToken();
         var githubClient = new GithubClient(_octoLogger, _clientFactory.CreateClient("Default"), _versionProvider, _retryPolicy, _dateTimeProvider, sourcePersonalAccessToken);
-        var multipartUploader = new ArchiveUploader(githubClient, _octoLogger, _retryPolicy);
+        var multipartUploader = new ArchiveUploader(githubClient, uploadsUrl, _octoLogger, _retryPolicy);
         return new GithubApi(githubClient, apiUrl, _retryPolicy, multipartUploader);
     }
 
-    GithubApi ISourceGithubApiFactory.CreateClientNoSsl(string apiUrl, string sourcePersonalAccessToken)
+    GithubApi ISourceGithubApiFactory.CreateClientNoSsl(string apiUrl, string uploadsUrl, string sourcePersonalAccessToken)
     {
         apiUrl ??= DEFAULT_API_URL;
+        uploadsUrl ??= DEFAULT_UPLOADS_URL;
         sourcePersonalAccessToken ??= _environmentVariableProvider.SourceGithubPersonalAccessToken();
         var githubClient = new GithubClient(_octoLogger, _clientFactory.CreateClient("NoSSL"), _versionProvider, _retryPolicy, _dateTimeProvider, sourcePersonalAccessToken);
-        var multipartUploader = new ArchiveUploader(githubClient, _octoLogger, _retryPolicy);
+        var multipartUploader = new ArchiveUploader(githubClient, uploadsUrl, _octoLogger, _retryPolicy);
         return new GithubApi(githubClient, apiUrl, _retryPolicy, multipartUploader);
     }
 
-    GithubApi ITargetGithubApiFactory.Create(string apiUrl, string targetPersonalAccessToken)
+    GithubApi ITargetGithubApiFactory.Create(string apiUrl, string uploadsUrl, string targetPersonalAccessToken)
     {
         apiUrl ??= DEFAULT_API_URL;
+        uploadsUrl ??= DEFAULT_UPLOADS_URL;
         targetPersonalAccessToken ??= _environmentVariableProvider.TargetGithubPersonalAccessToken();
         var githubClient = new GithubClient(_octoLogger, _clientFactory.CreateClient("Default"), _versionProvider, _retryPolicy, _dateTimeProvider, targetPersonalAccessToken);
-        var multipartUploader = new ArchiveUploader(githubClient, _octoLogger, _retryPolicy);
+        var multipartUploader = new ArchiveUploader(githubClient, uploadsUrl, _octoLogger, _retryPolicy);
         return new GithubApi(githubClient, apiUrl, _retryPolicy, multipartUploader);
     }
 }