catenax-ng · denisneuling · Dec 8, 2022 · Dec 8, 2022
diff --git a/.github/workflows/business-tests.yaml b/.github/workflows/business-tests.yaml
@@ -154,6 +154,7 @@ jobs:
             --set postgresql.username=user \
             --set postgresql.password=password \
             --set postgresql.jdbcUrl=jdbc:postgresql://plato-postgresql:5432/edc \
+            --set vault.hashicorp.enabled=true \
             --set vault.hashicorp.url=http://vault:8200 \
             --set vault.hashicorp.token=root \
             --set vault.secretNames.transferProxyTokenSignerPublicKey=plato/daps/my-plato-daps-crt \
@@ -166,7 +167,7 @@ jobs:
             --set dataplane.aws.endpointOverride=http://minio:9000 \
             --set dataplane.aws.secretAccessKey=platoqwerty123 \
             --set dataplane.aws.accessKeyId=platoqwerty123 \
-            --set backendService.httpProxyTokenReceiverUrl=http://backend:80 \
+            --set backendService.httpProxyTokenReceiverUrl=http://backend:8080 \
             --wait-for-jobs --timeout=120s
 
           # Install Sokrates
@@ -186,6 +187,7 @@ jobs:
             --set postgresql.username=user \
             --set postgresql.password=password \
             --set postgresql.jdbcUrl=jdbc:postgresql://sokrates-postgresql:5432/edc \
+            --set vault.hashicorp.enabled=true \
             --set vault.hashicorp.url=http://vault:8200 \
             --set vault.hashicorp.token=root \
             --set vault.secretNames.transferProxyTokenSignerPublicKey=sokrates/daps/my-sokrates-daps-crt \
@@ -198,7 +200,7 @@ jobs:
             --set dataplane.aws.endpointOverride=http://minio:9000 \
             --set dataplane.aws.secretAccessKey=sokratesqwerty123 \
             --set dataplane.aws.accessKeyId=sokratesqwerty123 \
-            --set backendService.httpProxyTokenReceiverUrl=http://backend:80 \
+            --set backendService.httpProxyTokenReceiverUrl=http://backend:8080 \
             --wait-for-jobs --timeout=120s
 
           # GH pipelines constrained by cpu, so give helm some time to register all resources \w k8s

diff --git a/DEPENDENCIES b/DEPENDENCIES
diff --git a/charts/edc-controlplane/README.md b/charts/edc-controlplane/README.md
@@ -66,7 +66,7 @@ $ helm install my-release catenax-ng-product-edc/edc-controlplane --version 0.1.
 | ingresses[1].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
 | ingresses[1].tls.secretName | string | `""` | If present overwrites the default secret name |
 | livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| logging.properties | string | `".level=INFO\norg.eclipse.dataspaceconnector.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
+| logging.properties | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
 | nameOverride | string | `""` | Overrides the charts name |
 | nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
 | opentelemetry.properties | string | `"otel.javaagent.enabled=true\notel.javaagent.debug=false"` | opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) |

diff --git a/charts/edc-controlplane/values.yaml b/charts/edc-controlplane/values.yaml
@@ -242,7 +242,7 @@ logging:
   # -- EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8)
   properties: |-
     .level=INFO
-    org.eclipse.dataspaceconnector.level=ALL
+    org.eclipse.edc.level=ALL
     handlers=java.util.logging.ConsoleHandler
     java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
     java.util.logging.ConsoleHandler.level=ALL

diff --git a/charts/edc-dataplane/README.md b/charts/edc-dataplane/README.md
@@ -52,7 +52,7 @@ $ helm install my-release catenax-ng-product-edc/edc-dataplane --version 0.1.3
 | ingresses[0].tls.enabled | bool | `false` | Enables TLS on the ingress resource |
 | ingresses[0].tls.secretName | string | `""` | If present overwrites the default secret name |
 | livenessProbe.enabled | bool | `true` | Whether to enable kubernetes [liveness-probe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) |
-| logging.properties | string | `".level=INFO\norg.eclipse.dataspaceconnector.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
+| logging.properties | string | `".level=INFO\norg.eclipse.edc.level=ALL\nhandlers=java.util.logging.ConsoleHandler\njava.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter\njava.util.logging.ConsoleHandler.level=ALL\njava.util.logging.SimpleFormatter.format=[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS] [%4$-7s] %5$s%6$s%n"` | EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8) |
 | nameOverride | string | `""` | Overrides the charts name |
 | nodeSelector | object | `{}` | [Node-Selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain the Pod to nodes with specific labels. |
 | opentelemetry.properties | string | `"otel.javaagent.enabled=true\notel.javaagent.debug=false"` | opentelemetry.properties configuring the [opentelemetry agent](https://opentelemetry.io/docs/instrumentation/java/automatic/agent-config/) |

diff --git a/charts/edc-dataplane/values.yaml b/charts/edc-dataplane/values.yaml
@@ -199,7 +199,7 @@ logging:
   # -- EDC logging.properties configuring the [java.util.logging subsystem](https://docs.oracle.com/javase/7/docs/technotes/guides/logging/overview.html#a1.8)
   properties: |-
     .level=INFO
-    org.eclipse.dataspaceconnector.level=ALL
+    org.eclipse.edc.level=ALL
     handlers=java.util.logging.ConsoleHandler
     java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
     java.util.logging.ConsoleHandler.level=ALL

diff --git a/charts/tractusx-connector/templates/_helpers.tpl b/charts/tractusx-connector/templates/_helpers.tpl
@@ -132,7 +132,7 @@ Control IDS URL
 Control IDS URL
 */}}
 {{- define "txdc.controlplane.url.validation" -}}
-{{- printf "http://%s-controlplane:%v%s" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.validation.port $.Values.controlplane.endpoints.validation.path -}}
+{{- printf "http://%s-controlplane:%v%s/token" ( include "txdc.fullname" $ ) $.Values.controlplane.endpoints.validation.port $.Values.controlplane.endpoints.validation.path -}}
 {{- end }}
 
 {{/*

diff --git a/charts/tractusx-connector/templates/deployment-controlplane.yaml b/charts/tractusx-connector/templates/deployment-controlplane.yaml
@@ -39,7 +39,7 @@ spec:
             {{- toYaml .Values.controlplane.securityContext | nindent 12 }}
           {{- if .Values.controlplane.image.repository }}
           image: "{{ .Values.controlplane.image.repository }}:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
-          {{- else if and .Values.postgresql.enabled (not .Values.vault.azure.enabled) }}
+          {{- else if and .Values.postgresql.enabled .Values.vault.hashicorp.enabled }}
           image: "ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
           {{- else if and .Values.postgresql.enabled .Values.vault.azure.enabled }}
           image: "ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-vault:{{ .Values.controlplane.image.tag | default .Chart.AppVersion }}"
@@ -118,9 +118,9 @@ spec:
               value: {{ .Values.controlplane.endpoints.default.port | quote }}
             - name: "WEB_HTTP_DEFAULT_PATH"
               value: {{ .Values.controlplane.endpoints.default.path | quote }}
-            - name: "WEB_HTTP_DATA_PORT"
+            - name: "WEB_HTTP_MANAGEMENT_PORT"
               value: {{ .Values.controlplane.endpoints.data.port | quote }}
-            - name: "WEB_HTTP_DATA_PATH"
+            - name: "WEB_HTTP_MANAGEMENT_PATH"
               value: {{ .Values.controlplane.endpoints.data.path | quote }}
             - name: "WEB_HTTP_VALIDATION_PORT"
               value: {{ .Values.controlplane.endpoints.validation.port | quote }}

diff --git a/charts/tractusx-connector/values.yaml b/charts/tractusx-connector/values.yaml
@@ -17,7 +17,7 @@ controlplane:
   # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
     pullPolicy: IfNotPresent
     # -- Overrides the image tag whose default is the chart appVersion
-    tag: "0.1.2"
+    tag: ""
   initContainers: []
   debug:
     enabled: false
@@ -263,7 +263,7 @@ dataplane:
   # -- [Kubernetes image pull policy](https://kubernetes.io/docs/concepts/containers/images/#image-pull-policy) to use
     pullPolicy: IfNotPresent
     # -- Overrides the image tag whose default is the chart appVersion
-    tag: "0.1.2"
+    tag: ""
   initContainers: []
   debug:
     enabled: false
@@ -458,7 +458,7 @@ postgresql:
 
 vault:
   hashicorp:
-    enabled: true
+    enabled: false
     url: ""
     token: ""
     timeout: 30

diff --git a/edc-controlplane/edc-controlplane-base/pom.xml b/edc-controlplane/edc-controlplane-base/pom.xml
@@ -76,122 +76,122 @@
 
         <!-- Core -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>control-plane-core</artifactId>
         </dependency>
 
         <!-- Config -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>filesystem-configuration</artifactId>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>configuration-filesystem</artifactId>
         </dependency>
 
         <!-- Security -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>auth-tokenbased</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>oauth2-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>iam-daps</artifactId>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>oauth2-daps</artifactId>
         </dependency>
 
         <!-- APIs -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>data-management-api</artifactId>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>management-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>observability-api</artifactId>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>api-observability</artifactId>
         </dependency>
 
         <!-- IDS -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>ids-api-configuration</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>ids-api-multipart-dispatcher-v1</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>ids-api-multipart-endpoint-v1</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>ids-api-transform-v1</artifactId>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>ids-transform-v1</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>ids-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>ids-spi</artifactId>
         </dependency>
 
         <!-- Core -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>jwt-spi</artifactId>
         </dependency>
 
         <!-- Data-Plane -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>data-plane-transfer-sync</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>data-plane-selector-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>data-plane-selector-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>data-plane-selector-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>data-plane-transfer-client</artifactId>
         </dependency>
 
         <!-- Telemetry -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>core-micrometer</artifactId>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>micrometer-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>jersey-micrometer</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>jetty-micrometer</artifactId>
         </dependency>
 
         <!-- Logging -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>jdk-logger-monitor</artifactId>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>monitor-jdk-logger</artifactId>
         </dependency>
 
         <!-- Supportive -->
         <dependency>
             <!-- includes jetty and jersey -->
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>http</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>http-receiver</artifactId>
         </dependency>
 

diff --git a/edc-controlplane/edc-controlplane-memory-hashicorp-vault/pom.xml b/edc-controlplane/edc-controlplane-memory-hashicorp-vault/pom.xml
@@ -62,7 +62,7 @@
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>org.eclipse.dataspaceconnector.boot.system.runtime.BaseRuntime</mainClass>
+                            <mainClass>org.eclipse.edc.boot.system.runtime.BaseRuntime</mainClass>
                             <useUniqueVersions>false</useUniqueVersions>
                         </manifest>
                     </archive>
@@ -94,7 +94,7 @@
             <artifactId>edc-controlplane-base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>control-plane-core</artifactId>
         </dependency>
 
@@ -105,7 +105,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>data-plane-transfer-client</artifactId>
         </dependency>
     </dependencies>

diff --git a/edc-controlplane/edc-controlplane-memory/README.md b/edc-controlplane/edc-controlplane-memory/README.md
@@ -106,7 +106,7 @@ EOF
 export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
 cat << 'EOF' > ${LOGGING_PROPERTIES_FILE}
 .level=INFO
-org.eclipse.dataspaceconnector.level=ALL
+org.eclipse.edc.level=ALL
 handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
 java.util.logging.ConsoleHandler.level=ALL

diff --git a/edc-controlplane/edc-controlplane-memory/pom.xml b/edc-controlplane/edc-controlplane-memory/pom.xml
@@ -62,7 +62,7 @@
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>lib/</classpathPrefix>
                             <mainClass>
-                            org.eclipse.dataspaceconnector.boot.system.runtime.BaseRuntime
+                            org.eclipse.edc.boot.system.runtime.BaseRuntime
                         </mainClass>
                         <useUniqueVersions>false</useUniqueVersions>
                         </manifest>
@@ -94,14 +94,14 @@
             <artifactId>edc-controlplane-base</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
+            <groupId>org.eclipse.edc</groupId>
             <artifactId>control-plane-core</artifactId>
         </dependency>
 
         <!-- Vault -->
         <dependency>
-            <groupId>org.eclipse.dataspaceconnector</groupId>
-            <artifactId>azure-vault</artifactId>
+            <groupId>org.eclipse.edc</groupId>
+            <artifactId>vault-azure</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>com.azure</groupId>

diff --git a/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md b/edc-controlplane/edc-controlplane-postgresql-hashicorp-vault/README.md
@@ -146,7 +146,7 @@ EOF
 export LOGGING_PROPERTIES_FILE=$(mktemp /tmp/logging.properties.XXXXXX)
 cat << 'EOF' > ${LOGGING_PROPERTIES_FILE}
 .level=INFO
-org.eclipse.dataspaceconnector.level=ALL
+org.eclipse.edc.level=ALL
 handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
 java.util.logging.ConsoleHandler.level=ALL