Removed function and inlined it

Author: jess-lowe

vulnfeeds/conversion/common.go

@@ -211,10 +211,19 @@ func GitVersionsToCommits(versionRanges []*osvschema.Range, repos []string, metr
 			if introduced == "0" {
 				introducedCommit = "0"
 			} else {
-				introducedCommit = resolveVersionToCommit(introduced, normalizedTags)
+				introducedCommit, err = git.VersionToCommit(introduced, normalizedTags)
+				if err != nil {
+					metrics.AddNote("error resolving version to commit - %s - %s", introduced, err)
+				}
+			}
+			fixedCommit, err := git.VersionToCommit(fixed, normalizedTags)
+			if err != nil {
+				metrics.AddNote("error resolving version to commit - %s - %s", fixed, err)
+			}
+			lastAffectedCommit, err := git.VersionToCommit(lastAffected, normalizedTags)
+			if err != nil {
+				metrics.AddNote("error resolving version to commit - %s - %s", lastAffected, err)
 			}
-			fixedCommit := resolveVersionToCommit(fixed, normalizedTags)
-			lastAffectedCommit := resolveVersionToCommit(lastAffected, normalizedTags)
 
 			if introducedCommit != "" && (fixedCommit != "" || lastAffectedCommit != "") {
 				var newVR *osvschema.Range
@@ -247,19 +256,6 @@ func GitVersionsToCommits(versionRanges []*osvschema.Range, repos []string, metr
 	return newVersionRanges, unresolvedRanges, successfulRepos
 }
 
-// resolveVersionToCommit is a helper to convert a version string to a commit hash.
-func resolveVersionToCommit(version string, normalizedTags map[string]git.NormalizedTag) string {
-	if version == "" {
-		return ""
-	}
-	commit, err := git.VersionToCommit(version, normalizedTags)
-	if err != nil {
-		return ""
-	}
-
-	return commit
-}
-
 // BuildVersionRange is a helper function that adds 'introduced', 'fixed', or 'last_affected'
 // events to an OSV version range. If 'intro' is empty, it defaults to "0".
 func BuildVersionRange(intro string, lastAff string, fixed string) *osvschema.Range {

vulnfeeds/git/versions.go

@@ -82,6 +82,9 @@ func VersionToAffectedCommit(version string, repo string, commitType models.Comm
 
 // Take an unnormalized version string, the pre-normalized mapping of tags to commits and return a commit hash.
 func VersionToCommit(version string, normalizedTags map[string]NormalizedTag) (string, error) {
+	if version == "" {
+		return "", fmt.Errorf("version cannot be empty")
+	}
 	// TODO: try unnormalized version first.
 	normalizedVersion, err := NormalizeVersion(version)
 	if err != nil {