From e184e914a3c2005e6c6d7f856a5e24208dc4844c Mon Sep 17 00:00:00 2001 From: Sahil Bansal Date: Mon, 28 Jul 2025 18:03:29 +0530 Subject: [PATCH] fix: improve error wrapping & preserving the error (#57) --- extractor/npm.go | 12 ++++++------ extractor/pypi.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extractor/npm.go b/extractor/npm.go index 3f0da9a..5df8a45 100644 --- a/extractor/npm.go +++ b/extractor/npm.go @@ -37,7 +37,7 @@ func parseNpmPackageLockFile(lockfilePath, scanDir string) ([]*packagev1.Package file, err := os.Open(lockfilePath) if err != nil { - return nil, fmt.Errorf("failed to open lockfile: %s", err) + return nil, fmt.Errorf("failed to open lockfile: %w", err) } defer file.Close() @@ -49,7 +49,7 @@ func parseNpmPackageLockFile(lockfilePath, scanDir string) ([]*packagev1.Package inventory, err := packagelockExtractor.Extract(context.Background(), inputConfig) if err != nil { - return nil, fmt.Errorf("failed to extract packages: %s", err) + return nil, fmt.Errorf("failed to extract packages: %w", err) } var packages []*packagev1.PackageVersion @@ -93,7 +93,7 @@ func parsePnpmLockFile(lockfilePath, scanDir string) ([]*packagev1.PackageVersio file, err := os.Open(lockfilePath) if err != nil { - return nil, fmt.Errorf("failed to open lockfile: %s", err) + return nil, fmt.Errorf("failed to open lockfile: %w", err) } defer file.Close() @@ -105,7 +105,7 @@ func parsePnpmLockFile(lockfilePath, scanDir string) ([]*packagev1.PackageVersio inventory, err := pnpmLockExtractor.Extract(context.Background(), inputConfig) if err != nil { - return nil, fmt.Errorf("failed to extract packages: %s", err) + return nil, fmt.Errorf("failed to extract packages: %w", err) } var packages []*packagev1.PackageVersion @@ -148,7 +148,7 @@ func parseBunPackageLockFile(lockfilePath, scanDir string) ([]*packagev1.Package file, err := os.Open(lockfilePath) if err != nil { - return nil, fmt.Errorf("failed to open lockfile: %s", err) + return nil, fmt.Errorf("failed to open lockfile: %w", err) } defer file.Close() @@ -160,7 +160,7 @@ func parseBunPackageLockFile(lockfilePath, scanDir string) ([]*packagev1.Package inventory, err := bunlockExtractor.Extract(context.Background(), inputConfig) if err != nil { - return nil, fmt.Errorf("failed to extract packages: %s", err) + return nil, fmt.Errorf("failed to extract packages: %w", err) } var packages []*packagev1.PackageVersion diff --git a/extractor/pypi.go b/extractor/pypi.go index 25d58cb..3f71d13 100644 --- a/extractor/pypi.go +++ b/extractor/pypi.go @@ -35,7 +35,7 @@ func parseRequirementsTxtFile(lockfilePath, scanDir string) ([]*packagev1.Packag file, err := os.Open(lockfilePath) if err != nil { - return nil, fmt.Errorf("failed to open lockfile: %s", err) + return nil, fmt.Errorf("failed to open lockfile: %w", err) } defer file.Close() @@ -47,7 +47,7 @@ func parseRequirementsTxtFile(lockfilePath, scanDir string) ([]*packagev1.Packag inventory, err := requirementsExtractor.Extract(context.Background(), inputConfig) if err != nil { - return nil, fmt.Errorf("failed to extract packages: %s", err) + return nil, fmt.Errorf("failed to extract packages: %w", err) } var packages []*packagev1.PackageVersion