IProjectManagerFactory now returns IBaseProjectManager instead of BaseProjectManager (#417)

pmalmsten · web-flow · commit 6adda0ef10c8 · 2023-05-09T15:17:40.000-07:00
diff --git a/src/Shared.CLI/Helpers/OutputBuilder/SarifOutputBuilder.cs b/src/Shared.CLI/Helpers/OutputBuilder/SarifOutputBuilder.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.CST.OpenSource.Shared
 {
+    using Contracts;
     using Microsoft.CodeAnalysis.Sarif;
     using Microsoft.CST.OpenSource.PackageManagers;
     using Newtonsoft.Json;
@@ -26,7 +27,7 @@ public SarifOutputBuilder(SarifVersion version)
         /// <returns>Location list with single location object</returns>
         public static List<Location> BuildPurlLocation(PackageURL purl)
         {
-            BaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+            IBaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(purl, null);
             if (projectManager == null)
             {
                 Logger.Debug("Cannot determine the package type");
diff --git a/src/Shared.CLI/Helpers/PackageDownloader.cs b/src/Shared.CLI/Helpers/PackageDownloader.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.CST.OpenSource
 {
+    using Contracts;
     using Extensions;
     using Microsoft.CST.OpenSource.Helpers;
     using Microsoft.CST.OpenSource.PackageManagers;
@@ -293,7 +294,7 @@ public async Task<List<PackageURL>> GetPackageVersionsToProcess(PackageURL purl)
         // folders created
         private List<string> downloadPaths { get; set; } = new List<string>();
 
-        private BaseProjectManager? packageManager { get; set; }
+        private IBaseProjectManager? packageManager { get; set; }
         public List<PackageURL> PackageVersions { get; set; }
     }
 }
diff --git a/src/Shared.CLI/Helpers/RepoSearch.cs b/src/Shared.CLI/Helpers/RepoSearch.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.CST.OpenSource.Shared
 {
+    using Contracts;
     using Microsoft.CST.OpenSource.PackageManagers;
     using PackageUrl;
     using System;
@@ -59,7 +60,7 @@ public async Task<Dictionary<PackageURL, double>> ResolvePackageLibraryAsync(Pac
             Logger.Debug("Searching for source code for: {0}", purlNoVersion.ToString());
 
             // Get the correct project manager using the factory.
-            BaseProjectManager? projectManager = _projectManagerFactory.CreateProjectManager(purl);
+            IBaseProjectManager? projectManager = _projectManagerFactory.CreateProjectManager(purl);
 
             if (projectManager != null)
             {
diff --git a/src/Shared/Contracts/IProjectManagerFactory.cs b/src/Shared/Contracts/IProjectManagerFactory.cs
@@ -13,5 +13,5 @@ public interface IProjectManagerFactory
     /// <param name="purl">The <see cref="PackageURL"/> for the package to create the project manager for.</param>
     /// <param name="destinationDirectory">The new destination directory, if provided.</param>
     /// <returns>The implementation of <see cref="BaseProjectManager"/> for this <paramref name="purl"/>'s type.</returns>
-    BaseProjectManager? CreateProjectManager(PackageURL purl, string destinationDirectory = ".");
+    IBaseProjectManager? CreateProjectManager(PackageURL purl, string destinationDirectory = ".");
 }
diff --git a/src/Shared/PackageManagers/ProjectManagerFactory.cs b/src/Shared/PackageManagers/ProjectManagerFactory.cs
@@ -132,7 +132,7 @@ public static Dictionary<string, ConstructProjectManager> GetDefaultManagers(IHt
         }
 
         /// <inheritdoc />
-        public BaseProjectManager? CreateProjectManager(PackageURL purl, string destinationDirectory = ".")
+        public IBaseProjectManager? CreateProjectManager(PackageURL purl, string destinationDirectory = ".")
         {
             ConstructProjectManager? projectManager = _projectManagers.GetValueOrDefault(purl.Type);
 
@@ -147,7 +147,7 @@ public static Dictionary<string, ConstructProjectManager> GetDefaultManagers(IHt
         /// <param name="overrideManagers"> If provided, will set the project manager dictionary instead of using the defaults.</param>
         /// <param name="destinationDirectory">The new destination directory, if provided.</param>
         /// <returns>A new <see cref="BaseProjectManager"/> implementation.</returns>
-        public static BaseProjectManager? ConstructPackageManager(PackageURL packageUrl, IHttpClientFactory? httpClientFactory = null, Dictionary<string, ConstructProjectManager>? overrideManagers = null, string destinationDirectory = ".")
+        public static IBaseProjectManager? ConstructPackageManager(PackageURL packageUrl, IHttpClientFactory? httpClientFactory = null, Dictionary<string, ConstructProjectManager>? overrideManagers = null, string destinationDirectory = ".")
         {
             if (overrideManagers != null && overrideManagers.Any())
             {
diff --git a/src/oss-diff/DiffTool.cs b/src/oss-diff/DiffTool.cs
@@ -20,6 +20,7 @@
 
 namespace Microsoft.CST.OpenSource.DiffTool
 {
+    using Contracts;
     using Microsoft.CST.OpenSource.Helpers;
     using Microsoft.CST.OpenSource.PackageManagers;
     using PackageUrl;
@@ -120,7 +121,7 @@ public async Task<IOutputBuilder> DiffProjects(Options options)
             try
             {
                 PackageURL purl1 = new PackageURL(options.Targets.First());
-                BaseProjectManager? manager = ProjectManagerFactory.CreateProjectManager(purl1, options.DownloadDirectory ?? Path.GetTempPath());
+                IBaseProjectManager? manager = ProjectManagerFactory.CreateProjectManager(purl1, options.DownloadDirectory ?? Path.GetTempPath());
 
                 if (manager is not null)
                 {
@@ -154,7 +155,7 @@ public async Task<IOutputBuilder> DiffProjects(Options options)
             try
             {
                 PackageURL purl2 = new PackageURL(options.Targets.Last());
-                BaseProjectManager? manager2 = ProjectManagerFactory.CreateProjectManager(purl2, options.DownloadDirectory ?? Path.GetTempPath());
+                IBaseProjectManager? manager2 = ProjectManagerFactory.CreateProjectManager(purl2, options.DownloadDirectory ?? Path.GetTempPath());
 
                 if (manager2 is not null)
                 {
diff --git a/src/oss-find-squats-lib/FindPackageSquats.cs b/src/oss-find-squats-lib/FindPackageSquats.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.CST.OpenSource.FindSquats
 {
+    using Contracts;
     using ExtensionMethods;
     using Microsoft.CST.OpenSource;
     using Microsoft.CST.OpenSource.Exceptions;
@@ -19,7 +20,7 @@ public class FindPackageSquats : OssGadgetLib
         /// </summary>
         public PackageURL PackageUrl { get; }
 
-        public BaseProjectManager? ProjectManager { get;  }
+        public IBaseProjectManager? ProjectManager { get;  }
 
         public FindPackageSquats(ProjectManagerFactory projectManagerFactory, PackageURL packageUrl)
             : base(projectManagerFactory)
diff --git a/src/oss-find-squats-lib/MutateExtension.cs b/src/oss-find-squats-lib/MutateExtension.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.CST.OpenSource.FindSquats.ExtensionMethods
 {
+    using Contracts;
     using Extensions;
     using Microsoft.CST.OpenSource.FindSquats.Mutators;
     using Microsoft.CST.OpenSource.PackageManagers;
@@ -94,7 +95,7 @@ public static class MutateExtension
         /// </summary>
         /// <param name="manager"></param>
         /// <returns>An IEnumerable of the recommended IMutators.</returns>
-        public static IEnumerable<IMutator> GetDefaultMutators(this BaseProjectManager manager) => manager switch
+        public static IEnumerable<IMutator> GetDefaultMutators(this IBaseProjectManager manager) => manager switch
         {
             NuGetProjectManager => NugetMutators,
             NPMProjectManager => NpmMutators,
@@ -110,7 +111,7 @@ public static class MutateExtension
         /// <param name="purl">The Target package to check for squats.</param>
         /// <param name="options">The options for enumerating squats.</param>
         /// <returns>An <see cref="IDictionary{T, V}"/> where the key is the mutated name, and the value is a <see cref="IList{Mutation}"/> representing each candidate squat.</returns>
-        public static IDictionary<string, IList<Mutation>>? EnumerateSquatCandidates(this BaseProjectManager manager, PackageURL purl, MutateOptions? options = null)
+        public static IDictionary<string, IList<Mutation>>? EnumerateSquatCandidates(this IBaseProjectManager manager, PackageURL purl, MutateOptions? options = null)
         {
             return manager.EnumerateSquatCandidates(purl, manager.GetDefaultMutators(), options);
         }
@@ -124,7 +125,7 @@ public static class MutateExtension
         /// <param name="mutators">The mutators to use. Will ignore the default set of mutators.</param>
         /// <param name="options">The options for enumerating squats.</param>
         /// <returns>An <see cref="IDictionary{T, V}"/> where the key is the mutated name, and the value is a <see cref="IList{Mutation}"/> representing each candidate squat.</returns>
-        public static IDictionary<string, IList<Mutation>>? EnumerateSquatCandidates(this BaseProjectManager manager, PackageURL purl, IEnumerable<IMutator> mutators, MutateOptions? options = null)
+        public static IDictionary<string, IList<Mutation>>? EnumerateSquatCandidates(this IBaseProjectManager manager, PackageURL purl, IEnumerable<IMutator> mutators, MutateOptions? options = null)
         {
             if (purl.Name is null || purl.Type is null)
             {
@@ -164,7 +165,7 @@ public static class MutateExtension
         /// <param name="candidateMutations">The <see cref="IList{Mutation}"/> representing each squatting candidate.</param>
         /// <param name="options">The options for enumerating through existing squats.</param>
         /// <returns>An <see cref="IAsyncEnumerable{FindPackageSquatResult}"/> with the packages that exist which match one of the <paramref name="candidateMutations"/>.</returns>
-        public static async IAsyncEnumerable<FindPackageSquatResult> EnumerateExistingSquatsAsync(this BaseProjectManager manager, PackageURL purl, IDictionary<string, IList<Mutation>>? candidateMutations, MutateOptions? options = null)
+        public static async IAsyncEnumerable<FindPackageSquatResult> EnumerateExistingSquatsAsync(this IBaseProjectManager manager, PackageURL purl, IDictionary<string, IList<Mutation>>? candidateMutations, MutateOptions? options = null)
         {
             if (purl.Name is null || purl.Type is null)
             {
diff --git a/src/oss-health/HealthMetrics.cs b/src/oss-health/HealthMetrics.cs
@@ -13,6 +13,7 @@
 
 namespace Microsoft.CST.OpenSource.Health
 {
+    using Contracts;
     using PackageUrl;
 
     public class HealthMetrics
@@ -43,7 +44,7 @@ public void Normalize()
 
         public List<Result> toSarif()
         {
-            BaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+            IBaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(purl, null);
 
             if (projectManager == null)
             {
diff --git a/src/oss-health/HealthTool.cs b/src/oss-health/HealthTool.cs
@@ -11,6 +11,7 @@
 
 namespace Microsoft.CST.OpenSource
 {
+    using Contracts;
     using Microsoft.CST.OpenSource.PackageManagers;
     using PackageUrl;
 
@@ -26,7 +27,7 @@ public HealthTool() : this(new ProjectManagerFactory())
         }
         public async Task<HealthMetrics?> CheckHealth(PackageURL purl)
         {
-            BaseProjectManager? packageManager = ProjectManagerFactory.CreateProjectManager(purl);
+            IBaseProjectManager? packageManager = ProjectManagerFactory.CreateProjectManager(purl);
 
             if (packageManager != null)
             {
diff --git a/src/oss-tests/DownloadTests.cs b/src/oss-tests/DownloadTests.cs
@@ -10,6 +10,7 @@
 
 namespace Microsoft.CST.OpenSource.Tests
 {
+    using Contracts;
     using PackageManagers;
     using PackageUrl;
     using System.Collections.Generic;
@@ -151,7 +152,7 @@ public async Task NuGet_Download_Version_Succeeds(string purl, string targetFile
         public async Task Wildcard_Download_Version_Succeeds(string packageUrl, string targetFilename)
         {
             PackageURL purl = new(packageUrl);
-            BaseProjectManager? manager = new ProjectManagerFactory().CreateProjectManager(purl);
+            IBaseProjectManager? manager = new ProjectManagerFactory().CreateProjectManager(purl);
             IEnumerable<string> versions = await manager?.EnumerateVersionsAsync(purl) ?? throw new InvalidOperationException();
             await TestDownload(packageUrl, targetFilename, versions.Count());
         }
diff --git a/src/oss-tests/FindSquatsTests.cs b/src/oss-tests/FindSquatsTests.cs
@@ -101,7 +101,7 @@ public void GenerateManagerSpecific(string packageUrl, string expectedToFind)
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     foreach ((string _, IList<Mutation> mutations) in manager.EnumerateSquatCandidates(purl)!)
@@ -132,7 +132,7 @@ public void ExcludeRemoveNamespaceMutator(string packageUrl)
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     foreach ((string _, IList<Mutation> mutations) in manager.EnumerateSquatCandidates(purl, options: mutateOptions)!)
@@ -167,7 +167,7 @@ public void OriginalIsFullName(string packageUrl)
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     foreach ((string _, IList<Mutation> mutations) in manager.EnumerateSquatCandidates(purl)!)
@@ -192,7 +192,7 @@ public void DontMakeMutationsOfJustSeparators(string packageUrl)
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     foreach ((string _, IList<Mutation> mutations) in manager.EnumerateSquatCandidates(purl)!)
@@ -221,7 +221,7 @@ public void DontMakeEmptyMutations(string packageUrl)
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     foreach ((string mutation, IList<Mutation> mutations) in manager.EnumerateSquatCandidates(purl)!)
@@ -266,7 +266,7 @@ public void CanGetOriginalFromMutatingMutations(string packageUrl)
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     var originalMutations = manager.EnumerateSquatCandidates(purl);
@@ -321,7 +321,7 @@ public void ConvertToAndFromJson(string packageUrl, string expectedToFind)
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     foreach ((string mutationPurlString, IList<Mutation> mutations) in manager.EnumerateSquatCandidates(purl)!)
@@ -354,7 +354,7 @@ public void DontGenerateManagerSpecific(string packageUrl, Type notExpectedToFin
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     foreach (IMutator mutator in manager.GetDefaultMutators())
@@ -375,7 +375,7 @@ public void EnsureHttpEncoded(string packageUrl)
             PackageURL purl = new(packageUrl);
             if (purl.Name is not null && purl.Type is not null)
             {
-                BaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
+                IBaseProjectManager? manager = ProjectManagerFactory.ConstructPackageManager(purl, null);
                 if (manager is not null)
                 {
                     foreach ((string mutationPurlString, _) in manager.EnumerateSquatCandidates(purl)!)
diff --git a/src/oss-tests/ProjectManagerTests/ProjectManagerFactoryTests.cs b/src/oss-tests/ProjectManagerTests/ProjectManagerFactoryTests.cs
@@ -2,6 +2,7 @@
 
 namespace Microsoft.CST.OpenSource.Tests.ProjectManagerTests;
 
+using Contracts;
 using PackageActions;
 using PackageManagers;
 using PackageUrl;
@@ -82,10 +83,10 @@ public void OverrideManagerSucceeds()
         AssertFactoryCreatesCorrect(projectManagerFactory);
 
         // Assert that the overrides worked by checking the TopLevelExtractionDirectory was changed.
-        BaseProjectManager? nuGetProjectManager = projectManagerFactory.CreateProjectManager(new PackageURL("pkg:nuget/foo"));
+        IBaseProjectManager? nuGetProjectManager = projectManagerFactory.CreateProjectManager(new PackageURL("pkg:nuget/foo"));
         Assert.AreEqual("nugetTestDirectory", nuGetProjectManager?.TopLevelExtractionDirectory);
         
-        BaseProjectManager? npmProjectManager = projectManagerFactory.CreateProjectManager(new PackageURL("pkg:npm/foo"));
+        IBaseProjectManager? npmProjectManager = projectManagerFactory.CreateProjectManager(new PackageURL("pkg:npm/foo"));
         Assert.AreEqual("npmTestDirectory", npmProjectManager?.TopLevelExtractionDirectory);
     }
     
@@ -145,8 +146,8 @@ private void AssertFactoryCreatesCorrect(ProjectManagerFactory projectManagerFac
         foreach ((string purlType, ProjectManagerFactory.ConstructProjectManager ctor) in _managerOverrides)
         {
             PackageURL packageUrl = new($"pkg:{purlType}/foo");
-            BaseProjectManager? expectedManager = ctor.Invoke();
-            BaseProjectManager? manager = projectManagerFactory.CreateProjectManager(packageUrl);
+            IBaseProjectManager? expectedManager = ctor.Invoke();
+            IBaseProjectManager? manager = projectManagerFactory.CreateProjectManager(packageUrl);
             Assert.AreEqual(expectedManager?.ManagerType, manager?.ManagerType);
             Assert.AreEqual(expectedManager?.GetType(), manager?.GetType());
         }
diff --git a/src/oss-tests/SharedTests.cs b/src/oss-tests/SharedTests.cs
@@ -6,6 +6,7 @@
 
 namespace Microsoft.CST.OpenSource.Tests
 {
+    using Contracts;
     using Model;
     using PackageManagers;
     using PackageUrl;
@@ -36,7 +37,7 @@ public async Task VersionParseSucceeds(string versionString)
         public async Task MetadataToFromJsonSucceeds(string packageUrlString)
         {
             PackageURL packageUrl = new(packageUrlString);
-            BaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(packageUrl);
+            IBaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(packageUrl);
 
             if (projectManager == null)
             {

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Microsoft.CST.OpenSource.Shared`
`4`	`4`	`{`
	`5`	`+ using Contracts;`
`5`	`6`	`using Microsoft.CodeAnalysis.Sarif;`
`6`	`7`	`using Microsoft.CST.OpenSource.PackageManagers;`
`7`	`8`	`using Newtonsoft.Json;`
`@@ -26,7 +27,7 @@ public SarifOutputBuilder(SarifVersion version)`
`26`	`27`	`/// <returns>Location list with single location object</returns>`
`27`	`28`	`public static List<Location> BuildPurlLocation(PackageURL purl)`
`28`	`29`	`{`
`29`		`- BaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(purl, null);`
	`30`	`+ IBaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(purl, null);`
`30`	`31`	`if (projectManager == null)`
`31`	`32`	`{`
`32`	`33`	`Logger.Debug("Cannot determine the package type");`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Microsoft.CST.OpenSource`
`4`	`4`	`{`
	`5`	`+ using Contracts;`
`5`	`6`	`using Extensions;`
`6`	`7`	`using Microsoft.CST.OpenSource.Helpers;`
`7`	`8`	`using Microsoft.CST.OpenSource.PackageManagers;`
`@@ -293,7 +294,7 @@ public async Task<List<PackageURL>> GetPackageVersionsToProcess(PackageURL purl)`
`293`	`294`	`// folders created`
`294`	`295`	`private List<string> downloadPaths { get; set; } = new List<string>();`
`295`	`296`
`296`		`- private BaseProjectManager? packageManager { get; set; }`
	`297`	`+ private IBaseProjectManager? packageManager { get; set; }`
`297`	`298`	`public List<PackageURL> PackageVersions { get; set; }`
`298`	`299`	`}`
`299`	`300`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ public interface IProjectManagerFactory`
`13`	`13`	`/// <param name="purl">The <see cref="PackageURL"/> for the package to create the project manager for.</param>`
`14`	`14`	`/// <param name="destinationDirectory">The new destination directory, if provided.</param>`
`15`	`15`	`/// <returns>The implementation of <see cref="BaseProjectManager"/> for this <paramref name="purl"/>'s type.</returns>`
`16`		`- BaseProjectManager? CreateProjectManager(PackageURL purl, string destinationDirectory = ".");`
	`16`	`+ IBaseProjectManager? CreateProjectManager(PackageURL purl, string destinationDirectory = ".");`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public static Dictionary<string, ConstructProjectManager> GetDefaultManagers(IHt`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`/// <inheritdoc />`
`135`		`- public BaseProjectManager? CreateProjectManager(PackageURL purl, string destinationDirectory = ".")`
	`135`	`+ public IBaseProjectManager? CreateProjectManager(PackageURL purl, string destinationDirectory = ".")`
`136`	`136`	`{`
`137`	`137`	`ConstructProjectManager? projectManager = _projectManagers.GetValueOrDefault(purl.Type);`
`138`	`138`
`@@ -147,7 +147,7 @@ public static Dictionary<string, ConstructProjectManager> GetDefaultManagers(IHt`
`147`	`147`	`/// <param name="overrideManagers"> If provided, will set the project manager dictionary instead of using the defaults.</param>`
`148`	`148`	`/// <param name="destinationDirectory">The new destination directory, if provided.</param>`
`149`	`149`	`/// <returns>A new <see cref="BaseProjectManager"/> implementation.</returns>`
`150`		`- public static BaseProjectManager? ConstructPackageManager(PackageURL packageUrl, IHttpClientFactory? httpClientFactory = null, Dictionary<string, ConstructProjectManager>? overrideManagers = null, string destinationDirectory = ".")`
	`150`	`+ public static IBaseProjectManager? ConstructPackageManager(PackageURL packageUrl, IHttpClientFactory? httpClientFactory = null, Dictionary<string, ConstructProjectManager>? overrideManagers = null, string destinationDirectory = ".")`
`151`	`151`	`{`
`152`	`152`	`if (overrideManagers != null && overrideManagers.Any())`
`153`	`153`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`namespace Microsoft.CST.OpenSource.DiffTool`
`22`	`22`	`{`
	`23`	`+ using Contracts;`
`23`	`24`	`using Microsoft.CST.OpenSource.Helpers;`
`24`	`25`	`using Microsoft.CST.OpenSource.PackageManagers;`
`25`	`26`	`using PackageUrl;`
`@@ -120,7 +121,7 @@ public async Task<IOutputBuilder> DiffProjects(Options options)`
`120`	`121`	`try`
`121`	`122`	`{`
`122`	`123`	`PackageURL purl1 = new PackageURL(options.Targets.First());`
`123`		`- BaseProjectManager? manager = ProjectManagerFactory.CreateProjectManager(purl1, options.DownloadDirectory ?? Path.GetTempPath());`
	`124`	`+ IBaseProjectManager? manager = ProjectManagerFactory.CreateProjectManager(purl1, options.DownloadDirectory ?? Path.GetTempPath());`
`124`	`125`
`125`	`126`	`if (manager is not null)`
`126`	`127`	`{`
`@@ -154,7 +155,7 @@ public async Task<IOutputBuilder> DiffProjects(Options options)`
`154`	`155`	`try`
`155`	`156`	`{`
`156`	`157`	`PackageURL purl2 = new PackageURL(options.Targets.Last());`
`157`		`- BaseProjectManager? manager2 = ProjectManagerFactory.CreateProjectManager(purl2, options.DownloadDirectory ?? Path.GetTempPath());`
	`158`	`+ IBaseProjectManager? manager2 = ProjectManagerFactory.CreateProjectManager(purl2, options.DownloadDirectory ?? Path.GetTempPath());`
`158`	`159`
`159`	`160`	`if (manager2 is not null)`
`160`	`161`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Microsoft.CST.OpenSource.FindSquats.ExtensionMethods`
`4`	`4`	`{`
	`5`	`+ using Contracts;`
`5`	`6`	`using Extensions;`
`6`	`7`	`using Microsoft.CST.OpenSource.FindSquats.Mutators;`
`7`	`8`	`using Microsoft.CST.OpenSource.PackageManagers;`
`@@ -94,7 +95,7 @@ public static class MutateExtension`
`94`	`95`	`/// </summary>`
`95`	`96`	`/// <param name="manager"></param>`
`96`	`97`	`/// <returns>An IEnumerable of the recommended IMutators.</returns>`
`97`		`- public static IEnumerable<IMutator> GetDefaultMutators(this BaseProjectManager manager) => manager switch`
	`98`	`+ public static IEnumerable<IMutator> GetDefaultMutators(this IBaseProjectManager manager) => manager switch`
`98`	`99`	`{`
`99`	`100`	`NuGetProjectManager => NugetMutators,`
`100`	`101`	`NPMProjectManager => NpmMutators,`
`@@ -110,7 +111,7 @@ public static class MutateExtension`
`110`	`111`	`/// <param name="purl">The Target package to check for squats.</param>`
`111`	`112`	`/// <param name="options">The options for enumerating squats.</param>`
`112`	`113`	`/// <returns>An <see cref="IDictionary{T, V}"/> where the key is the mutated name, and the value is a <see cref="IList{Mutation}"/> representing each candidate squat.</returns>`
`113`		`- public static IDictionary<string, IList<Mutation>>? EnumerateSquatCandidates(this BaseProjectManager manager, PackageURL purl, MutateOptions? options = null)`
	`114`	`+ public static IDictionary<string, IList<Mutation>>? EnumerateSquatCandidates(this IBaseProjectManager manager, PackageURL purl, MutateOptions? options = null)`
`114`	`115`	`{`
`115`	`116`	`return manager.EnumerateSquatCandidates(purl, manager.GetDefaultMutators(), options);`
`116`	`117`	`}`
`@@ -124,7 +125,7 @@ public static class MutateExtension`
`124`	`125`	`/// <param name="mutators">The mutators to use. Will ignore the default set of mutators.</param>`
`125`	`126`	`/// <param name="options">The options for enumerating squats.</param>`
`126`	`127`	`/// <returns>An <see cref="IDictionary{T, V}"/> where the key is the mutated name, and the value is a <see cref="IList{Mutation}"/> representing each candidate squat.</returns>`
`127`		`- public static IDictionary<string, IList<Mutation>>? EnumerateSquatCandidates(this BaseProjectManager manager, PackageURL purl, IEnumerable<IMutator> mutators, MutateOptions? options = null)`
	`128`	`+ public static IDictionary<string, IList<Mutation>>? EnumerateSquatCandidates(this IBaseProjectManager manager, PackageURL purl, IEnumerable<IMutator> mutators, MutateOptions? options = null)`
`128`	`129`	`{`
`129`	`130`	`if (purl.Name is null \|\| purl.Type is null)`
`130`	`131`	`{`
`@@ -164,7 +165,7 @@ public static class MutateExtension`
`164`	`165`	`/// <param name="candidateMutations">The <see cref="IList{Mutation}"/> representing each squatting candidate.</param>`
`165`	`166`	`/// <param name="options">The options for enumerating through existing squats.</param>`
`166`	`167`	`/// <returns>An <see cref="IAsyncEnumerable{FindPackageSquatResult}"/> with the packages that exist which match one of the <paramref name="candidateMutations"/>.</returns>`
`167`		`- public static async IAsyncEnumerable<FindPackageSquatResult> EnumerateExistingSquatsAsync(this BaseProjectManager manager, PackageURL purl, IDictionary<string, IList<Mutation>>? candidateMutations, MutateOptions? options = null)`
	`168`	`+ public static async IAsyncEnumerable<FindPackageSquatResult> EnumerateExistingSquatsAsync(this IBaseProjectManager manager, PackageURL purl, IDictionary<string, IList<Mutation>>? candidateMutations, MutateOptions? options = null)`
`168`	`169`	`{`
`169`	`170`	`if (purl.Name is null \|\| purl.Type is null)`
`170`	`171`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace Microsoft.CST.OpenSource.Health`
`15`	`15`	`{`
	`16`	`+ using Contracts;`
`16`	`17`	`using PackageUrl;`
`17`	`18`
`18`	`19`	`public class HealthMetrics`
`@@ -43,7 +44,7 @@ public void Normalize()`
`43`	`44`
`44`	`45`	`public List<Result> toSarif()`
`45`	`46`	`{`
`46`		`- BaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(purl, null);`
	`47`	`+ IBaseProjectManager? projectManager = ProjectManagerFactory.ConstructPackageManager(purl, null);`
`47`	`48`
`48`	`49`	`if (projectManager == null)`
`49`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Microsoft.CST.OpenSource`
`13`	`13`	`{`
	`14`	`+ using Contracts;`
`14`	`15`	`using Microsoft.CST.OpenSource.PackageManagers;`
`15`	`16`	`using PackageUrl;`
`16`	`17`
`@@ -26,7 +27,7 @@ public HealthTool() : this(new ProjectManagerFactory())`
`26`	`27`	`}`
`27`	`28`	`public async Task<HealthMetrics?> CheckHealth(PackageURL purl)`
`28`	`29`	`{`
`29`		`- BaseProjectManager? packageManager = ProjectManagerFactory.CreateProjectManager(purl);`
	`30`	`+ IBaseProjectManager? packageManager = ProjectManagerFactory.CreateProjectManager(purl);`
`30`	`31`
`31`	`32`	`if (packageManager != null)`
`32`	`33`	`{`