Skip to content

Migrate SCANOSS implementation to use SCANOSS SDK #10265

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 5, 2025
Merged

Migrate SCANOSS implementation to use SCANOSS SDK #10265

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
497788c
refactor(scanoss): Remove path anonymization from SCANOSS implementation
isasmendiagus Mar 25, 2025
ff0224c
refactor(scanoss): Replace direct API calls with SCANOSS SDK
isasmendiagus Mar 25, 2025
e5571b4
refactor(scanoss): Set SCANOSS matcher property to null
isasmendiagus Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions plugins/scanners/scanoss/src/main/kotlin/ScanOss.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import org.ossreviewtoolkit.plugins.api.PluginDescriptor
import org.ossreviewtoolkit.scanner.PathScannerWrapper
import org.ossreviewtoolkit.scanner.ScanContext
import org.ossreviewtoolkit.scanner.ScannerMatcher
import org.ossreviewtoolkit.scanner.ScannerMatcherConfig
import org.ossreviewtoolkit.scanner.ScannerWrapperFactory

@OrtPlugin(
Expand All @@ -57,17 +56,7 @@ class ScanOss(

override val configuration = ""

override val matcher by lazy {
ScannerMatcher.create(
details,
ScannerMatcherConfig(
config.regScannerName,
config.minVersion,
config.maxVersion,
configuration
)
)
}
override val matcher: ScannerMatcher? = null
Copy link
Member

@mnonnenmacher mnonnenmacher May 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@isasmendiagus You should also change the property below to override val readFromStorage = false and remove the readFromStorage property from the config class, like it is also done in FossId.
I'm not requesting a change because you can also do it separately.

Copy link
Contributor Author

@isasmendiagus isasmendiagus May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't seen that. I'll implement the change on PR #10287

Copy link
Member

@sschuberth sschuberth May 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@isasmendiagus, please create a separate PR for this, as I want to get this in earlier than our discussion about the report generation PR will come to a conclusion.

Copy link
Member

@sschuberth sschuberth May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #10291.


override val readFromStorage = config.readFromStorage

Expand Down
Loading