admin/aquasecurity-trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2026-01-31 13:53:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(misconf): reduce log noise on incompatible check (#9029)

Browse Source
This commit is contained in:
simar7
2025-06-19 23:57:44 -06:00
committed by GitHub
parent 371b8cc02f
commit 99c5151d6e
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/iac/rego/load.go
View File

@@ -344,6 +344,15 @@ func moduleHasLegacyInputFormat(module *ast.Module) bool {
// filterModules filters the Rego modules based on metadata.
func (s *Scanner) filterModules() error {
filtered := make(map[string]*ast.Module)
tv, tverr := semver.Parse(s.trivyVersion)
if tverr != nil && s.trivyVersion != "dev" {
s.logger.Warn(
"Failed to parse Trivy version - cannot confirm if all modules will work with current version",
log.String("trivy_version", s.trivyVersion),
log.Err(tverr),
)
}
for name, module := range s.policies {
metadata, err := s.metadataForModule(context.Background(), name, module, nil)
if err != nil {
@@ -351,15 +360,7 @@ func (s *Scanner) filterModules() error {
}
if metadata != nil {
tv, err := semver.Parse(s.trivyVersion)
if err != nil {
s.logger.Warn(
"Failed to parse Trivy version - cannot confirm if module will work with current version",
log.String("trivy_version", s.trivyVersion),
log.FilePath(module.Package.Location.File),
log.Err(err),
)
} else if !s.IsMinimumVersionSupported(metadata, module, tv) {
if tverr == nil && !s.IsMinimumVersionSupported(metadata, module, tv) {
continue
}

6
pkg/iac/rego/load_test.go
View File

@@ -319,6 +319,12 @@ func TestIsMinimumTrivyVersion(t *testing.T) {
MinimumTrivyVersion: "",
expectedResults: 1,
},
{
name: "trivy version is dev",
trivyVersion: "dev",
MinimumTrivyVersion: "1.2.3",
expectedResults: 1,
},
}
for _, tc := range testCases {