Mirrors/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft synced 2024-11-13 23:57:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

update to latest packageurl-go (#3347)

Browse source 
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Alex Goodman 2024-10-18 14:47:02 -04:00 committed by GitHub
parent 3267545097
commit 56dbb342ef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -18,7 +18,7 @@ require (
github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb github.com/anchore/go-macholibre v0.0.0-20220308212642-53e6d0aaf6fb
github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04 github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04
github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b
github.com/anchore/packageurl-go v0.1.1-0.20240507183024-848e011fc24f github.com/anchore/packageurl-go v0.1.1-0.20241018175412-5c22e6360c4f
github.com/anchore/stereoscope v0.0.5-0.20241015153345-9e57bce5efeb github.com/anchore/stereoscope v0.0.5-0.20241015153345-9e57bce5efeb
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be
// we are hinting brotli to latest due to warning when installing archiver v3: // we are hinting brotli to latest due to warning when installing archiver v3:

4
go.sum
View file

@ -113,8 +113,8 @@ github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04 h1:VzprUTpc0v
github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04/go.mod h1:6dK64g27Qi1qGQZ67gFmBFvEHScy0/C8qhQhNe5B5pQ= github.com/anchore/go-testutils v0.0.0-20200925183923-d5f45b0d3c04/go.mod h1:6dK64g27Qi1qGQZ67gFmBFvEHScy0/C8qhQhNe5B5pQ=
github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b h1:e1bmaoJfZVsCYMrIZBpFxwV26CbsuoEh5muXD5I1Ods= github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b h1:e1bmaoJfZVsCYMrIZBpFxwV26CbsuoEh5muXD5I1Ods=
github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b/go.mod h1:Bkc+JYWjMCF8OyZ340IMSIi2Ebf3uwByOk6ho4wne1E= github.com/anchore/go-version v1.2.2-0.20200701162849-18adb9c92b9b/go.mod h1:Bkc+JYWjMCF8OyZ340IMSIi2Ebf3uwByOk6ho4wne1E=
github.com/anchore/packageurl-go v0.1.1-0.20240507183024-848e011fc24f h1:B/E9ixKNCasntpoch61NDaQyGPDXLEJlL+B9B/PbdbA= github.com/anchore/packageurl-go v0.1.1-0.20241018175412-5c22e6360c4f h1:dAQPIrQ3a5PBqZeZ+B9NGZsGmodk4NO9OjDIsQmQyQM=
github.com/anchore/packageurl-go v0.1.1-0.20240507183024-848e011fc24f/go.mod h1:Blo6OgJNiYF41ufcgHKkbCKF2MDOMlrqhXv/ij6ocR4= github.com/anchore/packageurl-go v0.1.1-0.20241018175412-5c22e6360c4f/go.mod h1:KoYIv7tdP5+CC9VGkeZV4/vGCKsY55VvoG+5dadg4YI=
github.com/anchore/stereoscope v0.0.5-0.20241015153345-9e57bce5efeb h1:yCFQfICLjqx2CK7Tjmxb+gj0OlZx1sRKnHOpKF3tsh8= github.com/anchore/stereoscope v0.0.5-0.20241015153345-9e57bce5efeb h1:yCFQfICLjqx2CK7Tjmxb+gj0OlZx1sRKnHOpKF3tsh8=
github.com/anchore/stereoscope v0.0.5-0.20241015153345-9e57bce5efeb/go.mod h1:pTHFcI/hFgBQ1R1fljEG1WMQavBRjuzgi+sZ4jotwko= github.com/anchore/stereoscope v0.0.5-0.20241015153345-9e57bce5efeb/go.mod h1:pTHFcI/hFgBQ1R1fljEG1WMQavBRjuzgi+sZ4jotwko=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=

2
syft/pkg/cataloger/alpine/package_test.go
View file

@ -112,7 +112,7 @@ func Test_PackageURL(t *testing.T) {
ID: "alpine", ID: "alpine",
VersionID: "3.4.6", VersionID: "3.4.6",
}, },
expected: "pkg:apk/alpine/p@v?arch=a&upstream=origin&distro=alpine-3.4.6", expected: "pkg:apk/alpine/p@v?arch=a&distro=alpine-3.4.6&upstream=origin",
}, },
{ {
name: "wolfi distro", name: "wolfi distro",

2
syft/pkg/cataloger/arch/package_test.go
View file

@ -108,7 +108,7 @@ func Test_PackageURL(t *testing.T) {
ID: "arch", ID: "arch",
BuildID: "rolling", BuildID: "rolling",
}, },
expected: "pkg:alpm/arch/p@v?arch=a&upstream=origin&distro=arch-rolling", expected: "pkg:alpm/arch/p@v?arch=a&distro=arch-rolling&upstream=origin",
}, },
} }

4
syft/pkg/cataloger/debian/package_test.go
View file

@ -81,7 +81,7 @@ func Test_packageURL(t *testing.T) {
Source: "s", Source: "s",
Version: "v", Version: "v",
}, },
expected: "pkg:deb/debian/p@v?upstream=s&distro=debian-11", expected: "pkg:deb/debian/p@v?distro=debian-11&upstream=s",
}, },
{ {
name: "with upstream qualifier with source pkg name and version info", name: "with upstream qualifier with source pkg name and version info",
@ -98,7 +98,7 @@ func Test_packageURL(t *testing.T) {
Version: "v", Version: "v",
SourceVersion: "2.3", SourceVersion: "2.3",
}, },
expected: "pkg:deb/debian/p@v?upstream=s%402.3&distro=debian-11", expected: "pkg:deb/debian/p@v?distro=debian-11&upstream=s%402.3",
}, },
} }

4
syft/pkg/cataloger/redhat/package_test.go
View file

@ -43,7 +43,7 @@ func Test_packageURL(t *testing.T) {
Release: "r", Release: "r",
Epoch: intRef(1), Epoch: intRef(1),
}, },
expected: "pkg:rpm/centos/p@v-r?arch=a&epoch=1&distro=centos-7", expected: "pkg:rpm/centos/p@v-r?arch=a&distro=centos-7&epoch=1",
}, },
{ {
name: "missing distro", name: "missing distro",
@ -67,7 +67,7 @@ func Test_packageURL(t *testing.T) {
Release: "r", Release: "r",
SourceRpm: "sourcerpm", SourceRpm: "sourcerpm",
}, },
expected: "pkg:rpm/redhat/p@v-r?upstream=sourcerpm&distro=rhel-8.4", expected: "pkg:rpm/redhat/p@v-r?distro=rhel-8.4&upstream=sourcerpm",
}, },
} }

2
syft/pkg/language_test.go
View file

@ -87,7 +87,7 @@ func TestLanguageFromPURL(t *testing.T) {
want: Lua, want: Lua,
}, },
{ {
purl: "pkg:opam/ocaml-base-compiler@ 5.2.0", purl: "pkg:opam/ocaml-base-compiler@5.2.0",
want: OCaml, want: OCaml,
}, },
} }