up

src/Scanner/__Libraries/StellaOps.Scanner.Analyzers.OS.Dpkg/DpkgPackageAnalyzer.cs

@@ -40,10 +40,9 @@ internal sealed class DpkgPackageAnalyzer : OsPackageAnalyzerBase
         using var stream = File.OpenRead(statusPath);
         var entries = _parser.Parse(stream, cancellationToken);
 
-        context.Metadata.TryGetValue(ScanMetadataKeys.CurrentLayerDigest, out var layerDigest);
-
         var infoDirectory = Path.Combine(context.RootPath, "var", "lib", "dpkg", "info");
         var records = new List<OSPackageRecord>();
+        var evidenceFactory = OsFileEvidenceFactory.Create(context.RootPath, context.Metadata);
 
         foreach (var entry in entries)
         {
@@ -86,7 +85,7 @@ internal sealed class DpkgPackageAnalyzer : OsPackageAnalyzerBase
             var dependencies = entry.Depends.Concat(entry.PreDepends).ToArray();
             var provides = entry.Provides.ToArray();
 
-            var fileEvidence = BuildFileEvidence(infoDirectory, entry, layerDigest, cancellationToken);
+            var fileEvidence = BuildFileEvidence(infoDirectory, entry, evidenceFactory, cancellationToken);
 
             var cveHints = CveHintExtractor.Extract(entry.Description, string.Join(' ', dependencies), string.Join(' ', provides));
 
@@ -128,7 +127,11 @@ internal sealed class DpkgPackageAnalyzer : OsPackageAnalyzerBase
         return parts.Length == 0 ? null : parts[0];
     }
 
-    private static IReadOnlyList<OSPackageFileEvidence> BuildFileEvidence(string infoDirectory, DpkgPackageEntry entry, string? layerDigest, CancellationToken cancellationToken)
+    private static IReadOnlyList<OSPackageFileEvidence> BuildFileEvidence(
+        string infoDirectory,
+        DpkgPackageEntry entry,
+        OsFileEvidenceFactory evidenceFactory,
+        CancellationToken cancellationToken)
     {
         if (!Directory.Exists(infoDirectory))
         {
@@ -140,7 +143,7 @@ internal sealed class DpkgPackageAnalyzer : OsPackageAnalyzerBase
         {
             if (!files.TryGetValue(path, out _))
             {
-                files[path] = new FileEvidenceBuilder(path, layerDigest);
+                files[path] = new FileEvidenceBuilder(path);
             }
         }
 
@@ -236,7 +239,7 @@ internal sealed class DpkgPackageAnalyzer : OsPackageAnalyzerBase
         }
 
         var evidence = files.Values
-            .Select(builder => builder.ToEvidence())
+            .Select(builder => evidenceFactory.Create(builder.Path, builder.IsConfig, builder.Digests))
             .OrderBy(e => e)
             .ToArray();
 
@@ -251,23 +254,15 @@ internal sealed class DpkgPackageAnalyzer : OsPackageAnalyzerBase
 
     private sealed class FileEvidenceBuilder
     {
-        public FileEvidenceBuilder(string path, string? layerDigest)
+        public FileEvidenceBuilder(string path)
         {
             Path = path;
-            LayerDigest = layerDigest;
         }
 
         public string Path { get; }
 
-        public string? LayerDigest { get; }
-
         public bool IsConfig { get; set; }
 
         public Dictionary<string, string> Digests { get; } = new(StringComparer.OrdinalIgnoreCase);
-
-        public OSPackageFileEvidence ToEvidence()
-        {
-            return new OSPackageFileEvidence(Path, layerDigest: LayerDigest, isConfigFile: IsConfig, digests: Digests);
-        }
     }
 }