From fbcf2f800c079fb544b4f302adb7d2128ccabcde Mon Sep 17 00:00:00 2001 From: Andrew Nesbitt Date: Sun, 18 Oct 2026 18:24:58 +0100 Subject: [PATCH] Bump git-pkgs/sbom to v0.1.7 --- go.mod | 2 +- go.sum | 4 ++-- internal/http/api/api_test.go | 11 +++++++++++ internal/http/api/export_test.go | 1 + 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 60b20a0..020852c 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/git-pkgs/manifests v0.12.3 github.com/git-pkgs/markup v0.1.1 github.com/git-pkgs/purl v0.1.21 - github.com/git-pkgs/sbom v0.1.6 + github.com/git-pkgs/sbom v0.1.7 github.com/gittuf/gittuf v0.14.2-0.20260614183827-6f382ee5c029 github.com/gliderlabs/ssh v0.3.8 github.com/go-git/go-git/v5 v5.19.3 diff --git a/go.sum b/go.sum index bb947a4..f90f21e 100644 --- a/go.sum +++ b/go.sum @@ -214,8 +214,8 @@ github.com/git-pkgs/pom v0.1.7 h1:4yKdtw6eyShtjul6bcZdyz7yLQ+jdrYeYkKbskDGi4c= github.com/git-pkgs/pom v0.1.7/go.mod h1:ufdMBe1lKzqOeP9IUb9NPZ458xKV8E8NvuyBMxOfwIk= github.com/git-pkgs/purl v0.1.21 h1:PDZUX43lxIiXPn2eHcsNiiiwQo+HajntZ/4TwSvCGlw= github.com/git-pkgs/purl v0.1.21/go.mod h1:4dOmris48ehjiKmWBqSmMHguUQht48BLeXW+hQUnuj0= -github.com/git-pkgs/sbom v0.1.6 h1:bHgk58NmpDZVNFe+6+kTEigrCaYkmpLjjDl8V0X9+RA= -github.com/git-pkgs/sbom v0.1.6/go.mod h1:CHxXSiOfsMRzF7SfvlTlZ2xhJE+NbZ/GK/lFuEYGC3U= +github.com/git-pkgs/sbom v0.1.7 h1:4eboy/Yed/SC9ZcC/xT50iywHPzWbmCU7azDb5T1RbA= +github.com/git-pkgs/sbom v0.1.7/go.mod h1:KIkZX0v31l62SeFsi2qsQXcZRVrAXvIdPQ4x4en+G2M= github.com/git-pkgs/vers v0.7.1 h1:23VceCbOjQKib0jhbfNRqL3YqkBPiUwdkQNhJoZgnsU= github.com/git-pkgs/vers v0.7.1/go.mod h1:ofLiBpPNkQmC0LB1k0zmN1gCv7Hi3MiZx8WtmWZ4A9A= github.com/github/smimesign v0.2.0 h1:Hho4YcX5N1I9XNqhq0fNx0Sts8MhLonHd+HRXVGNjvk= diff --git a/internal/http/api/api_test.go b/internal/http/api/api_test.go index 56cc526..42d1f3d 100644 --- a/internal/http/api/api_test.go +++ b/internal/http/api/api_test.go @@ -287,3 +287,14 @@ func TestComputeDiff(t *testing.T) { t.Errorf("modified = %+v", d.Modified) } } + +func TestBuildSBOMKeepsSameNameAcrossEcosystems(t *testing.T) { + doc := api.BuildSBOM([]index.Dependency{ + {Name: "foo", Requirement: "1.0.0", PURL: "pkg:npm/foo@1.0.0"}, + {Name: "foo", Requirement: "1.0.0", PURL: "pkg:pypi/foo@1.0.0"}, + {Name: "foo", Requirement: "1.0.0", PURL: "pkg:npm/foo@1.0.0"}, + }) + if len(doc.Packages) != 2 { + t.Fatalf("want 2 packages, got %d: %+v", len(doc.Packages), doc.Packages) + } +} diff --git a/internal/http/api/export_test.go b/internal/http/api/export_test.go index ac7e534..b7f06b7 100644 --- a/internal/http/api/export_test.go +++ b/internal/http/api/export_test.go @@ -4,4 +4,5 @@ package api var ( FilterDeps = filterDeps ComputeDiff = computeDiff + BuildSBOM = buildSBOM )