create team command changes

github · Feb 6, 2024 · e2befc6 · e2befc6
1 parent 300dc84
commit e2befc6
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/src/Octoshift/Commands/CreateTeam/CreateTeamCommandArgs.cs b/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; }
 }
diff --git a/src/Octoshift/Commands/CreateTeam/CreateTeamCommandBase.cs b/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);
     }
 }
diff --git a/src/OctoshiftCLI.Tests/Octoshift/Commands/CreateTeam/CreateTeamCommandBaseTests.cs b/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);
+    }
 }
diff --git a/src/OctoshiftCLI.Tests/ado2gh/Commands/CreateTeam/CreateTeamCommandTests.cs b/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);
     }
 }
diff --git a/src/OctoshiftCLI.Tests/bbs2gh/Commands/CreateTeam/CreateTeamCommandTests.cs b/src/OctoshiftCLI.Tests/bbs2gh/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);
     }
 }
diff --git a/src/OctoshiftCLI.Tests/gei/Commands/CreateTeam/CreateTeamCommandTests.cs b/src/OctoshiftCLI.Tests/gei/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-target-pat", false);
         TestHelpers.VerifyCommandOption(command.Options, "verbose", false);
+        TestHelpers.VerifyCommandOption(command.Options, "target-api-url", false);
     }
 }