-
Notifications
You must be signed in to change notification settings - Fork 383
OSADL project-license check improvements #11996
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
Open
sschuberth
wants to merge
3
commits into
main
Choose a base branch
from
osadl-project-license-check-imps
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| graph TD | ||
| Root["my-oss-project (outbound license)"] | ||
|
|
||
| Root --> Core[core:1.2.0] | ||
| Root --> Utils[utils:3.0.1] | ||
|
|
||
| Core --> Auth[auth:2.1.0] | ||
| Core --> Database[database:4.0.0] | ||
| Utils --> JSON[json:1.1.5] | ||
|
|
||
| Auth --> Crypto[crypto:1.0.2] | ||
| Database --> Pool[pool:2.5.0] | ||
|
|
||
| classDef default fill:#5CB85C,stroke:#333,stroke-width:1px,color:#fff; | ||
| classDef root fill:#4A90E2,stroke:#333,stroke-width:2px,color:#fff; | ||
|
|
||
| class Root root; | ||
|
|
||
| Core -- inbound license --> Root | ||
| Utils -. inbound license .-> Root | ||
| Auth -. inbound license .-> Root | ||
| Database -. inbound license .-> Root | ||
| JSON -. inbound license .-> Root | ||
| Crypto -. inbound license .-> Root | ||
| Pool -. inbound license .-> Root |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,7 @@ | |
| // | ||
| // Use this rule like: | ||
| // | ||
| // $ ort evaluate -i scanner/src/funTest/resources/scanner-integration-all-pkgs-expected-ort-result.yml --rules-resource /rules/osadl.rules.kts | ||
| // $ ort evaluate -i scanner/src/funTest/resources/scanner-integration-all-pkgs-expected-ort-result.yml --rules-resource /rules/project-license.rules.kts | ||
|
|
||
| import org.ossreviewtoolkit.evaluator.osadl.Compatibility | ||
| import org.ossreviewtoolkit.evaluator.osadl.CompatibilityMatrix | ||
|
|
@@ -37,7 +37,7 @@ val ruleSet = ruleSet(ortResult, licenseInfoResolver) { | |
| val licenseView = LicenseView.CONCLUDED_OR_DECLARED_AND_DETECTED | ||
|
|
||
| // Define a rule that is executed for each dependency. | ||
| dependencyRule("OSADL_MATRIX_COMPATIBILITY") { | ||
| dependencyRule("OSADL_PROJECT_LICENSE_DEPENDENCY_RULE") { | ||
| // Requirements for the rule to trigger a violation. | ||
| require { | ||
| -isExcluded() | ||
|
|
@@ -49,7 +49,7 @@ val ruleSet = ruleSet(ortResult, licenseInfoResolver) { | |
| val outboundLicenses = projectLicenseInfo.licenses.map { it.license } | ||
|
|
||
| // Define a rule that is executed for each license of the dependency. | ||
| licenseRule("OSADL_PROJECT_LICENSE_COMPATIBILITY", licenseView) { | ||
| licenseRule("OSADL_PROJECT_LICENSE_RULE", licenseView) { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't get the idea why the new name is better. The intention is to check if license in any dependency is compatible with the project license. So, the name before fit better? |
||
| // Requirements for the rule to trigger a violation. | ||
| require { | ||
| -isExcluded() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In
ort-configwe always use the same name for the outer rule and the innder rule, and outer and inner always correspond to the "same" rule.Should we follow this pattern here too?
Imho this is less misleading, as currently this is IIUC semantically just one rule, and no potentially flagged violation would ever use
"OSADL_PROJECT_LICENSE_DEPENDENCY_RULE"as the source.What do you think?