Address PR comments

Author: jpinz

src/Microsoft.ComponentDetection.Detectors/helm/HelmComponentDetector.cs

@@ -89,7 +89,7 @@ protected override async Task OnFileFoundAsync(ProcessRequest processRequest, ID
                 return;
             }
 
-            this.ExtractImageReferencesFromValues(yaml, processRequest.SingleFileComponentRecorder, file.Location);
+            this.ExtractImageReferencesFromValues(yaml, processRequest.SingleFileComponentRecorder);
         }
         catch (Exception e)
         {
@@ -112,13 +112,13 @@ private static bool IsValuesFile(string fileName) =>
         (fileName.EndsWith(".yaml", StringComparison.OrdinalIgnoreCase) ||
          fileName.EndsWith(".yml", StringComparison.OrdinalIgnoreCase));
 
-    private void ExtractImageReferencesFromValues(YamlStream yaml, ISingleFileComponentRecorder recorder, string fileLocation)
+    private void ExtractImageReferencesFromValues(YamlStream yaml, ISingleFileComponentRecorder recorder)
     {
         foreach (var document in yaml.Documents)
         {
             if (document.RootNode is YamlMappingNode rootMapping)
             {
-                this.WalkYamlForImages(rootMapping, recorder, fileLocation);
+                this.WalkYamlForImages(rootMapping, recorder);
             }
         }
     }
@@ -128,7 +128,7 @@ private void ExtractImageReferencesFromValues(YamlStream yaml, ISingleFileCompon
     /// 1. Direct image string: `image: nginx:1.21`
     /// 2. Structured image object: `image: { repository: nginx, tag: "1.21" }`.
     /// </summary>
-    private void WalkYamlForImages(YamlMappingNode mapping, ISingleFileComponentRecorder recorder, string fileLocation)
+    private void WalkYamlForImages(YamlMappingNode mapping, ISingleFileComponentRecorder recorder)
     {
         foreach (var entry in mapping.Children)
         {
@@ -156,15 +156,15 @@ private void WalkYamlForImages(YamlMappingNode mapping, ISingleFileComponentReco
             }
             else if (entry.Value is YamlMappingNode childMapping)
             {
-                this.WalkYamlForImages(childMapping, recorder, fileLocation);
+                this.WalkYamlForImages(childMapping, recorder);
             }
             else if (entry.Value is YamlSequenceNode sequenceNode)
             {
                 foreach (var item in sequenceNode)
                 {
                     if (item is YamlMappingNode sequenceMapping)
                     {
-                        this.WalkYamlForImages(sequenceMapping, recorder, fileLocation);
+                        this.WalkYamlForImages(sequenceMapping, recorder);
                     }
                 }
             }

test/Microsoft.ComponentDetection.Detectors.Tests/HelmComponentDetectorTests.cs

@@ -430,4 +430,48 @@ public async Task TestHelm_ChartYmlExtensionAsync()
         scanResult.ResultCode.Should().Be(ProcessingResultCode.Success);
         componentRecorder.GetDetectedComponents().Should().BeEmpty();
     }
+
+    [TestMethod]
+    public async Task TestHelm_ChartYmlWithValuesFileProcessedAsync()
+    {
+        var valuesYaml = @"
+image: nginx:1.21
+";
+
+        var (scanResult, componentRecorder) = await this.DetectorTestUtility
+            .WithFile("Chart.yml", MinimalChartYaml)
+            .WithFile("values.yaml", valuesYaml)
+            .ExecuteDetectorAsync();
+
+        scanResult.ResultCode.Should().Be(ProcessingResultCode.Success);
+        var components = componentRecorder.GetDetectedComponents();
+        components.Should().ContainSingle();
+
+        var dockerRef = components.First().Component as DockerReferenceComponent;
+        dockerRef.Should().NotBeNull();
+        dockerRef.Repository.Should().Be("library/nginx");
+        dockerRef.Tag.Should().Be("1.21");
+    }
+
+    [TestMethod]
+    public async Task TestHelm_MultipleValuesFilesAsync()
+    {
+        var valuesYaml = @"
+image: nginx:1.21
+";
+
+        var valuesOverrideYaml = @"
+image: redis:7-alpine
+";
+
+        var (scanResult, componentRecorder) = await this.DetectorTestUtility
+            .WithFile("Chart.yaml", MinimalChartYaml)
+            .WithFile("values.yaml", valuesYaml)
+            .WithFile("values.production.yaml", valuesOverrideYaml)
+            .ExecuteDetectorAsync();
+
+        scanResult.ResultCode.Should().Be(ProcessingResultCode.Success);
+        var components = componentRecorder.GetDetectedComponents();
+        components.Should().HaveCount(2);
+    }
 }