Skip to content

Commit 9673835

Browse files
committed
purl: add non-nil Source field to all PURL parse functions
The matching logic requires that a claircore.Package contain a non-nil Source field value. Signed-off-by: Brad Lugo <[email protected]>
1 parent 92e393f commit 9673835

File tree

29 files changed

+48
-0
lines changed

29 files changed

+48
-0
lines changed

alpine/purl.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
4848
Version: purl.Version,
4949
Kind: claircore.BINARY,
5050
Arch: purl.Qualifiers.Map()["arch"],
51+
Source: &claircore.Package{},
5152
},
5253
Distribution: d,
5354
},

alpine/purl_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ func TestRoundTripIndexRecordAlpine(t *testing.T) {
2828
Kind: claircore.BINARY,
2929
PackageDB: "apk:/busybox",
3030
Filepath: "/bin/busybox",
31+
Source: &claircore.Package{},
3132
},
3233
Distribution: &claircore.Distribution{
3334
Name: "Alpine Linux",
@@ -47,6 +48,7 @@ func TestRoundTripIndexRecordAlpine(t *testing.T) {
4748
Kind: claircore.BINARY,
4849
PackageDB: "apk:/busybox",
4950
Filepath: "/bin/busybox",
51+
Source: &claircore.Package{},
5052
},
5153
Distribution: &claircore.Distribution{
5254
Name: "Alpine Linux",

aws/purl.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
5555
Version: purl.Version,
5656
Arch: purl.Qualifiers.Map()["arch"],
5757
Kind: claircore.BINARY,
58+
Source: &claircore.Package{},
5859
},
5960
Distribution: &claircore.Distribution{},
6061
}

aws/purl_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ func TestRoundTripIndexRecordAWS(t *testing.T) {
2727
Version: "7.79.1-2.amzn2.0.2",
2828
Arch: "x86_64",
2929
Kind: claircore.BINARY,
30+
Source: &claircore.Package{},
3031
},
3132
Distribution: &claircore.Distribution{
3233
Name: "Amazon Linux AMI",
@@ -46,6 +47,7 @@ func TestRoundTripIndexRecordAWS(t *testing.T) {
4647
Version: "5.1.16-6.amzn2023.0.4",
4748
Arch: "aarch64",
4849
Kind: claircore.BINARY,
50+
Source: &claircore.Package{},
4951
},
5052
Distribution: &claircore.Distribution{
5153
Name: "Amazon Linux",

debian/purl.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
5858
Version: purl.Version,
5959
Arch: purl.Qualifiers.Map()["arch"],
6060
Kind: claircore.BINARY,
61+
Source: &claircore.Package{},
6162
},
6263
Distribution: &claircore.Distribution{
6364
Name: "Debian GNU/Linux",

debian/purl_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ func TestRoundTripIndexRecordDebian(t *testing.T) {
2727
Arch: "x86_64",
2828
Kind: claircore.BINARY,
2929
PackageDB: "deb:/var/lib/dpkg/status",
30+
Source: &claircore.Package{},
3031
},
3132
Distribution: &claircore.Distribution{
3233
Name: "Debian GNU/Linux",

gobin/purl.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
5353
Kind: claircore.BINARY,
5454
NormalizedVersion: pVersion,
5555
Arch: purl.Qualifiers.Map()["arch"],
56+
Source: &claircore.Package{},
5657
},
5758
Repository: &Repository,
5859
},

gobin/purl_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ func TestRoundTripIndexRecordGobin(t *testing.T) {
2727
Arch: "x86_64",
2828
Kind: claircore.BINARY,
2929
PackageDB: "go:/usr/local/bin/app",
30+
Source: &claircore.Package{},
3031
},
3132
Repository: &Repository,
3233
},
@@ -40,6 +41,7 @@ func TestRoundTripIndexRecordGobin(t *testing.T) {
4041
Arch: "aarch64",
4142
Kind: claircore.BINARY,
4243
PackageDB: "go:/opt/agent/agent",
44+
Source: &claircore.Package{},
4345
},
4446
Repository: &Repository,
4547
},
@@ -53,6 +55,7 @@ func TestRoundTripIndexRecordGobin(t *testing.T) {
5355
Arch: "x86_64",
5456
Kind: claircore.BINARY,
5557
PackageDB: "go:/usr/local/bin/go",
58+
Source: &claircore.Package{},
5659
},
5760
Repository: &Repository,
5861
},
@@ -67,6 +70,7 @@ func TestRoundTripIndexRecordGobin(t *testing.T) {
6770
Arch: "x86_64",
6871
Kind: claircore.BINARY,
6972
PackageDB: "go:/usr/local/bin/app",
73+
Source: &claircore.Package{},
7074
},
7175
Repository: &Repository,
7276
},

java/purl.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ func ParsePURL(ctx context.Context, purl packageurl.PackageURL) ([]*claircore.In
4040
Name: purl.Namespace + ":" + purl.Name,
4141
Version: purl.Version,
4242
Kind: claircore.BINARY,
43+
Source: &claircore.Package{},
4344
},
4445
Repository: &Repository,
4546
},

java/purl_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func TestRoundTripIndexRecordJava(t *testing.T) {
2626
Name: "org.apache.commons:commons-lang3",
2727
Version: "3.12.0",
2828
Kind: claircore.BINARY,
29+
Source: &claircore.Package{},
2930
},
3031
Repository: &Repository,
3132
},
@@ -37,6 +38,7 @@ func TestRoundTripIndexRecordJava(t *testing.T) {
3738
Name: "com.fasterxml.jackson.core:jackson-databind",
3839
Version: "2.17.1",
3940
Kind: claircore.BINARY,
41+
Source: &claircore.Package{},
4042
},
4143
Repository: &Repository,
4244
},

0 commit comments

Comments
 (0)