Skip to content

ScanSummary: Do not use sorted set for licenseFindings #7004

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

Merged
merged 4 commits into from
May 16, 2023

Conversation

fviernau
Copy link
Member

@fviernau fviernau commented May 16, 2023

See individual commits.

Part of #6235, also needed by #6945.

Breaking change: If you rely on LicenseFindings being comparable in the rules.kts or notifications.kts scripts, you'll have to adjust your scripts.

@fviernau fviernau requested a review from a team as a code owner May 16, 2023 13:06
@fviernau fviernau enabled auto-merge (rebase) May 16, 2023 13:06
@fviernau fviernau force-pushed the license-findings-set branch from 7ef307b to e957db5 Compare May 16, 2023 13:07
@fviernau fviernau force-pushed the license-findings-set branch from e957db5 to a964529 Compare May 16, 2023 13:52
@fviernau fviernau requested a review from sschuberth May 16, 2023 13:52
@codecov
Copy link

codecov bot commented May 16, 2023

Codecov Report

Patch coverage: 70.00% and project coverage change: -0.01 ⚠️

Comparison is base (1604522) 64.30% compared to head (0862259) 64.29%.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #7004      +/-   ##
============================================
- Coverage     64.30%   64.29%   -0.01%     
  Complexity     1970     1970              
============================================
  Files           331      331              
  Lines         16692    16694       +2     
  Branches       2382     2382              
============================================
  Hits          10734    10734              
- Misses         4921     4923       +2     
  Partials       1037     1037              
Flag Coverage Δ
funTest-non-docker 29.72% <55.55%> (-0.02%) ⬇️
test 40.09% <40.00%> (-0.01%) ⬇️

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

Impacted Files Coverage Δ
...main/kotlin/commands/SubtractScanResultsCommand.kt 0.00% <0.00%> (ø)
model/src/main/kotlin/utils/SortedSetConverters.kt 0.00% <0.00%> (ø)
...in/kotlin/provenance/NestedProvenanceScanResult.kt 83.16% <100.00%> (ø)
scanner/src/main/kotlin/scanners/Askalono.kt 86.04% <100.00%> (ø)
scanner/src/main/kotlin/scanners/BoyterLc.kt 87.50% <100.00%> (ø)
scanner/src/main/kotlin/scanners/Licensee.kt 86.04% <100.00%> (ø)
scanner/src/main/kotlin/scanners/fossid/FossId.kt 75.00% <100.00%> (ø)
...n/kotlin/scanners/scancode/ScanCodeResultParser.kt 86.41% <100.00%> (ø)
...ain/kotlin/scanners/scanoss/ScanOssResultParser.kt 82.27% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@fviernau fviernau force-pushed the license-findings-set branch from a964529 to cff8724 Compare May 16, 2023 14:30
sschuberth
sschuberth previously approved these changes May 16, 2023
fviernau added 4 commits May 16, 2023 17:39
Only sort on serialization for human readability and reproducibility.

Signed-off-by: Frank Viernau <[email protected]>
Returning a sorted set is no more necessary, because `ScanSummary` has
been changed in a preceeding change to use a set for the copyright
findings.

Signed-off-by: Frank Viernau <[email protected]>
Using a mutable one is not needed.

Signed-off-by: Frank Viernau <[email protected]>
Make the code consistent with the function below.

Signed-off-by: Frank Viernau <[email protected]>
@fviernau fviernau requested a review from sschuberth May 16, 2023 15:39
@fviernau fviernau force-pushed the license-findings-set branch from 7a019c5 to 0862259 Compare May 16, 2023 15:40
@fviernau fviernau merged commit 2073b79 into main May 16, 2023
@fviernau fviernau deleted the license-findings-set branch May 16, 2023 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants