Sanitize another Docker telemetry event (#1164)

microsoft · Jun 7, 2024 · 2b5b657 · 2b5b657
1 parent 341b036
commit 2b5b657
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/Microsoft.ComponentDetection.Common/DockerService.cs b/src/Microsoft.ComponentDetection.Common/DockerService.cs
@@ -71,7 +71,7 @@ public async Task<bool> ImageExistsLocallyAsync(string image, CancellationToken
         };
         try
         {
-            var imageInspectResponse = await Client.Images.InspectImageAsync(image, cancellationToken);
+            var imageInspectResponse = await this.InspectImageAndSanitizeVarsAsync(image, cancellationToken);
             record.ImageInspectResponse = JsonSerializer.Serialize(imageInspectResponse);
             return true;
         }
@@ -82,6 +82,13 @@ public async Task<bool> ImageExistsLocallyAsync(string image, CancellationToken
         }
     }
 
+    private async Task<ImageInspectResponse> InspectImageAndSanitizeVarsAsync(string image, CancellationToken cancellationToken = default)
+    {
+        var imageInspectResponse = await Client.Images.InspectImageAsync(image, cancellationToken);
+        this.SanitizeEnvironmentVariables(imageInspectResponse);
+        return imageInspectResponse;
+    }
+
     public async Task<bool> TryPullImageAsync(string image, CancellationToken cancellationToken = default)
     {
         using var record = new DockerServiceTryPullImageTelemetryRecord
@@ -135,10 +142,7 @@ public async Task<ContainerDetails> InspectImageAsync(string image, Cancellation
         };
         try
         {
-            var imageInspectResponse = await Client.Images.InspectImageAsync(image, cancellationToken);
-
-            this.SanitizeEnvironmentVariables(imageInspectResponse);
-
+            var imageInspectResponse = await this.InspectImageAndSanitizeVarsAsync(image, cancellationToken);
             record.ImageInspectResponse = JsonSerializer.Serialize(imageInspectResponse);
 
             var baseImageRef = string.Empty;