refactor(vulnfeeds): move cvelist2osv into conversion/cve5 subdirectory (#5036)

jess-lowe · web-flow · commit 5b03702ba763 · 2026-03-13T13:57:30.000+11:00
this just keep things a little more consistent
diff --git a/vulnfeeds/cmd/converters/cve/cve5/bulk-converter/main.go b/vulnfeeds/cmd/converters/cve/cve5/bulk-converter/main.go
@@ -15,14 +15,14 @@ import (
 	"time"
 
 	"github.com/google/osv/vulnfeeds/conversion"
-	"github.com/google/osv/vulnfeeds/cvelist2osv"
+	"github.com/google/osv/vulnfeeds/conversion/cve5"
 	"github.com/google/osv/vulnfeeds/models"
 	"github.com/google/osv/vulnfeeds/utility/logger"
 )
 
 var (
 	repoDir        = flag.String("cve5-repo", "cvelistV5", "CVEListV5 directory path")
-	localOutputDir = flag.String("out-dir", "cvelist2osv", "Path to output results.")
+	localOutputDir = flag.String("out-dir", "cve5", "Path to output results.")
 	startYear      = flag.String("start-year", "2022", "The first in scope year to process.")
 	workers        = flag.Int("workers", 30, "The number of concurrent workers to use for processing CVEs.")
 	cnaAllowList   = flag.String("cnas-allowlist", "", "A comma-separated list of CNAs to process. If not provided, defaults to cna_allowlist.txt.")
@@ -134,7 +134,7 @@ func worker(wg *sync.WaitGroup, jobs <-chan string, outDir string, cnas []string
 		}
 
 		// Perform the conversion and export the results.
-		metrics, err := cvelist2osv.ConvertAndExportCVEToOSV(cve, osvFile, metricsFile, sourceLink)
+		metrics, err := cve5.ConvertAndExportCVEToOSV(cve, osvFile, metricsFile, sourceLink)
 		if err != nil {
 			logger.Warn("Failed to generate an OSV record", slog.String("cve", string(cveID)), slog.Any("err", err))
 		} else {
diff --git a/vulnfeeds/cmd/converters/cve/cve5/single-converter/main.go b/vulnfeeds/cmd/converters/cve/cve5/single-converter/main.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/google/osv/vulnfeeds/conversion"
-	"github.com/google/osv/vulnfeeds/cvelist2osv"
+	"github.com/google/osv/vulnfeeds/conversion/cve5"
 	"github.com/google/osv/vulnfeeds/models"
 	"github.com/google/osv/vulnfeeds/utility/logger"
 )
@@ -53,7 +53,7 @@ func main() {
 	}
 
 	// Perform the conversion and export the results.
-	if metrics, err := cvelist2osv.ConvertAndExportCVEToOSV(cve, osvFile, metricsFile, ""); err != nil {
+	if metrics, err := cve5.ConvertAndExportCVEToOSV(cve, osvFile, metricsFile, ""); err != nil {
 		logger.Warn("Failed to generate an OSV record", slog.String("cve", string(cveID)), slog.Any("err", err))
 	} else {
 		logger.Info("Generated OSV record for "+string(cveID), slog.String("cve", string(cveID)), slog.String("cna", cve.Metadata.AssignerShortName), slog.String("outcome", metrics.Outcome.String()))
diff --git a/vulnfeeds/conversion/cve5/__snapshots__/converter_test.snap b/vulnfeeds/conversion/cve5/__snapshots__/converter_test.snap
diff --git a/vulnfeeds/conversion/cve5/common.go b/vulnfeeds/conversion/cve5/common.go
@@ -1,4 +1,4 @@
-package cvelist2osv
+package cve5
 
 import (
 	"cmp"
diff --git a/vulnfeeds/conversion/cve5/common_test.go b/vulnfeeds/conversion/cve5/common_test.go
@@ -1,4 +1,4 @@
-package cvelist2osv
+package cve5
 
 import (
 	"testing"
diff --git a/vulnfeeds/conversion/cve5/converter.go b/vulnfeeds/conversion/cve5/converter.go
@@ -1,5 +1,5 @@
-// Package cvelist2osv converts a single given CVEList JSON to OSV format.
-package cvelist2osv
+// Package cve5 converts a single given CVEList JSON to OSV format.
+package cve5
 
 import (
 	"encoding/json"
diff --git a/vulnfeeds/conversion/cve5/converter_test.go b/vulnfeeds/conversion/cve5/converter_test.go
@@ -1,4 +1,4 @@
-package cvelist2osv
+package cve5
 
 import (
 	"bytes"
@@ -24,7 +24,7 @@ func loadTestData(t *testing.T, cveName string) models.CVE5 {
 	t.Helper()
 	prefix := strings.Split(cveName, "-")[2]
 	prefixpath := prefix[:len(prefix)-3] + "xxx"
-	fileName := filepath.Join("..", "test_data", "cvelistV5", "cves", cveName[4:8], prefixpath, cveName+".json")
+	fileName := filepath.Join("..", "..", "test_data", "cvelistV5", "cves", cveName[4:8], prefixpath, cveName+".json")
 
 	return loadTestCVE(t, fileName)
 }
diff --git a/vulnfeeds/conversion/cve5/default_extractor.go b/vulnfeeds/conversion/cve5/default_extractor.go
@@ -1,4 +1,4 @@
-package cvelist2osv
+package cve5
 
 import (
 	"github.com/google/osv/vulnfeeds/conversion"
diff --git a/vulnfeeds/conversion/cve5/extraction.go b/vulnfeeds/conversion/cve5/extraction.go
@@ -1,4 +1,4 @@
-package cvelist2osv
+package cve5
 
 import (
 	"github.com/google/osv/vulnfeeds/models"
diff --git a/vulnfeeds/conversion/cve5/linux_extractor.go b/vulnfeeds/conversion/cve5/linux_extractor.go
@@ -1,4 +1,4 @@
-package cvelist2osv
+package cve5
 
 import (
 	"fmt"
diff --git a/vulnfeeds/conversion/cve5/strategies.go b/vulnfeeds/conversion/cve5/strategies.go
@@ -1,4 +1,4 @@
-package cvelist2osv
+package cve5
 
 import (
 	"github.com/google/osv/vulnfeeds/conversion"
diff --git a/vulnfeeds/conversion/cve5/testdata/TestCVEToOSV_successful_conversion.yaml b/vulnfeeds/conversion/cve5/testdata/TestCVEToOSV_successful_conversion.yaml
diff --git a/vulnfeeds/conversion/cve5/testdata/TestExtractVersionInfo_CVE_with_lessThan.yaml b/vulnfeeds/conversion/cve5/testdata/TestExtractVersionInfo_CVE_with_lessThan.yaml
diff --git a/vulnfeeds/conversion/cve5/version_extraction_test.go b/vulnfeeds/conversion/cve5/version_extraction_test.go
@@ -1,4 +1,4 @@
-package cvelist2osv
+package cve5
 
 import (
 	"reflect"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cvelist2osv`
	`1`	`+package cve5`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"cmp"`