Added grouping tests

Author: jess-lowe

vulnfeeds/conversion/grouping.go

@@ -259,7 +259,12 @@ func cleanEvents(events []*osvschema.Event) []*osvschema.Event {
 //   - commits: A slice of affected commits to be converted into events and added to ranges.
 //   - successfulRepos: A slice of repository URLs that were successfully processed.
 //   - metrics: A pointer to ConversionMetrics to track the outcome and notes.
-func MergeRangesAndCreateAffected(resolvedRanges []*osvschema.Range, commits []models.AffectedCommit, successfulRepos []string, metrics *models.ConversionMetrics) *osvschema.Affected {
+func MergeRangesAndCreateAffected(
+	resolvedRanges []*osvschema.Range,
+	commits []models.AffectedCommit,
+	successfulRepos []string,
+	metrics *models.ConversionMetrics,
+) *osvschema.Affected {
 	var newResolvedRanges []*osvschema.Range
 	// Combine the ranges appropriately
 	if len(resolvedRanges) > 0 {

vulnfeeds/conversion/grouping_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/google/osv/vulnfeeds/models"
 	"github.com/ossf/osv-schema/bindings/go/osvschema"
 	"google.golang.org/protobuf/testing/protocmp"
 	"google.golang.org/protobuf/types/known/structpb"
@@ -435,3 +436,200 @@ func TestGroupAffectedRanges(t *testing.T) {
 		})
 	}
 }
+
+func TestMergeRangesAndCreateAffected(t *testing.T) {
+	tests := []struct {
+		name            string
+		resolvedRanges  []*osvschema.Range
+		commits         []models.AffectedCommit
+		successfulRepos []string
+		want            *osvschema.Affected
+	}{
+		{
+			name: "Merge existing ranges with commits for the same repo",
+			resolvedRanges: []*osvschema.Range{
+				{
+					Type: osvschema.Range_GIT,
+					Repo: "repo1",
+					Events: []*osvschema.Event{
+						{Introduced: "0"},
+						{Fixed: "1.0"},
+					},
+				},
+			},
+			commits: []models.AffectedCommit{
+				{
+					Repo:       "repo1",
+					Introduced: "1.1",
+				},
+				{
+					Repo:       "repo1",
+					Fixed:      "1.2",
+				},
+			},
+			successfulRepos: []string{"repo1"},
+			want: &osvschema.Affected{
+				Ranges: []*osvschema.Range{
+					{
+						Type: osvschema.Range_GIT,
+						Repo: "repo1",
+						Events: []*osvschema.Event{
+							{Introduced: "1.1"},
+							{Introduced: "0"},
+							{Fixed: "1.0"},
+							{Fixed: "1.2"},
+						},
+					},
+				},
+			},
+		},
+		{
+			name:           "No resolved ranges, only commits",
+			resolvedRanges: nil,
+			commits: []models.AffectedCommit{
+				{
+					Repo:       "repo2",
+					Introduced: "0",
+					Fixed:      "1.0",
+				},
+			},
+			successfulRepos: []string{"repo2"},
+			want: &osvschema.Affected{
+				Ranges: []*osvschema.Range{
+					{
+						Events: []*osvschema.Event{
+							{Introduced: "0"},
+							{Fixed: "1.0"},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "Duplicate events are deduplicated",
+			resolvedRanges: []*osvschema.Range{
+				{
+					Type: osvschema.Range_GIT,
+					Repo: "repo3",
+					Events: []*osvschema.Event{
+						{Introduced: "0"},
+						{Fixed: "1.0"},
+					},
+				},
+			},
+			commits: []models.AffectedCommit{
+				// duplicate fixed
+				{
+					Repo:  "repo3",
+					Fixed: "1.0",
+				},
+				// duplicate introduced
+				{
+					Repo:       "repo3",
+					Introduced: "0",
+				},
+				// new last affected
+				{
+					Repo:         "repo3",
+					LastAffected: "0.5",
+				},
+			},
+			successfulRepos: []string{"repo3"},
+			want: &osvschema.Affected{
+				Ranges: []*osvschema.Range{
+					{
+						Type: osvschema.Range_GIT,
+						Repo: "repo3",
+						Events: []*osvschema.Event{
+							{Introduced: "0"},
+							{Fixed: "1.0"},
+							{LastAffected: "0.5"},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "Commits for repos not in successfulRepos are ignored when resolvedRanges exist",
+			resolvedRanges: []*osvschema.Range{
+				{
+					Type: osvschema.Range_GIT,
+					Repo: "repo4",
+					Events: []*osvschema.Event{
+						{Introduced: "0"},
+					},
+				},
+			},
+			commits: []models.AffectedCommit{
+				{
+					Repo:       "repo_ignored",
+					Introduced: "1.1",
+				},
+			},
+			successfulRepos: []string{"repo4"}, // repo_ignored is absent
+			want: &osvschema.Affected{
+				Ranges: []*osvschema.Range{
+					{
+						Type: osvschema.Range_GIT,
+						Repo: "repo4",
+						Events: []*osvschema.Event{
+							{Introduced: "0"},
+						},
+					},
+				},
+			},
+		},
+		{
+			name: "Multiple resolved ranges for same repo are merged and commits appended",
+			resolvedRanges: []*osvschema.Range{
+				{
+					Type: osvschema.Range_GIT,
+					Repo: "repo5",
+					Events: []*osvschema.Event{
+						{Introduced: "0"},
+						{Fixed: "1.0"},
+					},
+				},
+				{
+					Type: osvschema.Range_GIT,
+					Repo: "repo5",
+					Events: []*osvschema.Event{
+						{Introduced: "2.0"},
+						{Fixed: "3.0"},
+					},
+				},
+			},
+			commits: []models.AffectedCommit{
+				{
+					Repo:  "repo5",
+					Fixed: "4.0",
+				},
+			},
+			successfulRepos: []string{"repo5"},
+			want: &osvschema.Affected{
+				Ranges: []*osvschema.Range{
+					{
+						Type: osvschema.Range_GIT,
+						Repo: "repo5",
+						Events: []*osvschema.Event{
+							{Introduced: "0"},
+							{Fixed: "1.0"},
+							{Introduced: "2.0"},
+							{Fixed: "3.0"},
+							{Fixed: "4.0"},
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := MergeRangesAndCreateAffected(tt.resolvedRanges, tt.commits, tt.successfulRepos, &models.ConversionMetrics{})
+			if diff := cmp.Diff(tt.want, got, protocmp.Transform()); diff != "" {
+				t.Errorf("MergeRangesAndCreateAffected() mismatch (-want +got):\n%s", diff)
+			}
+		})
+	}
+}

vulnfeeds/conversion/versions.go

@@ -194,7 +194,6 @@ func Repo(u string) (string, error) {
 			return fmt.Sprintf("%s://%s/%s", parsedURL.Scheme, parsedURL.Hostname(), pathParts[2]), nil
 		}
 		if parsedURL.Hostname() == "sourceware.org" {
-			// Call out to m function for GitWeb URLs
 			return repoGitWeb(parsedURL)
 		}
 		if parsedURL.Hostname() == "git.postgresql.org" {