feat(nvd): improve ranges to include metadata in db_specific of CPE used to extract it

vulnfeeds/cmd/combine-to-osv/main.go

@@ -320,9 +320,7 @@ func pickAffectedInformation(cve5Affected []*osvschema.Affected, nvdAffected []*
 				}
 
 				if c5Intro != "" || c5Fixed != "" {
-					newRange := conversion.BuildVersionRange(c5Intro, "", c5Fixed)
-					newRange.Repo = repo
-					newRange.Type = osvschema.Range_GIT // Preserve the repo
+					newRange := conversion.BuildGitVersionRange(c5Intro, "", c5Fixed, repo)
 					newAffectedRanges = append(newAffectedRanges, newRange)
 				} else {
 					newAffectedRanges = cveRanges

vulnfeeds/cmd/converters/cve/nvd-cve-osv/main.go

@@ -32,21 +32,6 @@ var (
 	cpuProfile          = flag.String("cpuprofile", "", "Path to write cpu profile to file (default = no output)")
 )
 
-func loadCPEDictionary(productToRepo *c.VPRepoCache, f string) error {
-	data, err := os.ReadFile(f)
-	if err != nil {
-		return err
-	}
-
-	var tempMap c.VendorProductToRepoMap
-	if err := json.Unmarshal(data, &tempMap); err != nil {
-		return err
-	}
-	productToRepo.Initialize(tempMap)
-
-	return nil
-}
-
 func main() {
 	flag.Parse()
 	if !slices.Contains([]string{"OSV", "PackageInfo"}, *outFormat) {
@@ -82,7 +67,7 @@ func main() {
 
 	vpRepoCache := c.NewVPRepoCache()
 	if *parsedCPEDictionary != "" {
-		err = loadCPEDictionary(vpRepoCache, *parsedCPEDictionary)
+		err = c.LoadCPEDictionary(vpRepoCache, *parsedCPEDictionary)
 		if err != nil {
 			logger.Fatal("Failed to load parsed CPE dictionary", slog.Any("err", err))
 		}