Skip to content

claircore: change Package.Kind type and add new values #1781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 4 commits into from
Apr 10, 2026
Merged

claircore: change Package.Kind type and add new values #1781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aca34ab
wart: add handling for string-typed PackageKind behavior
hdonnay Mar 4, 2026
4b83a7d
claircore: change `Package.Kind` type and add new values
hdonnay Mar 4, 2026
126355d
postgres: add type handling for `PackageKind` type
hdonnay Mar 4, 2026
498b332
postgres: add handling for `Package` changes
hdonnay Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion alpine/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/quay/claircore"
"github.com/quay/claircore/libvuln/driver"
"github.com/quay/claircore/toolkit/types"
)

const (
Expand Down Expand Up @@ -40,7 +41,7 @@ func (u *updater) parse(ctx context.Context, sdb *SecurityDB) ([]*claircore.Vuln
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: pkg.Pkg.Name,
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: u.release.Distribution(),
}
Expand Down
19 changes: 10 additions & 9 deletions alpine/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/quay/claircore"
"github.com/quay/claircore/test"
"github.com/quay/claircore/toolkit/types"
)

var dist310 = stableRelease{3, 10}.Distribution()
Expand All @@ -24,7 +25,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "botan",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand All @@ -36,7 +37,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "botan",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand All @@ -48,7 +49,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "botan",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand All @@ -60,7 +61,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "botan",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand All @@ -72,7 +73,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "cfengine",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand All @@ -84,7 +85,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "chicken",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand All @@ -96,7 +97,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "chicken",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand All @@ -108,7 +109,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "chicken",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand All @@ -120,7 +121,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "chicken",
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
},
Dist: dist310,
},
Expand Down
3 changes: 2 additions & 1 deletion alpine/purl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/package-url/packageurl-go"

"github.com/quay/claircore"
"github.com/quay/claircore/toolkit/types"
)

const (
Expand Down Expand Up @@ -46,7 +47,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
Package: &claircore.Package{
Name: purl.Name,
Version: purl.Version,
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: purl.Qualifiers.Map()["arch"],
Source: &claircore.Package{},
},
Expand Down
5 changes: 3 additions & 2 deletions alpine/purl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"

"github.com/quay/claircore"
"github.com/quay/claircore/toolkit/types"
)

func TestRoundTripIndexRecordAlpine(t *testing.T) {
Expand All @@ -25,7 +26,7 @@ func TestRoundTripIndexRecordAlpine(t *testing.T) {
Name: "busybox",
Version: "1.36.1-r0",
Arch: "x86_64",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
PackageDB: "apk:/busybox",
Filepath: "/bin/busybox",
Source: &claircore.Package{},
Expand All @@ -45,7 +46,7 @@ func TestRoundTripIndexRecordAlpine(t *testing.T) {
Name: "busybox",
Version: "1.36.1-r0",
Arch: "x86_64",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
PackageDB: "apk:/busybox",
Filepath: "/bin/busybox",
Source: &claircore.Package{},
Expand Down
5 changes: 3 additions & 2 deletions apk/scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/quay/claircore"
"github.com/quay/claircore/indexer"
"github.com/quay/claircore/toolkit/types"
)

const (
Expand Down Expand Up @@ -84,7 +85,7 @@ func (*Scanner) Scan(ctx context.Context, layer *claircore.Layer) ([]*claircore.
continue
}
p := claircore.Package{
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
PackageDB: installedFile,
}
r := bytes.NewBuffer(entry)
Expand All @@ -105,7 +106,7 @@ func (*Scanner) Scan(ctx context.Context, layer *claircore.Layer) ([]*claircore.
} else {
p.Source = &claircore.Package{
Name: l,
Kind: claircore.SOURCE,
Kind: types.SourcePackage,
}
if p.Version != "" {
p.Source.Version = p.Version
Expand Down
57 changes: 29 additions & 28 deletions apk/scanner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/quay/claircore"
"github.com/quay/claircore/test"
"github.com/quay/claircore/toolkit/types"
)

func TestScan(t *testing.T) {
Expand All @@ -17,126 +18,126 @@ func TestScan(t *testing.T) {
{
Name: "musl",
Version: "1.1.22-r3",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "musl", Version: "1.1.22-r3", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "musl", Version: "1.1.22-r3", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "0c777cf840e82cdc528651e3f3f8f9dda6b1b028",
},
{
Name: "busybox",
Version: "1.30.1-r2",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "busybox", Version: "1.30.1-r2", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "busybox", Version: "1.30.1-r2", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "d310e6a3189f51bd55bdc398fca5948c2d044804",
},
{
Name: "alpine-baselayout",
Version: "3.1.2-r0",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "alpine-baselayout", Version: "3.1.2-r0", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "alpine-baselayout", Version: "3.1.2-r0", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "770d8ce7c6c556d952884ad436dd82b17ceb1a9a",
},
{
Name: "alpine-keys",
Version: "2.1-r2",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "alpine-keys", Version: "2.1-r2", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "alpine-keys", Version: "2.1-r2", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "bdc861e495d33e961b7b9884324bea64a16d2b91",
},
{
Name: "libcrypto1.1",
Version: "1.1.1d-r0",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "openssl", Version: "1.1.1d-r0", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "openssl", Version: "1.1.1d-r0", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "95e4899bd4d379e6dde69de81fb0506e00322dec",
},
{
Name: "libssl1.1",
Version: "1.1.1d-r0",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "openssl", Version: "1.1.1d-r0", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "openssl", Version: "1.1.1d-r0", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "95e4899bd4d379e6dde69de81fb0506e00322dec",
},
{
Name: "ca-certificates-cacert",
Version: "20190108-r0",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "ca-certificates", Version: "20190108-r0", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "ca-certificates", Version: "20190108-r0", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "2e508d7528ca4d9496f05d7f453cbd17dbb80f9d",
},
{
Name: "libtls-standalone",
Version: "2.9.1-r0",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "libtls-standalone", Version: "2.9.1-r0", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "libtls-standalone", Version: "2.9.1-r0", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "981bf8f8fb3cbbc210ee4f2a2fb5b55d0132e02a",
},
{
Name: "ssl_client",
Version: "1.30.1-r2",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "busybox", Version: "1.30.1-r2", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "busybox", Version: "1.30.1-r2", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "d310e6a3189f51bd55bdc398fca5948c2d044804",
},
{
Name: "zlib",
Version: "1.2.11-r1",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "zlib", Version: "1.2.11-r1", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "zlib", Version: "1.2.11-r1", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "d2bfb22c8e8f67ad7d8d02704f35ec4d2a19f9b9",
},
{
Name: "apk-tools",
Version: "2.10.4-r2",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "apk-tools", Version: "2.10.4-r2", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "apk-tools", Version: "2.10.4-r2", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "1b98a2fa98c5af24a6a55cc61a4ff1ba1fa1f34f",
},
{
Name: "scanelf",
Version: "1.2.3-r0",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "pax-utils", Version: "1.2.3-r0", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "pax-utils", Version: "1.2.3-r0", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "7768569c07c52f01b11e62e523cd6ddcb4690889",
},
{
Name: "musl-utils",
Version: "1.1.22-r3",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "musl", Version: "1.1.22-r3", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "musl", Version: "1.1.22-r3", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "0c777cf840e82cdc528651e3f3f8f9dda6b1b028",
},
{
Name: "libc-utils",
Version: "0.7.1-r0",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: "x86_64",
Source: &claircore.Package{Name: "libc-dev", Version: "0.7.1-r0", Kind: claircore.SOURCE},
Source: &claircore.Package{Name: "libc-dev", Version: "0.7.1-r0", Kind: types.SourcePackage},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "cdca45021830765ad71e58af7ed31f42d1d3d644",
},
Expand Down
4 changes: 3 additions & 1 deletion aws/purl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ import (
"strings"

"github.com/package-url/packageurl-go"

"github.com/quay/claircore"
"github.com/quay/claircore/toolkit/types"
"github.com/quay/claircore/toolkit/types/cpe"
)

Expand Down Expand Up @@ -54,7 +56,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
Name: purl.Name,
Version: purl.Version,
Arch: purl.Qualifiers.Map()["arch"],
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Source: &claircore.Package{},
},
Distribution: &claircore.Distribution{},
Expand Down
5 changes: 3 additions & 2 deletions aws/purl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/package-url/packageurl-go"

"github.com/quay/claircore"
"github.com/quay/claircore/toolkit/types"
"github.com/quay/claircore/toolkit/types/cpe"
)

Expand All @@ -26,7 +27,7 @@ func TestRoundTripIndexRecordAWS(t *testing.T) {
Name: "curl",
Version: "7.79.1-2.amzn2.0.2",
Arch: "x86_64",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Source: &claircore.Package{},
},
Distribution: &claircore.Distribution{
Expand All @@ -46,7 +47,7 @@ func TestRoundTripIndexRecordAWS(t *testing.T) {
Name: "bash",
Version: "5.1.16-6.amzn2023.0.4",
Arch: "aarch64",
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Source: &claircore.Package{},
},
Distribution: &claircore.Distribution{
Expand Down
3 changes: 2 additions & 1 deletion aws/updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/quay/claircore/aws/internal/alas"
"github.com/quay/claircore/internal/xmlutil"
"github.com/quay/claircore/libvuln/driver"
"github.com/quay/claircore/toolkit/types"
)

var _ driver.Updater = (*Updater)(nil)
Expand Down Expand Up @@ -111,7 +112,7 @@ func (u *Updater) unpack(partial *claircore.Vulnerability, packages []alas.Packa

v.Package = &claircore.Package{
Name: alasPKG.Name,
Kind: claircore.BINARY,
Kind: types.BinaryPackage,
Arch: alasPKG.Arch,
}
v.FixedInVersion = versionString(&b, alasPKG)
Expand Down
Loading
Loading