diff --git a/.github/workflows/irs-build.yml b/.github/workflows/irs-build.yml index f013d63385..0918fae1a3 100644 --- a/.github/workflows/irs-build.yml +++ b/.github/workflows/irs-build.yml @@ -173,3 +173,10 @@ jobs: username: ${{ secrets.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} repository: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }} + + trigger-trivy-image-scan: + if: >- + github.event_name != 'pull_request' + needs: + - build_images + uses: ./.github/workflows/trivy-docker-hub-scan.yml diff --git a/.github/workflows/trivy-docker-hub-scan.yml b/.github/workflows/trivy-docker-hub-scan.yml new file mode 100644 index 0000000000..1cf40378c2 --- /dev/null +++ b/.github/workflows/trivy-docker-hub-scan.yml @@ -0,0 +1,33 @@ +name: "Trivy vulnerability scanner for Docker Hub Image" + +on: + workflow_dispatch: # Trigger manually + workflow_call: # Trigger by another workflow + schedule: + - cron: "0 0 * * *" + +jobs: + image-scan: + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Run Trivy vulnerability scanner + uses: aquasecurity/trivy-action@master + with: + image-ref: 'tractusx/irs-api:latest' + format: 'sarif' + output: 'trivy-results.sarif' + + - run: cat trivy-results.sarif + + - name: Upload Trivy scan results to GitHub Security tab + uses: github/codeql-action/upload-sarif@v2 + with: + sarif_file: 'trivy-results.sarif' \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 172793e337..3b38f914ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [3.3.4] - 2023-08-24 +### Fixed +- Added missing license information to documentation and docker image + ## [3.3.3] - 2023-08-11 ### Changed - IRS now calls the entire dataplane URL retrieved from the registry href instead of building it from the URL of the EDC token and the path @@ -307,7 +311,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Unresolved - **Select Aspects you need** You are able to select the needed aspects for which you want to collect the correct endpoint information. -[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.3...HEAD +[Unreleased]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.4...HEAD +[3.3.4]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.3...3.3.4 [3.3.3]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.2...3.3.3 [3.3.2]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.1...3.3.2 [3.3.1]: https://github.com/eclipse-tractusx/item-relationship-service/compare/3.3.0...3.3.1 diff --git a/charts/irs-helm/.helmignore b/charts/irs-helm/.helmignore index c2701969e3..e3a0e85695 100644 --- a/charts/irs-helm/.helmignore +++ b/charts/irs-helm/.helmignore @@ -42,3 +42,7 @@ .idea/ *.tmproj .vscode/ + +# Accept only values.yaml +values?*.yaml +values?*.yml \ No newline at end of file diff --git a/charts/irs-helm/CHANGELOG.md b/charts/irs-helm/CHANGELOG.md index 259a38fff4..16a99c0a6e 100644 --- a/charts/irs-helm/CHANGELOG.md +++ b/charts/irs-helm/CHANGELOG.md @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [6.4.2] - 2023-08-11 +### Added +- Added entry to .helmignore to only accept values.yaml + +### Changed +- Update IRS version to 3.3.4 + ## [6.4.1] - 2023-08-11 ### Changed - Update IRS version to 3.3.3 diff --git a/charts/irs-helm/Chart.yaml b/charts/irs-helm/Chart.yaml index 65ed6cdb26..1975c76a8c 100644 --- a/charts/irs-helm/Chart.yaml +++ b/charts/irs-helm/Chart.yaml @@ -35,12 +35,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 6.4.1 +version: 6.4.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "3.3.3" +appVersion: "3.3.4" dependencies: - name: common repository: https://charts.bitnami.com/bitnami