nit: leave symbolic links untouched for now

microsoft · Nov 17, 2024 · 16cf57a · 16cf57a
1 parent 0a8d2b5
commit 16cf57a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...mponentDetection.Orchestrator/Services/GraphTranslation/DefaultGraphTranslationService.cs b/...mponentDetection.Orchestrator/Services/GraphTranslation/DefaultGraphTranslationService.cs
@@ -273,7 +273,7 @@ private HashSet<string> MakeFilePathsRelative(ILogger logger, DirectoryInfo root
             try
             {
                 var relativePath = rootUri.MakeRelativeUri(new Uri(path)).ToString();
-                if (!relativePath.StartsWith('/') && !relativePath.Contains(':', StringComparison.CurrentCultureIgnoreCase))
+                if (!relativePath.StartsWith('/'))
                 {
                     relativePath = "/" + relativePath;
                 }

diff --git a/...oft.ComponentDetection.Orchestrator.Tests/Services/DefaultGraphTranslationServiceTests.cs b/...oft.ComponentDetection.Orchestrator.Tests/Services/DefaultGraphTranslationServiceTests.cs
@@ -156,7 +156,8 @@ public void GenerateScanResultFromResult_WithCustomLocations_WithExperimentsDryR
         var resultNpmComponent = result.ComponentsFound.Single(c => c.Component.Type == ComponentType.Npm);
         var resultNugetComponent = result.ComponentsFound.Single(c => c.Component.Type == ComponentType.NuGet);
 
-        resultNpmComponent.LocationsFoundAt.Should().BeEquivalentTo([npmCustomPath, detectedFilePath, relatedFilePath, npmCustomPath2]);
+        // for now there is a bug that adds a forward slash to the path for symbolic links. This will be fixed in a future PR if we can parse dependency graph better for those.
+        resultNpmComponent.LocationsFoundAt.Should().BeEquivalentTo([npmCustomPath, detectedFilePath, relatedFilePath, $"/{npmCustomPath2}"]);
         resultNugetComponent.LocationsFoundAt.Should().BeEquivalentTo([nugetCustomPath, detectedFilePath, relatedFilePath]);
 
         var actualNpmComponent = resultNpmComponent.Component as NpmComponent;