Skip to content

Commit e8b5727

Browse files
hdonnayhdonnay
committed
claircore: change Package.Kind type and add new values
This was largely an automated rewrite, but does touch a lot of files. See-also: https://issues.redhat.com/browse/CLAIRDEV-85 Change-Id: I6ed030878dcccb1a5d0c437f2b480e9f0bea80fd Signed-off-by: Hank Donnay <hdonnay@redhat.com>
1 parent c4c726d commit e8b5727

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+846
-676
lines changed

‎alpine/parser.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (u *updater) parse(ctx context.Context, sdb *SecurityDB) ([]*claircore.Vuln
4040
NormalizedSeverity: claircore.Unknown,
4141
Package: &claircore.Package{
4242
Name: pkg.Pkg.Name,
43-
Kind: claircore.SOURCE,
43+
Kind: claircore.PackageSource,
4444
},
4545
Dist: u.release.Distribution(),
4646
}

‎alpine/parser_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
2424
NormalizedSeverity: claircore.Unknown,
2525
Package: &claircore.Package{
2626
Name: "botan",
27-
Kind: claircore.SOURCE,
27+
Kind: claircore.PackageSource,
2828
},
2929
Dist: dist310,
3030
},
@@ -36,7 +36,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
3636
NormalizedSeverity: claircore.Unknown,
3737
Package: &claircore.Package{
3838
Name: "botan",
39-
Kind: claircore.SOURCE,
39+
Kind: claircore.PackageSource,
4040
},
4141
Dist: dist310,
4242
},
@@ -48,7 +48,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
4848
NormalizedSeverity: claircore.Unknown,
4949
Package: &claircore.Package{
5050
Name: "botan",
51-
Kind: claircore.SOURCE,
51+
Kind: claircore.PackageSource,
5252
},
5353
Dist: dist310,
5454
},
@@ -60,7 +60,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
6060
NormalizedSeverity: claircore.Unknown,
6161
Package: &claircore.Package{
6262
Name: "botan",
63-
Kind: claircore.SOURCE,
63+
Kind: claircore.PackageSource,
6464
},
6565
Dist: dist310,
6666
},
@@ -72,7 +72,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
7272
NormalizedSeverity: claircore.Unknown,
7373
Package: &claircore.Package{
7474
Name: "cfengine",
75-
Kind: claircore.SOURCE,
75+
Kind: claircore.PackageSource,
7676
},
7777
Dist: dist310,
7878
},
@@ -84,7 +84,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
8484
NormalizedSeverity: claircore.Unknown,
8585
Package: &claircore.Package{
8686
Name: "chicken",
87-
Kind: claircore.SOURCE,
87+
Kind: claircore.PackageSource,
8888
},
8989
Dist: dist310,
9090
},
@@ -96,7 +96,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
9696
NormalizedSeverity: claircore.Unknown,
9797
Package: &claircore.Package{
9898
Name: "chicken",
99-
Kind: claircore.SOURCE,
99+
Kind: claircore.PackageSource,
100100
},
101101
Dist: dist310,
102102
},
@@ -108,7 +108,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
108108
NormalizedSeverity: claircore.Unknown,
109109
Package: &claircore.Package{
110110
Name: "chicken",
111-
Kind: claircore.SOURCE,
111+
Kind: claircore.PackageSource,
112112
},
113113
Dist: dist310,
114114
},
@@ -120,7 +120,7 @@ var v3_10CommunityTruncatedVulns = []*claircore.Vulnerability{
120120
NormalizedSeverity: claircore.Unknown,
121121
Package: &claircore.Package{
122122
Name: "chicken",
123-
Kind: claircore.SOURCE,
123+
Kind: claircore.PackageSource,
124124
},
125125
Dist: dist310,
126126
},

‎alpine/purl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
4646
Package: &claircore.Package{
4747
Name: purl.Name,
4848
Version: purl.Version,
49-
Kind: claircore.BINARY,
49+
Kind: claircore.PackageBinary,
5050
Arch: purl.Qualifiers.Map()["arch"],
5151
Source: &claircore.Package{},
5252
},

‎alpine/purl_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestRoundTripIndexRecordAlpine(t *testing.T) {
2525
Name: "busybox",
2626
Version: "1.36.1-r0",
2727
Arch: "x86_64",
28-
Kind: claircore.BINARY,
28+
Kind: claircore.PackageBinary,
2929
PackageDB: "apk:/busybox",
3030
Filepath: "/bin/busybox",
3131
Source: &claircore.Package{},
@@ -45,7 +45,7 @@ func TestRoundTripIndexRecordAlpine(t *testing.T) {
4545
Name: "busybox",
4646
Version: "1.36.1-r0",
4747
Arch: "x86_64",
48-
Kind: claircore.BINARY,
48+
Kind: claircore.PackageBinary,
4949
PackageDB: "apk:/busybox",
5050
Filepath: "/bin/busybox",
5151
Source: &claircore.Package{},

‎apk/scanner.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (*Scanner) Scan(ctx context.Context, layer *claircore.Layer) ([]*claircore.
8484
continue
8585
}
8686
p := claircore.Package{
87-
Kind: claircore.BINARY,
87+
Kind: claircore.PackageBinary,
8888
PackageDB: installedFile,
8989
}
9090
r := bytes.NewBuffer(entry)
@@ -105,7 +105,7 @@ func (*Scanner) Scan(ctx context.Context, layer *claircore.Layer) ([]*claircore.
105105
} else {
106106
p.Source = &claircore.Package{
107107
Name: l,
108-
Kind: claircore.SOURCE,
108+
Kind: claircore.PackageSource,
109109
}
110110
if p.Version != "" {
111111
p.Source.Version = p.Version

‎apk/scanner_test.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,126 +17,126 @@ func TestScan(t *testing.T) {
1717
{
1818
Name: "musl",
1919
Version: "1.1.22-r3",
20-
Kind: claircore.BINARY,
20+
Kind: claircore.PackageBinary,
2121
Arch: "x86_64",
22-
Source: &claircore.Package{Name: "musl", Version: "1.1.22-r3", Kind: claircore.SOURCE},
22+
Source: &claircore.Package{Name: "musl", Version: "1.1.22-r3", Kind: claircore.PackageSource},
2323
PackageDB: "lib/apk/db/installed",
2424
RepositoryHint: "0c777cf840e82cdc528651e3f3f8f9dda6b1b028",
2525
},
2626
{
2727
Name: "busybox",
2828
Version: "1.30.1-r2",
29-
Kind: claircore.BINARY,
29+
Kind: claircore.PackageBinary,
3030
Arch: "x86_64",
31-
Source: &claircore.Package{Name: "busybox", Version: "1.30.1-r2", Kind: claircore.SOURCE},
31+
Source: &claircore.Package{Name: "busybox", Version: "1.30.1-r2", Kind: claircore.PackageSource},
3232
PackageDB: "lib/apk/db/installed",
3333
RepositoryHint: "d310e6a3189f51bd55bdc398fca5948c2d044804",
3434
},
3535
{
3636
Name: "alpine-baselayout",
3737
Version: "3.1.2-r0",
38-
Kind: claircore.BINARY,
38+
Kind: claircore.PackageBinary,
3939
Arch: "x86_64",
40-
Source: &claircore.Package{Name: "alpine-baselayout", Version: "3.1.2-r0", Kind: claircore.SOURCE},
40+
Source: &claircore.Package{Name: "alpine-baselayout", Version: "3.1.2-r0", Kind: claircore.PackageSource},
4141
PackageDB: "lib/apk/db/installed",
4242
RepositoryHint: "770d8ce7c6c556d952884ad436dd82b17ceb1a9a",
4343
},
4444
{
4545
Name: "alpine-keys",
4646
Version: "2.1-r2",
47-
Kind: claircore.BINARY,
47+
Kind: claircore.PackageBinary,
4848
Arch: "x86_64",
49-
Source: &claircore.Package{Name: "alpine-keys", Version: "2.1-r2", Kind: claircore.SOURCE},
49+
Source: &claircore.Package{Name: "alpine-keys", Version: "2.1-r2", Kind: claircore.PackageSource},
5050
PackageDB: "lib/apk/db/installed",
5151
RepositoryHint: "bdc861e495d33e961b7b9884324bea64a16d2b91",
5252
},
5353
{
5454
Name: "libcrypto1.1",
5555
Version: "1.1.1d-r0",
56-
Kind: claircore.BINARY,
56+
Kind: claircore.PackageBinary,
5757
Arch: "x86_64",
58-
Source: &claircore.Package{Name: "openssl", Version: "1.1.1d-r0", Kind: claircore.SOURCE},
58+
Source: &claircore.Package{Name: "openssl", Version: "1.1.1d-r0", Kind: claircore.PackageSource},
5959
PackageDB: "lib/apk/db/installed",
6060
RepositoryHint: "95e4899bd4d379e6dde69de81fb0506e00322dec",
6161
},
6262
{
6363
Name: "libssl1.1",
6464
Version: "1.1.1d-r0",
65-
Kind: claircore.BINARY,
65+
Kind: claircore.PackageBinary,
6666
Arch: "x86_64",
67-
Source: &claircore.Package{Name: "openssl", Version: "1.1.1d-r0", Kind: claircore.SOURCE},
67+
Source: &claircore.Package{Name: "openssl", Version: "1.1.1d-r0", Kind: claircore.PackageSource},
6868
PackageDB: "lib/apk/db/installed",
6969
RepositoryHint: "95e4899bd4d379e6dde69de81fb0506e00322dec",
7070
},
7171
{
7272
Name: "ca-certificates-cacert",
7373
Version: "20190108-r0",
74-
Kind: claircore.BINARY,
74+
Kind: claircore.PackageBinary,
7575
Arch: "x86_64",
76-
Source: &claircore.Package{Name: "ca-certificates", Version: "20190108-r0", Kind: claircore.SOURCE},
76+
Source: &claircore.Package{Name: "ca-certificates", Version: "20190108-r0", Kind: claircore.PackageSource},
7777
PackageDB: "lib/apk/db/installed",
7878
RepositoryHint: "2e508d7528ca4d9496f05d7f453cbd17dbb80f9d",
7979
},
8080
{
8181
Name: "libtls-standalone",
8282
Version: "2.9.1-r0",
83-
Kind: claircore.BINARY,
83+
Kind: claircore.PackageBinary,
8484
Arch: "x86_64",
85-
Source: &claircore.Package{Name: "libtls-standalone", Version: "2.9.1-r0", Kind: claircore.SOURCE},
85+
Source: &claircore.Package{Name: "libtls-standalone", Version: "2.9.1-r0", Kind: claircore.PackageSource},
8686
PackageDB: "lib/apk/db/installed",
8787
RepositoryHint: "981bf8f8fb3cbbc210ee4f2a2fb5b55d0132e02a",
8888
},
8989
{
9090
Name: "ssl_client",
9191
Version: "1.30.1-r2",
92-
Kind: claircore.BINARY,
92+
Kind: claircore.PackageBinary,
9393
Arch: "x86_64",
94-
Source: &claircore.Package{Name: "busybox", Version: "1.30.1-r2", Kind: claircore.SOURCE},
94+
Source: &claircore.Package{Name: "busybox", Version: "1.30.1-r2", Kind: claircore.PackageSource},
9595
PackageDB: "lib/apk/db/installed",
9696
RepositoryHint: "d310e6a3189f51bd55bdc398fca5948c2d044804",
9797
},
9898
{
9999
Name: "zlib",
100100
Version: "1.2.11-r1",
101-
Kind: claircore.BINARY,
101+
Kind: claircore.PackageBinary,
102102
Arch: "x86_64",
103-
Source: &claircore.Package{Name: "zlib", Version: "1.2.11-r1", Kind: claircore.SOURCE},
103+
Source: &claircore.Package{Name: "zlib", Version: "1.2.11-r1", Kind: claircore.PackageSource},
104104
PackageDB: "lib/apk/db/installed",
105105
RepositoryHint: "d2bfb22c8e8f67ad7d8d02704f35ec4d2a19f9b9",
106106
},
107107
{
108108
Name: "apk-tools",
109109
Version: "2.10.4-r2",
110-
Kind: claircore.BINARY,
110+
Kind: claircore.PackageBinary,
111111
Arch: "x86_64",
112-
Source: &claircore.Package{Name: "apk-tools", Version: "2.10.4-r2", Kind: claircore.SOURCE},
112+
Source: &claircore.Package{Name: "apk-tools", Version: "2.10.4-r2", Kind: claircore.PackageSource},
113113
PackageDB: "lib/apk/db/installed",
114114
RepositoryHint: "1b98a2fa98c5af24a6a55cc61a4ff1ba1fa1f34f",
115115
},
116116
{
117117
Name: "scanelf",
118118
Version: "1.2.3-r0",
119-
Kind: claircore.BINARY,
119+
Kind: claircore.PackageBinary,
120120
Arch: "x86_64",
121-
Source: &claircore.Package{Name: "pax-utils", Version: "1.2.3-r0", Kind: claircore.SOURCE},
121+
Source: &claircore.Package{Name: "pax-utils", Version: "1.2.3-r0", Kind: claircore.PackageSource},
122122
PackageDB: "lib/apk/db/installed",
123123
RepositoryHint: "7768569c07c52f01b11e62e523cd6ddcb4690889",
124124
},
125125
{
126126
Name: "musl-utils",
127127
Version: "1.1.22-r3",
128-
Kind: claircore.BINARY,
128+
Kind: claircore.PackageBinary,
129129
Arch: "x86_64",
130-
Source: &claircore.Package{Name: "musl", Version: "1.1.22-r3", Kind: claircore.SOURCE},
130+
Source: &claircore.Package{Name: "musl", Version: "1.1.22-r3", Kind: claircore.PackageSource},
131131
PackageDB: "lib/apk/db/installed",
132132
RepositoryHint: "0c777cf840e82cdc528651e3f3f8f9dda6b1b028",
133133
},
134134
{
135135
Name: "libc-utils",
136136
Version: "0.7.1-r0",
137-
Kind: claircore.BINARY,
137+
Kind: claircore.PackageBinary,
138138
Arch: "x86_64",
139-
Source: &claircore.Package{Name: "libc-dev", Version: "0.7.1-r0", Kind: claircore.SOURCE},
139+
Source: &claircore.Package{Name: "libc-dev", Version: "0.7.1-r0", Kind: claircore.PackageSource},
140140
PackageDB: "lib/apk/db/installed",
141141
RepositoryHint: "cdca45021830765ad71e58af7ed31f42d1d3d644",
142142
},

‎archop_string.go‎

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aws/purl.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
5454
Name: purl.Name,
5555
Version: purl.Version,
5656
Arch: purl.Qualifiers.Map()["arch"],
57-
Kind: claircore.BINARY,
57+
Kind: claircore.PackageBinary,
5858
Source: &claircore.Package{},
5959
},
6060
Distribution: &claircore.Distribution{},

‎aws/purl_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestRoundTripIndexRecordAWS(t *testing.T) {
2626
Name: "curl",
2727
Version: "7.79.1-2.amzn2.0.2",
2828
Arch: "x86_64",
29-
Kind: claircore.BINARY,
29+
Kind: claircore.PackageBinary,
3030
Source: &claircore.Package{},
3131
},
3232
Distribution: &claircore.Distribution{
@@ -46,7 +46,7 @@ func TestRoundTripIndexRecordAWS(t *testing.T) {
4646
Name: "bash",
4747
Version: "5.1.16-6.amzn2023.0.4",
4848
Arch: "aarch64",
49-
Kind: claircore.BINARY,
49+
Kind: claircore.PackageBinary,
5050
Source: &claircore.Package{},
5151
},
5252
Distribution: &claircore.Distribution{

‎aws/updater.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (u *Updater) unpack(partial *claircore.Vulnerability, packages []alas.Packa
111111

112112
v.Package = &claircore.Package{
113113
Name: alasPKG.Name,
114-
Kind: claircore.BINARY,
114+
Kind: claircore.PackageBinary,
115115
Arch: alasPKG.Arch,
116116
}
117117
v.FixedInVersion = versionString(&b, alasPKG)

0 commit comments

Comments
 (0)