Add githubPat to createMigrationSource mutation (#161)

Author: Arin Ghazarian

src/OctoshiftCLI.Tests/Commands/MigrateRepoCommandTests.cs

@@ -37,17 +37,20 @@ public async Task HappyPath()
             var githubOrgId = Guid.NewGuid().ToString();
             var migrationSourceId = Guid.NewGuid().ToString();
             var migrationId = Guid.NewGuid().ToString();
+            var githubPat = Guid.NewGuid().ToString();
 
             var mockGithub = new Mock<GithubApi>(null);
             mockGithub.Setup(x => x.GetOrganizationId(githubOrg).Result).Returns(githubOrgId);
-            mockGithub.Setup(x => x.CreateMigrationSource(githubOrgId, adoToken).Result).Returns(migrationSourceId);
+            mockGithub.Setup(x => x.CreateMigrationSource(githubOrgId, adoToken, githubPat).Result).Returns(migrationSourceId);
             mockGithub.Setup(x => x.StartMigration(migrationSourceId, adoRepoUrl, githubOrgId, githubRepo).Result).Returns(migrationId);
             mockGithub.Setup(x => x.GetMigrationState(migrationId).Result).Returns("SUCCEEDED");
 
+            var githubFactory = new Mock<GithubApiFactory>(mockGithub.Object);
+            githubFactory.Setup(m => m.GetGithubToken()).Returns(githubPat);
+
             using var adoFactory = new AdoApiFactory(adoToken);
-            using var githubFactory = new GithubApiFactory(mockGithub.Object);
 
-            var command = new MigrateRepoCommand(new Mock<OctoLogger>().Object, adoFactory, githubFactory);
+            var command = new MigrateRepoCommand(new Mock<OctoLogger>().Object, adoFactory, githubFactory.Object);
             await command.Invoke(adoOrg, adoTeamProject, adoRepo, githubOrg, githubRepo);
 
             mockGithub.Verify(x => x.GetMigrationState(migrationId));

src/OctoshiftCLI.Tests/GithubApiTests.cs

@@ -0,0 +1,38 @@
+using System.Net.Http;
+using System.Threading.Tasks;
+using Moq;
+using Xunit;
+
+namespace OctoshiftCLI.Tests
+{
+    public class GithubApiTests
+    {
+        [Fact]
+        public async Task CreateMigrationSourceReturnsNewMigrationSourceId()
+        {
+            // Arrange
+            const string url = "https://api.github.com/graphql";
+            const string orgId = "ORG_ID";
+            const string adoToken = "ADO_TOKEN";
+            const string githubPat = "GITHUB_PAT";
+            var payload =
+                "{\"query\":\"mutation createMigrationSource($name: String!, $url: String!, $ownerId: ID!, $accessToken: String!, $type: MigrationSourceType!, $githubPat: String!) " +
+                "{ createMigrationSource(input: {name: $name, url: $url, ownerId: $ownerId, accessToken: $accessToken, type: $type, githubPat: $githubPat}) { migrationSource { id, name, url, type } } }\"" +
+                $",\"variables\":{{\"name\":\"Azure DevOps Source\",\"url\":\"https://dev.azure.com\",\"ownerId\":\"{orgId}\",\"type\":\"AZURE_DEVOPS\",\"accessToken\":\"{adoToken}\", \"githubPat\":\"{githubPat}\"}},\"operationName\":\"createMigrationSource\"}}";
+            const string migrationSourceId = "MS_kgC4NjFhOTVjOTc4ZTRhZjEwMDA5NjNhOTdm";
+            var result = $"{{\"data\":{{\"createMigrationSource\":{{\"migrationSource\": {{\"id\":\"{migrationSourceId}\",\"name\":\"Azure Devops Source\",\"url\":\"https://dev.azure.com\",\"type\":\"AZURE_DEVOPS\"}}}}}}}}";
+
+            var githubClientMock = new Mock<GithubClient>(null, null);
+            githubClientMock
+                .Setup(m => m.PostAsync(url, It.Is<StringContent>(x => x.ReadAsStringAsync().Result == payload)))
+                .ReturnsAsync(result);
+
+            // Act
+            using var githubApi = new GithubApi(githubClientMock.Object);
+            var id = await githubApi.CreateMigrationSource(orgId, adoToken, githubPat);
+
+            // Assert
+            Assert.Equal(migrationSourceId, id);
+        }
+    }
+}

src/OctoshiftCLI/Commands/MigrateRepoCommand.cs

@@ -68,9 +68,9 @@ public async Task Invoke(string adoOrg, string adoTeamProject, string adoRepo, s
 
             using var github = _githubFactory.Create();
             var adoToken = _adoFactory.GetAdoToken();
-
+            var githubPat = _githubFactory.GetGithubToken();
             var githubOrgId = await github.GetOrganizationId(githubOrg);
-            var migrationSourceId = await github.CreateMigrationSource(githubOrgId, adoToken);
+            var migrationSourceId = await github.CreateMigrationSource(githubOrgId, adoToken, githubPat);
             var migrationId = await github.StartMigration(migrationSourceId, adoRepoUrl, githubOrgId, githubRepo);
 
             var migrationState = await github.GetMigrationState(migrationId);

src/OctoshiftCLI/GithubApi.cs

@@ -99,13 +99,13 @@ public virtual async Task<string> GetOrganizationId(string org)
             return (string)data["data"]["organization"]["id"];
         }
 
-        public virtual async Task<string> CreateMigrationSource(string orgId, string adoToken)
+        public virtual async Task<string> CreateMigrationSource(string orgId, string adoToken, string githubPat)
         {
             var url = $"https://api.github.com/graphql";
 
-            var query = "mutation createMigrationSource($name: String!, $url: String!, $ownerId: ID!, $accessToken: String!, $type: MigrationSourceType!)";
-            var gql = "createMigrationSource(input: {name: $name, url: $url, ownerId: $ownerId, accessToken: $accessToken, type: $type}) { migrationSource { id, name, url, type } }";
-            var variables = $"{{\"name\":\"Azure DevOps Source\",\"url\":\"https://dev.azure.com\",\"ownerId\":\"{orgId}\",\"type\":\"AZURE_DEVOPS\",\"accessToken\":\"{adoToken}\"}}";
+            var query = "mutation createMigrationSource($name: String!, $url: String!, $ownerId: ID!, $accessToken: String!, $type: MigrationSourceType!, $githubPat: String!)";
+            var gql = "createMigrationSource(input: {name: $name, url: $url, ownerId: $ownerId, accessToken: $accessToken, type: $type, githubPat: $githubPat}) { migrationSource { id, name, url, type } }";
+            var variables = $"{{\"name\":\"Azure DevOps Source\",\"url\":\"https://dev.azure.com\",\"ownerId\":\"{orgId}\",\"type\":\"AZURE_DEVOPS\",\"accessToken\":\"{adoToken}\", \"githubPat\":\"{githubPat}\"}}";
 
             var payload = $"{{\"query\":\"{query} {{ {gql} }}\",\"variables\":{variables},\"operationName\":\"createMigrationSource\"}}";
             using var body = new StringContent(payload.ToString(), Encoding.UTF8, "application/json");

src/OctoshiftCLI/GithubApiFactory.cs

@@ -27,7 +27,7 @@ public GithubApi Create()
             return _api;
         }
 
-        public string GetGithubToken()
+        public virtual string GetGithubToken()
         {
             if (!string.IsNullOrWhiteSpace(_token))
             {

src/OctoshiftCLI/GithubClient.cs

@@ -35,7 +35,7 @@ public async Task<string> GetAsync(string url)
             return content;
         }
 
-        public async Task<string> PostAsync(string url, HttpContent body)
+        public virtual async Task<string> PostAsync(string url, HttpContent body)
         {
             url = url?.Replace(" ", "%20");