Merge pull request #120 from catenax-ng/feature/upgrade-tx-edc-060

feat: upgrade matchmaking agent to interact with edc 0.7; complete chart/deployment
eclipse-tractusx · May 22, 2024 · 05827e2 · 05827e2
2 parents 33bc479 + e2ba887
commit 05827e2
Show file tree

Hide file tree

Showing 62 changed files with 1,956 additions and 1,254 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#  Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -142,7 +142,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=1.12.18-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       # build in any case, but push only main and version tag settings
@@ -181,7 +181,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=1.12.18-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       # build in any case, but push only main and version tag settings
@@ -220,7 +220,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=1.12.18-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       # build in any case, but push only main and version tag settings
@@ -244,6 +244,24 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN || secrets.GITHUB_TOKEN }}
           repository: ${{ steps.set-docker-repo.outputs.REPO }}/provisioning-agent
 
+      # Create SemVer or ref tags dependent of trigger event
+      - name: Docker Meta Matchmaking
+        id: meta-match
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        with:
+          images: |
+            ${{ steps.set-docker-repo.outputs.REPO }}/matchmaking-agent
+          # Automatically prepare image tags; See action docs for more examples.
+          # semver patter will generate tags like these for example :1 :1.2 :1.2.3
+          tags: |
+            type=sha,event=branch
+            type=sha,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=1.12.19-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
+
       # build in any case, but push only main and version tag settings
       - name: Matchmaking Container Build and Push
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
@@ -252,8 +270,8 @@ jobs:
           file: matchmaking/src/main/docker/Dockerfile
           # Build image for verification purposes on every trigger event. Only push if event is not a PR
           push: ${{ ( github.event.inputs.deploy_docker == 'true' || github.ref == 'refs/heads/main' ||  startsWith(github.ref, 'refs/tags/v') ) }}
-          tags: ${{ steps.meta-remote.outputs.tags }}
-          labels: ${{ steps.meta-remote.outputs.labels }}
+          tags: ${{ steps.meta-match.outputs.tags }}
+          labels: ${{ steps.meta-match.outputs.labels }}
 
       # Important step to push image description to DockerHub - since this is version independent, we always take it from main
       - name: Update Docker Hub description for Matchmaking Agent
@@ -265,21 +283,3 @@ jobs:
           password: ${{ secrets.DOCKER_HUB_TOKEN || secrets.GITHUB_TOKEN }}
           repository: ${{ steps.set-docker-repo.outputs.REPO }}/matchmaking-agent
 
-      # Create SemVer or ref tags dependent of trigger event
-      - name: Docker Meta Matchmaking
-        id: meta-match
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
-        with:
-          images: |
-            ${{ steps.set-docker-repo.outputs.REPO }}/provisioning-agent
-          # Automatically prepare image tags; See action docs for more examples.
-          # semver patter will generate tags like these for example :1 :1.2 :1.2.3
-          tags: |
-            type=sha,event=branch
-            type=sha,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=1.12.18-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
-
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -1,5 +1,5 @@
 ###############################################################
-# Copyright (c) 2021, 2024 Contributors to the Eclipse Foundation
+# Copyright (c) 2021,2024 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/.github/workflows/helm-chart-release.yml b/.github/workflows/helm-chart-release.yml
@@ -1,6 +1,6 @@
 ---
 #
-#  Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+#  Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.

diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -1,6 +1,6 @@
 ---
 #
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#  Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.

diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -1,6 +1,6 @@
 ---
 #
-#  Copyright (c) 2021, 2023 Contributors to the Eclipse Foundation
+#  Copyright (c) 2021,2023 Contributors to the Eclipse Foundation
 #
 #  See the NOTICE file(s) distributed with this work for additional
 #  information regarding copyright ownership.

diff --git a/.gitignore b/.gitignore
@@ -35,7 +35,6 @@ __pycache__
 .classpath
 .project
 .settings/
-*.bak
 *cs-cleanup.xml
 *cs-formatter.xml
 .checkstyle

diff --git a/.tractusx b/.tractusx
@@ -1,5 +1,5 @@
 ###############################################################
-# Copyright (c) 2022, 2023 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,32 @@ All notable changes to this product will be documented in this file.
 
 # Released
 
+## [1.12.19] - 2024-05-17
+
+### Added
+
+- Matchmaking Agent: Carve-Out of the SPARQL-Processor from [Tractus-X EDC Agent Plane (KA-EDC)](http://github.com/eclipse-tractusx/knowledge-agents-edc) in order to hide graph data in the internal network.
+- Matchmaking Agent: Implements a new API extension to upload/delete graph assets by ttl and csv.
+
+### Changed
+
+- Remoting Agent: Deal with mapping of taxonomical constants to API elements. Support for JSON-serialization of partial results.
+- Upgraded to the latest possible version of dependent libraries
+
+### Removed
+
+## [1.11.16] - 2024-02-20
+
+### Added
+
+### Changed
+
+- Remoting Agent upgraded to latest RDF4J distribution
+- Provisioning Agent upgrade to latest Ontop release
+- Upgraded to the latest possible version of dependent libraries
+
+### Removed
+
 ## [1.10.15] - 2023-11-28
 
 ### Added