Support remaining target-api-url commands (-1)

src/Octoshift/Commands/AbortMigration/AbortMigrationCommandArgs.cs

@@ -8,6 +8,7 @@ public class AbortMigrationCommandArgs : CommandArgs
     public string MigrationId { get; set; }
     [Secret]
     public string GithubPat { get; set; }
+    public string TargetApiUrl { get; set; }
 
     public override void Validate(OctoLogger log)
     {

src/Octoshift/Commands/AbortMigration/AbortCommandBase.cs → src/Octoshift/Commands/AbortMigration/AbortMigrationCommandBase.cs

@@ -30,12 +30,16 @@ public AbortMigrationCommandBase() : base(
     {
         Description = "Display more information to the console."
     };
-
+    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"
+    };
     protected void AddOptions()
     {
         AddOption(MigrationId);
         AddOption(GithubPat);
         AddOption(Verbose);
+        AddOption(TargetApiUrl);
     }
 
     public override AbortMigrationCommandHandler BuildHandler(AbortMigrationCommandArgs args, IServiceProvider sp)
@@ -51,7 +55,7 @@ public override AbortMigrationCommandHandler BuildHandler(AbortMigrationCommandA
         }
 
         var log = sp.GetRequiredService<OctoLogger>();
-        var githubApi = sp.GetRequiredService<ITargetGithubApiFactory>().Create(targetPersonalAccessToken: args.GithubPat);
+        var githubApi = sp.GetRequiredService<ITargetGithubApiFactory>().Create(args.TargetApiUrl, args.GithubPat);
 
         return new AbortMigrationCommandHandler(log, githubApi);
     }

src/Octoshift/Commands/CreateTeam/CreateTeamCommandArgs.cs

@@ -7,4 +7,5 @@ public class CreateTeamCommandArgs : CommandArgs
     public string IdpGroup { get; set; }
     [Secret]
     public string GithubPat { get; set; }
+    public string TargetApiUrl { get; set; }
 }

src/Octoshift/Commands/CreateTeam/CreateTeamCommandBase.cs

@@ -22,7 +22,10 @@ public CreateTeamCommandBase() : base(name: "create-team", description: "Creates
     {
         Description = "Personal access token of the GitHub target. Overrides GH_PAT environment variable."
     };
-
+    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 virtual Option<bool> Verbose { get; } = new("--verbose") { IsRequired = false };
 
     public override CreateTeamCommandHandler BuildHandler(CreateTeamCommandArgs args, IServiceProvider sp)
@@ -40,7 +43,7 @@ public override CreateTeamCommandHandler BuildHandler(CreateTeamCommandArgs args
         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);
 
         return new CreateTeamCommandHandler(log, githubApi);
     }
@@ -52,5 +55,6 @@ protected void AddOptions()
         AddOption(IdpGroup);
         AddOption(GithubPat);
         AddOption(Verbose);
+        AddOption(TargetApiUrl);
     }
 }

src/Octoshift/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandArgs.cs

@@ -1,4 +1,5 @@
-using OctoshiftCLI.Services;
+using OctoshiftCLI.Extensions;
+using OctoshiftCLI.Services;
 
 namespace OctoshiftCLI.Commands.RevokeMigratorRole;
 
@@ -10,6 +11,7 @@ public class RevokeMigratorRoleCommandArgs : CommandArgs
     [Secret]
     public string GithubPat { get; set; }
     public string GhesApiUrl { get; set; }
+    public string TargetApiUrl { get; set; }
 
     public override void Validate(OctoLogger log)
     {
@@ -23,5 +25,10 @@ public override void Validate(OctoLogger log)
         {
             throw new OctoshiftCliException("Actor type must be either TEAM or USER.");
         }
+
+        if (GhesApiUrl.HasValue() && TargetApiUrl.HasValue())
+        {
+            throw new OctoshiftCliException("Only one of --ghes-api-url or --target-api-url can be set at a time.");
+        }
     }
 }

src/Octoshift/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandBase.cs

@@ -41,13 +41,22 @@ public override RevokeMigratorRoleCommandHandler BuildHandler(RevokeMigratorRole
 
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-        var githubApi = githubApiFactory.Create(args.GhesApiUrl, args.GithubPat);
+        var apiUrl = args.TargetApiUrl ?? args.GhesApiUrl;
+        var githubApi = githubApiFactory.Create(apiUrl, args.GithubPat);
 
         return new RevokeMigratorRoleCommandHandler(log, githubApi);
     }
 
-    public virtual Option<string> GhesApiUrl { get; } = new("--ghes-api-url") { IsRequired = false };
-
+    public virtual Option<string> GhesApiUrl { get; } = new("--ghes-api-url")
+    {
+        IsRequired = false,
+        Description = "The URL of the GitHub Enterprise Server instance, if migrating from GHES. Supports revoking access for exports. Can only configure one of --ghes-api-url or --target-api-url at a time."
+    };
+    public Option<string> TargetApiUrl { get; } = new("--target-api-url")
+    {
+        IsRequired = false,
+        Description = "The URL of the target API, if not migrating to github.com. Defaults to https://api.github.com. Can only configure one of --ghes-api-url or --target-api-url at a time."
+    };
     protected void AddOptions()
     {
         AddOption(GithubOrg);
@@ -56,5 +65,6 @@ protected void AddOptions()
         AddOption(GithubPat);
         AddOption(Verbose);
         AddOption(GhesApiUrl);
+        AddOption(TargetApiUrl);
     }
 }

src/Octoshift/Commands/WaitForMigration/WaitForMigrationCommandArgs.cs

@@ -8,6 +8,7 @@ public class WaitForMigrationCommandArgs : CommandArgs
     public string MigrationId { get; set; }
     [Secret]
     public string GithubPat { get; set; }
+    public string TargetApiUrl { get; set; }
 
     public const string REPO_MIGRATION_ID_PREFIX = "RM_";
     public const string ORG_MIGRATION_ID_PREFIX = "OM_";

src/Octoshift/Commands/WaitForMigration/WaitForMigrationCommandBase.cs

@@ -27,14 +27,18 @@ public WaitForMigrationCommandBase() : base(
     {
         Description = "Personal access token of the GitHub target. Overrides GH_PAT environment variable."
     };
-
+    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 virtual Option<bool> Verbose { get; } = new("--verbose");
 
     protected void AddOptions()
     {
         AddOption(MigrationId);
         AddOption(GithubPat);
         AddOption(Verbose);
+        AddOption(TargetApiUrl);
     }
 
     public override WaitForMigrationCommandHandler BuildHandler(WaitForMigrationCommandArgs args, IServiceProvider sp)
@@ -50,7 +54,7 @@ public override WaitForMigrationCommandHandler BuildHandler(WaitForMigrationComm
         }
 
         var log = sp.GetRequiredService<OctoLogger>();
-        var githubApi = sp.GetRequiredService<ITargetGithubApiFactory>().Create(targetPersonalAccessToken: args.GithubPat);
+        var githubApi = sp.GetRequiredService<ITargetGithubApiFactory>().Create(args.TargetApiUrl, args.GithubPat);
         var warningsCountLogger = sp.GetRequiredService<WarningsCountLogger>();
 
         return new WaitForMigrationCommandHandler(log, githubApi, warningsCountLogger);

src/OctoshiftCLI.Tests/Octoshift/Commands/AbortMigration/AbortMigrationCommandBaseTests.cs

@@ -0,0 +1,45 @@
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using OctoshiftCLI.Commands.AbortMigration;
+using OctoshiftCLI.Contracts;
+using OctoshiftCLI.Services;
+using Xunit;
+
+namespace OctoshiftCLI.Tests.Octoshift.Commands.AbortMigration;
+
+public class AbortMigrationCommandBaseTests
+{
+    private readonly Mock<ITargetGithubApiFactory> _mockGithubApiFactory = new();
+    private readonly Mock<OctoLogger> _mockOctoLogger = TestHelpers.CreateMock<OctoLogger>();
+    private readonly ServiceProvider _serviceProvider;
+    private readonly AbortMigrationCommandBase _command = new();
+
+    private const string REPO_MIGRATION_ID = "RM_MIGRATION_ID";
+
+    public AbortMigrationCommandBaseTests()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddSingleton(_mockOctoLogger.Object)
+            .AddSingleton(_mockGithubApiFactory.Object);
+
+        _serviceProvider = serviceCollection.BuildServiceProvider();
+    }
+
+    [Fact]
+    public void It_Uses_The_TargetApiUrl_When_Provided()
+    {
+        var targetApiUrl = "TargetApiUrl";
+
+        var args = new AbortMigrationCommandArgs
+        {
+            MigrationId = REPO_MIGRATION_ID,
+            TargetApiUrl = targetApiUrl
+        };
+
+        _command.BuildHandler(args, _serviceProvider);
+
+        _mockGithubApiFactory.Verify(m => m.Create(targetApiUrl, It.IsAny<string>()));
+    }
+}
+

src/OctoshiftCLI.Tests/Octoshift/Commands/CreateTeam/CreateTeamCommandBaseTests.cs

@@ -42,4 +42,21 @@ public void It_Uses_Github_Source_Pat_When_Provided()
 
         _mockGithubApiFactory.Verify(m => m.Create(It.IsAny<string>(), args.GithubPat), Times.Once);
     }
+
+    [Fact]
+    public void It_Uses_Target_Api_Url_When_Provided()
+    {
+        var targetApiUrl = "https://api.github.com";
+
+        var args = new CreateTeamCommandArgs
+        {
+            GithubOrg = "foo",
+            TeamName = "blah",
+            TargetApiUrl = targetApiUrl
+        };
+
+        _command.BuildHandler(args, _serviceProvider);
+
+        _mockGithubApiFactory.Verify(m => m.Create(args.TargetApiUrl, null), Times.Once);
+    }
 }

src/OctoshiftCLI.Tests/Octoshift/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandArgsTests.cs

@@ -23,6 +23,23 @@ public void Invalid_Actor_Type()
             ActorType = "INVALID",
         };
 
+        FluentActions
+            .Invoking(() => args.Validate(_mockOctoLogger.Object))
+            .Should()
+            .ThrowExactly<OctoshiftCliException>();
+    }
+    [Fact]
+    public void It_Validates_GhesApiUrl_And_TargetApiUrl()
+    {
+        var args = new RevokeMigratorRoleCommandArgs
+        {
+            GithubOrg = GITHUB_ORG,
+            Actor = ACTOR,
+            ActorType = "USER",
+            GhesApiUrl = "https://ghes.example.com",
+            TargetApiUrl = "https://api.github.com",
+        };
+
         FluentActions
             .Invoking(() => args.Validate(_mockOctoLogger.Object))
             .Should()

src/OctoshiftCLI.Tests/Octoshift/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandBaseTests.cs

@@ -61,4 +61,24 @@ public void It_Uses_The_GhesApiUrl_When_Provided()
 
         _mockGithubApiFactory.Verify(m => m.Create(ghesApiUrl, null));
     }
+
+    [Fact]
+    public void It_Uses_The_TargetApiUrl_When_Provided()
+    {
+        var ghesApiUrl = "GhesApiUrl";
+        var targetApiUrl = "TargetApiUrl";
+
+        var args = new RevokeMigratorRoleCommandArgs
+        {
+            GithubOrg = "foo",
+            Actor = "blah",
+            ActorType = "TEAM",
+            GhesApiUrl = ghesApiUrl,
+            TargetApiUrl = targetApiUrl
+        };
+
+        _command.BuildHandler(args, _serviceProvider);
+
+        _mockGithubApiFactory.Verify(m => m.Create(targetApiUrl, null));
+    }
 }

src/OctoshiftCLI.Tests/Octoshift/Commands/WaitForMigration/WaitForMigrationCommandBaseTests.cs

@@ -0,0 +1,46 @@
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
+using OctoshiftCLI.Commands.WaitForMigration;
+using OctoshiftCLI.Contracts;
+using OctoshiftCLI.Services;
+using Xunit;
+
+namespace OctoshiftCLI.Tests.Octoshift.Commands.WaitForMigration;
+
+public class WaitForMigrationCommandBaseTests
+{
+    private readonly Mock<ITargetGithubApiFactory> _mockGithubApiFactory = new();
+    private readonly Mock<OctoLogger> _mockOctoLogger = TestHelpers.CreateMock<OctoLogger>();
+    private readonly Mock<WarningsCountLogger> _mockWarningsCountLogger = TestHelpers.CreateMock<WarningsCountLogger>();
+    private readonly ServiceProvider _serviceProvider;
+    private readonly WaitForMigrationCommandBase _command = new();
+
+    private const string REPO_MIGRATION_ID = "RM_MIGRATION_ID";
+    public WaitForMigrationCommandBaseTests()
+    {
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddSingleton(_mockOctoLogger.Object)
+            .AddSingleton(_mockGithubApiFactory.Object)
+            .AddSingleton(_mockWarningsCountLogger.Object);
+
+        _serviceProvider = serviceCollection.BuildServiceProvider();
+    }
+
+    [Fact]
+    public void It_Uses_The_TargetApiUrl_When_Provided()
+    {
+        var targetApiUrl = "TargetApiUrl";
+
+        var args = new WaitForMigrationCommandArgs
+        {
+            MigrationId = REPO_MIGRATION_ID,
+            TargetApiUrl = targetApiUrl
+        };
+
+        _command.BuildHandler(args, _serviceProvider);
+
+        _mockGithubApiFactory.Verify(m => m.Create(targetApiUrl, It.IsAny<string>()));
+    }
+}
+

src/OctoshiftCLI.Tests/ado2gh/Commands/AbortMigration/AbortMigrationCommandTests.cs

@@ -12,10 +12,11 @@ public void Should_Have_Options()
         var command = new AbortMigrationCommand();
         command.Should().NotBeNull();
         command.Name.Should().Be("abort-migration");
-        command.Options.Count.Should().Be(3);
+        command.Options.Count.Should().Be(4);
 
         TestHelpers.VerifyCommandOption(command.Options, "migration-id", true);
         TestHelpers.VerifyCommandOption(command.Options, "github-pat", false);
         TestHelpers.VerifyCommandOption(command.Options, "verbose", false);
+        TestHelpers.VerifyCommandOption(command.Options, "target-api-url", false);
     }
 }

src/OctoshiftCLI.Tests/ado2gh/Commands/CreateTeam/CreateTeamCommandTests.cs

@@ -11,12 +11,13 @@ public void Should_Have_Options()
         var command = new CreateTeamCommand();
         Assert.NotNull(command);
         Assert.Equal("create-team", command.Name);
-        Assert.Equal(5, command.Options.Count);
+        Assert.Equal(6, command.Options.Count);
 
         TestHelpers.VerifyCommandOption(command.Options, "github-org", true);
         TestHelpers.VerifyCommandOption(command.Options, "team-name", true);
         TestHelpers.VerifyCommandOption(command.Options, "idp-group", false);
         TestHelpers.VerifyCommandOption(command.Options, "github-pat", false);
         TestHelpers.VerifyCommandOption(command.Options, "verbose", false);
+        TestHelpers.VerifyCommandOption(command.Options, "target-api-url", false);
     }
 }

src/OctoshiftCLI.Tests/ado2gh/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandTests.cs

@@ -11,13 +11,14 @@ public void Should_Have_Options()
         var command = new RevokeMigratorRoleCommand();
         Assert.NotNull(command);
         Assert.Equal("revoke-migrator-role", command.Name);
-        Assert.Equal(6, command.Options.Count);
+        Assert.Equal(7, command.Options.Count);
 
         TestHelpers.VerifyCommandOption(command.Options, "github-org", true);
         TestHelpers.VerifyCommandOption(command.Options, "actor", true);
         TestHelpers.VerifyCommandOption(command.Options, "actor-type", true);
         TestHelpers.VerifyCommandOption(command.Options, "github-pat", false);
         TestHelpers.VerifyCommandOption(command.Options, "verbose", false);
         TestHelpers.VerifyCommandOption(command.Options, "ghes-api-url", false);
+        TestHelpers.VerifyCommandOption(command.Options, "target-api-url", false);
     }
 }

src/OctoshiftCLI.Tests/ado2gh/Commands/WaitForMigration/WaitForMigrationCommandTests.cs

@@ -12,10 +12,11 @@ public void Should_Have_Options()
         var command = new WaitForMigrationCommand();
         command.Should().NotBeNull();
         command.Name.Should().Be("wait-for-migration");
-        command.Options.Count.Should().Be(3);
+        command.Options.Count.Should().Be(4);
 
         TestHelpers.VerifyCommandOption(command.Options, "migration-id", true);
         TestHelpers.VerifyCommandOption(command.Options, "github-pat", false);
         TestHelpers.VerifyCommandOption(command.Options, "verbose", false);
+        TestHelpers.VerifyCommandOption(command.Options, "target-api-url", false);
     }
 }

src/OctoshiftCLI.Tests/bbs2gh/Commands/AbortMigration/AbortMigrationCommandTests.cs

@@ -12,10 +12,11 @@ public void Should_Have_Options()
         var command = new AbortMigrationCommand();
         command.Should().NotBeNull();
         command.Name.Should().Be("abort-migration");
-        command.Options.Count.Should().Be(3);
+        command.Options.Count.Should().Be(4);
 
         TestHelpers.VerifyCommandOption(command.Options, "migration-id", true);
         TestHelpers.VerifyCommandOption(command.Options, "github-pat", false);
         TestHelpers.VerifyCommandOption(command.Options, "verbose", false);
+        TestHelpers.VerifyCommandOption(command.Options, "target-api-url", false);
     }
 }