remove BuildEngine null check before logging

Author: Surayya Huseyn Zada

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

@@ -13,7 +13,6 @@ public static async Task PublishImageAsync(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken)
     {
@@ -27,7 +26,6 @@ await PushToLocalRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    isSafeLog,
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync).ConfigureAwait(false);
@@ -38,7 +36,6 @@ await PushToRemoteRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    isSafeLog,
                     cancellationToken,
                     destinationImageReference.RemoteRegistry!.PushAsync,
                     Strings.ContainerBuilder_ImageUploadedToRegistry).ConfigureAwait(false);
@@ -55,7 +52,6 @@ public static async Task PublishImageAsync(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken)
     {
@@ -69,7 +65,6 @@ await PushToLocalRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    isSafeLog,
                     telemetry,
                     cancellationToken,
                     destinationImageReference.LocalRegistry!.LoadAsync).ConfigureAwait(false);
@@ -80,7 +75,6 @@ await PushToRemoteRegistryAsync(
                     sourceImageReference,
                     destinationImageReference,
                     Log,
-                    isSafeLog,
                     cancellationToken,
                     destinationImageReference.RemoteRegistry!.PushManifestListAsync,
                     Strings.ImageIndexUploadedToRegistry).ConfigureAwait(false);
@@ -97,7 +91,6 @@ private static async Task PushToLocalRegistryAsync<T>(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        bool isSafeLog,
         Telemetry telemetry,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> loadFunc)
@@ -112,34 +105,25 @@ private static async Task PushToLocalRegistryAsync<T>(
         try
         {
             await loadFunc(image, sourceImageReference, destinationImageReference, cancellationToken).ConfigureAwait(false);
-            if (isSafeLog) 
-            {
-                Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
-            }
+            Log.LogMessage(MessageImportance.High, Strings.ContainerBuilder_ImageUploadedToLocalDaemon, destinationImageReference, localRegistry);
         }
-        catch (ContainerHttpException e) when (isSafeLog)
+        catch (ContainerHttpException e)
         {
             Log.LogErrorFromException(e, true);
         }
         catch (AggregateException ex) when (ex.InnerException is DockerLoadException dle)
         {
             telemetry.LogLocalLoadError();
-            if (isSafeLog)
-            {
-                Log.LogErrorFromException(dle, showStackTrace: false);
-            }
+            Log.LogErrorFromException(dle, showStackTrace: false);
         }
-        catch (ArgumentException argEx) when (isSafeLog)
+        catch (ArgumentException argEx)
         {
             Log.LogErrorFromException(argEx, showStackTrace: false);
         }
         catch (DockerLoadException dle)
         {
             telemetry.LogLocalLoadError();
-            if (isSafeLog)
-            {
-                Log.LogErrorFromException(dle, showStackTrace: false);
-            }
+            Log.LogErrorFromException(dle, showStackTrace: false);
         }
     }
 
@@ -148,7 +132,6 @@ private static async Task PushToRemoteRegistryAsync<T>(
         SourceImageReference sourceImageReference,
         DestinationImageReference destinationImageReference,
         Microsoft.Build.Utilities.TaskLoggingHelper Log,
-        bool isSafeLog,
         CancellationToken cancellationToken,
         Func<T, SourceImageReference, DestinationImageReference, CancellationToken, Task> pushFunc,
         string successMessage)
@@ -160,20 +143,17 @@ await pushFunc(
                 sourceImageReference,
                 destinationImageReference,
                 cancellationToken).ConfigureAwait(false);
-            if (isSafeLog) 
-            {
-                Log.LogMessage(MessageImportance.High, successMessage, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
-            }
+            Log.LogMessage(MessageImportance.High, successMessage, destinationImageReference, destinationImageReference.RemoteRegistry!.RegistryName);
         }
-        catch (UnableToAccessRepositoryException) when (isSafeLog)
+        catch (UnableToAccessRepositoryException)
         {
             Log.LogErrorWithCodeFromResources(nameof(Strings.UnableToAccessRepository), destinationImageReference.Repository, destinationImageReference.RemoteRegistry!.RegistryName);
         }
-        catch (ContainerHttpException e) when (isSafeLog)
+        catch (ContainerHttpException e)
         {
             Log.LogErrorFromException(e, true);
         }
-        catch (Exception e) when (isSafeLog)
+        catch (Exception e)
         {
             Log.LogErrorWithCodeFromResources(nameof(Strings.RegistryOutputPushFailed), e.Message);
             Log.LogMessage(MessageImportance.Low, "Details: {0}", e);

src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateImageIndex.cs

@@ -83,7 +83,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         var telemetry = new Telemetry(sourceImageReference, destinationImageReference, Log);
 
-        await ImagePublisher.PublishImageAsync(multiArchImage, sourceImageReference, destinationImageReference, Log, BuildEngine != null, telemetry, cancellationToken)
+        await ImagePublisher.PublishImageAsync(multiArchImage, sourceImageReference, destinationImageReference, Log, telemetry, cancellationToken)
             .ConfigureAwait(false); 
 
         return !Log.HasLoggedErrors;

src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs

@@ -120,13 +120,10 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             return !Log.HasLoggedErrors;
         }
 
-        if (BuildEngine != null) 
-        {
-            (string message, object[] parameters) = SkipPublishing ?
-                ( Strings.ContainerBuilder_StartBuildingImageForRid, new object[] { Repository, ContainerRuntimeIdentifier, sourceImageReference }) :
-                ( Strings.ContainerBuilder_StartBuildingImage, new object[] { Repository, String.Join(",", ImageTags), sourceImageReference });
-            Log.LogMessage(MessageImportance.High, message, parameters);
-        }
+        (string message, object[] parameters) = SkipPublishing ?
+            ( Strings.ContainerBuilder_StartBuildingImageForRid, new object[] { Repository, ContainerRuntimeIdentifier, sourceImageReference }) :
+            ( Strings.ContainerBuilder_StartBuildingImage, new object[] { Repository, String.Join(",", ImageTags), sourceImageReference });
+        Log.LogMessage(MessageImportance.High, message, parameters);
 
         Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
         imageBuilder.AddLayer(newLayer);
@@ -183,7 +180,7 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
 
         if (!SkipPublishing)
         {
-            await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, BuildEngine != null, telemetry, cancellationToken)
+            await ImagePublisher.PublishImageAsync(builtImage, sourceImageReference, destinationImageReference, Log, telemetry, cancellationToken)
                 .ConfigureAwait(false);
         }