Fixed tests and updated CD version (#162)

* Fixed tests and updated version * Updated CD version and removed public feed
microsoft · Oct 21, 2022 · 7723053 · 7723053
1 parent 1756fa7
commit 7723053
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 23 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,7 +7,7 @@
         </PackageVersion>
     </ItemDefinitionGroup>
     <PropertyGroup>
-        <ComponentDetectionPackageVersion>1.1.12</ComponentDetectionPackageVersion>
+        <ComponentDetectionPackageVersion>2.0.5</ComponentDetectionPackageVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageVersion Include="MinVer" Version="2.5.0"/>

diff --git a/nuget.config b/nuget.config
@@ -2,6 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="SBOMToolsPublic" value="https://pkgs.dev.azure.com/mseng/PipelineTools/_packaging/SBOMToolsPublic/nuget/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/Microsoft.Sbom.Api/Executors/ComponentDetectionBaseWalker.cs b/src/Microsoft.Sbom.Api/Executors/ComponentDetectionBaseWalker.cs
@@ -87,7 +87,7 @@ async Task Scan(string path)
                 cliArgumentBuilder.SourceDirectory(buildComponentDirPath);
                 var cmdLineParams = configuration.ToComponentDetectorCommandLineParams(cliArgumentBuilder);
 
-                var scanResult = await Task.Run(() => componentDetector.Scan(cmdLineParams));
+                var scanResult = await componentDetector.ScanAsync(cmdLineParams);
 
                 if (scanResult.ResultCode != ProcessingResultCode.Success)
                 {

diff --git a/src/Microsoft.Sbom.Api/Utils/ComponentDetector.cs b/src/Microsoft.Sbom.Api/Utils/ComponentDetector.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.ComponentDetection.Contracts.BcdeModels;
 using Microsoft.ComponentDetection.Orchestrator;
+using System.Threading.Tasks;
 
 namespace Microsoft.Sbom.Api.Utils
 {
@@ -11,10 +12,10 @@ namespace Microsoft.Sbom.Api.Utils
     /// </summary>
     public class ComponentDetector
     {
-        public virtual ScanResult Scan(string[] args)
+        public virtual async Task<ScanResult> ScanAsync(string[] args)
         {
             var orchestrator = new Orchestrator();
-            return orchestrator.Load(args);
+            return await orchestrator.LoadAsync(args);
         }
     }
 }
diff --git a/src/Microsoft.Sbom.Api/Utils/ComponentDetectorCachedExecutor.cs b/src/Microsoft.Sbom.Api/Utils/ComponentDetectorCachedExecutor.cs
@@ -5,6 +5,7 @@
 using Serilog;
 using System;
 using System.Collections.Concurrent;
+using System.Threading.Tasks;
 
 namespace Microsoft.Sbom.Api.Utils
 {
@@ -31,7 +32,7 @@ public ComponentDetectorCachedExecutor(ILogger log, ComponentDetector detector)
         /// </summary>
         /// <param name="args">CD arguments.</param>
         /// <returns>Result of CD scan.</returns>
-        public virtual ScanResult Scan(string[] args)
+        public virtual async Task<ScanResult> ScanAsync(string[] args)
         {
             if (args is null)
             {
@@ -45,7 +46,7 @@ public virtual ScanResult Scan(string[] args)
                 return results[argsHashCode];
             }
 
-            var result = detector.Scan(args);
+            var result = await detector.ScanAsync(args);
             results.TryAdd(argsHashCode, result);
             return result;
         }

diff --git a/test/Microsoft.Sbom.Api.Tests/Executors/PackagesWalkerTests.cs b/test/Microsoft.Sbom.Api.Tests/Executors/PackagesWalkerTests.cs
@@ -69,7 +69,7 @@ public async Task ScanSuccessTestAsync()
                 ComponentsFound = scannedComponents
             };
 
-            mockDetector.Setup(o => o.Scan(It.IsAny<string[]>())).Returns(scanResult);
+            mockDetector.Setup(o => o.ScanAsync(It.IsAny<string[]>())).Returns(Task.FromResult(scanResult));
             var walker = new PackagesWalker(mockLogger.Object, mockDetector.Object, mockConfiguration.Object, mockSbomConfigs.Object);
             var packagesChannelReader = walker.GetComponents("root");
 
@@ -122,7 +122,7 @@ public async Task ScanCombinePackagesWithSameNameDifferentCase()
                 ComponentsFound = scannedComponents
             };
 
-            mockDetector.Setup(o => o.Scan(It.IsAny<string[]>())).Returns(scanResult);
+            mockDetector.Setup(o => o.ScanAsync(It.IsAny<string[]>())).Returns(Task.FromResult(scanResult));
             var walker = new PackagesWalker(mockLogger.Object, mockDetector.Object, mockConfiguration.Object, mockSbomConfigs.Object);
             var packagesChannelReader = walker.GetComponents("root");
 
@@ -153,7 +153,7 @@ public void ScanWithNullOrEmptyPathSuccessTest()
             walker.GetComponents(null);
             walker.GetComponents(string.Empty);
 
-            mockDetector.Verify(mock => mock.Scan(It.IsAny<string[]>()), Times.Never());
+            mockDetector.Verify(mock => mock.ScanAsync(It.IsAny<string[]>()), Times.Never());
         }
 
         [TestMethod]
@@ -167,7 +167,7 @@ public async Task ScanFailureTestAsync()
                 ComponentsFound = null
             };
 
-            mockDetector.Setup(o => o.Scan(It.IsAny<string[]>())).Returns(scanResult);
+            mockDetector.Setup(o => o.ScanAsync(It.IsAny<string[]>())).Returns(Task.FromResult(scanResult));
             var walker = new PackagesWalker(mockLogger.Object, mockDetector.Object, mockConfiguration.Object, mockSbomConfigs.Object);
             var packagesChannelReader = walker.GetComponents("root");
             ComponentDetectorException actualError = null;
@@ -215,7 +215,7 @@ public async Task ScanIgnoreSbomComponents()
                 ComponentsFound = scannedComponents
             };
 
-            mockDetector.Setup(o => o.Scan(It.IsAny<string[]>())).Returns(scanResult);
+            mockDetector.Setup(o => o.ScanAsync(It.IsAny<string[]>())).Returns(Task.FromResult(scanResult));
             var walker = new PackagesWalker(mockLogger.Object, mockDetector.Object, mockConfiguration.Object, mockSbomConfigs.Object);
             var packagesChannelReader = walker.GetComponents("root");
 

diff --git a/test/Microsoft.Sbom.Api.Tests/Executors/SBOMComponentsWalkerTests.cs b/test/Microsoft.Sbom.Api.Tests/Executors/SBOMComponentsWalkerTests.cs
@@ -63,7 +63,7 @@ public async Task GetComponents()
                 ComponentsFound = scannedComponents
             };
 
-            mockDetector.Setup(o => o.Scan(It.IsAny<string[]>())).Returns(scanResult);
+            mockDetector.Setup(o => o.ScanAsync(It.IsAny<string[]>())).Returns(Task.FromResult(scanResult));
             var walker = new SBOMComponentsWalker(mockLogger.Object, mockDetector.Object, mockConfiguration.Object, mockSbomConfigs.Object);
             var packagesChannelReader = walker.GetComponents("root");
 
@@ -108,7 +108,7 @@ public async Task GetComponentsWithFiltering()
                 ComponentsFound = scannedComponents
             };
 
-            mockDetector.Setup(o => o.Scan(It.IsAny<string[]>())).Returns(scanResult);
+            mockDetector.Setup(o => o.ScanAsync(It.IsAny<string[]>())).Returns(Task.FromResult(scanResult));
             var walker = new SBOMComponentsWalker(mockLogger.Object, mockDetector.Object, mockConfiguration.Object, mockSbomConfigs.Object);
             var packagesChannelReader = walker.GetComponents("root");
 

diff --git a/test/Microsoft.Sbom.Api.Tests/Utils/ComponentDetectorCachedExecutorTest.cs b/test/Microsoft.Sbom.Api.Tests/Utils/ComponentDetectorCachedExecutorTest.cs
@@ -6,6 +6,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Serilog;
+using System.Threading.Tasks;
 
 namespace Microsoft.Sbom.Api.Tests.Utils
 {
@@ -23,28 +24,28 @@ public void TestInitialize()
         }
 
         [TestMethod]
-        public void Scan()
+        public async Task Scan()
         {
             var executor = new ComponentDetectorCachedExecutor(logger.Object, detector.Object);
             var arguments = new string[] { "a", "b", "c" };
             var expectedResult = new ScanResult();
 
-            detector.Setup(x => x.Scan(arguments)).Returns(expectedResult);
-            var result = executor.Scan(arguments);
+            detector.Setup(x => x.ScanAsync(arguments)).Returns(Task.FromResult(expectedResult));
+            var result = await executor.ScanAsync(arguments);
             Assert.AreEqual(result, expectedResult);
             Assert.IsTrue(detector.Invocations.Count == 1);
         }
 
         [TestMethod]
-        public void ScanWithCache()
+        public async Task ScanWithCache()
         {
             var executor = new ComponentDetectorCachedExecutor(logger.Object, detector.Object);
             var arguments = new string[] { "a", "b", "c" };
             var expectedResult = new ScanResult();
 
-            detector.Setup(x => x.Scan(arguments)).Returns(expectedResult);
-            executor.Scan(arguments);
-            var result = executor.Scan(arguments);
+            detector.Setup(x => x.ScanAsync(arguments)).Returns(Task.FromResult(expectedResult));
+            await executor.ScanAsync(arguments);
+            var result = await executor.ScanAsync(arguments);
             Assert.AreEqual(result, expectedResult);
             Assert.IsTrue(detector.Invocations.Count == 1);
         }

diff --git a/test/Microsoft.Sbom.Api.Tests/Workflows/Helpers/RelationshipsArrayGeneratorTest.cs b/test/Microsoft.Sbom.Api.Tests/Workflows/Helpers/RelationshipsArrayGeneratorTest.cs
@@ -13,7 +13,6 @@
 using Microsoft.Sbom.Common;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using MoreLinq;
 using Serilog;
 using System.Collections.Generic;
 using System.IO;

diff --git a/test/Microsoft.Sbom.Api.Tests/Workflows/ManifestGenerationWorkflowTests.cs b/test/Microsoft.Sbom.Api.Tests/Workflows/ManifestGenerationWorkflowTests.cs
@@ -198,7 +198,7 @@ public async Task ManifestGenerationWorkflowTests_Succeeds(bool deleteExistingMa
                 ComponentsFound = scannedComponents
             };
 
-            mockDetector.Setup(o => o.Scan(It.IsAny<string[]>())).Returns(scanResult);
+            mockDetector.Setup(o => o.ScanAsync(It.IsAny<string[]>())).Returns(Task.FromResult(scanResult));
 
             var packagesChannel = Channel.CreateUnbounded<SBOMPackage>();
             var errorsChannel = Channel.CreateUnbounded<FileValidationResult>();