gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-05 20:40:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correctly check for semver versions for trivy version check (#8948)

Browse Source
This commit is contained in:
simar7
2025-05-30 11:20:18 -06:00
committed by GitHub
parent c29bb21973
commit b813527449
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/notification/notice.go
View File

@@ -10,6 +10,7 @@ import (
"strings"
"time"
"github.com/aquasecurity/go-version/pkg/semver"
"github.com/aquasecurity/trivy/pkg/log"
"github.com/aquasecurity/trivy/pkg/version/app"
)
@@ -140,8 +141,18 @@ func (v *VersionChecker) PrintNotices(output io.Writer) {
}
}
if v.currentVersion != v.LatestVersion() {
notices = append(notices, fmt.Sprintf("Version %s of Trivy is now available, current version is %s", v.latestVersion.Trivy.LatestVersion, v.currentVersion))
cv, err := semver.Parse(strings.TrimPrefix(v.currentVersion, "v"))
if err != nil {
return
}
lv, err := semver.Parse(strings.TrimPrefix(v.LatestVersion(), "v"))
if err != nil {
return
}
if cv.LessThan(lv) {
notices = append(notices, fmt.Sprintf("Version %s of Trivy is now available, current version is %s", lv, cv))
}
if len(notices) > 0 {

7
pkg/notification/notice_test.go
View File

@@ -29,6 +29,13 @@ func TestPrintNotices(t *testing.T) {
responseExpected: true,
expectedOutput: "\n📣 \x1b[34mNotices:\x1b[0m\n - Version 0.60.0 of Trivy is now available, current version is 0.58.0\n\nTo suppress version checks, run Trivy scans with the --skip-version-check flag\n\n",
},
{
name: "New version available but includes a prefixed version number",
options: []Option{WithCurrentVersion("0.58.0")},
latestVersion: "v0.60.0",
responseExpected: true,
expectedOutput: "\n📣 \x1b[34mNotices:\x1b[0m\n - Version 0.60.0 of Trivy is now available, current version is 0.58.0\n\nTo suppress version checks, run Trivy scans with the --skip-version-check flag\n\n",
},
{
name: "new version available but --quiet mode enabled",
options: []Option{