-
Notifications
You must be signed in to change notification settings - Fork 314
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(Scanner): Apply detectedLicenseMapping
to FossId findings
#7537
fix(Scanner): Apply detectedLicenseMapping
to FossId findings
#7537
Conversation
a97eefb
to
662757e
Compare
96cdd5c
to
c5db772
Compare
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## main #7537 +/- ##
=========================================
Coverage 68.02% 68.02%
Complexity 2023 2023
=========================================
Files 343 343
Lines 16723 16723
Branches 2371 2371
=========================================
Hits 11375 11375
Misses 4364 4364
Partials 984 984
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
92cd8af
to
fb82e67
Compare
detectedLicenseMapping
to package scannersdetectedLicenseMapping
to FossId findings
fb82e67
to
1385d27
Compare
Sorry for having broken this. The intention of my commit was to "centralize" the mapping on the scanner-level, I just accidentally only applied it to path scanners. With FossId being a package scanner, can't we do the same centralization for package scanners (or even more ideally, for any scanner) instead of only applying it to FossId? |
I tried that. See: https://github.com/oss-review-toolkit/ort/compare/fb82e67c4972fc1e707a3c0735336206bd2e1b74..1385d27ac7ce6d1c22e4dec19e1bea26a704b88d (the removed code). This was not working in my tests. |
I looked at the diff and am really surprised that it didn't work, I don't understand why it shouldn't. I would be fine with merging this as a quick fix, but could you please add a TODO comment that the mapping of licenses should be moved to a central location? |
1385d27
to
a97d4ea
Compare
While the `detectedLicenseMapping`s are globally applied for the other scanners, these mappings are not applied for FossId. This is because FossId works different from other scanners as a "remote" scanner. Apply the mappings to FossId results as well. This fixes a regression introduced in cdecb9b. Signed-off-by: Marcel Bochtler <[email protected]>
a97d4ea
to
c35212f
Compare
While the
detectedLicenseMapping
s are globally applied for the otherscanners, these mappings are not applied for FossId. This is because
FossId works different from other scanners as a "remote" scanner.
Apply the mappings to FossId results as well. This fixes a regression
introduced in cdecb9b.