Merge pull request #1735 from eclipse-tractusx/dependabot/gradle/main/edc-0.11.0-20250110-SNAPSHOT

chore(deps): bump edc from 0.11.0-20241213-SNAPSHOT to 0.11.0-20250110-SNAPSHOT

Author: lgblaumeiser

.github/workflows/upgradeability-test.yaml

@@ -56,11 +56,10 @@ jobs:
           helm repo add tractusx https://eclipse-tractusx.github.io/charts/dev
           helm repo update tractusx
 
-      ## Skip 0.6.0 when doing the compatibility check ref https://github.com/eclipse-tractusx/tractusx-edc/issues/1082
       - name: "Get latest released version"
         id: get-version
         run: |
-          RELEASED_VERSION=$(helm search repo tractusx/tractusx-connector -l -o json | jq -r 'map(select(.version !="0.6.0")) | first | .version') 
+          RELEASED_VERSION=$(helm search repo tractusx/tractusx-connector -l -o json | jq -r 'first | .version')
           echo "Last official release is $RELEASED_VERSION"
           echo "RELEASE=$RELEASED_VERSION" >> $GITHUB_ENV
           exit 0

DEPENDENCIES

@@ -163,9 +163,9 @@ spec:
 
             - name: "TX_EDC_DPF_CONSUMER_PROXY_AUTH_APIKEY"
               value: {{ .Values.runtime.endpoints.proxy.authKey | required ".Values.runtime.endpoints.proxy.authKey is required" | quote }}
-            - name: "WEB_HTTP_DEFAULT_PORT"
+            - name: "WEB_HTTP_PORT"
               value: {{ .Values.runtime.endpoints.default.port | quote }}
-            - name: "WEB_HTTP_DEFAULT_PATH"
+            - name: "WEB_HTTP_PATH"
               value: {{ .Values.runtime.endpoints.default.path | quote }}
             {{- if or (eq (substr 0 3 .Values.runtime.image.tag) "0.1") (eq (substr 0 3 .Values.runtime.image.tag) "0.2") }}
             # WEB_HTTP_DATA_PORT is renamed to WEB_HTTP_MANAGEMENT_PORT from version 0.2.1 and newer

charts/tractusx-connector-memory/templates/deployment-runtime.yaml

@@ -346,7 +346,6 @@ runtime:
     # -- targetAverageUtilization of memory provided to a pod
     targetMemoryUtilizationPercentage: 80
 
-
   # -- [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) to constrain pods to nodes
   nodeSelector: {}
   # -- [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to configure preferred nodes

charts/tractusx-connector-memory/values.yaml

@@ -162,9 +162,9 @@ spec:
               value: {{ .Values.controlplane.endpoints.management.authKey | required ".Values.controlplane.endpoints.management.authKey is required" | quote }}
             {{- end }}
 
-            - name: "WEB_HTTP_DEFAULT_PORT"
+            - name: "WEB_HTTP_PORT"
               value: {{ .Values.controlplane.endpoints.default.port | quote }}
-            - name: "WEB_HTTP_DEFAULT_PATH"
+            - name: "WEB_HTTP_PATH"
               value: {{ .Values.controlplane.endpoints.default.path | quote }}
             - name: "WEB_HTTP_MANAGEMENT_PORT"
               value: {{ .Values.controlplane.endpoints.management.port | quote }}

charts/tractusx-connector/templates/deployment-controlplane.yaml

@@ -154,9 +154,9 @@ spec:
             #######
             - name: "TX_EDC_DPF_CONSUMER_PROXY_AUTH_APIKEY"
               value: {{ .Values.dataplane.endpoints.proxy.authKey | required ".Values.dataplane.endpoints.proxy.authKey is required" | quote }}
-            - name: "WEB_HTTP_DEFAULT_PORT"
+            - name: "WEB_HTTP_PORT"
               value: {{ .Values.dataplane.endpoints.default.port | quote }}
-            - name: "WEB_HTTP_DEFAULT_PATH"
+            - name: "WEB_HTTP_PATH"
               value: {{ .Values.dataplane.endpoints.default.path | quote }}
             - name: "WEB_HTTP_CONTROL_PORT"
               value: {{ .Values.dataplane.endpoints.control.port | quote }}

charts/tractusx-connector/templates/deployment-dataplane.yaml

@@ -23,17 +23,18 @@
 import org.eclipse.edc.api.auth.spi.AuthenticationService;
 import org.eclipse.edc.api.auth.spi.registry.ApiAuthenticationRegistry;
 import org.eclipse.edc.connector.dataplane.spi.pipeline.PipelineService;
+import org.eclipse.edc.runtime.metamodel.annotation.Configuration;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;
+import org.eclipse.edc.runtime.metamodel.annotation.Settings;
 import org.eclipse.edc.spi.monitor.Monitor;
 import org.eclipse.edc.spi.security.Vault;
 import org.eclipse.edc.spi.system.ServiceExtension;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.web.spi.WebServer;
 import org.eclipse.edc.web.spi.WebService;
-import org.eclipse.edc.web.spi.configuration.WebServiceConfigurer;
-import org.eclipse.edc.web.spi.configuration.WebServiceSettings;
+import org.eclipse.edc.web.spi.configuration.PortMapping;
+import org.eclipse.edc.web.spi.configuration.PortMappingRegistry;
 import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.ClientErrorExceptionMapper;
 import org.eclipse.tractusx.edc.dataplane.proxy.consumer.api.asset.ConsumerAssetRequestController;
 import org.eclipse.tractusx.edc.edr.spi.service.EdrService;
@@ -50,16 +51,18 @@
  */
 @Extension(value = DataPlaneProxyConsumerApiExtension.NAME)
 public class DataPlaneProxyConsumerApiExtension implements ServiceExtension {
-    public static final int DEFAULT_THREAD_POOL = 10;
+
+    public static final String NAME = "Data Plane Proxy Consumer API";
+    private static final String PROXY = "proxy";
+    private static final int DEFAULT_PROXY_PORT = 8186;
+    private static final String DEFAULT_PROXY_PATH = "/proxy";
+    private static final int DEFAULT_THREAD_POOL = 10;
+
     @Setting("Vault alias for the Consumer Proxy API key")
     public static final String AUTH_SETTING_CONSUMER_PROXY_APIKEY_ALIAS = "tx.edc.dpf.consumer.proxy.auth.apikey.alias";
     @Setting("API key for the Consumer Proxy API")
     public static final String AUTH_SETTING_CONSUMER_PROXY_APIKEY = "tx.edc.dpf.consumer.proxy.auth.apikey";
-    static final String NAME = "Data Plane Proxy Consumer API";
-    private static final int DEFAULT_PROXY_PORT = 8186;
-    private static final String CONSUMER_API_ALIAS = "consumer.api";
-    private static final String CONSUMER_CONTEXT_PATH = "/proxy";
-    private static final String CONSUMER_CONFIG_KEY = "web.http.proxy";
+
     @Setting(value = "Data plane proxy API consumer port", type = "int")
     private static final String CONSUMER_PORT = "tx.edc.dpf.consumer.proxy.port";
     @Deprecated(since = "0.7.1")
@@ -72,29 +75,24 @@ public class DataPlaneProxyConsumerApiExtension implements ServiceExtension {
     private static final String AUTH_SETTING_APIKEY_ALIAS_DEPRECATED = "edc.api.auth.key.alias";
     @Deprecated(since = "0.7.1")
     private static final String AUTH_SETTING_APIKEY_DEPRECATED = "edc.api.auth.key";
-    @Inject
-    private WebService webService;
 
-    @Inject
-    private WebServer webServer;
+    @Configuration
+    private DataPlaneProxyConsumerApiConfiguration apiConfiguration;
 
+    @Inject
+    private WebService webService;
     @Inject
     private PipelineService pipelineService;
-
     @Inject
     private EdrService edrService;
-
-    @Inject
-    private WebServiceConfigurer configurer;
-
     @Inject
     private Vault vault;
-
     @Inject
     private ApiAuthenticationRegistry apiAuthenticationRegistry;
-
     @Inject
     private Monitor monitor;
+    @Inject
+    private PortMappingRegistry portMappingRegistry;
 
     private ExecutorService executorService;
 
@@ -105,22 +103,22 @@ public String name() {
 
     @Override
     public void initialize(ServiceExtensionContext context) {
+        // when deprecated port will be purged, just assign `apiConfiguration.port()` to `port`
         var port = propertyCompatibility(context, CONSUMER_PORT, CONSUMER_PORT_DEPRECATED, DEFAULT_PROXY_PORT);
-        var config = context.getConfig(CONSUMER_CONFIG_KEY);
-
-        configurer.configure(config, webServer, createApiContext(port));
+        var portMapping = new PortMapping(PROXY, port, apiConfiguration.path());
+        portMappingRegistry.register(portMapping);
 
         var poolSize = propertyCompatibility(context, THREAD_POOL_SIZE, THREAD_POOL_SIZE_DEPRECATED, DEFAULT_THREAD_POOL);
         executorService = newFixedThreadPool(poolSize);
 
         var authenticationService = createAuthenticationService(context);
-        apiAuthenticationRegistry.register(CONSUMER_API_ALIAS, authenticationService);
+        apiAuthenticationRegistry.register(PROXY, authenticationService);
 
-        var authenticationFilter = new AuthenticationRequestFilter(apiAuthenticationRegistry, CONSUMER_API_ALIAS);
-        webService.registerResource(CONSUMER_API_ALIAS, authenticationFilter);
+        var authenticationFilter = new AuthenticationRequestFilter(apiAuthenticationRegistry, PROXY);
+        webService.registerResource(PROXY, authenticationFilter);
 
-        webService.registerResource(CONSUMER_API_ALIAS, new ClientErrorExceptionMapper());
-        webService.registerResource(CONSUMER_API_ALIAS, new ConsumerAssetRequestController(edrService, pipelineService, executorService, monitor));
+        webService.registerResource(PROXY, new ClientErrorExceptionMapper());
+        webService.registerResource(PROXY, new ConsumerAssetRequestController(edrService, pipelineService, executorService, monitor));
     }
 
     @Override
@@ -138,14 +136,14 @@ private AuthenticationService createAuthenticationService(ServiceExtensionContex
         return new TokenBasedAuthenticationService(context.getMonitor().withPrefix("ConsumerProxyAPI"), apiKey);
     }
 
-    private WebServiceSettings createApiContext(int port) {
-        return WebServiceSettings.Builder.newInstance()
-                .apiConfigKey(CONSUMER_CONFIG_KEY)
-                .contextAlias(CONSUMER_API_ALIAS)
-                .defaultPath(CONSUMER_CONTEXT_PATH)
-                .defaultPort(port)
-                .name(NAME)
-                .build();
+    @Settings
+    record DataPlaneProxyConsumerApiConfiguration(
+            @Setting(key = "web.http." + PROXY + ".port", description = "Port for " + PROXY + " api context", defaultValue = DEFAULT_PROXY_PORT + "")
+            int port,
+            @Setting(key = "web.http." + PROXY + ".path", description = "Path for " + PROXY + " api context", defaultValue = DEFAULT_PROXY_PATH)
+            String path
+    ) {
+
     }
 
 }

edc-extensions/dataplane/dataplane-proxy/edc-dataplane-proxy-consumer-api/src/main/java/org/eclipse/tractusx/edc/dataplane/proxy/consumer/api/DataPlaneProxyConsumerApiExtension.java

@@ -50,8 +50,8 @@ public String verificationId() {
     @Override
     public Map<String, String> getConfiguration() {
         var cfg = new HashMap<>(super.getConfiguration());
-        cfg.put("web.http.resolution.port", String.valueOf(csService.getPort()));
-        cfg.put("web.http.resolution.path", csService.getPath());
+        cfg.put("web.http.presentation.port", String.valueOf(csService.getPort()));
+        cfg.put("web.http.presentation.path", csService.getPath());
         if (dimUri != null) {
             cfg.put("tx.edc.iam.sts.dim.url", dimUri.toString());
         }

edc-tests/edc-controlplane/iatp-tests/src/test/java/org/eclipse/tractusx/edc/tests/transfer/iatp/harness/IatpParticipant.java

@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.11.0-20241213-SNAPSHOT"
+edc = "0.11.0-20250110-SNAPSHOT"
 assertj = "3.27.2"
 awaitility = "4.2.2"
 aws = "2.29.49"

gradle/libs.versions.toml

@@ -49,10 +49,8 @@ HEALTHCHECK NONE
 
 ENTRYPOINT ["java", \
      "-javaagent:/app/opentelemetry-javaagent.jar", \
-     "-Dedc.fs.config=/app/configuration.properties", \
      "-Dotel.javaagent.configuration-file=/app/opentelemetry.properties", \
-     "-Dotel.metrics.exporter=prometheus", \
-     "-Dotel.exporter.prometheus.port=9090", \
+     "-Dedc.fs.config=/app/configuration.properties", \
      "-Djava.security.egd=file:/dev/urandom", \
      "-jar", \
      "edc-runtime.jar"]