Change library parse error log (fanal#85)

Co-authored-by: Teppei Fukuda <[email protected]>

Author: masahiro331

analyzer/analyzer.go

@@ -151,7 +151,7 @@ func GetPackages(filesMap extractor.FileMap) ([]Package, error) {
 		if err != nil && err == ErrNoPkgsDetected {
 			continue
 		} else if err != nil {
-			return nil, xerrors.Errorf("failed to analyze packages: %w", err)
+			return nil, xerrors.Errorf("failed to get packages: %w", err)
 		}
 		return pkgs, nil
 	}
@@ -178,7 +178,7 @@ func GetLibraries(filesMap extractor.FileMap) (map[FilePath][]godeptypes.Library
 	for _, analyzer := range libAnalyzers {
 		libMap, err := analyzer.Analyze(filesMap)
 		if err != nil {
-			return nil, xerrors.Errorf("failed to analyze libraries: %w", err)
+			return nil, xerrors.Errorf("failed to get libraries: %w", err)
 		}
 
 		for filePath, libs := range libMap {

analyzer/library/bundler/bundler.go

@@ -31,7 +31,7 @@ func (a bundlerLibraryAnalyzer) Analyze(fileMap extractor.FileMap) (map[analyzer
 		r := bytes.NewBuffer(content)
 		libs, err := bundler.Parse(r)
 		if err != nil {
-			return nil, xerrors.Errorf("invalid Gemfile.lock format: %w", err)
+			return nil, xerrors.Errorf("error with %s: %w", filename, err)
 		}
 		libMap[analyzer.FilePath(filename)] = libs
 	}

analyzer/library/cargo/cargo.go

@@ -31,7 +31,7 @@ func (a cargoLibraryAnalyzer) Analyze(fileMap extractor.FileMap) (map[analyzer.F
 		r := bytes.NewBuffer(content)
 		libs, err := cargo.Parse(r)
 		if err != nil {
-			return nil, xerrors.Errorf("invalid Cargo.lock format: %w", err)
+			return nil, xerrors.Errorf("error with %s: %w", filename, err)
 		}
 		libMap[analyzer.FilePath(filename)] = libs
 	}

analyzer/library/composer/composer.go

@@ -31,7 +31,7 @@ func (a composerLibraryAnalyzer) Analyze(fileMap extractor.FileMap) (map[analyze
 		r := bytes.NewBuffer(content)
 		libs, err := composer.Parse(r)
 		if err != nil {
-			return nil, xerrors.Errorf("invalid composer.lock format: %w", err)
+			return nil, xerrors.Errorf("error with %s: %w", filename, err)
 		}
 		libMap[analyzer.FilePath(filename)] = libs
 	}

analyzer/library/npm/npm.go

@@ -31,7 +31,7 @@ func (a npmLibraryAnalyzer) Analyze(fileMap extractor.FileMap) (map[analyzer.Fil
 		r := bytes.NewBuffer(content)
 		libs, err := npm.Parse(r)
 		if err != nil {
-			return nil, xerrors.Errorf("invalid package-lock.json format: %w", err)
+			return nil, xerrors.Errorf("error with %s: %w", filename, err)
 		}
 		libMap[analyzer.FilePath(filename)] = libs
 	}

analyzer/library/pipenv/pipenv.go

@@ -31,7 +31,7 @@ func (a pipenvLibraryAnalyzer) Analyze(fileMap extractor.FileMap) (map[analyzer.
 		r := bytes.NewBuffer(content)
 		libs, err := pipenv.Parse(r)
 		if err != nil {
-			return nil, xerrors.Errorf("invalid Pipfile.lock format: %w", err)
+			return nil, xerrors.Errorf("error with %s: %w", filename, err)
 		}
 		libMap[analyzer.FilePath(filename)] = libs
 	}

analyzer/library/poetry/poetry.go

@@ -31,7 +31,7 @@ func (a poetryLibraryAnalyzer) Analyze(fileMap extractor.FileMap) (map[analyzer.
 		r := bytes.NewBuffer(content)
 		libs, err := poetry.Parse(r)
 		if err != nil {
-			return nil, xerrors.Errorf("invalid poetry.lock format: %w", err)
+			return nil, xerrors.Errorf("error with %s: %w", filename, err)
 		}
 		libMap[analyzer.FilePath(filename)] = libs
 	}

analyzer/library/yarn/yarn.go

@@ -33,7 +33,7 @@ func (a yarnLibraryAnalyzer) Analyze(fileMap extractor.FileMap) (map[analyzer.Fi
 		r := bytes.NewBuffer(content)
 		libs, err := yarn.Parse(r)
 		if err != nil {
-			return nil, xerrors.Errorf("invalid yarn.lock format: %w", err)
+			return nil, xerrors.Errorf("error with %s: %w", filename, err)
 		}
 		libMap[analyzer.FilePath(filename)] = libs
 	}