fixes linting

Author: timbastin

tests/malicious_packages_checker_test.go

@@ -67,7 +67,7 @@ func TestMaliciousPackageChecker(t *testing.T) {
 	err := db.Create(&pkg).Error
 	assert.Nil(t, err)
 
-	components := transformer.MaliciousAffectedComponentFromOSV(testEntry, testEntry.ID)
+	components := transformer.MaliciousAffectedComponentFromOSV(&testEntry, testEntry.ID)
 	err = db.Create(&components).Error
 	assert.Nil(t, err)
 

vulndb/gob.go

@@ -128,36 +128,6 @@ func gobExploitToModel(g GobExploit) models.Exploit {
 	}
 }
 
-// --- Malicious package conversions ---
-
-func maliciousComponentToGob(c models.MaliciousAffectedComponent) GobMaliciousComponent {
-	return GobMaliciousComponent{
-		ID:                 c.ID,
-		MaliciousPackageID: c.MaliciousPackageID,
-		PurlWithoutVersion: c.PurlWithoutVersion,
-		Ecosystem:          c.Ecosystem,
-		Version:            c.Version,
-		SemverIntroduced:   c.SemverIntroduced,
-		SemverFixed:        c.SemverFixed,
-		VersionIntroduced:  c.VersionIntroduced,
-		VersionFixed:       c.VersionFixed,
-	}
-}
-
-func gobComponentToModel(g GobMaliciousComponent) models.MaliciousAffectedComponent {
-	return models.MaliciousAffectedComponent{
-		ID:                 g.ID,
-		MaliciousPackageID: g.MaliciousPackageID,
-		PurlWithoutVersion: g.PurlWithoutVersion,
-		Ecosystem:          g.Ecosystem,
-		Version:            g.Version,
-		SemverIntroduced:   g.SemverIntroduced,
-		SemverFixed:        g.SemverFixed,
-		VersionIntroduced:  g.VersionIntroduced,
-		VersionFixed:       g.VersionFixed,
-	}
-}
-
 func writeGobFileItems[T any](items []T, fileName string) error {
 	gobFile, err := os.Create(fileName)
 	if err != nil {
@@ -244,16 +214,17 @@ func readGobFileStream[T any](ctx context.Context, path string, handleItems func
 			case <-ctx.Done():
 				return ctx.Err()
 			default:
-				handleItems(batch)
+				if err := handleItems(batch); err != nil {
+					return fmt.Errorf("could not handle batch of items from gob file %s: %w", path, err)
+				}
 			}
 			batch = batch[:0]
 		}
 	}
 	if len(batch) > 0 {
 		select {
 		default:
-			handleItems(batch)
-			return nil
+			return handleItems(batch)
 		case <-ctx.Done():
 			return ctx.Err()
 		}