Refactor ExtractImageReferences and TryRegisterStructuredImageReference methods to remove unused fileLocation parameter

jpinz · jpinz · commit 035bdc9beef5 · 2026-04-13T18:00:10.000Z
diff --git a/src/Microsoft.ComponentDetection.Detectors/dockercompose/DockerComposeComponentDetector.cs b/src/Microsoft.ComponentDetection.Detectors/dockercompose/DockerComposeComponentDetector.cs
@@ -68,7 +68,7 @@ protected override async Task OnFileFoundAsync(ProcessRequest processRequest, ID
             {
                 if (document.RootNode is YamlMappingNode rootMapping)
                 {
-                    this.ExtractImageReferences(rootMapping, singleFileComponentRecorder, file.Location);
+                    this.ExtractImageReferences(rootMapping, singleFileComponentRecorder);
                 }
             }
         }
@@ -91,7 +91,7 @@ protected override async Task OnFileFoundAsync(ProcessRequest processRequest, ID
         return null;
     }
 
-    private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComponentRecorder recorder, string fileLocation)
+    private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComponentRecorder recorder)
     {
         var services = GetMappingChild(rootMapping, "services");
         if (services == null)
diff --git a/src/Microsoft.ComponentDetection.Detectors/helm/HelmComponentDetector.cs b/src/Microsoft.ComponentDetection.Detectors/helm/HelmComponentDetector.cs
@@ -154,7 +154,7 @@ private void WalkYamlForImages(YamlMappingNode mapping, ISingleFileComponentReco
                     //   repository: nginx
                     //   tag: "1.21"
                     case YamlMappingNode imageMapping:
-                        this.TryRegisterStructuredImageReference(imageMapping, recorder, fileLocation);
+                        this.TryRegisterStructuredImageReference(imageMapping, recorder);
                         break;
 
                     default:
@@ -178,7 +178,7 @@ private void WalkYamlForImages(YamlMappingNode mapping, ISingleFileComponentReco
         }
     }
 
-    private void TryRegisterStructuredImageReference(YamlMappingNode imageMapping, ISingleFileComponentRecorder recorder, string fileLocation)
+    private void TryRegisterStructuredImageReference(YamlMappingNode imageMapping, ISingleFileComponentRecorder recorder)
     {
         string? repository = null;
         string? tag = null;
diff --git a/src/Microsoft.ComponentDetection.Detectors/kubernetes/KubernetesComponentDetector.cs b/src/Microsoft.ComponentDetection.Detectors/kubernetes/KubernetesComponentDetector.cs
@@ -84,7 +84,7 @@ protected override async Task OnFileFoundAsync(ProcessRequest processRequest, ID
                 }
 
                 this.Logger.LogInformation("Discovered Kubernetes manifest: {Location}", file.Location);
-                this.ExtractImageReferences(rootMapping, singleFileComponentRecorder, file.Location);
+                this.ExtractImageReferences(rootMapping, singleFileComponentRecorder);
             }
         }
         catch (YamlException e)
@@ -208,7 +208,7 @@ private static bool IsKubernetesManifest(YamlMappingNode rootMapping)
         return !string.IsNullOrEmpty(apiVersion) && !string.IsNullOrEmpty(kind) && KubernetesKinds.Contains(kind);
     }
 
-    private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComponentRecorder recorder, string fileLocation)
+    private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComponentRecorder recorder)
     {
         // PodTemplate has pod spec at root.template.spec.
         var rootTemplate = GetMappingChild(rootMapping, "template");
@@ -217,7 +217,7 @@ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComp
             var rootTemplateSpec = GetMappingChild(rootTemplate, "spec");
             if (rootTemplateSpec != null)
             {
-                this.ExtractContainerImages(rootTemplateSpec, recorder, fileLocation);
+                this.ExtractContainerImages(rootTemplateSpec, recorder);
             }
         }
 
@@ -230,7 +230,7 @@ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComp
         }
 
         // Direct pod spec (kind: Pod)
-        this.ExtractContainerImages(spec, recorder, fileLocation);
+        this.ExtractContainerImages(spec, recorder);
 
         // Templated pod spec (kind: Deployment, StatefulSet, etc.)
         var template = GetMappingChild(spec, "template");
@@ -239,7 +239,7 @@ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComp
             var templateSpec = GetMappingChild(template, "spec");
             if (templateSpec != null)
             {
-                this.ExtractContainerImages(templateSpec, recorder, fileLocation);
+                this.ExtractContainerImages(templateSpec, recorder);
             }
         }
 
@@ -256,21 +256,21 @@ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComp
                     var jobPodSpec = GetMappingChild(jobPodTemplate, "spec");
                     if (jobPodSpec != null)
                     {
-                        this.ExtractContainerImages(jobPodSpec, recorder, fileLocation);
+                        this.ExtractContainerImages(jobPodSpec, recorder);
                     }
                 }
             }
         }
     }
 
-    private void ExtractContainerImages(YamlMappingNode podSpec, ISingleFileComponentRecorder recorder, string fileLocation)
+    private void ExtractContainerImages(YamlMappingNode podSpec, ISingleFileComponentRecorder recorder)
     {
-        this.ExtractImagesFromContainerList(podSpec, "containers", recorder, fileLocation);
-        this.ExtractImagesFromContainerList(podSpec, "initContainers", recorder, fileLocation);
-        this.ExtractImagesFromContainerList(podSpec, "ephemeralContainers", recorder, fileLocation);
+        this.ExtractImagesFromContainerList(podSpec, "containers", recorder);
+        this.ExtractImagesFromContainerList(podSpec, "initContainers", recorder);
+        this.ExtractImagesFromContainerList(podSpec, "ephemeralContainers", recorder);
     }
 
-    private void ExtractImagesFromContainerList(YamlMappingNode podSpec, string containerKey, ISingleFileComponentRecorder recorder, string fileLocation)
+    private void ExtractImagesFromContainerList(YamlMappingNode podSpec, string containerKey, ISingleFileComponentRecorder recorder)
     {
         var containers = GetSequenceChild(podSpec, containerKey);
         if (containers == null)

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected override async Task OnFileFoundAsync(ProcessRequest processRequest, ID`
`68`	`68`	`{`
`69`	`69`	`if (document.RootNode is YamlMappingNode rootMapping)`
`70`	`70`	`{`
`71`		`- this.ExtractImageReferences(rootMapping, singleFileComponentRecorder, file.Location);`
	`71`	`+ this.ExtractImageReferences(rootMapping, singleFileComponentRecorder);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
`@@ -91,7 +91,7 @@ protected override async Task OnFileFoundAsync(ProcessRequest processRequest, ID`
`91`	`91`	`return null;`
`92`	`92`	`}`
`93`	`93`
`94`		`- private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComponentRecorder recorder, string fileLocation)`
	`94`	`+ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComponentRecorder recorder)`
`95`	`95`	`{`
`96`	`96`	`var services = GetMappingChild(rootMapping, "services");`
`97`	`97`	`if (services == null)`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private void WalkYamlForImages(YamlMappingNode mapping, ISingleFileComponentReco`
`154`	`154`	`// repository: nginx`
`155`	`155`	`// tag: "1.21"`
`156`	`156`	`case YamlMappingNode imageMapping:`
`157`		`- this.TryRegisterStructuredImageReference(imageMapping, recorder, fileLocation);`
	`157`	`+ this.TryRegisterStructuredImageReference(imageMapping, recorder);`
`158`	`158`	`break;`
`159`	`159`
`160`	`160`	`default:`
`@@ -178,7 +178,7 @@ private void WalkYamlForImages(YamlMappingNode mapping, ISingleFileComponentReco`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
`181`		`- private void TryRegisterStructuredImageReference(YamlMappingNode imageMapping, ISingleFileComponentRecorder recorder, string fileLocation)`
	`181`	`+ private void TryRegisterStructuredImageReference(YamlMappingNode imageMapping, ISingleFileComponentRecorder recorder)`
`182`	`182`	`{`
`183`	`183`	`string? repository = null;`
`184`	`184`	`string? tag = null;`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected override async Task OnFileFoundAsync(ProcessRequest processRequest, ID`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`this.Logger.LogInformation("Discovered Kubernetes manifest: {Location}", file.Location);`
`87`		`- this.ExtractImageReferences(rootMapping, singleFileComponentRecorder, file.Location);`
	`87`	`+ this.ExtractImageReferences(rootMapping, singleFileComponentRecorder);`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`	`catch (YamlException e)`
`@@ -208,7 +208,7 @@ private static bool IsKubernetesManifest(YamlMappingNode rootMapping)`
`208`	`208`	`return !string.IsNullOrEmpty(apiVersion) && !string.IsNullOrEmpty(kind) && KubernetesKinds.Contains(kind);`
`209`	`209`	`}`
`210`	`210`
`211`		`- private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComponentRecorder recorder, string fileLocation)`
	`211`	`+ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComponentRecorder recorder)`
`212`	`212`	`{`
`213`	`213`	`// PodTemplate has pod spec at root.template.spec.`
`214`	`214`	`var rootTemplate = GetMappingChild(rootMapping, "template");`
`@@ -217,7 +217,7 @@ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComp`
`217`	`217`	`var rootTemplateSpec = GetMappingChild(rootTemplate, "spec");`
`218`	`218`	`if (rootTemplateSpec != null)`
`219`	`219`	`{`
`220`		`- this.ExtractContainerImages(rootTemplateSpec, recorder, fileLocation);`
	`220`	`+ this.ExtractContainerImages(rootTemplateSpec, recorder);`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`
`@@ -230,7 +230,7 @@ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComp`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`// Direct pod spec (kind: Pod)`
`233`		`- this.ExtractContainerImages(spec, recorder, fileLocation);`
	`233`	`+ this.ExtractContainerImages(spec, recorder);`
`234`	`234`
`235`	`235`	`// Templated pod spec (kind: Deployment, StatefulSet, etc.)`
`236`	`236`	`var template = GetMappingChild(spec, "template");`
`@@ -239,7 +239,7 @@ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComp`
`239`	`239`	`var templateSpec = GetMappingChild(template, "spec");`
`240`	`240`	`if (templateSpec != null)`
`241`	`241`	`{`
`242`		`- this.ExtractContainerImages(templateSpec, recorder, fileLocation);`
	`242`	`+ this.ExtractContainerImages(templateSpec, recorder);`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`
`@@ -256,21 +256,21 @@ private void ExtractImageReferences(YamlMappingNode rootMapping, ISingleFileComp`
`256`	`256`	`var jobPodSpec = GetMappingChild(jobPodTemplate, "spec");`
`257`	`257`	`if (jobPodSpec != null)`
`258`	`258`	`{`
`259`		`- this.ExtractContainerImages(jobPodSpec, recorder, fileLocation);`
	`259`	`+ this.ExtractContainerImages(jobPodSpec, recorder);`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`
`266`		`- private void ExtractContainerImages(YamlMappingNode podSpec, ISingleFileComponentRecorder recorder, string fileLocation)`
	`266`	`+ private void ExtractContainerImages(YamlMappingNode podSpec, ISingleFileComponentRecorder recorder)`
`267`	`267`	`{`
`268`		`- this.ExtractImagesFromContainerList(podSpec, "containers", recorder, fileLocation);`
`269`		`- this.ExtractImagesFromContainerList(podSpec, "initContainers", recorder, fileLocation);`
`270`		`- this.ExtractImagesFromContainerList(podSpec, "ephemeralContainers", recorder, fileLocation);`
	`268`	`+ this.ExtractImagesFromContainerList(podSpec, "containers", recorder);`
	`269`	`+ this.ExtractImagesFromContainerList(podSpec, "initContainers", recorder);`
	`270`	`+ this.ExtractImagesFromContainerList(podSpec, "ephemeralContainers", recorder);`
`271`	`271`	`}`
`272`	`272`
`273`		`- private void ExtractImagesFromContainerList(YamlMappingNode podSpec, string containerKey, ISingleFileComponentRecorder recorder, string fileLocation)`
	`273`	`+ private void ExtractImagesFromContainerList(YamlMappingNode podSpec, string containerKey, ISingleFileComponentRecorder recorder)`
`274`	`274`	`{`
`275`	`275`	`var containers = GetSequenceChild(podSpec, containerKey);`
`276`	`276`	`if (containers == null)`