diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9262a80..941a730 100644 --- 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.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d9ce3a..fbf2b88 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/DEPENDENCIES b/DEPENDENCIES index 97ac0a4..f6598f0 100644 --- a/DEPENDENCIES +++ b/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 diff --git a/README.md b/README.md index b2853b2..5f75dc1 100644 --- a/README.md +++ b/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 diff --git a/charts/conforming-agent/Chart.yaml b/charts/conforming-agent/Chart.yaml index 80c883f..c4d57db 100644 --- a/charts/conforming-agent/Chart.yaml +++ b/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' diff --git a/charts/conforming-agent/README.md b/charts/conforming-agent/README.md index 0b85fba..a4f664a 100644 --- a/charts/conforming-agent/README.md +++ b/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) diff --git a/charts/matchmaking-agent/Chart.yaml b/charts/matchmaking-agent/Chart.yaml index 75fd1d1..8c7035d 100644 --- a/charts/matchmaking-agent/Chart.yaml +++ b/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' diff --git a/charts/matchmaking-agent/README.md b/charts/matchmaking-agent/README.md index 7a350b8..6c7cf9a 100644 --- a/charts/matchmaking-agent/README.md +++ b/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) diff --git a/charts/matchmaking-agent/ci/integration-values.yaml b/charts/matchmaking-agent/ci/integration-values.yaml index ae7382b..7004219 100644 --- a/charts/matchmaking-agent/ci/integration-values.yaml +++ b/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" diff --git a/charts/matchmaking-agent/templates/configmap.yaml b/charts/matchmaking-agent/templates/configmap.yaml index e30fab8..7e47551 100644 --- a/charts/matchmaking-agent/templates/configmap.yaml +++ b/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 }} ################### diff --git a/charts/matchmaking-agent/templates/deployment.yaml b/charts/matchmaking-agent/templates/deployment.yaml index bb351af..0e51860 100644 --- a/charts/matchmaking-agent/templates/deployment.yaml +++ b/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: diff --git a/charts/matchmaking-agent/templates/service.yaml b/charts/matchmaking-agent/templates/service.yaml index 9bafc53..e4bf6fa 100644 --- a/charts/matchmaking-agent/templates/service.yaml +++ b/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 }} diff --git a/charts/matchmaking-agent/values.yaml b/charts/matchmaking-agent/values.yaml index 7461308..9c3ee68 100644 --- a/charts/matchmaking-agent/values.yaml +++ b/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. diff --git a/charts/provisioning-agent/Chart.yaml b/charts/provisioning-agent/Chart.yaml index 1781d07..c37d502 100644 --- a/charts/provisioning-agent/Chart.yaml +++ b/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' diff --git a/charts/provisioning-agent/README.md b/charts/provisioning-agent/README.md index 41e04d7..ab0943d 100644 --- a/charts/provisioning-agent/README.md +++ b/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) diff --git a/charts/remoting-agent/Chart.yaml b/charts/remoting-agent/Chart.yaml index 8750aea..8868439 100644 --- a/charts/remoting-agent/Chart.yaml +++ b/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' diff --git a/charts/remoting-agent/README.md b/charts/remoting-agent/README.md index 3abc9ee..dd78b57 100644 --- a/charts/remoting-agent/README.md +++ b/charts/remoting-agent/README.md @@ -19,7 +19,7 @@ --> # remoting-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 Remoting Agent which is a container to Bridge Agent-Enabled Connector and REST APIs. @@ -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/remoting-agent --version 1.13.21-SNAPSHOT +$ helm install my-release eclipse-tractusx/remoting-agent --version 1.13.22-SNAPSHOT ``` ## Maintainers @@ -117,4 +117,4 @@ $ helm install my-release eclipse-tractusx/remoting-agent --version 1.13.21-SNAP | 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) diff --git a/conforming/README.md b/conforming/README.md index 22b1451..b592ebc 100644 --- a/conforming/README.md +++ b/conforming/README.md @@ -54,15 +54,15 @@ mvn package This will generate -- a [plugin jar](target/original-conforming-agent-1.13.21-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server. -- a [standalone jar](target/conforming-agent-1.13.21-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish). +- a [plugin jar](target/original-conforming-agent-1.13.22-SNAPSHOT.jar) containing all necessary components to be dropped into a Jakarta-Compatible Web Server. +- a [standalone jar](target/conforming-agent-1.13.22-SNAPSHOT.jar) including the Jakarta-Reference Implementation (Glassfish). ### Run Locally -The [standalone jar](target/conforming-agent-1.13.21-SNAPSHOT.jar) may be started as follows +The [standalone jar](target/conforming-agent-1.13.22-SNAPSHOT.jar) may be started as follows ```console -java -cp target/conforming-agent-1.13.21-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap" +java -cp target/conforming-agent-1.13.22-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap" ``` ### Containerizing @@ -76,7 +76,7 @@ mvn install -Pwith-docker-image or invoke the following docker command after a successful package run ```console -docker build -t tractusx/conforming-agent:1.13.21-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/conforming-agent:1.13.22-SNAPSHOT -f src/main/docker/Dockerfile . ``` This will create a docker image based on a minimal java environment for running the Glassfish-based standalone jar. @@ -85,7 +85,7 @@ To run the docker image, you could invoke this command ```console docker run -p 8080:8080 \ - tractusx/conforming-agent:1.13.21-SNAPSHOT + tractusx/conforming-agent:1.13.22-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8080/) via @@ -143,7 +143,7 @@ It can be added to your umbrella chart.yaml by the following snippet dependencies: - name: conforming-agent repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.13.21-SNAPSHOT + version: 1.13.22-SNAPSHOT alias: my-conforming-agent ``` diff --git a/conforming/pom.xml b/conforming/pom.xml index dfb9ab4..7c82c6c 100644 --- a/conforming/pom.xml +++ b/conforming/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.13.21-SNAPSHOT + 1.13.22-SNAPSHOT ../pom.xml diff --git a/matchmaking/README.md b/matchmaking/README.md index c5cca58..3224eb3 100644 --- a/matchmaking/README.md +++ b/matchmaking/README.md @@ -66,10 +66,10 @@ This will generate ### Run Locally -The [standalone jar](target/matchmaking-agent-1.13.21-SNAPSHOT.jar) may be started as follows +The [standalone jar](target/matchmaking-agent-1.13.22-SNAPSHOT.jar) may be started as follows ```console -java -Dproperty.file.location="dataplane.properties" -cp ../matchmaking-agent-1.13.21-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap +java -Dproperty.file.location="dataplane.properties" -cp ../matchmaking-agent-1.13.22-SNAPSHOT.jar org.eclipse.tractusx.agents.conforming.Bootstrap ``` Make sure that jar file, properties file and dataspace.ttl are in the same directory Then you should be able to reach the /graph endpoint @@ -126,7 +126,7 @@ It can be added to your umbrella chart.yaml by the following snippet dependencies: - name: matchmaking-agent repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.13.21-SNAPSHOT + version: 1.13.22-SNAPSHOT alias: my-matchmmaking-agent ``` diff --git a/matchmaking/pom.xml b/matchmaking/pom.xml index 89de36b..15c2e1e 100644 --- a/matchmaking/pom.xml +++ b/matchmaking/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.13.21-SNAPSHOT + 1.13.22-SNAPSHOT ../pom.xml @@ -121,6 +121,16 @@ org.glassfish.jersey.containers jersey-container-jetty-http ${jersey3-version} + + + org.eclipse.jetty + jetty-util + + + org.eclipse.jetty + jetty-server + + org.glassfish.jersey.containers @@ -179,7 +189,7 @@ org.eclipse.jetty - jetty-servlet + jetty-server ${jetty-servlet.version} @@ -187,11 +197,27 @@ jetty-jakarta-servlet-api ${jetty-jakarta-servlet-api.version} + + org.eclipse.jetty + jetty-security + ${jetty-servlet.version} + + + org.eclipse.jetty + jetty-servlets + ${jetty-servlet.version} + + + org.eclipse.jetty + jetty-servlet + ${jetty-servlet.version} + + org.apache.jena jena-fuseki-core ${org.apache.jena.version} - + diff --git a/matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java b/matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java index 16765c2..e808cfd 100644 --- a/matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java +++ b/matchmaking/src/main/java/org/eclipse/tractusx/agents/service/DataManagement.java @@ -209,6 +209,20 @@ public class DataManagement { public static final String TRANSFER_CHECK_CALL = "%s/v2/transferprocesses/%s"; public static final String AGREEMENT_CHECK_CALL = "%s/v2/contractagreements/%s"; + public static final String DEFAULT_ID_RESPONSE = "{\n" + + " \"@type\": \"IdResponse\",\n" + + " \"@id\": \"%1$s\",\n" + + " \"createdAt\": %2$d,\n" + + " \"@context\": {\n" + + " \"@vocab\": \"https://w3id.org/edc/v0.0.1/ns/\",\n" + + " \"edc\": \"https://w3id.org/edc/v0.0.1/ns/\",\n" + + " \"tx\": \"https://w3id.org/tractusx/v0.0.1/ns/\",\n" + + " \"tx-auth\": \"https://w3id.org/tractusx/auth/\",\n" + + " \"cx-policy\": \"https://w3id.org/catenax/policy/\",\n" + + " \"odrl\": \"http://www.w3.org/ns/odrl/2/\"\n" + + " }\n" + + "}"; + /** * references to EDC services */ @@ -329,6 +343,7 @@ protected IdResponse createOrUpdateAsset(String assetId, String assetSpec) throw try (var response = httpClient.newCall(request.build()).execute()) { ResponseBody body = response.body(); + String bodyString = String.format(DEFAULT_ID_RESPONSE, assetId, System.currentTimeMillis()); if (!response.isSuccessful() || body == null) { @@ -341,14 +356,17 @@ protected IdResponse createOrUpdateAsset(String assetId, String assetSpec) throw config.getControlPlaneManagementHeaders().forEach(patchRequest::addHeader); try (var patchResponse = httpClient.newCall(patchRequest.build()).execute()) { - body = patchResponse.body(); - if (!patchResponse.isSuccessful() || body == null) { + // patch will return an empty body + if (!patchResponse.isSuccessful()) { monitor.warning(format("Failure in updating the resource at %s. Ignoring", url)); return null; } } + } else { + // parse the actual id response + bodyString = body.string(); } - return JsonLd.processIdResponse(body.string()); + return JsonLd.processIdResponse(bodyString); } catch (Exception e) { monitor.severe(format("Error in calling the control plane at %s", url), e); throw e; diff --git a/pom.xml b/pom.xml index 7ac1e02..efa0070 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.eclipse.tractusx agents - 1.13.21-SNAPSHOT + 1.13.22-SNAPSHOT pom Tractus-X Knowledge Agents Reference Implementations Provides Reference Implementations and Artifacts to Realize Semantic Dataspace Backends @@ -63,11 +63,12 @@ 2.2 1.1.10.5 42.7.2 - 3.7.2 + 3.8.4 2.2.12 2.40 3.1.3 - 11.0.15 + 11.0.16 + 9.0.90 4.9.0 3.6.0 2.0.1.Final diff --git a/provisioning/README.md b/provisioning/README.md index 8570b98..221c4f5 100644 --- a/provisioning/README.md +++ b/provisioning/README.md @@ -111,7 +111,7 @@ mvn package ``` This will generate -- a [pluging jar](target/provisioning-agent-1.13.21-SNAPSHOT.jar) which maybe dropped into an Ontop server (into the lib folder) +- a [pluging jar](target/provisioning-agent-1.13.22-SNAPSHOT.jar) which maybe dropped into an Ontop server (into the lib folder) ### Containerizing (Provisioning Agent) @@ -124,7 +124,7 @@ mvn install -Pwith-docker-image or invoke the following docker command after a successful package run ```console -docker build -t tractusx/provisioning-agent:1.13.21-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/provisioning-agent:1.13.22-SNAPSHOT -f src/main/docker/Dockerfile . ``` The image contains @@ -144,7 +144,7 @@ docker run -p 8080:8080 \ -v $(pwd)/resources/university-role1.obda:/input/mapping.obda \ -v $(pwd)/resources/university-role1.properties:/input/settings.properties \ -v $(pwd)/resources/university.sql:/tmp/university.sql \ - tractusx/provisioning-agent:1.13.21-SNAPSHOT + tractusx/provisioning-agent:1.13.22-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8080/) via @@ -192,7 +192,7 @@ docker run -p 8080:8080 -p 8082:8082 \ -e ONTOP_MAPPING_FILE="/input/role1.obda /input/role2.obda" \ -e ONTOP_PROPERTIES_FILE="/input/role1.properties /input/role2.properties" \ -e ONTOP_DEV_MODE="false false" \ - tractusx/provisioning-agent:1.13.21-SNAPSHOT + tractusx/provisioning-agent:1.13.22-SNAPSHOT ```` Accessing entities spanning two schemas using the first role/endpoint delivers a greater count @@ -297,7 +297,7 @@ It can be added to your umbrella chart.yaml by the following snippet dependencies: - name: provisioning-agent repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.13.21-SNAPSHOT + version: 1.13.22-SNAPSHOT alias: my-provider-agent ``` diff --git a/provisioning/pom.xml b/provisioning/pom.xml index 0a564ea..816ad40 100644 --- a/provisioning/pom.xml +++ b/provisioning/pom.xml @@ -27,7 +27,7 @@ org.eclipse.tractusx agents - 1.13.21-SNAPSHOT + 1.13.22-SNAPSHOT ../pom.xml diff --git a/remoting/README.md b/remoting/README.md index a1bad0f..e84df9e 100644 --- a/remoting/README.md +++ b/remoting/README.md @@ -134,15 +134,15 @@ mvn package ``` This will generate -- a [standalone jar](target/remoting-agent-1.13.21-SNAPSHOT.jar) containing all necessary rdf4j components to build your own repository server. -- a [pluging jar](target/original-remoting-agent-1.13.21-SNAPSHOT.jar) which maybe dropped into an rdf4j server for remoting support. +- a [standalone jar](target/remoting-agent-1.13.22-SNAPSHOT.jar) containing all necessary rdf4j components to build your own repository server. +- a [pluging jar](target/original-remoting-agent-1.13.22-SNAPSHOT.jar) which maybe dropped into an rdf4j server for remoting support. ### Run Locally -The standalone jar](target/remoting-agent-1.13.21-SNAPSHOT.jar) contains an example application that runs a sample repository against a sample source +The standalone jar](target/remoting-agent-1.13.22-SNAPSHOT.jar) contains an example application that runs a sample repository against a sample source ```console -java -jar target/remoting-agent-1.13.21-SNAPSHOT.jar -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG +java -jar target/remoting-agent-1.13.22-SNAPSHOT.jar -Dorg.slf4j.simpleLogger.defaultLogLevel=DEBUG ``` ### Containerizing @@ -156,7 +156,7 @@ mvn install -Pwith-docker-image or invoke the following docker command after a successful package run ```console -docker build -t tractusx/remoting-agent:1.13.21-SNAPSHOT -f src/main/docker/Dockerfile . +docker build -t tractusx/remoting-agent:1.13.22-SNAPSHOT -f src/main/docker/Dockerfile . ``` This will create a docker image including an extended rdf4j-server as well as an interactive rdf4j-workbench. @@ -166,7 +166,7 @@ To run the docker image, you could invoke this command ```console docker run -p 8081:8081 \ -v $(pwd)/src/test:/var/rdf4j/config \ - tractusx/remoting-agent:1.13.21-SNAPSHOT + tractusx/remoting-agent:1.13.22-SNAPSHOT ```` Afterwards, you should be able to access the [local SparQL endpoint](http://localhost:8081/) via @@ -224,7 +224,7 @@ It can be added to your umbrella chart.yaml by the following snippet dependencies: - name: remoting-agent repository: https://eclipse-tractusx.github.io/charts/dev - version: 1.13.21-SNAPSHOT + version: 1.13.22-SNAPSHOT alias: my-remoting-agent ``` diff --git a/remoting/pom.xml b/remoting/pom.xml index 802e77c..ff0146b 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -26,7 +26,7 @@ org.eclipse.tractusx agents - 1.13.21-SNAPSHOT + 1.13.22-SNAPSHOT ../pom.xml @@ -213,8 +213,53 @@ spring-boot-starter-tomcat ${spring.boot.version} test + + + org.apache.tomcat.embed + tomcat-embed-core + + + org.apache.tomcat.embed + tomcat-embed-el + + + org.apache.tomcat.embed + tomcat-embed-websocket + + + org.apache.tomcat + tomcat-annotations-api + + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + test + + + + org.apache.tomcat.embed + tomcat-embed-el + ${tomcat.version} + test + + + + org.apache.tomcat.embed + tomcat-embed-websocket + ${tomcat.version} + test + + + + org.apache.tomcat + tomcat-annotations-api + ${tomcat.version} + test + io.netty diff --git a/remoting/src/main/docker/Dockerfile b/remoting/src/main/docker/Dockerfile index 5dc8acd..5865e2b 100644 --- a/remoting/src/main/docker/Dockerfile +++ b/remoting/src/main/docker/Dockerfile @@ -59,7 +59,8 @@ RUN wget -q -O /tmp/rdf4j.zip "https://rhlx01.hs-esslingen.de/pub/Mirrors/eclips rm /tmp/rdf4j-server/WEB-INF/lib/logback-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/snappy-*.jar && \ rm /tmp/rdf4j-server/WEB-INF/lib/zookeeper-*.jar && \ - cp /opt/lib/*.jar /tmp/rdf4j-server/WEB-INF/lib/ + rm /tmp/rdf4j-server/WEB-INF/lib/solr-*.jar && \ + cp /opt/lib/*.jar /tmp/rdf4j-server/WEB-INF/lib/ COPY resources/web/rdf4j.xml /tmp/rdf4j-server/WEB-INF/web.xml COPY resources/web/callback.xml /tmp/rdf4j-server/WEB-INF/callback.xml @@ -87,7 +88,7 @@ RUN adduser \ # Environment variables ENV TOMCAT_MAJOR=9 \ - TOMCAT_VERSION=9.0.83 \ + TOMCAT_VERSION=9.0.90 \ CATALINA_HOME=/opt/tomcat RUN mkdir -p /opt diff --git a/upgrade_version.sh b/upgrade_version.sh index 44a9817..6843fb6 100755 --- a/upgrade_version.sh +++ b/upgrade_version.sh @@ -16,7 +16,7 @@ # # SPDX-License-Identifier: Apache-2.0 -OLD_VERSION=1.13.21-SNAPSHOT +OLD_VERSION=1.13.22-SNAPSHOT echo Upgrading from $OLD_VERSION to $1 PATTERN=s/$OLD_VERSION/$1/g LC_ALL=C