Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: oss-review-toolkit/ort
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: doubleopen-project/ort
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: door
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
4 contributors

Commits on Jun 9, 2024

  1. scanner: Add basic DOS integration

    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    af56227 View commit details

  2. scanner: scanPath() implementation can now be started 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    113e289 View commit details

  3. get presigned URL from DOS

    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    b2e6ff0 View commit details

  4. scanner: added DOS client 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    40f02e1 View commit details

  5. scanner: presigned URL 1st implementation, doesn't work yet 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    134926b View commit details

  6. scanner: presigned URL fetching from DOS API 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    47d30a0 View commit details

  7. scanner: Add zipping of the directory to scan 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    bbed35d View commit details

  8. scanner: Upload packet to S3 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    9090b85 View commit details

  9. scanner: Delete the uploaded packet from local storage 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    bceb4f0 View commit details

  10. Changed DOS scanner to PackageScannerWrapper interface 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    4b39cf3 View commit details

  11. scanner: local cleanup after S3 upload 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    1564ed1 View commit details

  12. scanner: fix DOS scanner class definition 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    3e2a5f4 View commit details

  13. scanner-dos: first dummy implementation of scan results request and r… 

    …esponse

Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    74ce25f View commit details

  14. scanner-dos: Notify DOS API about new package and get a folder in S3 … 

    …to scan

Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    6c3bb74 View commit details

  15. scanner-dos: Refactor some DOS code 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    088aa4e View commit details

  16. scanner-dos: Clean up 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    c17b824 View commit details

  17. scanner-dos: Add scanjob to DOS API (backend) 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    f1bcb80 View commit details

  18. scanner-dos: Add periodical polling of scanjob results from DOS API 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    1bc81a6 View commit details

  19. scanner-dos: Add configuration class for the scanner 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    224c7cc View commit details

  20. scanner-dos: Clean up the configuration and copyright info 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    5b58313 View commit details

  21. scanner-dos: Implement result parser for scan results returned by DOS… 

    … API

Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    be505ed View commit details

  22. scanner-dos: safety measures for getPresignedUrl() and uploadFile() 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    31faef9 View commit details

  23. scanner-dos: Safety measures for getScanResults() 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    9126f6d View commit details

  24. scanner-dos: Wrap network calls into Response<> and handle responses … 

    …properly

Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    172a1f4 View commit details

  25. scanner-dos: Add time elapsed info to scanner's log messages 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    315c86e View commit details

  26. scanner-dos: Retrofit2 interface unified with REST endpoint names 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    ff42077 View commit details

  27. scanner-dos: Some changes to REST API to comply with changes in DOS API 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    72d602f View commit details

  28. scanner-dos: Returning real results from DOS API, generating summary … 

    …and ORT result

Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    699b4b6 View commit details

  29. scanner-dos: Changes in /scan-results endpoint: also pending job is n… 

    …ow handled

Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    9aa0c25 View commit details

  30. scanner-dos: Add authorization for the network calls 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    52961bb View commit details

  31. scanner-dos: Clean up unused imports and commented code lines 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    a319328 View commit details

  32. scanner-dos: Survive empty results due to backend failure 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    259a258 View commit details

  33. scanner-dos: Add a general 'backend issue' to the return 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    5dbfcf7 View commit details

  34. scanner-dos: Add specific issues for backend failures 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    cb35a64 View commit details

  35. scanner-dos: Check response to scan job request and act accordingly

    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    be4558d View commit details

  36. scanner-dos: Simplify /package and /job endpoints 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    2913582 View commit details

  37. scanner-dos: Add REST timeout to scanner configuration 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    e063a3f View commit details

  38. scanner-dos: Recover from licenses/copyrights = null until better ref… 

    …actoring of DOS Scanner is done

Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    edf5fad View commit details

  39. scanner-dos: Clean up logging 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    ef78b62 View commit details

  40. scanner-dos: Implement refactoring functions 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    a5a637e View commit details

  41. scanner-dos: Refactor 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    f9df37b View commit details

  42. scanner-dos: REST changes at network layer 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    ce690a7 View commit details

  43. scanner-dos: REST changes at data layer 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    24dd05c View commit details

  44. scanner-dos: remove unneeded function from DOS Scanner 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    a421328 View commit details

  45. scanner-dos: REST changes at DOS Scanner 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    30383e6 View commit details

  46. scanner-dos: Change logging to better show the status of backend scan 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    9c72ef2 View commit details

  47. scanner-dos: Change logs to be clear they are coming from a new scan 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    a5a4cd1 View commit details

  48. scanner-dos: Receive and log scan issues returned from DOS API 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    9552edb View commit details

  49. scanner-dos: Added empty DOS test class 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    77db14d View commit details

  50. scanner-dos: Add skeleton for first unit test 

    Signed-off-by: Etsija <jyrki.keisala@gmail.com>
    @Etsija @sschuberth
    Etsija authored and sschuberth committed Jun 9, 2024
    Copy the full SHA
    c4b61f9 View commit details
2 changes: 2 additions & 0 deletions .github/workflows/static-analysis.yml
View file
Original file line number Diff line number Diff line change
@@ -4,9 +4,11 @@ on:
pull_request:
branches:
- main
- door
push:
branches:
- main
- door

env:
GRADLE_OPTS: -Dorg.gradle.daemon=false
26 changes: 26 additions & 0 deletions .github/workflows/test-door.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Test the Door

on:
pull_request:
branches:
- door

env:
GRADLE_OPTS: -Dorg.gradle.daemon=false

jobs:
test:
runs-on: ubuntu-22.04
steps:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
- name: Run unit tests
uses: gradle/gradle-build-action@v2
with:
gradle-home-cache-cleanup: true
arguments: :plugins:scanners:dos:test
Binary file removed .idea/icon.png
View file
Binary file not shown.
Binary file removed .idea/icon_dark.png
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion plugins/scanners/dos/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -37,7 +37,8 @@ dependencies {

implementation(libs.bundles.kotlinxSerialization)
implementation(libs.kotlinx.coroutines)
implementation(libs.log4j.api)
implementation(projects.clients.dosClient)
implementation(projects.downloader)

testImplementation(libs.mockk)
testImplementation(libs.wiremock)