Merge branch 'main' into patch-1

Author: gennaropalma

LATEST-VERSION.txt

@@ -1 +1 @@
-v1.14.0
+v1.15.1

releasenotes/v1.15.0.md

@@ -0,0 +1 @@
+- Improve resilience of `gh gei migrate-repo` and `gh bb2gh migrate-repo` commands when uploading migration archives to GitHub owned storage.

releasenotes/v1.15.1.md

@@ -0,0 +1 @@
+Adjusting the release version so we can go to 1.15.1

releasenotes/v1.9.1.md

@@ -0,0 +1 @@
+- `gh gei migrate-secret-alerts` copies the resolver name from the original alert to the resolution comment of the matching target alert. The comment follows this format: `[@actorname] original comment`.

src/Octoshift/Models/GithubSecretScanningAlert.cs

@@ -7,6 +7,7 @@ public class GithubSecretScanningAlert
     public string ResolutionComment { get; set; }
     public string SecretType { get; set; }
     public string Secret { get; set; }
+    public string ResolverName { get; set; }
 }
 
 public class GithubSecretScanningAlertLocation

src/Octoshift/Services/ArchiveUploader.cs

@@ -15,13 +15,15 @@ public class ArchiveUploader
     private readonly GithubClient _client;
     private readonly OctoLogger _log;
     internal int _streamSizeLimit = 100 * 1024 * 1024; // 100 MiB
+    private readonly RetryPolicy _retryPolicy;
 
     private const string BASE_URL = "https://uploads.github.com";
 
-    public ArchiveUploader(GithubClient client, OctoLogger log)
+    public ArchiveUploader(GithubClient client, OctoLogger log, RetryPolicy retryPolicy)
     {
         _client = client;
         _log = log;
+        _retryPolicy = retryPolicy;
     }
     public virtual async Task<string> Upload(Stream archiveContent, string archiveName, string orgDatabaseId)
     {
@@ -48,7 +50,7 @@ public virtual async Task<string> Upload(Stream archiveContent, string archiveNa
         {
             var url = $"{BASE_URL}/organizations/{orgDatabaseId.EscapeDataString()}/gei/archive?name={archiveName.EscapeDataString()}";
 
-            response = await _client.PostAsync(url, streamContent);
+            response = await _retryPolicy.Retry(async () => await _client.PostAsync(url, streamContent));
             var data = JObject.Parse(response);
             return (string)data["uri"];
         }
@@ -101,7 +103,7 @@ private async Task<IEnumerable<KeyValuePair<string, IEnumerable<string>>>> Start
 
         try
         {
-            var (responseContent, headers) = await _client.PostWithFullResponseAsync(uploadUrl, body);
+            var (_, headers) = await _retryPolicy.Retry(async () => await _client.PostWithFullResponseAsync(uploadUrl, body));
             return headers.ToList();
         }
         catch (Exception ex)
@@ -119,7 +121,7 @@ private async Task<Uri> UploadPart(byte[] body, int bytesRead, string nextUrl, i
         try
         {
             // Make the PATCH request and retrieve headers
-            var (_, headers) = await _client.PatchWithFullResponseAsync(nextUrl, content);
+            var (_, headers) = await _retryPolicy.Retry(async () => await _client.PatchWithFullResponseAsync(nextUrl, content));
 
             // Retrieve the next URL from the response headers
             return GetNextUrl(headers.ToList());
@@ -134,7 +136,7 @@ private async Task CompleteUpload(string lastUrl)
     {
         try
         {
-            await _client.PutAsync(lastUrl, "");
+            await _retryPolicy.Retry(async () => await _client.PutAsync(lastUrl, ""));
             _log.LogInformation("Finished uploading archive");
         }
         catch (Exception ex)

src/Octoshift/Services/GithubApi.cs

@@ -1182,6 +1182,9 @@ private static GithubSecretScanningAlert BuildSecretScanningAlert(JToken secretA
             ResolutionComment = (string)secretAlert["resolution_comment"],
             SecretType = (string)secretAlert["secret_type"],
             Secret = (string)secretAlert["secret"],
+            ResolverName = secretAlert["resolved_by"]?.Type != JTokenType.Null
+                ? (string)secretAlert["resolved_by"]["login"]
+                : null
         };
 
     private static GithubSecretScanningAlertLocation BuildSecretScanningAlertLocation(JToken alertLocation)

src/Octoshift/Services/SecretScanningAlertService.cs

@@ -74,9 +74,11 @@ public virtual async Task MigrateSecretScanningAlerts(string sourceOrg, string s
 
                         _log.LogInformation($"  updating target alert:{targetAlert.Alert.Number} to state:{sourceAlert.Alert.State} and resolution:{sourceAlert.Alert.Resolution}");
 
+                        var targetResolutionComment = $"[@{sourceAlert.Alert.ResolverName}] {sourceAlert.Alert.ResolutionComment}";
+
                         await _targetGithubApi.UpdateSecretScanningAlert(targetOrg, targetRepo, targetAlert.Alert.Number, sourceAlert.Alert.State,
-                            sourceAlert.Alert.Resolution, sourceAlert.Alert.ResolutionComment);
-                        _log.LogSuccess($"  target alert successfully updated to {sourceAlert.Alert.Resolution}.");
+                            sourceAlert.Alert.Resolution, targetResolutionComment);
+                        _log.LogSuccess($"  target alert successfully updated to {sourceAlert.Alert.Resolution} with comment {targetResolutionComment}.");
                     }
                     else
                     {

src/OctoshiftCLI.IntegrationTests/BbsToGithub.cs

@@ -59,7 +59,8 @@ public BbsToGithub(ITestOutputHelper output)
 
         _targetGithubHttpClient = new HttpClient();
         _targetGithubClient = new GithubClient(_logger, _targetGithubHttpClient, new VersionChecker(_versionClient, _logger), new RetryPolicy(_logger), new DateTimeProvider(), targetGithubToken);
-        _archiveUploader = new ArchiveUploader(_targetGithubClient, _logger);
+        var retryPolicy = new RetryPolicy(_logger);
+        _archiveUploader = new ArchiveUploader(_targetGithubClient, _logger, retryPolicy);
         _targetGithubApi = new GithubApi(_targetGithubClient, "https://api.github.com", new RetryPolicy(_logger), _archiveUploader);
 
         _blobServiceClient = new BlobServiceClient(_azureStorageConnectionString);

src/OctoshiftCLI.IntegrationTests/GhesToGithub.cs

@@ -47,7 +47,8 @@ public GhesToGithub(ITestOutputHelper output)
         };
 
         _versionClient = new HttpClient();
-        _archiveUploader = new ArchiveUploader(_targetGithubClient, logger);
+        var retryPolicy = new RetryPolicy(logger);
+        _archiveUploader = new ArchiveUploader(_targetGithubClient, logger, retryPolicy);
 
         _sourceGithubHttpClient = new HttpClient();
         _sourceGithubClient = new GithubClient(logger, _sourceGithubHttpClient, new VersionChecker(_versionClient, logger), new RetryPolicy(logger), new DateTimeProvider(), sourceGithubToken);