Pass through the cache context to the vulnerability resource (#5361)

nkolev92 · web-flow · commit 9ea2defeabc6 · 2023-08-19T13:51:26.000+02:00
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommandProviders.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommandProviders.cs
@@ -39,11 +39,12 @@ public RestoreCommandProviders(
         private static IReadOnlyList<IVulnerabilityInformationProvider> CreateVulnerabilityInfoProviders(IReadOnlyList<IRemoteDependencyProvider> remoteProviders)
         {
             List<IVulnerabilityInformationProvider> providers = new(remoteProviders.Count);
+            using var sourceCacheContext = new SourceCacheContext();
             for (int i = 0; i < remoteProviders.Count; i++)
             {
                 if (remoteProviders[i].SourceRepository != null)
                 {
-                    providers.Add(new VulnerabilityInformationProvider(remoteProviders[i].SourceRepository, NullLogger.Instance));
+                    providers.Add(new VulnerabilityInformationProvider(remoteProviders[i].SourceRepository, sourceCacheContext, NullLogger.Instance));
                 }
             }
             return providers;
@@ -150,7 +151,7 @@ public static RestoreCommandProviders Create(
             var vulnerabilityInfoProviders = new List<IVulnerabilityInformationProvider>(remoteProviders.Count);
             foreach (SourceRepository source in sources)
             {
-                var provider = new VulnerabilityInformationProvider(source, log);
+                var provider = new VulnerabilityInformationProvider(source, cacheContext, log);
                 vulnerabilityInfoProviders.Add(provider);
             }
 
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommandProvidersCache.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommandProvidersCache.cs
@@ -120,7 +120,7 @@ public RestoreCommandProviders GetOrCreate(
             var vulnerabilityInformationProviders = new List<IVulnerabilityInformationProvider>(sources.Count);
             foreach (SourceRepository source in sources)
             {
-                IVulnerabilityInformationProvider provider = _vulnerabilityInformationProviders.GetOrAdd(source, s => new VulnerabilityInformationProvider(s, log));
+                IVulnerabilityInformationProvider provider = _vulnerabilityInformationProviders.GetOrAdd(source, s => new VulnerabilityInformationProvider(s, cacheContext, log));
                 vulnerabilityInformationProviders.Add(provider);
             }
 
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/AuditUtility.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/AuditUtility.cs
@@ -399,6 +399,7 @@ private PackageVulnerabilitySeverity ParseAuditLevel()
 
         internal enum NuGetAuditMode { Unknown, Direct, All }
 
+        // Enum parsing and ToString are a magnitude of times slower than a naive implementation. 
         private NuGetAuditMode ParseAuditMode()
         {
             string? auditMode = _restoreAuditProperties?.AuditMode?.Trim();
@@ -431,6 +432,7 @@ internal enum EnabledValue
             ExplicitOptOut
         }
 
+        // Enum parsing and ToString are a magnitude of times slower than a naive implementation.
         public static EnabledValue ParseEnableValue(string? value, string projectFullPath, ILogger logger)
         {
             if (string.IsNullOrEmpty(value) || string.Equals(value, "default", StringComparison.OrdinalIgnoreCase))
@@ -455,6 +457,7 @@ public static EnabledValue ParseEnableValue(string? value, string projectFullPat
             return EnabledValue.Invalid;
         }
 
+        // Enum parsing and ToString are a magnitude of times slower than a naive implementation.
         internal static string GetString(EnabledValue enableAudit)
         {
             return enableAudit switch
@@ -467,6 +470,7 @@ internal static string GetString(EnabledValue enableAudit)
             };
         }
 
+        // Enum parsing and ToString are a magnitude of times slower than a naive implementation.
         internal static string GetString(NuGetAuditMode auditMode)
         {
             return auditMode switch
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/VulnerabilityInformationProvider.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/VulnerabilityInformationProvider.cs
@@ -15,13 +15,15 @@ namespace NuGet.Commands
     internal sealed class VulnerabilityInformationProvider : IVulnerabilityInformationProvider
     {
         private readonly SourceRepository _source;
+        private readonly SourceCacheContext _sourceCacheContext;
         private readonly ILogger _logger;
 
         private readonly AsyncLazy<GetVulnerabilityInfoResult?> _vulnerabilityInfo;
 
-        public VulnerabilityInformationProvider(SourceRepository source, ILogger logger)
+        public VulnerabilityInformationProvider(SourceRepository source, SourceCacheContext cacheContext, ILogger logger)
         {
             _source = source;
+            _sourceCacheContext = cacheContext;
             _logger = logger;
 
             _vulnerabilityInfo = new AsyncLazy<GetVulnerabilityInfoResult?>(GetVulnerabilityInfoAsync);
@@ -42,8 +44,7 @@ public VulnerabilityInformationProvider(SourceRepository source, ILogger logger)
                 return null;
             }
 
-            using SourceCacheContext cacheContext = new();
-            GetVulnerabilityInfoResult result = await vulnerabilityInfoResource.GetVulnerabilityInfoAsync(cacheContext, _logger, CancellationToken.None);
+            GetVulnerabilityInfoResult result = await vulnerabilityInfoResource.GetVulnerabilityInfoAsync(_sourceCacheContext, _logger, CancellationToken.None);
             return result;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,12 @@ public RestoreCommandProviders(`
`39`	`39`	`private static IReadOnlyList<IVulnerabilityInformationProvider> CreateVulnerabilityInfoProviders(IReadOnlyList<IRemoteDependencyProvider> remoteProviders)`
`40`	`40`	`{`
`41`	`41`	`List<IVulnerabilityInformationProvider> providers = new(remoteProviders.Count);`
	`42`	`+ using var sourceCacheContext = new SourceCacheContext();`
`42`	`43`	`for (int i = 0; i < remoteProviders.Count; i++)`
`43`	`44`	`{`
`44`	`45`	`if (remoteProviders[i].SourceRepository != null)`
`45`	`46`	`{`
`46`		`- providers.Add(new VulnerabilityInformationProvider(remoteProviders[i].SourceRepository, NullLogger.Instance));`
	`47`	`+ providers.Add(new VulnerabilityInformationProvider(remoteProviders[i].SourceRepository, sourceCacheContext, NullLogger.Instance));`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`return providers;`
`@@ -150,7 +151,7 @@ public static RestoreCommandProviders Create(`
`150`	`151`	`var vulnerabilityInfoProviders = new List<IVulnerabilityInformationProvider>(remoteProviders.Count);`
`151`	`152`	`foreach (SourceRepository source in sources)`
`152`	`153`	`{`
`153`		`- var provider = new VulnerabilityInformationProvider(source, log);`
	`154`	`+ var provider = new VulnerabilityInformationProvider(source, cacheContext, log);`
`154`	`155`	`vulnerabilityInfoProviders.Add(provider);`
`155`	`156`	`}`
`156`	`157`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public RestoreCommandProviders GetOrCreate(`
`120`	`120`	`var vulnerabilityInformationProviders = new List<IVulnerabilityInformationProvider>(sources.Count);`
`121`	`121`	`foreach (SourceRepository source in sources)`
`122`	`122`	`{`
`123`		`- IVulnerabilityInformationProvider provider = _vulnerabilityInformationProviders.GetOrAdd(source, s => new VulnerabilityInformationProvider(s, log));`
	`123`	`+ IVulnerabilityInformationProvider provider = _vulnerabilityInformationProviders.GetOrAdd(source, s => new VulnerabilityInformationProvider(s, cacheContext, log));`
`124`	`124`	`vulnerabilityInformationProviders.Add(provider);`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,7 @@ private PackageVulnerabilitySeverity ParseAuditLevel()`
`399`	`399`
`400`	`400`	`internal enum NuGetAuditMode { Unknown, Direct, All }`
`401`	`401`
	`402`	`+ // Enum parsing and ToString are a magnitude of times slower than a naive implementation.`
`402`	`403`	`private NuGetAuditMode ParseAuditMode()`
`403`	`404`	`{`
`404`	`405`	`string? auditMode = _restoreAuditProperties?.AuditMode?.Trim();`
`@@ -431,6 +432,7 @@ internal enum EnabledValue`
`431`	`432`	`ExplicitOptOut`
`432`	`433`	`}`
`433`	`434`
	`435`	`+ // Enum parsing and ToString are a magnitude of times slower than a naive implementation.`
`434`	`436`	`public static EnabledValue ParseEnableValue(string? value, string projectFullPath, ILogger logger)`
`435`	`437`	`{`
`436`	`438`	`if (string.IsNullOrEmpty(value) \|\| string.Equals(value, "default", StringComparison.OrdinalIgnoreCase))`
`@@ -455,6 +457,7 @@ public static EnabledValue ParseEnableValue(string? value, string projectFullPat`
`455`	`457`	`return EnabledValue.Invalid;`
`456`	`458`	`}`
`457`	`459`
	`460`	`+ // Enum parsing and ToString are a magnitude of times slower than a naive implementation.`
`458`	`461`	`internal static string GetString(EnabledValue enableAudit)`
`459`	`462`	`{`
`460`	`463`	`return enableAudit switch`
`@@ -467,6 +470,7 @@ internal static string GetString(EnabledValue enableAudit)`
`467`	`470`	`};`
`468`	`471`	`}`
`469`	`472`
	`473`	`+ // Enum parsing and ToString are a magnitude of times slower than a naive implementation.`
`470`	`474`	`internal static string GetString(NuGetAuditMode auditMode)`
`471`	`475`	`{`
`472`	`476`	`return auditMode switch`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,15 @@ namespace NuGet.Commands`
`15`	`15`	`internal sealed class VulnerabilityInformationProvider : IVulnerabilityInformationProvider`
`16`	`16`	`{`
`17`	`17`	`private readonly SourceRepository _source;`
	`18`	`+ private readonly SourceCacheContext _sourceCacheContext;`
`18`	`19`	`private readonly ILogger _logger;`
`19`	`20`
`20`	`21`	`private readonly AsyncLazy<GetVulnerabilityInfoResult?> _vulnerabilityInfo;`
`21`	`22`
`22`		`- public VulnerabilityInformationProvider(SourceRepository source, ILogger logger)`
	`23`	`+ public VulnerabilityInformationProvider(SourceRepository source, SourceCacheContext cacheContext, ILogger logger)`
`23`	`24`	`{`
`24`	`25`	`_source = source;`
	`26`	`+ _sourceCacheContext = cacheContext;`
`25`	`27`	`_logger = logger;`
`26`	`28`
`27`	`29`	`_vulnerabilityInfo = new AsyncLazy<GetVulnerabilityInfoResult?>(GetVulnerabilityInfoAsync);`
`@@ -42,8 +44,7 @@ public VulnerabilityInformationProvider(SourceRepository source, ILogger logger)`
`42`	`44`	`return null;`
`43`	`45`	`}`
`44`	`46`
`45`		`- using SourceCacheContext cacheContext = new();`
`46`		`- GetVulnerabilityInfoResult result = await vulnerabilityInfoResource.GetVulnerabilityInfoAsync(cacheContext, _logger, CancellationToken.None);`
	`47`	`+ GetVulnerabilityInfoResult result = await vulnerabilityInfoResource.GetVulnerabilityInfoAsync(_sourceCacheContext, _logger, CancellationToken.None);`
`47`	`48`	`return result;`
`48`	`49`	`}`
`49`	`50`	`}`