fix the fluent-bit regex detection pattern (#3817)

Signed-off-by: Yuntao Hu <victorhu493@gmail.com>
This commit is contained in:
VictorHuu 2025-04-25 23:50:45 +08:00 committed by GitHub
parent 22d8b30813
commit fa599547a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 1 deletions

View File

@ -1243,6 +1243,17 @@ func Test_Cataloger_PositiveCases(t *testing.T) {
Metadata: metadata("fluent-bit-binary"), Metadata: metadata("fluent-bit-binary"),
}, },
}, },
{
logicalFixture: "fluent-bit/1.3.10/linux-arm",
expected: pkg.Package{
Name: "fluent-bit",
Version: "1.3.10",
Type: "binary",
PURL: "pkg:github/fluent/fluent-bit@1.3.10",
Locations: locations("fluent-bit"),
Metadata: metadata("fluent-bit-binary"),
},
},
{ {
logicalFixture: "wp/2.9.0/linux-amd64", logicalFixture: "wp/2.9.0/linux-amd64",
expected: pkg.Package{ expected: pkg.Package{

View File

@ -573,7 +573,8 @@ func DefaultClassifiers() []Classifier {
// [NUL]2.2.3[NUL]Fluent Bit // [NUL]2.2.3[NUL]Fluent Bit
// [NUL]2.2.1[NUL][NUL][NUL]Fluent Bit // [NUL]2.2.1[NUL][NUL][NUL]Fluent Bit
// [NUL]1.7.0[NUL]\x1b[1m[NUL]%sFluent Bit (versions 1.7.0-dev-3 through 1.7.0-dev-9 and 1.7.0-rc4 through 1.7.0-rc8) // [NUL]1.7.0[NUL]\x1b[1m[NUL]%sFluent Bit (versions 1.7.0-dev-3 through 1.7.0-dev-9 and 1.7.0-rc4 through 1.7.0-rc8)
`\x00(?P<version>[0-9]+\.[0-9]+\.[0-9]+)\x00(\x1b\[1m\x00|\x00\x00)?(%s)?Fluent`, // [NUL][NUL]1.3.10[NUL][NUL]Fluent Bit v%s
`\x00(\x00)?(?P<version>[0-9]+\.[0-9]+\.[0-9]+)\x00(\x1b\[1m\x00|\x00|\x00\x00)?(%s)?Fluent`,
), ),
Package: "fluent-bit", Package: "fluent-bit",
PURL: mustPURL("pkg:github/fluent/fluent-bit@version"), PURL: mustPURL("pkg:github/fluent/fluent-bit@version"),

View File

@ -701,6 +701,13 @@ from-images:
paths: paths:
- /fluent-bit/bin/fluent-bit - /fluent-bit/bin/fluent-bit
- version: 1.3.10
images:
- ref: fluent/fluent-bit:1.3.10@sha256:98b32ef90c3ee3f6981b2cf31b70dc7d6104c9800b7287d4758318e0c19f96a9
platform: linux/arm
paths:
- /fluent-bit/bin/fluent-bit
- name: openssl - name: openssl
version: 1.1.1w version: 1.1.1w
images: images: