Skip to content

Commit 72de007

Browse files
committed
fix: switch scanner to using new config methods
1 parent b256cea commit 72de007

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

pkg/osvscanner/osvscanner.go

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,17 @@ func filterIgnoredPackages(r reporter.Reporter, packages []scannedPackage, confi
967967
out := make([]scannedPackage, 0, len(packages))
968968
for _, p := range packages {
969969
configToUse := configManager.Get(r, p.Source.Path)
970-
if ignore, ignoreLine := configToUse.ShouldIgnorePackageVersion(p.Name, p.Version, string(p.Ecosystem)); ignore {
970+
if ignore, ignoreLine := configToUse.ShouldIgnorePackage(
971+
models.PackageVulns{
972+
Package: models.PackageInfo{
973+
Name: p.Name,
974+
Version: p.Version,
975+
Ecosystem: string(p.Ecosystem),
976+
Commit: p.Commit,
977+
},
978+
DepGroups: p.DepGroups,
979+
},
980+
); ignore {
971981
pkgString := fmt.Sprintf("%s/%s/%s", p.Ecosystem, p.Name, p.Version)
972982
r.Infof("Package %s has been filtered out because: %s\n", pkgString, ignoreLine.Reason)
973983

pkg/osvscanner/vulnerability_result.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func buildVulnerabilityResults(
6868
}
6969
if actions.ScanLicensesSummary || len(actions.ScanLicensesAllowlist) > 0 {
7070
configToUse := configManager.Get(r, rawPkg.Source.Path)
71-
if override, entry := configToUse.ShouldOverridePackageVersionLicense(pkg.Package.Name, pkg.Package.Version, pkg.Package.Ecosystem); override {
71+
if override, entry := configToUse.ShouldOverridePackageLicense(pkg); override {
7272
overrideLicenses := make([]models.License, len(entry.License.Override))
7373
for j, license := range entry.License.Override {
7474
overrideLicenses[j] = models.License(license)

0 commit comments

Comments
 (0)