Skip to content

Commit d76feba

Browse files
fix(dotnet): show nuget package dir not found log only when checking nuget packages (#7194)
Co-authored-by: knqyf263 <[email protected]>
1 parent 8d5ba3f commit d76feba

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

pkg/fanal/analyzer/language/dotnet/nuget/nuget.go

+6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/aquasecurity/trivy/pkg/fanal/analyzer"
1818
"github.com/aquasecurity/trivy/pkg/fanal/analyzer/language"
1919
"github.com/aquasecurity/trivy/pkg/fanal/types"
20+
"github.com/aquasecurity/trivy/pkg/log"
2021
"github.com/aquasecurity/trivy/pkg/utils/fsutils"
2122
)
2223

@@ -39,19 +40,24 @@ type nugetLibraryAnalyzer struct {
3940
lockParser language.Parser
4041
configParser language.Parser
4142
licenseParser nuspecParser
43+
logger *log.Logger
4244
}
4345

4446
func newNugetLibraryAnalyzer(_ analyzer.AnalyzerOptions) (analyzer.PostAnalyzer, error) {
4547
return &nugetLibraryAnalyzer{
4648
lockParser: lock.NewParser(),
4749
configParser: config.NewParser(),
4850
licenseParser: newNuspecParser(),
51+
logger: log.WithPrefix("nuget"),
4952
}, nil
5053
}
5154

5255
func (a *nugetLibraryAnalyzer) PostAnalyze(_ context.Context, input analyzer.PostAnalysisInput) (*analyzer.AnalysisResult, error) {
5356
var apps []types.Application
5457
foundLicenses := make(map[string][]string)
58+
if a.licenseParser.packagesDir == "" {
59+
a.logger.Debug("The nuget packages directory couldn't be found. License search disabled")
60+
}
5561

5662
// We saved only config and lock files in the FS,
5763
// so we need to parse all saved files

pkg/fanal/analyzer/language/dotnet/nuget/nuget_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/aquasecurity/trivy/pkg/fanal/types"
1313
)
1414

15-
func Test_nugetibraryAnalyzer_Analyze(t *testing.T) {
15+
func Test_nugetLibraryAnalyzer_Analyze(t *testing.T) {
1616
tests := []struct {
1717
name string
1818
dir string

pkg/fanal/analyzer/language/dotnet/nuget/nuspec.go

-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"golang.org/x/xerrors"
1111

12-
"github.com/aquasecurity/trivy/pkg/log"
1312
"github.com/aquasecurity/trivy/pkg/utils/fsutils"
1413
)
1514

@@ -30,26 +29,21 @@ type License struct {
3029
}
3130

3231
type nuspecParser struct {
33-
logger *log.Logger
3432
packagesDir string // global packages folder - https: //learn.microsoft.com/en-us/nuget/consume-packages/managing-the-global-packages-and-cache-folders
3533
}
3634

3735
func newNuspecParser() nuspecParser {
38-
logger := log.WithPrefix("nuget")
39-
4036
// cf. https: //learn.microsoft.com/en-us/nuget/consume-packages/managing-the-global-packages-and-cache-folders
4137
packagesDir := os.Getenv("NUGET_PACKAGES")
4238
if packagesDir == "" {
4339
packagesDir = filepath.Join(os.Getenv("HOME"), ".nuget", "packages")
4440
}
4541

4642
if !fsutils.DirExists(packagesDir) {
47-
logger.Debug("The nuget packages directory couldn't be found. License search disabled")
4843
return nuspecParser{}
4944
}
5045

5146
return nuspecParser{
52-
logger: logger,
5347
packagesDir: packagesDir,
5448
}
5549
}

0 commit comments

Comments
 (0)