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

Open
hdonnay wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion alpine/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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: claircore.PackageSource,
},
Dist: u.release.Distribution(),
}
Expand Down
18 changes: 9 additions & 9 deletions alpine/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "botan",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand All @@ -36,7 +36,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "botan",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand All @@ -48,7 +48,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "botan",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand All @@ -60,7 +60,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "botan",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand All @@ -72,7 +72,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "cfengine",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand All @@ -84,7 +84,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "chicken",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand All @@ -96,7 +96,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "chicken",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand All @@ -108,7 +108,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "chicken",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand All @@ -120,7 +120,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
NormalizedSeverity: claircore.Unknown,
Package: &claircore.Package{
Name: "chicken",
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
},
Dist: dist310,
},
Expand Down
2 changes: 1 addition & 1 deletion alpine/purl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
Package: &claircore.Package{
Name: purl.Name,
Version: purl.Version,
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
Arch: purl.Qualifiers.Map()["arch"],
Source: &claircore.Package{},
},
Expand Down
4 changes: 2 additions & 2 deletions alpine/purl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestRoundTripIndexRecordAlpine(t *testing.T) {
Name: "busybox",
Version: "1.36.1-r0",
Arch: "x86_64",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
PackageDB: "apk:/busybox",
Filepath: "/bin/busybox",
Source: &claircore.Package{},
Expand All @@ -45,7 +45,7 @@ func TestRoundTripIndexRecordAlpine(t *testing.T) {
Name: "busybox",
Version: "1.36.1-r0",
Arch: "x86_64",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
PackageDB: "apk:/busybox",
Filepath: "/bin/busybox",
Source: &claircore.Package{},
Expand Down
4 changes: 2 additions & 2 deletions apk/scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func (*Scanner) Scan(ctx context.Context, layer *claircore.Layer) ([]*claircore.
continue
}
p := claircore.Package{
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
PackageDB: installedFile,
}
r := bytes.NewBuffer(entry)
Expand All @@ -105,7 +105,7 @@ func (*Scanner) Scan(ctx context.Context, layer *claircore.Layer) ([]*claircore.
} else {
p.Source = &claircore.Package{
Name: l,
Kind: claircore.SOURCE,
Kind: claircore.PackageSource,
}
if p.Version != "" {
p.Source.Version = p.Version
Expand Down
56 changes: 28 additions & 28 deletions apk/scanner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,126 +17,126 @@ func TestScan(t *testing.T) {
{
Name: "musl",
Version: "1.1.22-r3",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "0c777cf840e82cdc528651e3f3f8f9dda6b1b028",
},
{
Name: "busybox",
Version: "1.30.1-r2",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "d310e6a3189f51bd55bdc398fca5948c2d044804",
},
{
Name: "alpine-baselayout",
Version: "3.1.2-r0",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "770d8ce7c6c556d952884ad436dd82b17ceb1a9a",
},
{
Name: "alpine-keys",
Version: "2.1-r2",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "bdc861e495d33e961b7b9884324bea64a16d2b91",
},
{
Name: "libcrypto1.1",
Version: "1.1.1d-r0",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "95e4899bd4d379e6dde69de81fb0506e00322dec",
},
{
Name: "libssl1.1",
Version: "1.1.1d-r0",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "95e4899bd4d379e6dde69de81fb0506e00322dec",
},
{
Name: "ca-certificates-cacert",
Version: "20190108-r0",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "2e508d7528ca4d9496f05d7f453cbd17dbb80f9d",
},
{
Name: "libtls-standalone",
Version: "2.9.1-r0",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "981bf8f8fb3cbbc210ee4f2a2fb5b55d0132e02a",
},
{
Name: "ssl_client",
Version: "1.30.1-r2",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "d310e6a3189f51bd55bdc398fca5948c2d044804",
},
{
Name: "zlib",
Version: "1.2.11-r1",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "d2bfb22c8e8f67ad7d8d02704f35ec4d2a19f9b9",
},
{
Name: "apk-tools",
Version: "2.10.4-r2",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "1b98a2fa98c5af24a6a55cc61a4ff1ba1fa1f34f",
},
{
Name: "scanelf",
Version: "1.2.3-r0",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "7768569c07c52f01b11e62e523cd6ddcb4690889",
},
{
Name: "musl-utils",
Version: "1.1.22-r3",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "0c777cf840e82cdc528651e3f3f8f9dda6b1b028",
},
{
Name: "libc-utils",
Version: "0.7.1-r0",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
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: claircore.PackageSource},
PackageDB: "lib/apk/db/installed",
RepositoryHint: "cdca45021830765ad71e58af7ed31f42d1d3d644",
},
Expand Down
5 changes: 3 additions & 2 deletions archop_string.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aws/purl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,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: claircore.PackageBinary,
Source: &claircore.Package{},
},
Distribution: &claircore.Distribution{},
Expand Down
4 changes: 2 additions & 2 deletions aws/purl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func TestRoundTripIndexRecordAWS(t *testing.T) {
Name: "curl",
Version: "7.79.1-2.amzn2.0.2",
Arch: "x86_64",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
Source: &claircore.Package{},
},
Distribution: &claircore.Distribution{
Expand All @@ -46,7 +46,7 @@ func TestRoundTripIndexRecordAWS(t *testing.T) {
Name: "bash",
Version: "5.1.16-6.amzn2023.0.4",
Arch: "aarch64",
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
Source: &claircore.Package{},
},
Distribution: &claircore.Distribution{
Expand Down
2 changes: 1 addition & 1 deletion aws/updater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func (u *Updater) unpack(partial *claircore.Vulnerability, packages []alas.Packa

v.Package = &claircore.Package{
Name: alasPKG.Name,
Kind: claircore.BINARY,
Kind: claircore.PackageBinary,
Arch: alasPKG.Arch,
}
v.FixedInVersion = versionString(&b, alasPKG)
Expand Down
4 changes: 2 additions & 2 deletions datastore/postgres/querybuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ func buildGetQuery(record *claircore.IndexRecord, opts *datastore.GetOpts) (stri
}
packageQuery := goqu.And(
goqu.Ex{"package_name": record.Package.Name},
goqu.Ex{"package_kind": record.Package.Kind},
goqu.Ex{"package_kind": record.Package.Kind.String()},
)
exps = append(exps, packageQuery)

// If the package has a source, convert the first expression to an OR.
if record.Package.Source.Name != "" {
sourcePackageQuery := goqu.And(
goqu.Ex{"package_name": record.Package.Source.Name},
goqu.Ex{"package_kind": record.Package.Source.Kind},
goqu.Ex{"package_kind": record.Package.Source.Kind.String()},
)
or := goqu.Or(
packageQuery,
Expand Down
Loading
Loading