add support for abort migration and rename files as needed

github · Feb 6, 2024 · 0f8e926 · 0f8e926
1 parent 49dd24d
commit 0f8e926
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 5 deletions.
diff --git a/src/Octoshift/Commands/AbortMigration/AbortMigrationCommandArgs.cs b/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)
     {

diff --git a/...mmands/AbortMigration/AbortCommandBase.cs → ...ortMigration/AbortMigrationCommandBase.cs b/...mmands/AbortMigration/AbortCommandBase.cs → ...ortMigration/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);
     }

diff --git a/src/OctoshiftCLI.Tests/Octoshift/Commands/AbortMigration/AbortMigrationCommandBaseTests.cs b/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>()));
+    }
+}
+
diff --git a/...ation/AbortMirationCommandHandlerTests.cs → ...tion/AbortMigrationCommandHandlerTests.cs b/...ation/AbortMirationCommandHandlerTests.cs → ...tion/AbortMigrationCommandHandlerTests.cs
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Commands/AbortMigration/AbortMigrationCommandTests.cs b/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);
     }
 }
diff --git a/src/OctoshiftCLI.Tests/bbs2gh/Commands/AbortMigration/AbortMigrationCommandTests.cs b/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);
     }
 }
diff --git a/src/OctoshiftCLI.Tests/gei/Commands/AbortMigration/AbortMigrationCommandTests.cs b/src/OctoshiftCLI.Tests/gei/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);
     }
 }