--target-api-url support for migrate repo and org

RELEASENOTES.md

@@ -1 +1 @@
-
+- Add `--target-api-url` to `ado2gh migrate repo`, `bbs2gh migrate repo`, and `gei migrate org` to support newer GitHub migration paths.

src/OctoshiftCLI.Tests/ado2gh/Commands/MigrateRepo/MigrateRepoCommandHandlerTests.cs

@@ -23,6 +23,7 @@ public class MigrateRepoCommandHandlerTests
     private const string ADO_REPO = "foo-repo";
     private const string GITHUB_ORG = "foo-gh-org";
     private const string GITHUB_REPO = "gh-repo";
+    private const string TARGET_API_URL = "https://api.github.com";
     private readonly string ADO_REPO_URL = $"https://dev.azure.com/{ADO_ORG}/{ADO_TEAM_PROJECT}/_git/{ADO_REPO}";
     private readonly string ADO_TOKEN = Guid.NewGuid().ToString();
     private readonly string GITHUB_ORG_ID = Guid.NewGuid().ToString();
@@ -83,6 +84,7 @@ public async Task Happy_Path()
             AdoRepo = ADO_REPO,
             GithubOrg = GITHUB_ORG,
             GithubRepo = GITHUB_REPO,
+            TargetApiUrl = TARGET_API_URL,
             QueueOnly = true,
         };
         await _handler.Handle(args);
@@ -115,6 +117,7 @@ public async Task Ado_Server_Migration()
             AdoRepo = ADO_REPO,
             GithubOrg = GITHUB_ORG,
             GithubRepo = GITHUB_REPO,
+            TargetApiUrl = TARGET_API_URL,
             QueueOnly = true,
             AdoServerUrl = ADO_SERVER_URL,
             GithubPat = GITHUB_TOKEN,
@@ -168,6 +171,7 @@ public async Task Skip_Migration_If_Target_Repo_Exists()
             AdoRepo = ADO_REPO,
             GithubOrg = GITHUB_ORG,
             GithubRepo = GITHUB_REPO,
+            TargetApiUrl = TARGET_API_URL,
             QueueOnly = true,
         };
         await _handler.Handle(args);
@@ -212,6 +216,7 @@ public async Task Happy_Path_With_Wait()
             AdoRepo = ADO_REPO,
             GithubOrg = GITHUB_ORG,
             GithubRepo = GITHUB_REPO,
+            TargetApiUrl = TARGET_API_URL,
         };
         await _handler.Handle(args);
 
@@ -242,6 +247,7 @@ await _handler.Invoking(async x => await x.Handle(new MigrateRepoCommandArgs
             AdoRepo = ADO_REPO,
             GithubOrg = GITHUB_ORG,
             GithubRepo = GITHUB_REPO,
+            TargetApiUrl = TARGET_API_URL,
         }))
             .Should()
             .ThrowAsync<OctoshiftCliException>()
@@ -268,6 +274,7 @@ public async Task It_Falls_Back_To_Ado_And_Github_Pats_From_Environment_When_Not
             AdoRepo = ADO_REPO,
             GithubOrg = GITHUB_ORG,
             GithubRepo = GITHUB_REPO,
+            TargetApiUrl = TARGET_API_URL,
         };
 
         await _handler.Handle(args);
@@ -291,6 +298,7 @@ public async Task Sets_Target_Repo_Visibility_When_Specified()
             AdoRepo = ADO_REPO,
             GithubOrg = GITHUB_ORG,
             GithubRepo = GITHUB_REPO,
+            TargetApiUrl = TARGET_API_URL,
             QueueOnly = true,
             TargetRepoVisibility = targetRepoVisibility,
         };

src/OctoshiftCLI.Tests/ado2gh/Commands/MigrateRepo/MigrateRepoCommandTests.cs

@@ -35,7 +35,7 @@ public void Should_Have_Options()
         {
             _command.Should().NotBeNull();
             _command.Name.Should().Be("migrate-repo");
-            _command.Options.Count.Should().Be(11);
+            _command.Options.Count.Should().Be(12);
 
             TestHelpers.VerifyCommandOption(_command.Options, "ado-org", true);
             TestHelpers.VerifyCommandOption(_command.Options, "ado-team-project", true);
@@ -48,6 +48,7 @@ public void Should_Have_Options()
             TestHelpers.VerifyCommandOption(_command.Options, "ado-pat", false);
             TestHelpers.VerifyCommandOption(_command.Options, "github-pat", false);
             TestHelpers.VerifyCommandOption(_command.Options, "verbose", false);
+            TestHelpers.VerifyCommandOption(_command.Options, "target-api-url", false);
         }
 
         [Fact]

src/OctoshiftCLI.Tests/bbs2gh/Commands/MigrateRepo/MigrateRepoCommandHandlerTests.cs

@@ -31,6 +31,7 @@ public class MigrateRepoCommandHandlerTests
         private const string GITHUB_ORG = "target-org";
         private const string GITHUB_REPO = "target-repo";
         private const string GITHUB_PAT = "github pat";
+        private const string TARGET_API_URL = "https://api.github.com";
         private const string AWS_BUCKET_NAME = "aws-bucket-name";
         private const string AWS_ACCESS_KEY_ID = "aws-access-key-id";
         private const string AWS_SECRET_ACCESS_KEY = "aws-secret-access-key";
@@ -182,6 +183,7 @@ public async Task Happy_Path_Generate_Archive_Ssh_Download_Azure_Upload_And_Inge
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
                 GithubPat = GITHUB_PAT,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);
@@ -227,6 +229,7 @@ public async Task Happy_Path_Generate_Archive_Ssh_Download_Aws_Upload_And_Ingest
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
                 GithubPat = GITHUB_PAT,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);
@@ -269,6 +272,7 @@ public async Task Happy_Path_Full_Flow_Running_On_Bbs_Server()
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
                 GithubPat = GITHUB_PAT,
+                TargetApiUrl = TARGET_API_URL,
                 BbsSharedHome = bbsSharedHome,
                 QueueOnly = true,
             };
@@ -327,6 +331,7 @@ public async Task Happy_Path_Full_Flow_Bbs_Credentials_Via_Environment()
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
                 GithubPat = GITHUB_PAT,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);
@@ -367,6 +372,7 @@ public async Task Happy_Path_Deletes_Downloaded_Archive()
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
                 GithubPat = GITHUB_PAT,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);
@@ -398,7 +404,8 @@ public async Task It_Deletes_Downloaded_Archive_Even_If_Upload_Fails()
                 AzureStorageConnectionString = AZURE_STORAGE_CONNECTION_STRING,
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
-                GithubPat = GITHUB_PAT
+                GithubPat = GITHUB_PAT,
+                TargetApiUrl = TARGET_API_URL,
             };
             await _handler.Invoking(async x => await x.Handle(args)).Should().ThrowExactlyAsync<InvalidOperationException>();
 
@@ -431,6 +438,7 @@ public async Task Happy_Path_Does_Not_Throw_If_Fails_To_Delete_Downloaded_Archiv
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
                 GithubPat = GITHUB_PAT,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);
@@ -459,6 +467,7 @@ public async Task Dont_Generate_Archive_If_Target_Repo_Exists()
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
                 GithubPat = GITHUB_PAT,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
 
@@ -488,6 +497,7 @@ public async Task Uses_GitHub_Pat_When_Provided_As_Option()
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
                 GithubPat = githubPat,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);
@@ -522,6 +532,7 @@ public async Task Skip_Migration_If_Target_Repo_Exists()
                 ArchiveUrl = ARCHIVE_URL,
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);
@@ -547,6 +558,7 @@ await _handler.Invoking(async x => await x.Handle(new MigrateRepoCommandArgs
                 ArchiveUrl = ARCHIVE_URL,
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             }))
                 .Should()
@@ -598,6 +610,7 @@ public async Task Uses_Archive_Path_If_Provided()
                 ArchivePath = ARCHIVE_PATH,
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
+                TargetApiUrl = TARGET_API_URL,
                 AzureStorageConnectionString = AZURE_STORAGE_CONNECTION_STRING,
                 QueueOnly = true,
             };
@@ -667,6 +680,7 @@ public async Task It_Does_Not_Set_The_Archive_Path_When_Archive_Path_Is_Provided
                 AzureStorageConnectionString = AZURE_STORAGE_CONNECTION_STRING,
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);
@@ -686,6 +700,7 @@ public async Task It_Does_Not_Set_The_Archive_Path_When_Archive_Url_Is_Provided(
                 AzureStorageConnectionString = AZURE_STORAGE_CONNECTION_STRING,
                 GithubOrg = GITHUB_ORG,
                 GithubRepo = GITHUB_REPO,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);

src/OctoshiftCLI.Tests/bbs2gh/Commands/MigrateRepo/MigrateRepoCommandTests.cs

@@ -56,7 +56,7 @@ public void Should_Have_Options()
         var command = new MigrateRepoCommand();
         command.Should().NotBeNull();
         command.Name.Should().Be("migrate-repo");
-        command.Options.Count.Should().Be(30);
+        command.Options.Count.Should().Be(31);
 
         TestHelpers.VerifyCommandOption(command.Options, "bbs-server-url", true);
         TestHelpers.VerifyCommandOption(command.Options, "bbs-project", true);
@@ -87,6 +87,7 @@ public void Should_Have_Options()
         TestHelpers.VerifyCommandOption(command.Options, "verbose", false);
         TestHelpers.VerifyCommandOption(command.Options, "keep-archive", false);
         TestHelpers.VerifyCommandOption(command.Options, "no-ssl-verify", false);
+        TestHelpers.VerifyCommandOption(command.Options, "target-api-url", false);
     }
 
     [Fact]

src/OctoshiftCLI.Tests/gei/Commands/MigrateOrg/MigrateOrgCommandHandlerTests.cs

@@ -22,6 +22,7 @@ public class MigrateOrgCommandHandlerTests
         private const string TARGET_ORG = "foo-target-org";
         private const string SOURCE_PAT = "foo-source-pat";
         private const string TARGET_PAT = "foo-target-pat";
+        private const string TARGET_API_URL = "https://api.github.com";
 
         public MigrateOrgCommandHandlerTests()
         {
@@ -119,6 +120,7 @@ public async Task Happy_Path_PAT_In_Env()
                 GithubSourceOrg = SOURCE_ORG,
                 GithubTargetOrg = TARGET_ORG,
                 GithubTargetEnterprise = TARGET_ENTERPRISE,
+                TargetApiUrl = TARGET_API_URL,
             };
             await _handler.Handle(args);
 
@@ -155,6 +157,7 @@ public async Task Queue_Only()
                 GithubTargetOrg = TARGET_ORG,
                 GithubTargetEnterprise = TARGET_ENTERPRISE,
                 GithubTargetPat = TARGET_PAT,
+                TargetApiUrl = TARGET_API_URL,
                 QueueOnly = true,
             };
             await _handler.Handle(args);

src/OctoshiftCLI.Tests/gei/Commands/MigrateOrg/MigrateOrgCommandTests.cs

@@ -12,7 +12,7 @@ public void Should_Have_Options()
             var command = new MigrateOrgCommand();
             command.Should().NotBeNull();
             command.Name.Should().Be("migrate-org");
-            command.Options.Count.Should().Be(7);
+            command.Options.Count.Should().Be(8);
 
             TestHelpers.VerifyCommandOption(command.Options, "github-source-org", true);
             TestHelpers.VerifyCommandOption(command.Options, "github-target-org", true);
@@ -21,6 +21,7 @@ public void Should_Have_Options()
             TestHelpers.VerifyCommandOption(command.Options, "github-source-pat", false);
             TestHelpers.VerifyCommandOption(command.Options, "github-target-pat", false);
             TestHelpers.VerifyCommandOption(command.Options, "verbose", false);
+            TestHelpers.VerifyCommandOption(command.Options, "target-api-url", false);
         }
     }
 }

src/ado2gh/Commands/MigrateRepo/MigrateRepoCommand.cs

@@ -26,6 +26,7 @@ public MigrateRepoCommand() : base(
             AddOption(AdoPat);
             AddOption(GithubPat);
             AddOption(Verbose);
+            AddOption(TargetApiUrl);
         }
 
         public Option<string> AdoOrg { get; } = new("--ado-org")
@@ -61,6 +62,10 @@ public MigrateRepoCommand() : base(
         {
             Description = "The visibility of the target repo. Defaults to private. Valid values are public, private, or internal."
         };
+        public Option<string> TargetApiUrl { get; } = new("--target-api-url")
+        {
+            Description = "The URL of the target API, if not migrating to github.com. Defaults to https://api.github.com"
+        };
         public Option<string> AdoPat { get; } = new("--ado-pat");
         public Option<string> GithubPat { get; } = new("--github-pat");
         public Option<bool> Verbose { get; } = new("--verbose");
@@ -79,7 +84,7 @@ public override MigrateRepoCommandHandler BuildHandler(MigrateRepoCommandArgs ar
 
             var log = sp.GetRequiredService<OctoLogger>();
             var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-            var githubApi = githubApiFactory.Create(targetPersonalAccessToken: args.GithubPat);
+            var githubApi = githubApiFactory.Create(args.TargetApiUrl, args.GithubPat);
             var environmentVariableProvider = sp.GetRequiredService<EnvironmentVariableProvider>();
             var warningsCountLogger = sp.GetRequiredService<WarningsCountLogger>();
 

src/ado2gh/Commands/MigrateRepo/MigrateRepoCommandArgs.cs

@@ -16,5 +16,6 @@ public class MigrateRepoCommandArgs : CommandArgs
         public string AdoPat { get; set; }
         [Secret]
         public string GithubPat { get; set; }
+        public string TargetApiUrl { get; set; }
     }
 }

src/bbs2gh/Commands/MigrateRepo/MigrateRepoCommand.cs

@@ -47,6 +47,7 @@ public MigrateRepoCommand() : base(
         AddOption(Verbose);
         AddOption(KeepArchive);
         AddOption(NoSslVerify);
+        AddOption(TargetApiUrl);
     }
 
     public Option<string> BbsServerUrl { get; } = new(
@@ -182,7 +183,10 @@ public MigrateRepoCommand() : base(
     public Option<bool> KeepArchive { get; } = new(
         name: "--keep-archive",
         description: "Keeps the downloaded export archive after successfully uploading it. By default, it will be automatically deleted.");
-
+    public Option<string> TargetApiUrl { get; } = new("--target-api-url")
+    {
+        Description = "The URL of the target API, if not migrating to github.com. Defaults to https://api.github.com"
+    };
     public Option<bool> NoSslVerify { get; } = new(
         name: "--no-ssl-verify",
         description: "Disables SSL verification when communicating with your Bitbucket Server/Data Center instance. All other migration steps will continue to verify SSL. " +
@@ -212,7 +216,7 @@ public override MigrateRepoCommandHandler BuildHandler(MigrateRepoCommandArgs ar
         if (args.GithubOrg.HasValue())
         {
             var githubApiFactory = sp.GetRequiredService<GithubApiFactory>();
-            githubApi = githubApiFactory.Create(null, args.GithubPat);
+            githubApi = githubApiFactory.Create(args.TargetApiUrl, args.GithubPat);
         }
 
         if (args.BbsServerUrl.HasValue())

src/bbs2gh/Commands/MigrateRepo/MigrateRepoCommandArgs.cs

@@ -28,6 +28,7 @@ public class MigrateRepoCommandArgs : CommandArgs
     public string GithubPat { get; set; }
     public bool QueueOnly { get; set; }
     public string TargetRepoVisibility { get; set; }
+    public string TargetApiUrl { get; set; }
     public bool Kerberos { get; set; }
 
     public string BbsServerUrl { get; set; }

src/gei/Commands/MigrateOrg/MigrateOrgCommand.cs

@@ -16,6 +16,7 @@ public MigrateOrgCommand() : base(
             AddOption(GithubSourceOrg);
             AddOption(GithubTargetOrg);
             AddOption(GithubTargetEnterprise);
+            AddOption(TargetApiUrl);
 
             AddOption(GithubSourcePat);
             AddOption(GithubTargetPat);
@@ -40,6 +41,10 @@ public MigrateOrgCommand() : base(
         };
         public Option<string> GithubSourcePat { get; } = new("--github-source-pat");
         public Option<string> GithubTargetPat { get; } = new("--github-target-pat");
+        public Option<string> TargetApiUrl { get; } = new("--target-api-url")
+        {
+            Description = "The URL of the target API, if not migrating to github.com. Defaults to https://api.github.com"
+        };
         public Option<bool> QueueOnly { get; } = new("--queue-only")
         {
             Description = "Only queues the migration, does not wait for it to finish. Use the wait-for-migration command to subsequently wait for it to finish and view the status."
@@ -62,7 +67,7 @@ public override MigrateOrgCommandHandler BuildHandler(MigrateOrgCommandArgs args
             var environmentVariableProvider = sp.GetRequiredService<EnvironmentVariableProvider>();
 
             var targetGithubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-            var targetGithubApi = targetGithubApiFactory.Create(targetPersonalAccessToken: args.GithubTargetPat);
+            var targetGithubApi = targetGithubApiFactory.Create(args.TargetApiUrl, args.GithubTargetPat);
 
             return new MigrateOrgCommandHandler(log, targetGithubApi, environmentVariableProvider);
         }

src/gei/Commands/MigrateOrg/MigrateOrgCommandArgs.cs

@@ -14,6 +14,7 @@ public class MigrateOrgCommandArgs : CommandArgs
         public string GithubSourcePat { get; set; }
         [Secret]
         public string GithubTargetPat { get; set; }
+        public string TargetApiUrl { get; set; }
 
         public override void Validate(OctoLogger log)
         {