Ignore leading and trailing spaces on versions (#1025)

microsoft · Mar 6, 2024 · 5be8728 · 5be8728
1 parent 1eea9ac
commit 5be8728
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Microsoft.ComponentDetection.Detectors/pip/PythonVersionUtilities.cs b/src/Microsoft.ComponentDetection.Detectors/pip/PythonVersionUtilities.cs
@@ -95,9 +95,10 @@ private static bool VersionValidForSpec(string version, string spec)
         }
 
         var op = spec[..i];
+        var specVerSection = spec[i..].Trim();
 
         var targetVer = PythonVersion.Create(version);
-        var specVer = PythonVersion.Create(spec[i..]);
+        var specVer = PythonVersion.Create(specVerSection);
 
         if (!targetVer.Valid)
         {
@@ -106,7 +107,7 @@ private static bool VersionValidForSpec(string version, string spec)
 
         if (!specVer.Valid)
         {
-            throw new ArgumentException($"The version specification {spec[i..]} is not a valid python version");
+            throw new ArgumentException($"The version specification {specVerSection} is not a valid python version");
         }
 
         return op switch

diff --git a/test/Microsoft.ComponentDetection.Detectors.Tests/PythonVersionTests.cs b/test/Microsoft.ComponentDetection.Detectors.Tests/PythonVersionTests.cs
@@ -86,6 +86,7 @@ public void TestVersionValidForSpec()
         IList<(IList<string>, IList<string>, IList<string>)> testCases = new List<(IList<string>, IList<string>, IList<string>)>
         {
             (new List<string> { "==1.0" }, new List<string> { "1.0" }, new List<string> { "1.0.1", "2.0", "0.1" }),
+            (new List<string> { "== 1.0 " }, new List<string> { "1.0" }, new List<string> { "1.0.1", "2.0", "0.1" }),
             (new List<string> { "==1.4.*" }, new List<string> { "1.4", "1.4.1", "1.4.2", "1.4.3" }, new List<string> { "1.0.1", "2.0", "0.1", "1.5", "1.5.0" }),
             (new List<string> { ">=1.0" }, new List<string> { "1.0", "1.1", "1.5" }, new List<string> { "0.9" }),
             (new List<string> { ">=1.0", "<=1.4" }, new List<string> { "1.0", "1.1", "1.4" }, new List<string> { "0.9", "1.5" }),