Merge pull request #1386 from github/copilot/fix-617-4

Refactor AzureApiFactory and related factories into shared Octoshift project

Author: dylan-smith

src/bbs2gh/Factories/AwsApiFactory.cs renamed to src/Octoshift/Factories/AwsApiFactory.cs

@@ -1,6 +1,6 @@
 using OctoshiftCLI.Services;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public class AwsApiFactory
 {

src/bbs2gh/Factories/AzureApiFactory.cs renamed to src/Octoshift/Factories/AzureApiFactory.cs

@@ -1,7 +1,7 @@
 using System.Net.Http;
 using OctoshiftCLI.Services;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public sealed class AzureApiFactory : IAzureApiFactory
 {

src/bbs2gh/Factories/BlobServiceClientFactory.cs renamed to src/Octoshift/Factories/BlobServiceClientFactory.cs

@@ -1,6 +1,6 @@
 using Azure.Storage.Blobs;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public class BlobServiceClientFactory : IBlobServiceClientFactory
 {

src/gei/Factories/GithubApiFactory.cs renamed to src/Octoshift/Factories/GithubApiFactory.cs

@@ -2,7 +2,7 @@
 using OctoshiftCLI.Contracts;
 using OctoshiftCLI.Services;
 
-namespace OctoshiftCLI.GithubEnterpriseImporter.Factories;
+namespace OctoshiftCLI.Factories;
 
 public sealed class GithubApiFactory : ISourceGithubApiFactory, ITargetGithubApiFactory
 {

src/bbs2gh/Factories/IAzureApiFactory.cs renamed to src/Octoshift/Factories/IAzureApiFactory.cs

@@ -1,6 +1,6 @@
 using OctoshiftCLI.Services;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public interface IAzureApiFactory
 {

src/bbs2gh/Factories/IBlobServiceClientFactory.cs renamed to src/Octoshift/Factories/IBlobServiceClientFactory.cs

@@ -1,6 +1,6 @@
 using Azure.Storage.Blobs;
 
-namespace OctoshiftCLI.BbsToGithub.Factories;
+namespace OctoshiftCLI.Factories;
 
 public interface IBlobServiceClientFactory
 {

src/OctoshiftCLI.Tests/bbs2gh/Factories/AwsApiFactoryTests.cs renamed to src/OctoshiftCLI.Tests/Octoshift/Factories/AwsApiFactoryTests.cs

@@ -1,10 +1,10 @@
 using FluentAssertions;
 using Moq;
-using OctoshiftCLI.BbsToGithub.Factories;
+using OctoshiftCLI.Factories;
 using OctoshiftCLI.Services;
 using Xunit;
 
-namespace OctoshiftCLI.Tests.bbs2gh.Factories;
+namespace OctoshiftCLI.Tests.Octoshift.Factories;
 
 public class AwsApiFactoryTests
 {

src/OctoshiftCLI.Tests/gei/Factories/AzureApiFactoryTests.cs renamed to src/OctoshiftCLI.Tests/Octoshift/Factories/AzureApiFactoryTests.cs

@@ -2,11 +2,11 @@
 using Azure.Storage.Blobs;
 using FluentAssertions;
 using Moq;
-using OctoshiftCLI.GithubEnterpriseImporter.Factories;
+using OctoshiftCLI.Factories;
 using OctoshiftCLI.Services;
 using Xunit;
 
-namespace OctoshiftCLI.Tests.GithubEnterpriseImporter.Factories;
+namespace OctoshiftCLI.Tests.Octoshift.Factories;
 
 public class AzureApiFactoryTests
 {

src/OctoshiftCLI.Tests/gei/Factories/GithubApiFactoryTests.cs renamed to src/OctoshiftCLI.Tests/Octoshift/Factories/GithubApiFactoryTests.cs

@@ -6,11 +6,11 @@
 using Moq;
 using Moq.Protected;
 using OctoshiftCLI.Contracts;
-using OctoshiftCLI.GithubEnterpriseImporter.Factories;
+using OctoshiftCLI.Factories;
 using OctoshiftCLI.Services;
 using Xunit;
 
-namespace OctoshiftCLI.Tests.GithubEnterpriseImporter.Factories;
+namespace OctoshiftCLI.Tests.Octoshift.Factories;
 
 public class GithubApiFactoryTests
 {
@@ -271,4 +271,58 @@ public async Task GithubApiFactory_Should_Use_The_Default_Github_Api_Url_If_Pass
             ItExpr.Is<HttpRequestMessage>(msg => msg.RequestUri.AbsoluteUri.StartsWith("https://api.github.com")),
             ItExpr.IsAny<CancellationToken>());
     }
+
+    [Fact]
+    public void Create_Should_Create_Github_Api_With_Github_Pat_From_Environment_If_Not_Provided()
+    {
+        // Arrange
+        var environmentVariableProviderMock = TestHelpers.CreateMock<EnvironmentVariableProvider>();
+        environmentVariableProviderMock.Setup(m => m.TargetGithubPersonalAccessToken(It.IsAny<bool>())).Returns(TARGET_GH_PAT);
+
+        using var httpClient = new HttpClient();
+
+        var mockHttpClientFactory = new Mock<IHttpClientFactory>();
+        mockHttpClientFactory
+            .Setup(x => x.CreateClient("Default"))
+            .Returns(httpClient);
+
+        // Act
+        var factory = new GithubApiFactory(null, mockHttpClientFactory.Object, environmentVariableProviderMock.Object, null, null, null);
+        var targetFactory = (ITargetGithubApiFactory)factory;
+        var result = targetFactory.Create();
+
+        // Assert
+        result.Should().NotBeNull();
+        httpClient.DefaultRequestHeaders.Authorization.Parameter.Should().Be(TARGET_GH_PAT);
+        httpClient.DefaultRequestHeaders.Authorization.Scheme.Should().Be("Bearer");
+
+        environmentVariableProviderMock.Verify(m => m.TargetGithubPersonalAccessToken(It.IsAny<bool>()));
+    }
+
+    [Fact]
+    public void Create_Should_Create_Github_Api_With_Provided_Github_Pat()
+    {
+        // Arrange
+        var environmentVariableProviderMock = TestHelpers.CreateMock<EnvironmentVariableProvider>();
+        environmentVariableProviderMock.Setup(m => m.TargetGithubPersonalAccessToken(It.IsAny<bool>())).Returns(TARGET_GH_PAT);
+
+        using var httpClient = new HttpClient();
+
+        var mockHttpClientFactory = new Mock<IHttpClientFactory>();
+        mockHttpClientFactory
+            .Setup(x => x.CreateClient("Default"))
+            .Returns(httpClient);
+
+        // Act
+        var factory = new GithubApiFactory(null, mockHttpClientFactory.Object, environmentVariableProviderMock.Object, null, null, null);
+        var targetFactory = (ITargetGithubApiFactory)factory;
+        var result = targetFactory.Create(targetPersonalAccessToken: TARGET_GH_PAT);
+
+        // Assert
+        result.Should().NotBeNull();
+        httpClient.DefaultRequestHeaders.Authorization.Parameter.Should().Be(TARGET_GH_PAT);
+        httpClient.DefaultRequestHeaders.Authorization.Scheme.Should().Be("Bearer");
+
+        environmentVariableProviderMock.Verify(m => m.TargetGithubPersonalAccessToken(It.IsAny<bool>()), Times.Never);
+    }
 }