Merge pull request #149 from drcgjung/fix/e2etest-patches

fix|chore: e2e test issues

.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.13.21-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.13.22-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.13.21-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.13.22-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.13.21-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.13.22-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
@@ -259,7 +259,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}
             type=semver,pattern={{major}}.{{minor}}
-            type=raw,value=1.13.21-SNAPSHOT,enable=${{ github.event.inputs.deploy_docker == 'true' || github.ref == format('refs/heads/{0}', 'main') }}
+            type=raw,value=1.13.22-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

CHANGELOG.md

@@ -24,13 +24,16 @@ All notable changes to this product will be documented in this file.
 
 # Released
 
-## [1.13.21] - 2024-07-15
+## [1.13.22] - 2024-07-29
 
 ### Added
 
 ### Changed
 
 - Matchmaking Agent: Compliant to the TX EDC 0.7.3 management api
+- Matchmaking Agent: Add connector allowance patterns to chart
+- Matchmaking Agent: Ugrade to jetty 10.0.16
+- Remoting Agent: Upgrade to tomcat 9.0.90 and zookeeper 8.1.4. Remove vulnerable solr support.
 
 ## [1.12.19] - 2024-05-17
 

DEPENDENCIES

@@ -155,13 +155,13 @@ maven/mavencentral/org.apache.lucene/lucene-spatial-extras/8.9.0, Apache-2.0, ap
 maven/mavencentral/org.apache.lucene/lucene-spatial3d/8.9.0, Apache-2.0, approved, #6140
 maven/mavencentral/org.apache.solr/solr-solrj/8.9.0, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #6141
 maven/mavencentral/org.apache.thrift/libthrift/0.18.1, Apache-2.0, approved, #8911
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.83, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.83, Apache-2.0, approved, CQ20193
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.83, Apache-2.0, approved, CQ20194
-maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/9.0.83, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.90, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.90, Apache-2.0, approved, CQ20193
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.90, Apache-2.0, approved, CQ20194
+maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/9.0.90, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.apache.yetus/audience-annotations/0.12.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.apache.zookeeper/zookeeper-jute/3.7.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.apache.zookeeper/zookeeper/3.7.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.zookeeper/zookeeper-jute/3.8.4, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.zookeeper/zookeeper/3.8.4, Apache-2.0, approved, #11422
 maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
 maven/mavencentral/org.assertj/assertj-core/3.24.2, Apache-2.0, approved, #6161
 maven/mavencentral/org.attoparser/attoparser/2.0.5.RELEASE, Apache-2.0, approved, CQ18900
@@ -177,15 +177,15 @@ maven/mavencentral/org.eclipse.jetty.toolchain/jetty-jakarta-servlet-api/5.0.2,
 maven/mavencentral/org.eclipse.jetty/jetty-alpn-client/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-alpn-java-client/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-client/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-http/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-http/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-io/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-io/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-servlets/10.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
-maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.15, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-security/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-server/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-servlet/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-servlets/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
+maven/mavencentral/org.eclipse.jetty/jetty-util/11.0.16, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.jetty/jetty-util/9.4.54.v20240208, EPL-2.0 OR Apache-2.0, approved, rt.jetty
 maven/mavencentral/org.eclipse.rdf4j/rdf4j-client/4.3.8, BSD-3-Clause, approved, technology.rdf4j
 maven/mavencentral/org.eclipse.rdf4j/rdf4j-collection-factory-api/4.3.8, BSD-3-Clause, approved, technology.rdf4j

README.md

@@ -114,10 +114,10 @@ kubectl wait --namespace ingress-nginx \
   --selector=app.kubernetes.io/component=controller \
   --timeout=90s
 # transfer images
-kind load docker-image docker.io/tractusx/conforming-agent:1.13.21-SNAPSHOT --name ka
-kind load docker-image docker.io/tractusx/matchmaking-agent:1.13.21-SNAPSHOT --name ka
-kind load docker-image docker.io/tractusx/provisioning-agent:1.13.21-SNAPSHOT --name ka
-kind load docker-image docker.io/tractusx/remoting-agent:1.13.21-SNAPSHOT --name ka
+kind load docker-image docker.io/tractusx/conforming-agent:1.13.22-SNAPSHOT --name ka
+kind load docker-image docker.io/tractusx/matchmaking-agent:1.13.22-SNAPSHOT --name ka
+kind load docker-image docker.io/tractusx/provisioning-agent:1.13.22-SNAPSHOT --name ka
+kind load docker-image docker.io/tractusx/remoting-agent:1.13.22-SNAPSHOT --name ka
 # run container test
 ct install --charts charts/conforming-agent 
 ct install --charts charts/matchmaking-agent  

charts/conforming-agent/Chart.yaml

@@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/
 sources:
   - https://github.com/eclipse-tractusx/knowledge-agents/tree/main/conforming
 type: application
-appVersion: "1.13.21-SNAPSHOT"
-version: 1.13.21-SNAPSHOT
+appVersion: "1.13.22-SNAPSHOT"
+version: 1.13.22-SNAPSHOT
 maintainers:
   - name: 'Tractus-X Knowledge Agents Team'

charts/conforming-agent/README.md

@@ -20,7 +20,7 @@
 
 # conforming-agent
 
-![Version: 1.13.21-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.21-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square)
+![Version: 1.13.22-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.22-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square)
 
 A Helm chart for the Tractus-X Conforming Agent which is a container to assess the conformity of all other parts of the Agent-Enabled Dataspace.
 
@@ -31,7 +31,7 @@ This chart has no prerequisites.
 ## TL;DR
 ```shell
 $ helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev
-$ helm install my-release eclipse-tractusx/conforming-agent --version 1.13.21-SNAPSHOT
+$ helm install my-release eclipse-tractusx/conforming-agent --version 1.13.22-SNAPSHOT
 ```
 
 ## Maintainers
@@ -117,4 +117,4 @@ $ helm install my-release eclipse-tractusx/conforming-agent --version 1.13.21-SN
 | tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/matchmaking-agent/Chart.yaml

@@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/
 sources:
   - https://github.com/eclipse-tractusx/knowledge-agents/tree/main/matchmaking
 type: application
-appVersion: "1.13.21-SNAPSHOT"
-version: 1.13.21-SNAPSHOT
+appVersion: "1.13.22-SNAPSHOT"
+version: 1.13.22-SNAPSHOT
 maintainers:
   - name: 'Tractus-X Knowledge Agents Team'

charts/matchmaking-agent/README.md

@@ -19,7 +19,7 @@
 -->
 # matchmaking-agent
 
-![Version: 1.13.21-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.21-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square)
+![Version: 1.13.22-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.22-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square)
 
 A Helm chart for the Tractus-X Matchmaking Agent which is a container encompassing data storage capabilities accessible from the dataplane by a REST API
 
@@ -30,7 +30,7 @@ This chart has no prerequisites.
 ## TL;DR
 ```shell
 $ helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev
-$ helm install my-release eclipse-tractusx/matchmaking-agent --version 1.13.21-SNAPSHOT
+$ helm install my-release eclipse-tractusx/matchmaking-agent --version 1.13.22-SNAPSHOT
 ```
 
 ## Maintainers
@@ -65,11 +65,13 @@ $ helm install my-release eclipse-tractusx/matchmaking-agent --version 1.13.21-S
 | agent.endpoints.internal.regex | string | `"/(.*)"` | An optional regex path match (whose match groups could be used in an nginx-annotation of the ingress) |
 | agent.graphcontract | string | `"Contract?partner=Graph"` | Names the visible contract under which new graphs are published (if not otherwise specified) |
 | agent.maxbatchsize | string | `"9223372036854775807"` | Sets the maximal batch size when delegating to agents and services |
-| agent.services | object | `{"allow":"(edcs?://.*)|(https://query\\\\.wikidata\\\\.org/sparql)","asset":{"allow":"(edcs?://.*)","deny":"https?://.*"},"deny":"http://.*"}` | A set of configs for regulating outgoing service calls |
+| agent.services | object | `{"allow":"(edcs?://.*)|(https://query\\\\.wikidata\\\\.org/sparql)","asset":{"allow":"(edcs?://.*)","deny":"https?://.*"},"connector":{"allow":"https://.*","deny":"http://.*"},"deny":"http://.*"}` | A set of configs for regulating outgoing service calls |
 | agent.services.allow | string | `"(edcs?://.*)|(https://query\\\\.wikidata\\\\.org/sparql)"` | A regular expression which outgoing service URLs must match (unless overwritten by a specific asset property) |
 | agent.services.asset | object | `{"allow":"(edcs?://.*)","deny":"https?://.*"}` | A set of configs for regulating outgoing service calls when providing an asset (when no specific asset property is given) |
 | agent.services.asset.allow | string | `"(edcs?://.*)"` | A regular expression which outgoing service URLs must match (unless overwritten by a specific asset property) |
 | agent.services.asset.deny | string | `"https?://.*"` | A regular expression which outgoing service URLs must not match (unless overwritten by a specific asset property) |
+| agent.services.connector.allow | string | `"https://.*"` | A regular expression which outgoing connector URLs must match |
+| agent.services.connector.deny | string | `"http://.*"` | A regular expression which outgoing connector URLs must not match |
 | agent.services.deny | string | `"http://.*"` | A regular expression which outgoing service URLs must not match (unless overwritten by a specific asset property) |
 | agent.skillcontract | string | `"Contract?partner=Skill"` | Names the visible contract under which new skills are published (if not otherwise specified) |
 | agent.synchronization | int | `-1` | The synchronization interval in ms to update the federated data catalogue |
@@ -152,4 +154,4 @@ $ helm install my-release eclipse-tractusx/matchmaking-agent --version 1.13.21-S
 | tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/matchmaking-agent/ci/integration-values.yaml

@@ -24,7 +24,7 @@
 # image:
 #  registry: ghcr.io/catenax-ng/
 #  repository: tx-knowledge-agents/matchmaking-agent
-#  tag: 1.13.21-SNAPSHOT
+#  tag: 1.13.22-SNAPSHOT
 
 participant:
   id: "BPNL0000000DUMMY"

charts/matchmaking-agent/templates/configmap.yaml

@@ -86,6 +86,14 @@ data:
     cx.agent.service.asset.deny={{ .Values.agent.services.asset.deny }} 
     {{- end }}
     {{- end }}
+    {{- if .Values.agent.services.connector }}
+    {{- if .Values.agent.services.connector.allow }}
+    cx.agent.service.connector.allow={{ .Values.agent.services.connector.allow }} 
+    {{- end }}
+    {{- if .Values.agent.services.connector.deny }}
+    cx.agent.service.connector.deny={{ .Values.agent.services.connector.deny }} 
+    {{- end }}
+    {{- end }}
     {{- end }}
           
     ###################

charts/matchmaking-agent/templates/deployment.yaml

@@ -58,6 +58,12 @@ spec:
             - name: default
               containerPort: {{ .Values.agent.endpoints.default.port }}
               protocol: TCP
+            - name: internal
+              containerPort: {{ .Values.agent.endpoints.internal.port }}
+              protocol: TCP
+            - name: callback
+              containerPort: {{ .Values.agent.endpoints.callback.port }}
+              protocol: TCP
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:

charts/matchmaking-agent/templates/service.yaml

@@ -29,5 +29,13 @@ spec:
       targetPort: default
       protocol: TCP
       name: default
+    - port: {{ .Values.agent.endpoints.internal.port }}
+      targetPort: internal
+      protocol: TCP
+      name: internal
+    - port: {{ .Values.agent.endpoints.callback.port }}
+      targetPort: callback
+      protocol: TCP
+      name: callback
   selector:
     {{- include "agent.selectorLabels" . | nindent 4 }}

charts/matchmaking-agent/values.yaml

@@ -240,6 +240,11 @@ agent:
       allow: '(edcs?://.*)'
       # -- A regular expression which outgoing service URLs must not match (unless overwritten by a specific asset property)
       deny: 'https?://.*'
+    connector:
+      # -- A regular expression which outgoing connector URLs must match
+      allow: 'https://.*'
+      # -- A regular expression which outgoing connector URLs must not match
+      deny: 'http://.*'
 
 service:
   # -- [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service.

charts/provisioning-agent/Chart.yaml

@@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/
 sources:
   - https://github.com/eclipse-tractusx/knowledge-agents/tree/main/provisioning
 type: application
-appVersion: "1.13.21-SNAPSHOT"
-version: 1.13.21-SNAPSHOT
+appVersion: "1.13.22-SNAPSHOT"
+version: 1.13.22-SNAPSHOT
 maintainers:
   - name: 'Tractus-X Knowledge Agents Team'

charts/provisioning-agent/README.md

@@ -20,7 +20,7 @@
 
 # provisioning-agent
 
-![Version: 1.13.21-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.21-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square)
+![Version: 1.13.22-SNAPSHOT](https://img.shields.io/badge/Version-1.13.21--SNAPSHOT-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.13.22-SNAPSHOT](https://img.shields.io/badge/AppVersion-1.13.21--SNAPSHOT-informational?style=flat-square)
 
 A Helm chart for the Tractus-X Provisioning Agent which is a container to Bridge Agent-Enabled Connector and Relational Data Sources.
 
@@ -31,7 +31,7 @@ This chart has no prerequisites.
 ## TL;DR
 ```shell
 $ helm repo add eclipse-tractusx https://eclipse-tractusx.github.io/charts/dev
-$ helm install my-release eclipse-tractusx/provisioning-agent --version 1.13.21-SNAPSHOT
+$ helm install my-release eclipse-tractusx/provisioning-agent --version 1.13.22-SNAPSHOT
 ```
 
 ## Maintainers
@@ -117,4 +117,4 @@ $ helm install my-release eclipse-tractusx/provisioning-agent --version 1.13.21-
 | tolerations | list | `[]` | [Tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) are applied to Pods to schedule onto nodes with matching taints. |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.2](https://github.com/norwoodj/helm-docs/releases/v1.11.2)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)

charts/remoting-agent/Chart.yaml

@@ -28,7 +28,7 @@ home: https://github.com/eclipse-tractusx/knowledge-agents/
 sources:
   - https://github.com/eclipse-tractusx/knowledge-agents/tree/main/remoting
 type: application
-appVersion: "1.13.21-SNAPSHOT"
-version: 1.13.21-SNAPSHOT
+appVersion: "1.13.22-SNAPSHOT"
+version: 1.13.22-SNAPSHOT
 maintainers:
   - name: 'Tractus-X Knowledge Agents Team'