feat(converter): Added snapshot testing to converter.go (#4268)

This involved some refactoring of the way the files are being output
(both metrics and OSV)

Author: jess-lowe

vulnfeeds/cmd/cve-bulk-converter/main.go

@@ -91,13 +91,25 @@ func worker(wg *sync.WaitGroup, jobs <-chan string, outDir string, cnas []string
 			continue
 		}
 
-		if slices.Contains(cnas, cve.Metadata.AssignerShortName) && cve.Metadata.State == "PUBLISHED" {
-			logger.Info("Processing "+string(cve.Metadata.CVEID), slog.String("cve", string(cve.Metadata.CVEID)))
+		if !slices.Contains(cnas, cve.Metadata.AssignerShortName) || cve.Metadata.State != "PUBLISHED" {
+			continue
+		}
+		cveID := cve.Metadata.CVEID
+		logger.Info("Processing "+string(cveID), slog.String("cve", string(cveID)))
 
-			if err = cvelist2osv.ConvertAndExportCVEToOSV(cve, outDir); err != nil {
-				logger.Warn("Failed to generate an OSV record for "+string(cve.Metadata.CVEID),
-					slog.String("cve", string(cve.Metadata.CVEID)), slog.Any("err", err))
-			}
+		osvFile, errCVE := cvelist2osv.CreateOSVFile(cveID, outDir)
+		metricsFile, errMetrics := cvelist2osv.CreateMetricsFile(cveID, outDir)
+		if errCVE != nil || errMetrics != nil {
+			logger.Fatal("File failed to be created for CVE", slog.String("cve", string(cveID)))
 		}
+		// Perform the conversion and export the results.
+		if err = cvelist2osv.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))
+		}
+
+		metricsFile.Close()
+		osvFile.Close()
 	}
 }

vulnfeeds/cmd/cve-single-converter/main.go

@@ -33,8 +33,30 @@ func main() {
 		logger.Fatal("Failed to parse CVEList CVE JSON", slog.Any("err", err))
 	}
 
+	outDir := *outDir
+	if outDir == "" {
+		outDir = cve.Metadata.AssignerShortName
+	}
+	cveID := cve.Metadata.CVEID
+	err = os.MkdirAll(outDir, 0755)
+	if err != nil {
+		logger.Warn("Failed to create dir", slog.Any("err", err))
+	}
+	// create the files
+
+	osvFile, errCVE := cvelist2osv.CreateOSVFile(cveID, outDir)
+	metricsFile, errMetrics := cvelist2osv.CreateMetricsFile(cveID, outDir)
+	if errCVE != nil || errMetrics != nil {
+		logger.Fatal("File failed to be created for CVE", slog.String("cve", string(cveID)))
+	}
+
 	// Perform the conversion and export the results.
-	if err = cvelist2osv.ConvertAndExportCVEToOSV(cve, *outDir); err != nil {
-		logger.Warn("Failed to generate an OSV record", slog.String("cve", string(cve.Metadata.CVEID)), slog.Any("err", err))
+	if err = cvelist2osv.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))
 	}
+
+	metricsFile.Close()
+	osvFile.Close()
 }