Merge branch 'main' into bbs-send-repo-url-for-selecting-fork-support

Author: dpmex4527

RELEASENOTES.md

@@ -1,6 +1,7 @@
 - Add new '--skip-invitation' flag for `reclaim-mannequin` to allow EMU organizations to reclaim mannequins without an email invitation
 - Write warnings to log and console if GitHub is experiencing an availability incident.
 - Improve the error thrown when you have insufficient permissions for the target GitHub organization to explicitly mention the relevant organization
+- Write log output prior to making API calls in wait-for-migration commands
 - Fix the `Multiple repositories found in archive` error by adding migration support for fork repositories. This is accomplished by passing the full
   Bitbucket Server repository URL to GEI when starting the migration. This URL is constructed using the `--bbs-server-url`, `--bbs-project`, and
   `--bbs-repo` arguments supplied to the `migrate-repo` command.

src/Octoshift/Commands/WaitForMigration/WaitForMigrationCommandHandler.cs

@@ -75,9 +75,11 @@ private async Task WaitForOrgMigration(string migrationId, GithubApi githubApi)
 
     private async Task WaitForRepositoryMigration(string migrationId, GithubApi githubApi)
     {
+        _log.LogInformation($"Waiting for migration (ID: {migrationId}) to finish...");
+
         var (state, repositoryName, failureReason, migrationLogUrl) = await githubApi.GetMigration(migrationId);
 
-        _log.LogInformation($"Waiting for {repositoryName} migration (ID: {migrationId}) to finish...");
+        _log.LogInformation($"Waiting for migration of repository {repositoryName} to finish...");
 
         while (true)
         {

src/Octoshift/Octoshift.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.S3" Version="3.7.104.19" />
+    <PackageReference Include="AWSSDK.S3" Version="3.7.104.23" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />

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

@@ -45,7 +45,8 @@ public async Task With_Migration_ID_That_Succeeds()
 
         var expectedLogOutput = new List<string>
             {
-                $"Waiting for {TARGET_REPO} migration (ID: {REPO_MIGRATION_ID}) to finish...",
+                $"Waiting for migration (ID: {REPO_MIGRATION_ID}) to finish...",
+                $"Waiting for migration of repository {TARGET_REPO} to finish...",
                 $"Migration {REPO_MIGRATION_ID} for {TARGET_REPO} is {RepositoryMigrationStatus.InProgress}",
                 $"Waiting {WAIT_INTERVAL} seconds...",
                 $"Migration {REPO_MIGRATION_ID} for {TARGET_REPO} is {RepositoryMigrationStatus.InProgress}",
@@ -62,7 +63,7 @@ public async Task With_Migration_ID_That_Succeeds()
         await _handler.Handle(args);
 
         // Assert
-        _mockOctoLogger.Verify(m => m.LogInformation(It.IsAny<string>()), Times.Exactly(6));
+        _mockOctoLogger.Verify(m => m.LogInformation(It.IsAny<string>()), Times.Exactly(7));
         _mockOctoLogger.Verify(m => m.LogSuccess(It.IsAny<string>()), Times.Once);
 
         _mockGithubApi.Verify(m => m.GetMigration(REPO_MIGRATION_ID), Times.Exactly(3));
@@ -90,7 +91,8 @@ public async Task With_Migration_ID_That_Fails()
 
         var expectedLogOutput = new List<string>
             {
-                $"Waiting for {TARGET_REPO} migration (ID: {REPO_MIGRATION_ID}) to finish...",
+                $"Waiting for migration (ID: {REPO_MIGRATION_ID}) to finish...",
+                $"Waiting for migration of repository {TARGET_REPO} to finish...",
                 $"Migration {REPO_MIGRATION_ID} for {TARGET_REPO} is {RepositoryMigrationStatus.InProgress}",
                 $"Waiting {WAIT_INTERVAL} seconds...",
                 $"Migration {REPO_MIGRATION_ID} for {TARGET_REPO} is {RepositoryMigrationStatus.InProgress}",
@@ -111,7 +113,7 @@ await FluentActions
             .WithMessage(failureReason);
 
         // Assert
-        _mockOctoLogger.Verify(m => m.LogInformation(It.IsAny<string>()), Times.Exactly(6));
+        _mockOctoLogger.Verify(m => m.LogInformation(It.IsAny<string>()), Times.Exactly(7));
         _mockOctoLogger.Verify(m => m.LogError(It.IsAny<string>()), Times.Once);
 
         _mockGithubApi.Verify(m => m.GetMigration(REPO_MIGRATION_ID), Times.Exactly(3));
@@ -139,7 +141,8 @@ public async Task With_Migration_ID_That_Fails_Validation()
 
         var expectedLogOutput = new List<string>
             {
-                $"Waiting for {TARGET_REPO} migration (ID: {REPO_MIGRATION_ID}) to finish...",
+                $"Waiting for migration (ID: {REPO_MIGRATION_ID}) to finish...",
+                $"Waiting for migration of repository {TARGET_REPO} to finish...",
                 $"Migration {REPO_MIGRATION_ID} for {TARGET_REPO} is {RepositoryMigrationStatus.PendingValidation}",
                 $"Waiting {WAIT_INTERVAL} seconds...",
                 $"Migration {REPO_MIGRATION_ID} for {TARGET_REPO} is {RepositoryMigrationStatus.PendingValidation}",
@@ -161,7 +164,7 @@ await FluentActions
 
         // Assert
 
-        _mockOctoLogger.Verify(m => m.LogInformation(It.IsAny<string>()), Times.Exactly(6));
+        _mockOctoLogger.Verify(m => m.LogInformation(It.IsAny<string>()), Times.Exactly(7));
         _mockOctoLogger.Verify(m => m.LogError(It.IsAny<string>()), Times.Once);
 
         _mockGithubApi.Verify(m => m.GetMigration(REPO_MIGRATION_ID), Times.Exactly(3));