Release version 0.5.0

.github/workflows/draft-new-release.yaml

@@ -38,56 +38,42 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/[email protected]
-      -
-        name: Create release branch
+      - name: Create release branch
         run: git checkout -b release/${{ github.event.inputs.version }}
-      -
-        name: Update changelog
-        uses: thomaseizinger/[email protected]
-        with:
-          tag: ${{ github.event.inputs.version }}
-      -
-        name: Initialize mandatory git config
+      - name: Initialize mandatory git config
         run: |
           git config user.name "eclipse-tractusx-bot"
           git config user.email "[email protected]"
-      -
-        uses: ./.github/actions/setup-java
-      -
-        name: Bump version in gradle.properties
+      - uses: ./.github/actions/setup-java
+      - name: Bump version in gradle.properties
         run: |-
-           # replace the project's (default) version, could be overwritten later with the -Pversion=... flag
-           sed -i  's/version=.*/version=${{ github.event.inputs.version }}/g' gradle.properties
+          # replace the project's (default) version, could be overwritten later with the -Pversion=... flag
+          sed -i  's/version=.*/version=${{ github.event.inputs.version }}/g' gradle.properties
         env:
           GITHUB_PACKAGE_USERNAME: ${{ github.actor }}
           GITHUB_PACKAGE_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Bump version in /charts
+      - name: Bump version in /charts
         uses: mikefarah/[email protected]
         with:
           cmd: |-
             find charts -name Chart.yaml -maxdepth 3 | xargs -n1 yq -i '.appVersion = "${{ github.event.inputs.version }}" | .version = "${{ github.event.inputs.version }}"'
-      -
-        name: Update Chart READMEs
+      - name: Update Chart READMEs
         uses: addnab/docker-run-action@v3
         with:
           image: jnorwood/helm-docs:v1.10.0
           options: -v ${{ github.workspace }}/charts:/helm-docs
           run: |
             helm-docs --log-level debug
-      -
-        name: Commit changelog and manifest files
+      - name: Commit manifest files
         id: make-commit
         run: |
-          git add CHANGELOG.md gradle.properties $(find charts -name Chart.yaml) $(find charts -name README.md)
+          git add gradle.properties $(find charts -name Chart.yaml) $(find charts -name README.md)
           git commit --message "Prepare release ${{ github.event.inputs.version }}"
 
           echo "commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-      -
-        name: Push new branch
+      - name: Push new branch
         run: git push origin release/${{ github.event.inputs.version }}
-      -
-        name: Create pull request
+      - name: Create pull request
         uses: thomaseizinger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -98,6 +84,6 @@ jobs:
           reviewers: ${{ github.actor }}
           body: |-
             This PR was created in response to a manual trigger of the [release workflow](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}).
-            The changelog was updated and versions have been bumped in [commit ${{ steps.make-commit.outputs.commit }}](${{ steps.make-commit.outputs.commit }}).
+            Versions have been bumped in [commit ${{ steps.make-commit.outputs.commit }}](${{ steps.make-commit.outputs.commit }}).
 
             Merging this PR will create a GitHub release and upload any assets that are created as part of the release build.

.github/workflows/helm-lint.yaml

@@ -41,41 +41,35 @@ jobs:
   helm-lint:
     runs-on: ubuntu-latest
     steps:
-    ##############
-    ### Set-Up ###
-    ##############
-    -
-      uses: actions/[email protected]
-      with:
-        fetch-depth: 0
-    -
-      name: helm (setup)
-      uses: azure/[email protected]
-      with:
-        version: v3.8.1
-    -
-      name: python (setup)
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.7
-    -
-      name: chart-testing (setup)
-      uses: helm/[email protected]
-    #####################
-    ### Chart Testing ###
-    #####################
-    -
-      name: chart-testing (list-changed)
-      id: list-changed
-      run: |
-        changed=$(ct list-changed --config ct.yaml --target-branch main)
-        if [[ -n "$changed" ]]; then
-          echo "changed=true" >> $GITHUB_OUTPUT
-        fi
-    -
-      name: chart-testing (lint)
-      if: steps.list-changed.outputs.changed == 'true'
-      run: |
-        ct lint \
-          --config ct.yaml \
-          --all
+      ##############
+      ### Set-Up ###
+      ##############
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+      - name: helm (setup)
+        uses: azure/[email protected]
+        with:
+          version: v3.8.1
+      - name: python (setup)
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.7
+      - name: chart-testing (setup)
+        uses: helm/[email protected]
+      #####################
+      ### Chart Testing ###
+      #####################
+      - name: chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --config ct.yaml --target-branch main)
+          if [[ -n "$changed" ]]; then
+            echo "changed=true" >> $GITHUB_OUTPUT
+          fi
+      - name: chart-testing (lint)
+        if: steps.list-changed.outputs.changed == 'true'
+        run: |
+          ct lint \
+            --config ct.yaml \
+            --all

.github/workflows/kics.yml

@@ -22,9 +22,9 @@ name: "KICS"
 
 on:
   push:
-    branches: [main, releases]
+    branches: [ main, releases ]
   pull_request:
-    branches: [main, releases]
+    branches: [ main, releases ]
   workflow_dispatch:
 
   schedule:

.github/workflows/publish-new-release.yml

@@ -36,24 +36,21 @@ jobs:
     outputs:
       RELEASE_VERSION: ${{ steps.release-version.outputs.RELEASE_VERSION }}
     steps:
-      -
-        name: Extract version from branch name (for release branches)
+      - name: Extract version from branch name (for release branches)
         if: startsWith(github.event.pull_request.head.ref, 'release/')
         run: |
           BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
           VERSION=${BRANCH_NAME#release/}
 
           echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
-      -
-        name: Extract version from branch name (for hotfix branches)
+      - name: Extract version from branch name (for hotfix branches)
         if: startsWith(github.event.pull_request.head.ref, 'hotfix/')
         run: |
           BRANCH_NAME="${{ github.event.pull_request.head.ref }}"
           VERSION=${BRANCH_NAME#hotfix/}
 
           echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
-      -
-        name: Output release version
+      - name: Output release version
         id: release-version
         run: |
           echo "RELEASE_VERSION=${{ env.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
@@ -102,12 +99,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: [{dir: edc-controlplane, img: edc-runtime-memory},
-                {dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault},
-                {dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault},
-                {dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault},
-                {dir: edc-dataplane,    img: edc-dataplane-azure-vault},
-                {dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault}]
+        variant: [ { dir: edc-controlplane, img: edc-runtime-memory },
+                   { dir: edc-controlplane, img: edc-controlplane-memory-hashicorp-vault },
+                   { dir: edc-controlplane, img: edc-controlplane-postgresql-hashicorp-vault },
+                   { dir: edc-controlplane, img: edc-controlplane-postgresql-azure-vault },
+                   { dir: edc-dataplane,    img: edc-dataplane-azure-vault },
+                   { dir: edc-dataplane,    img: edc-dataplane-hashicorp-vault } ]
 
     steps:
       - uses: actions/[email protected]
@@ -136,21 +133,17 @@ jobs:
 
     if: github.event.pull_request.merged == true && needs.release-version.outputs.RELEASE_VERSION
     steps:
-      -
-        name: Export RELEASE_VERSION env
+      - name: Export RELEASE_VERSION env
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
-      -
-        uses: actions/[email protected]
+      - uses: actions/[email protected]
         with:
           fetch-depth: 0
-      -
-        name: Install Helm
+      - name: Install Helm
         uses: azure/[email protected]
         with:
           version: v3.8.1
-      -
-        name: Package helm, update index.yaml and push to gh-pages
+      - name: Package helm, update index.yaml and push to gh-pages
         run: |
           # Prepare git env
           git config user.name "eclipse-tractusx-bot"
@@ -183,17 +176,14 @@ jobs:
       pull-requests: write
     if: github.event.pull_request.merged == true && needs.release-version.outputs.RELEASE_VERSION
     steps:
-      -
-        name: Export RELEASE_VERSION env
+      - name: Export RELEASE_VERSION env
         run: |
           echo "RELEASE_VERSION=${{ needs.release-version.outputs.RELEASE_VERSION }}" >> $GITHUB_ENV
-      -
-        uses: actions/[email protected]
+      - uses: actions/[email protected]
         with:
           # 0 to fetch the full history due to upcoming merge of releases into main branch
           fetch-depth: 0
-      -
-        name: Create Release Tag
+      - name: Create Release Tag
         id: create_release_tag
         run: |
           # Prepare git env
@@ -207,22 +197,16 @@ jobs:
           # Create & push tag
           git tag --force ${{ env.RELEASE_VERSION }}
           git push --force origin ${{ env.RELEASE_VERSION }}
-      -
-        name: Create Github Release
-        id: create_release
-        uses: thomaseizinger/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Create GitHub Release
+        uses: ncipollo/release-action@v1
         with:
-          target_commitish: ${{ github.event.pull_request.merge_commit_sha }}
-          tag_name: ${{ env.RELEASE_VERSION }}
-          name: ${{ env.RELEASE_VERSION }}
-          draft: false
-          prerelease: false
-      -
-        uses: ./.github/actions/setup-java
-      -
-        name: Merge releases back into main and set new snapshot version
+          generateReleaseNotes: true
+          tag: ${{ env.RELEASE_VERSION }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          makeLatest: true
+          removeArtifacts: true
+      - uses: ./.github/actions/setup-java
+      - name: Merge releases back into main and set new snapshot version
         if: github.event.pull_request.base.ref == 'releases'
         run: |
           # Prepare git env

.github/workflows/verify.yaml

@@ -70,7 +70,7 @@ jobs:
       - uses: ./.github/actions/setup-java
       - name: Download latest Eclipse Dash
         run: |
-            curl -L https://repo.eclipse.org/service/local/artifact/maven/redirect\?r\=dash-licenses\&g\=org.eclipse.dash\&a\=org.eclipse.dash.licenses\&v\=LATEST --output dash.jar
+          curl -L https://repo.eclipse.org/service/local/artifact/maven/redirect\?r\=dash-licenses\&g\=org.eclipse.dash\&a\=org.eclipse.dash.licenses\&v\=LATEST --output dash.jar
       - name: Regenerate DEPENDENCIES
         run: |
           # dash returns a nonzero exit code if there are libs that need review. the "|| true" avoids that
@@ -187,9 +187,8 @@ jobs:
       - name: Run Postgresql E2E tests
         run: ./gradlew test -DincludeTags="PostgresqlIntegrationTest"
 
-  ssi-integration-tests:
+  miw-integration-tests:
     runs-on: ubuntu-latest
-    continue-on-error: true
     needs: [ verify-formatting, verify-license-headers ]
 
     steps:
@@ -199,7 +198,30 @@ jobs:
       - uses: actions/checkout@v2
       - name: Starting MIW, Keycloak and Postgres Servers
         run: |
-          docker compose -f edc-tests/e2e-tests/src/test/resources/docker-compose.yml up -d 
+          cd edc-tests/miw-tests/src/test/resources/docker-environment
+          docker compose up --wait
 
-      - name: Run MIW E2E tests
-        run: ./gradlew test -DincludeTags="MiwIntegrationTest"
+      - uses: nick-fields/retry@v2
+        name: Wait for MIW
+        with:
+          timeout_minutes: 5
+          max_attempts: 3
+          command: |
+            code=$(curl -IL -sw "%{http_code}" http://localhost:8000/api/actuator/health -o /dev/null)
+            if [ "$code" -ne "401" ]; then
+              echo "MIW not ready yet, status = $code"
+              exit 1;
+            fi
+
+      - name: Seed test data
+        run: |
+          docker exec docker-environment-postgres-1 /opt/seed.sh
+
+      - name: Run MIW Integration tests
+        run: | 
+          ./gradlew -p edc-tests/miw-tests test -DincludeTags="MiwIntegrationTest" -PverboseTest=true
+      - name: Run SSI E2E tests
+        run: |
+          pwd
+          ./gradlew compileJava compileTestJava
+          ./gradlew -p edc-tests/e2e-tests test -DincludeTags="MiwIntegrationTest" -PverboseTest=true

.gitignore

@@ -109,3 +109,5 @@ buildNumber.properties
 ### Helm
 **/*.lock
 **/*.tgz
+
+edc-tests/miw-tests/src/test/resources/docker-environment/postgres_data/