External/pmg
1
0
Fork 0
mirror of https://github.com/safedep/pmg.git synced 2026-08-03 07:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Show error messages on fatal failures #32 (#34)

Browse Source 
* fix: Show error messages on fatal failures #32

* test: Add E2E test

* test: fix E2E scripts

* test: fix E2E scripts

* fix: Race condition in concurrent analyzer

* fix: update formatting to ensure docs URL is clickable

Signed-off-by: Sahil Bansal <bansalsahil315@gmail.com>

* fix: E2E test

---------

Signed-off-by: Sahil Bansal <bansalsahil315@gmail.com>
Co-authored-by: Sahil Bansal <bansalsahil315@gmail.com>
This commit is contained in:
Abhisek Datta
2025-05-17 21:54:47 +05:30
committed by GitHub
co-authored by Sahil Bansal
parent b85f77cfbc
commit 4031219375
12 changed files with 215 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/npm/common.go
-77
View File
@@ -1,77 +0,0 @@
package npm
import (
"context"
"fmt"
"github.com/safedep/pmg/analyzer"
"github.com/safedep/pmg/config"
"github.com/safedep/pmg/guard"
"github.com/safedep/pmg/internal/ui"
"github.com/safedep/pmg/packagemanager"
)
func executeCommonFlow(ctx context.Context, config config.Config, pm packagemanager.PackageManager, args []string) error {
packageResolverConfig := packagemanager.NewDefaultNpmDependencyResolverConfig()
packageResolverConfig.IncludeTransitiveDependencies = config.Transitive
packageResolverConfig.TransitiveDepth = config.TransitiveDepth
packageResolverConfig.IncludeDevDependencies = config.IncludeDevDependencies
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
if err != nil {
return fmt.Errorf("failed to create npm dependency resolver: %w", err)
}
var analyzers []analyzer.PackageVersionAnalyzer
if config.Paranoid {
malysisActiveScanAnalyzer, err := analyzer.NewMalysisActiveScanAnalyzer(analyzer.DefaultMalysisActiveScanAnalyzerConfig())
if err != nil {
return fmt.Errorf("failed to create malysis active scan analyzer: %w", err)
}
analyzers = append(analyzers, malysisActiveScanAnalyzer)
} else {
malysisQueryAnalyzer, err := analyzer.NewMalysisQueryAnalyzer(analyzer.MalysisQueryAnalyzerConfig{})
if err != nil {
return fmt.Errorf("failed to create malysis query analyzer: %w", err)
}
analyzers = append(analyzers, malysisQueryAnalyzer)
}
interaction := guard.PackageManagerGuardInteraction{
SetStatus: ui.SetStatus,
ClearStatus: ui.ClearStatus,
GetConfirmationOnMalware: ui.GetConfirmationOnMalware,
Block: ui.Block,
}
guardConfig := guard.DefaultPackageManagerGuardConfig()
guardConfig.DryRun = config.DryRun
proxy, err := guard.NewPackageManagerGuard(guardConfig, pm, packageResolver, analyzers, interaction)
if err != nil {
return fmt.Errorf("failed to create package manager guard: %w", err)
}
return proxy.Run(ctx, args)
}
func executeNpmFlow(ctx context.Context, config config.Config, args []string) error {
packageManager, err := packagemanager.NewNpmPackageManager(packagemanager.DefaultNpmPackageManagerConfig())
if err != nil {
return fmt.Errorf("failed to create npm package manager: %w", err)
}
return executeCommonFlow(ctx, config, packageManager, args)
}
func executePnpmFlow(ctx context.Context, config config.Config, args []string) error {
packageManager, err := packagemanager.NewNpmPackageManager(packagemanager.DefaultPnpmPackageManagerConfig())
if err != nil {
return fmt.Errorf("failed to create pnpm package manager: %w", err)
}
return executeCommonFlow(ctx, config, packageManager, args)
}
cmd/npm/npm.go
+13 -7
View File
@@ -1,11 +1,13 @@
package npm
import (
"context"
_ "embed"
"github.com/safedep/dry/log"
"github.com/safedep/pmg/config"
"github.com/safedep/pmg/internal/flows"
"github.com/safedep/pmg/internal/ui"
"github.com/safedep/pmg/packagemanager"
"github.com/spf13/cobra"
)
@@ -15,12 +17,7 @@ func NewNpmCommand() *cobra.Command {
Short: "Guard npm package manager",
DisableFlagParsing: true,
RunE: func(cmd *cobra.Command, args []string) error {
config, err := config.FromContext(cmd.Context())
if err != nil {
ui.Fatalf("Failed to get config: %s", err)
}
err = executeNpmFlow(cmd.Context(), config, args)
err := executeNpmFlow(cmd.Context(), args)
if err != nil {
log.Errorf("Failed to execute npm flow: %s", err)
}
@@ -29,3 +26,12 @@ func NewNpmCommand() *cobra.Command {
},
}
}
func executeNpmFlow(ctx context.Context, args []string) error {
packageManager, err := packagemanager.NewNpmPackageManager(packagemanager.DefaultNpmPackageManagerConfig())
if err != nil {
ui.Fatalf("Failed to create npm package manager proxy: %s", err)
}
return flows.Common(packageManager).Run(ctx, args)
}
cmd/npm/pnpm.go
+13 -7
View File
@@ -1,11 +1,13 @@
package npm
import (
"context"
_ "embed"
"github.com/safedep/dry/log"
"github.com/safedep/pmg/config"
"github.com/safedep/pmg/internal/flows"
"github.com/safedep/pmg/internal/ui"
"github.com/safedep/pmg/packagemanager"
"github.com/spf13/cobra"
)
@@ -15,12 +17,7 @@ func NewPnpmCommand() *cobra.Command {
Short: "Guard pnpm package manager",
DisableFlagParsing: true,
RunE: func(cmd *cobra.Command, args []string) error {
config, err := config.FromContext(cmd.Context())
if err != nil {
ui.Fatalf("Failed to get config: %s", err)
}
err = executePnpmFlow(cmd.Context(), config, args)
err := executePnpmFlow(cmd.Context(), args)
if err != nil {
log.Errorf("Failed to execute pnpm flow: %s", err)
}
@@ -29,3 +26,12 @@ func NewPnpmCommand() *cobra.Command {
},
}
}
func executePnpmFlow(ctx context.Context, args []string) error {
packageManager, err := packagemanager.NewNpmPackageManager(packagemanager.DefaultPnpmPackageManagerConfig())
if err != nil {
ui.Fatalf("Failed to create pnpm package manager proxy: %s", err)
}
return flows.Common(packageManager).Run(ctx, args)
}