Skip to content

Commit 3bc1490

Browse files
aqua-botorizerah
andauthored
fix: using SrcVersion instead of Version for echo detector [backport: release/v0.67] (#9629)
Co-authored-by: Ori <[email protected]>
1 parent 542eee7 commit 3bc1490

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

pkg/detector/ospkg/echo/echo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (s *Scanner) Detect(ctx context.Context, _ string, _ *ftypes.Repository, pk
3636
if err != nil {
3737
return nil, xerrors.Errorf("failed to get echo advisories: %w", err)
3838
}
39-
formattedInstalledVersion := utils.FormatVersion(pkg)
39+
formattedInstalledVersion := utils.FormatSrcVersion(pkg)
4040
installedVersion, err := version.NewVersion(formattedInstalledVersion)
4141
if err != nil {
4242
return nil, xerrors.Errorf("failed to parse installed version: %w", err)

pkg/detector/ospkg/echo/echo_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ func TestScanner_Detect(t *testing.T) {
152152
SrcName: "nginx",
153153
SrcVersion: "1.14.2",
154154
Release: "1ubuntu1",
155+
SrcRelease: "1ubuntu1",
155156
Layer: ftypes.Layer{
156157
DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
157158
},
@@ -163,6 +164,7 @@ func TestScanner_Detect(t *testing.T) {
163164
Version: "2.4.24",
164165
SrcVersion: "2.4.24",
165166
Release: "2",
167+
SrcRelease: "2",
166168
Layer: ftypes.Layer{
167169
DiffID: "sha256:932da51564135c98a49a34a193d6cd363d8fa4184d957fde16c9d8527b3f3b02",
168170
},
@@ -226,7 +228,7 @@ func TestScanner_Detect(t *testing.T) {
226228
name: "happy path - no matching packages",
227229
args: args{
228230
pkgs: []ftypes.Package{
229-
{ID: "echo", Version: "1.0.0"},
231+
{ID: "echo", Version: "1.0.0", SrcVersion: "1.0.0", SrcName: "echo"},
230232
},
231233
},
232234
want: nil,
@@ -239,7 +241,7 @@ func TestScanner_Detect(t *testing.T) {
239241
},
240242
args: args{
241243
pkgs: []ftypes.Package{
242-
{SrcName: "apache2", Version: "1.0.0"},
244+
{SrcName: "apache2", Version: "1.0.0", SrcVersion: "1.0.0"},
243245
},
244246
},
245247
wantErr: "failed to get echo advisories",

0 commit comments

Comments
 (0)