Skip to content

Commit ee9a3b0

Browse files
kotakanbeclaude
andcommitted
fix: address Copilot review round 2 on PR #2476
- Remove unused parserRustBinary constant (dispatch returns parserGoBinary for all executables, language determined at parse time) - Make suffix-based dispatch case-insensitive (.deps.json, gradle.lockfile) for cross-platform compatibility - Aggregate parse errors into l.warns so they surface in scan results - Remove unused fanal blank imports from golden test file Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 7921854 commit ee9a3b0

File tree

3 files changed

+6
-30
lines changed

3 files changed

+6
-30
lines changed

scanner/analyze_golden_test.go

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,6 @@ import (
1111
"strings"
1212
"testing"
1313

14-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/c/conan"
15-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/dart/pub"
16-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/dotnet/deps"
17-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/dotnet/nuget"
18-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/dotnet/packagesprops"
19-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/elixir/mix"
20-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/golang/binary"
21-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/golang/mod"
22-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/java/gradle"
23-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/java/pom"
24-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/nodejs/bun"
25-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/nodejs/npm"
26-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/nodejs/pnpm"
27-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/nodejs/yarn"
28-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/php/composer"
29-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/python/pip"
30-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/python/pipenv"
31-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/python/poetry"
32-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/python/uv"
33-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/ruby/bundler"
34-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/rust/cargo"
35-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/swift/cocoapods"
36-
_ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/swift/swift"
37-
_ "github.com/future-architect/vuls/scanner/trivy/jar"
38-
3914
"github.com/future-architect/vuls/models"
4015
)
4116

scanner/base.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,7 @@ func (l *base) scanLibraries() (err error) {
722722
libraryScanners, err := AnalyzeLibrary(context.Background(), abspath, contents, filemode, l.ServerInfo.Mode.IsOffline())
723723
if err != nil {
724724
l.log.Warnf("Failed to analyze library %s: %+v", abspath, err)
725+
l.warns = append(l.warns, err)
725726
continue
726727
}
727728
for _, libscanner := range libraryScanners {

scanner/dispatch.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ const (
3939
parserMix parserType = "mix"
4040
parserCocoapods parserType = "cocoapods"
4141
parserSwift parserType = "swift"
42-
parserRustBinary parserType = "rust-binary"
4342
)
4443

4544
// detectParserType determines which parser should handle a given file,
@@ -127,14 +126,15 @@ func detectParserType(filePath string, filemode os.FileMode) parserType {
127126
return parserSwift
128127
}
129128

130-
// Suffix-based matches
131-
if strings.HasSuffix(filePath, ".deps.json") {
129+
// Suffix-based matches (case-insensitive for cross-platform compatibility)
130+
lowerPath := strings.ToLower(filePath)
131+
if strings.HasSuffix(lowerPath, ".deps.json") {
132132
return parserDotnetDeps
133133
}
134-
if strings.HasSuffix(strings.ToLower(filePath), "packages.props") {
134+
if strings.HasSuffix(lowerPath, "packages.props") {
135135
return parserPackagesProps
136136
}
137-
if strings.HasSuffix(filePath, "gradle.lockfile") {
137+
if strings.HasSuffix(lowerPath, "gradle.lockfile") {
138138
return parserGradle
139139
}
140140

0 commit comments

Comments
 (0)