prefer changes from pr #48987 over #44953

Author: surayya-MS

src/Containers/Microsoft.NET.Build.Containers/ContainerBuilder.cs

@@ -248,11 +248,6 @@ private static async Task<int> PushToRemoteRegistryAsync(ILogger logger, BuiltIm
             logger.LogError(Resource.FormatString(nameof(Strings.UnableToDownloadFromRepository)), sourceImageReference);
             return 1;
         }
-        catch (UnableToAccessRepositoryException)
-        {
-            logger.LogError(Resource.FormatString(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName));
-            return 1;
-        }
         catch (Exception e)
         {
             logger.LogError(Resource.FormatString(nameof(Strings.RegistryOutputPushFailed), e.Message));

src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs

@@ -414,25 +414,40 @@ public async Task<string> DownloadBlobAsync(string repository, Descriptor descri
             // Assume file is up to date and just return it
             return localPath;
         }
-
+    
         string tempTarballPath = ContentStore.GetTempFile();
-
-        try
+    
+        int retryCount = 0;
+        while (retryCount < MaxDownloadRetries)
         {
-            // No local copy, so download one
-            using Stream responseStream = await _registryAPI.Blob.GetStreamAsync(repository, descriptor.Digest, cancellationToken).ConfigureAwait(false);
-
-            using (FileStream fs = File.Create(tempTarballPath))
+            try
             {
-                await responseStream.CopyToAsync(fs, cancellationToken).ConfigureAwait(false);
+                // No local copy, so download one
+                using Stream responseStream = await _registryAPI.Blob.GetStreamAsync(repository, descriptor.Digest, cancellationToken).ConfigureAwait(false);
+    
+                using (FileStream fs = File.Create(tempTarballPath))
+                {
+                    await responseStream.CopyToAsync(fs, cancellationToken).ConfigureAwait(false);
+                }
+    
+                // Break the loop if successful
+                break;
+            }
+            catch (Exception ex)
+            {
+                retryCount++;
+                if (retryCount >= MaxDownloadRetries)
+                {
+                    throw new UnableToDownloadFromRepositoryException(repository);
+                }
+    
+                _logger.LogTrace("Download attempt {0}/{1} for repository '{2}' failed. Error: {3}", retryCount, MaxDownloadRetries, repository, ex.ToString());
+    
+                // Wait before retrying
+                await Task.Delay(_retryDelayProvider(), cancellationToken).ConfigureAwait(false);
             }
         }
-        catch (Exception)
-        {
-            throw new UnableToDownloadFromRepositoryException(repository);
-        }
-        cancellationToken.ThrowIfCancellationRequested();
-
+    
         File.Move(tempTarballPath, localPath, overwrite: true);
 
         return localPath;

test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

@@ -1433,9 +1433,10 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir)
     }
 
     [DockerAvailableFact]
-    public async Task CheckErrorMessageWhenSourceRepositoryThrows()
+    public async void CheckDownloadErrorMessageWhenSourceRepositoryThrows()
     {
-        ILogger logger = _loggerFactory.CreateLogger(nameof(CheckErrorMessageWhenSourceRepositoryThrows));
+        var loggerFactory = new TestLoggerFactory(_testOutput);
+        var logger = loggerFactory.CreateLogger(nameof(CheckDownloadErrorMessageWhenSourceRepositoryThrows));
         string rid = "win-x64";
         string publishDirectory = BuildLocalApp(tfm: ToolsetInfo.CurrentTargetFramework, rid: rid);
 
@@ -1461,24 +1462,39 @@ public async Task CheckErrorMessageWhenSourceRepositoryThrows()
 
         // Load the image into the local registry
         var sourceReference = new SourceImageReference(registry, "some_random_image", DockerRegistryManager.Net9ImageTag, null);
-        var destinationReference = new DestinationImageReference(registry, NewImageName(), new[] { rid });
-        var sawMyException = false;
-        try
-        {
-            await new DockerCli(_loggerFactory).LoadAsync(builtImage, sourceReference, destinationReference, default).ConfigureAwait(false);
-        }
-        catch (UnableToDownloadFromRepositoryException e)
-        {
-            sawMyException = true;
-            Assert.Contains("The download of the image from repository some_random_image has failed", e.ToString());
-        }
-        Assert.True(sawMyException);
+        string archivePath = Path.Combine(TestSettings.TestArtifactsDirectory, nameof(CheckDownloadErrorMessageWhenSourceRepositoryThrows));
+        var destinationReference = new DestinationImageReference(new ArchiveFileRegistry(archivePath), NewImageName(), new[] { rid });
+
+        (var taskLog, var errors) = SetupTaskLog();
+        var telemetry = new Telemetry(sourceReference, destinationReference, taskLog);
+
+        await ImagePublisher.PublishImageAsync(builtImage, sourceReference, destinationReference, taskLog, telemetry, CancellationToken.None)
+                .ConfigureAwait(false);
+
+        // Assert the error message
+        Assert.True(taskLog.HasLoggedErrors);
+        Assert.NotNull(errors);
+        Assert.Single(errors);
+        Assert.Contains("Unable to download image from the repository", errors[0]);
 
         static string[] DecideEntrypoint(string rid, string appName, string workingDir)
         {
             var binary = rid.StartsWith("win", StringComparison.Ordinal) ? $"{appName}.exe" : appName;
             return new[] { $"{workingDir}/{binary}" };
         }
+
+        static (Microsoft.Build.Utilities.TaskLoggingHelper, List<string?> errors) SetupTaskLog()
+        {
+            // We can use any Task, we just need TaskLoggingHelper
+            Tasks.CreateNewImage cni = new();
+            List<string?> errors = new();
+            IBuildEngine buildEngine = A.Fake<IBuildEngine>();
+            A.CallTo(() => buildEngine.LogWarningEvent(A<BuildWarningEventArgs>.Ignored)).Invokes((BuildWarningEventArgs e) => errors.Add(e.Message));
+            A.CallTo(() => buildEngine.LogErrorEvent(A<BuildErrorEventArgs>.Ignored)).Invokes((BuildErrorEventArgs e) => errors.Add(e.Message));
+            A.CallTo(() => buildEngine.LogMessageEvent(A<BuildMessageEventArgs>.Ignored)).Invokes((BuildMessageEventArgs e) => errors.Add(e.Message));
+            cni.BuildEngine = buildEngine;
+            return (cni.Log, errors);
+        }
     }
 
     [DockerAvailableFact(checkContainerdStoreAvailability: true)]