mirror of
https://github.com/anchore/syft
synced 2024-11-12 23:27:20 +00:00
fix: haproxy classifier for versions with -dev suffix (#3180)
Signed-off-by: witchcraze <witchcraze@gmail.com>
This commit is contained in:
parent
7c96a10cbe
commit
a343825685
4 changed files with 20 additions and 3 deletions
|
@ -359,7 +359,17 @@ func Test_Cataloger_PositiveCases(t *testing.T) {
|
||||||
Metadata: metadata("haproxy-binary"),
|
Metadata: metadata("haproxy-binary"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
logicalFixture: "haproxy/3.1-dev0/linux-amd64",
|
||||||
|
expected: pkg.Package{
|
||||||
|
Name: "haproxy",
|
||||||
|
Version: "3.1-dev0",
|
||||||
|
Type: "binary",
|
||||||
|
PURL: "pkg:generic/haproxy@3.1-dev0",
|
||||||
|
Locations: locations("haproxy"),
|
||||||
|
Metadata: metadata("haproxy-binary"),
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
logicalFixture: "helm/3.11.1/linux-amd64",
|
logicalFixture: "helm/3.11.1/linux-amd64",
|
||||||
expected: pkg.Package{
|
expected: pkg.Package{
|
||||||
|
|
|
@ -190,8 +190,8 @@ func DefaultClassifiers() []Classifier {
|
||||||
Class: "haproxy-binary",
|
Class: "haproxy-binary",
|
||||||
FileGlob: "**/haproxy",
|
FileGlob: "**/haproxy",
|
||||||
EvidenceMatcher: evidenceMatchers(
|
EvidenceMatcher: evidenceMatchers(
|
||||||
FileContentsVersionMatcher(`(?m)HA-Proxy version (?P<version>[0-9]+\.[0-9]+\.[0-9]+)`),
|
FileContentsVersionMatcher(`(?m)HA-Proxy version (?P<version>[0-9]+\.[0-9]+(\.|-dev)[0-9]+)`),
|
||||||
FileContentsVersionMatcher(`(?m)(?P<version>[0-9]+\.[0-9]+\.[0-9]+)-[0-9a-zA-Z]{7}.+HAProxy version`),
|
FileContentsVersionMatcher(`(?m)(?P<version>[0-9]+\.[0-9]+(\.|-dev)[0-9]+)-[0-9a-zA-Z]{7}.+HAProxy version`),
|
||||||
),
|
),
|
||||||
Package: "haproxy",
|
Package: "haproxy",
|
||||||
PURL: mustPURL("pkg:generic/haproxy@version"),
|
PURL: mustPURL("pkg:generic/haproxy@version"),
|
||||||
|
|
Binary file not shown.
|
@ -106,6 +106,13 @@ from-images:
|
||||||
paths:
|
paths:
|
||||||
- /usr/local/sbin/haproxy
|
- /usr/local/sbin/haproxy
|
||||||
|
|
||||||
|
- version: 3.1-dev0
|
||||||
|
images:
|
||||||
|
- ref: haproxy:3.1-dev0@sha256:eba1aac9aa6ea84869bd2ecae79792a934563fd731eddf724eb3b12ef6a9b93f
|
||||||
|
platform: linux/amd64
|
||||||
|
paths:
|
||||||
|
- /usr/local/sbin/haproxy
|
||||||
|
|
||||||
- version: 2.4.54
|
- version: 2.4.54
|
||||||
images:
|
images:
|
||||||
- ref: httpd:2.4.54@sha256:c13feaef62bdb03e65e645f47d9780adea5a080c78eb9e4b3c32e861327262b4
|
- ref: httpd:2.4.54@sha256:c13feaef62bdb03e65e645f47d9780adea5a080c78eb9e4b3c32e861327262b4
|
||||||
|
|
Loading…
Reference in a new issue