refactor: use official semantic package instead of vendored version

google · Mar 6, 2025 · 93677bd · 93677bd
1 parent 957c776
commit 93677bd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 211 deletions.
diff --git a/detector/cve/cve202338408/cve202338408.go b/detector/cve/cve202338408/cve202338408.go
@@ -26,11 +26,11 @@ import (
 	"strings"
 
 	"github.com/google/osv-scalibr/detector"
-	"github.com/google/osv-scalibr/detector/cve/cve202338408/semantic"
 	scalibrfs "github.com/google/osv-scalibr/fs"
 	"github.com/google/osv-scalibr/inventoryindex"
 	"github.com/google/osv-scalibr/log"
 	"github.com/google/osv-scalibr/plugin"
+	"github.com/google/osv-scalibr/semantic"
 )
 
 const (
@@ -234,7 +234,13 @@ type fileLocations struct {
 
 func versionLessEqual(lower, upper string) bool {
 	// Version format looks like this: 3.7.1p2, 3.7, 3.2.3, 2.9p2
-	return semantic.ParsePackagistVersion(lower).CompareStr(upper) <= 0
+	r, err := semantic.MustParse(lower, "Packagist").CompareStr(upper)
+
+	if err != nil {
+		panic(err)
+	}
+
+	return r <= 0
 }
 
 func findHistoryFiles() []string {

diff --git a/detector/cve/cve202338408/semantic/utilities.go b/detector/cve/cve202338408/semantic/utilities.go
diff --git a/detector/cve/cve202338408/semantic/version-packagist.go b/detector/cve/cve202338408/semantic/version-packagist.go