chore: rebase adjustments and conan docs updates

Update docs/docs/coverage/language/c.md Co-authored-by: Teppei Fukuda <[email protected]>
aquasecurity · Apr 25, 2024 · 3fb527e · 3fb527e
1 parent a4c2085
commit 3fb527e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/docs/docs/coverage/language/c.md b/docs/docs/coverage/language/c.md
@@ -10,9 +10,10 @@ The following scanners are supported.
 
 The following table provides an outline of the features Trivy offers.
 
-| Package manager | File           | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position |
-|-----------------|----------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|
-| Conan           | conan.lock[^1] |            ✓ [^3]       |     Excluded     |                  ✓                   |    ✓     |
+| Package manager       | File           | Transitive dependencies | Dev dependencies | [Dependency graph][dependency-graph] | Position |
+|-----------------------|----------------|:-----------------------:|:----------------:|:------------------------------------:|:--------:|
+| Conan (lockfile v1)   | conan.lock[^2] |            ✓            |     Excluded     |                  ✓                   |    ✓     |
+| Conan (lockfile v2)   | conan.lock[^2] |            ✓ [^3]       |     Excluded     |                  -                   |    ✓     |
 
 ## Conan
 In order to detect dependencies, Trivy searches for `conan.lock`[^1].

diff --git a/pkg/dependency/parser/c/conan/parse.go b/pkg/dependency/parser/c/conan/parse.go
@@ -43,7 +43,6 @@ type Parser struct {
 	logger *log.Logger
 }
 
-
 func NewParser() types.Parser {
 	return &Parser{
 		logger: log.WithPrefix("conan"),
@@ -108,7 +107,7 @@ func (p *Parser) parseV2(lock LockFile) ([]types.Library, []types.Dependency, er
 	for _, req := range lock.Requires {
 		lib, err := toLibrary(req.Dependency, req.StartLine, req.EndLine)
 		if err != nil {
-			log.Logger.Debug(err)
+			p.logger.Debug("Creating library entry from requirement failed", err)
 			continue
 		}
 
@@ -130,11 +129,11 @@ func (p *Parser) Parse(r xio.ReadSeekerAt) ([]types.Library, []types.Dependency,
 
 	// try to parse requirements as conan v1.x
 	if lock.GraphLock.Nodes != nil {
-		log.Logger.Debug("Handling conan lockfile as v1.x")
+		p.logger.Debug("Handling conan lockfile as v1.x")
 		return p.parseV1(lock)
 	} else {
 		// try to parse requirements as conan v2.x
-		log.Logger.Debug("Handling conan lockfile as v2.x")
+		p.logger.Debug("Handling conan lockfile as v2.x")
 		return p.parseV2(lock)
 	}
 }