Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Various fixes related to path includes #10762

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

Draft
nnobelis wants to merge 4 commits into oss-review-toolkit:main
base: main
Choose a base branch
Loading
from boschglobal:nnobelis/add_includes_to_webapp_report

Conversation

Copy link
Member

@nnobelis nnobelis commented Aug 22, 2025
edited
Loading

This PR contains some of the change still required for #10347.

Please have a look at the individual commit messages for the details.

image

@tsteenbe With these changes, the includes are rendered in the WebApp report: when a result is excluded due to the presence of includes, all includes are rendered in the collapsible section under it, with the mention (includes).

Copy link

codecov bot commented Aug 22, 2025
edited
Loading

Codecov Report

❌ Patch coverage is 86.04651% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 57.47%. Comparing base (6dd73f5) to head (bfb62c7).

Files with missing lines Patch % Lines
model/src/main/kotlin/licenses/ResolvedLicense.kt 0.00% 5 Missing ⚠️
...main/kotlin/licenses/DefaultLicenseInfoProvider.kt 75.00% 1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@
## main #10762 +/- ##
============================================
+ Coverage 57.38% 57.47% +0.09% 
- Complexity 1673 1679 +6 
============================================
 Files 346 346 
 Lines 12759 12796 +37 
 Branches 1209 1212 +3 
============================================
+ Hits 7322 7355 +33 
- Misses 4972 4976 +4 
 Partials 465 465 
Flag Coverage Δ
funTest-docker 71.15% <ø> (ø)
test-ubuntu-24.04 42.07% <86.04%> (+0.17%) ⬆️
test-windows-2025 42.05% <86.04%> (+0.17%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@nnobelis nnobelis force-pushed the nnobelis/add_includes_to_webapp_report branch from 790f7ae to 31679d2 Compare August 22, 2025 10:16
Signed-off-by: Nicolas Nobelis <nicolas.nobelis@bosch.com>
...model
Signed-off-by: Nicolas Nobelis <nicolas.nobelis@bosch.com>
...udes
Signed-off-by: Nicolas Nobelis <nicolas.nobelis@bosch.com>
Signed-off-by: Nicolas Nobelis <nicolas.nobelis@bosch.com>
@nnobelis nnobelis force-pushed the nnobelis/add_includes_to_webapp_report branch from 31679d2 to bfb62c7 Compare August 22, 2025 13:09
@nnobelis nnobelis marked this pull request as ready for review August 25, 2025 05:07
@nnobelis nnobelis requested review from a team and tsteenbe as code owners August 25, 2025 05:07
val pathIncludes = input.ortResult.getIncludes().findPathIncludes(project, input.ortResult)
val dependencies = input.ortResult.dependencyNavigator.projectDependencies(project)
if (pathExcludes.isEmpty()) {
if (pathExcludes.isEmpty()&& pathIncludes.isEmpty()) {
Copy link
Member

@mnonnenmacher mnonnenmacher Sep 3, 2025

Choose a reason for hiding this comment

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

I think there is a problem here: pathIncludes.isEmpty() can mean two things:

  • There are no path includes defined at all so this project is included.
  • There are path includes but none match this project so it is excluded.

I wonder if for the case that no path includes are defined at all, Includes should return a default path include which matches ** to make the usage unambiguous.

Copy link
Member Author

@nnobelis nnobelis Sep 3, 2025

Choose a reason for hiding this comment

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

I am not too sure about this.

I also experimented with null to reflect the tri-state, and is the end I went with a separated boolean isExcludedByPathIncludes in EvaluatedFinding.

Maybe we can discuss this in the Community meeting.

Copy link
Member

@fviernau fviernau Sep 30, 2025
edited
Loading

Choose a reason for hiding this comment

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

Am I right that semantics is as follows: A file is included, if it is not matched by any exclude OR if it is matched by at least one include and an arbitrary amount of excludes?

Copy link
Member

@mnonnenmacher mnonnenmacher Sep 30, 2025
edited
Loading

Choose a reason for hiding this comment

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

No, excludes always win. A file is included when: (there are no includes defined (which means include all) OR it is matched by an include) AND it is not matched by an exclude.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mnonnenmacher mnonnenmacher mnonnenmacher left review comments

@fviernau fviernau fviernau left review comments

@tsteenbe tsteenbe Awaiting requested review from tsteenbe tsteenbe is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /