refactor: unify package dependency resolution and improve PyPI version handling using registry adapter

This commit is contained in:
Sahilb315
2025-05-20 21:23:48 +05:30
parent 722ee05376
commit 0b4729f18b
9 changed files with 448 additions and 75 deletions
+10 -21
View File
@@ -11,37 +11,26 @@ import (
)
type commonFlow struct {
pm packagemanager.PackageManager
pm packagemanager.PackageManager
packageResolver packagemanager.PackageResolver
config config.Config
}
// Creates a common flow of execution for all package managers. This should work for most
// of the cases unless a package manager has its own unique requirements. Configuration
// should be passed through the context (Global Config)
func Common(pm packagemanager.PackageManager) *commonFlow {
func Common(pm packagemanager.PackageManager, pkgResolver packagemanager.PackageResolver, config config.Config) *commonFlow {
return &commonFlow{
pm: pm,
pm: pm,
packageResolver: pkgResolver,
config: config,
}
}
func (f *commonFlow) Run(ctx context.Context, args []string) error {
config, err := config.FromContext(ctx)
if err != nil {
ui.Fatalf("Failed to get config: %s", err)
}
packageResolverConfig := packagemanager.NewDefaultNpmDependencyResolverConfig()
packageResolverConfig.IncludeTransitiveDependencies = config.Transitive
packageResolverConfig.TransitiveDepth = config.TransitiveDepth
packageResolverConfig.IncludeDevDependencies = config.IncludeDevDependencies
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
if err != nil {
ui.Fatalf("Failed to create dependency resolver: %s", err)
}
var analyzers []analyzer.PackageVersionAnalyzer
if config.Paranoid {
if f.config.Paranoid {
malysisActiveScanAnalyzer, err := analyzer.NewMalysisActiveScanAnalyzer(analyzer.DefaultMalysisActiveScanAnalyzerConfig())
if err != nil {
ui.Fatalf("Failed to create malware analyzer: %s", err)
@@ -65,9 +54,9 @@ func (f *commonFlow) Run(ctx context.Context, args []string) error {
}
guardConfig := guard.DefaultPackageManagerGuardConfig()
guardConfig.DryRun = config.DryRun
guardConfig.DryRun = f.config.DryRun
proxy, err := guard.NewPackageManagerGuard(guardConfig, f.pm, packageResolver, analyzers, interaction)
proxy, err := guard.NewPackageManagerGuard(guardConfig, f.pm, f.packageResolver, analyzers, interaction)
if err != nil {
ui.Fatalf("Failed to create package manager guard: %s", err)
}