add DPF instance store

eclipse-tractusx · Aug 20, 2023 · 38ef2f9 · 38ef2f9
1 parent 649fd79
commit 38ef2f9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/edc-dataplane/edc-dataplane-base/build.gradle.kts b/edc-dataplane/edc-dataplane-base/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     runtimeOnly(libs.edc.dpf.awss3)
     runtimeOnly(libs.edc.dpf.oauth2)
     runtimeOnly(libs.edc.dpf.http)
+    runtimeOnly(libs.edc.dpf.instance.store.sql)
 
     runtimeOnly(libs.edc.dpf.framework)
     runtimeOnly(libs.edc.dpf.api)

diff --git a/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts b/edc-tests/edc-dataplane-proxy-e2e/build.gradle.kts
@@ -25,6 +25,8 @@ dependencies {
     testImplementation(libs.edc.config.filesystem)
     testImplementation(libs.edc.dpf.http)
     testImplementation(libs.edc.auth.tokenbased)
+    testImplementation(libs.edc.dpf.selector.core)
+    testImplementation(libs.edc.dsp.apiconfig)
     testImplementation(project(":spi:edr-spi"))
     testImplementation(project(":core:edr-cache-core"))
     testImplementation(project(":edc-extensions:dataplane-proxy:edc-dataplane-proxy-consumer-api"))

diff --git a/...-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java b/...-e2e/src/test/java/org/eclipse/tractusx/edc/dataplane/proxy/e2e/DpfProxyEndToEndTest.java
@@ -63,6 +63,8 @@ public class DpfProxyEndToEndTest {
     private static final int CONSUMER_HTTP_PORT = getFreePort();
     private static final int CONSUMER_PROXY_PORT = getFreePort();
     private static final int PRODUCER_HTTP_PORT = getFreePort();
+    private static final int CONSUMER_PROTOCOL_PORT = getFreePort();
+    private static final int PRODUCER_PROTOCOL_PORT = getFreePort();
     private static final int MOCK_ENDPOINT_PORT = getFreePort();
 
     private static final int VALIDATION_ENDPOINT_PORT = getFreePort();
@@ -82,6 +84,8 @@ public class DpfProxyEndToEndTest {
             "consumer",
             baseConfig(Map.of(
                     "web.http.port", valueOf(CONSUMER_HTTP_PORT),
+                    "web.http.protocol.path", "/api-consumer",
+                    "web.http.protocol.port", valueOf(CONSUMER_PROTOCOL_PORT),
                     "edc.api.auth.key", API_KEY,
                     "tx.dpf.consumer.proxy.port", valueOf(CONSUMER_PROXY_PORT)
             )));
@@ -91,6 +95,8 @@ public class DpfProxyEndToEndTest {
             "provider",
             baseConfig(Map.of(
                     "web.http.port", valueOf(PRODUCER_HTTP_PORT),
+                    "web.http.protocol.path", "/api-producer",
+                    "web.http.protocol.port", valueOf(PRODUCER_PROTOCOL_PORT),
                     "tx.dpf.proxy.gateway.aas.proxied.path", "http://localhost:" + MOCK_ENDPOINT_PORT
             )));
     private static MockWebServer mockEndpoint = new MockWebServer();

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -67,6 +67,7 @@ edc-api-contractnegotiation = { module = "org.eclipse.edc:contract-negotiation-a
 edc-api-dataplane = { module = "org.eclipse.edc:dataplane-api", version.ref = "edc" }
 edc-api-transferprocess = { module = "org.eclipse.edc:transfer-process-api", version.ref = "edc" }
 edc-dsp = { module = "org.eclipse.edc:dsp", version.ref = "edc" }
+edc-dsp-apiconfig = { module = "org.eclipse.edc:dsp-api-configuration", version.ref = "edc" }
 edc-iam-mock = { module = "org.eclipse.edc:iam-mock", version.ref = "edc" }
 edc-policy-engine = { module = "org.eclipse.edc:policy-engine", version.ref = "edc" }
 edc-auth-tokenbased = { module = "org.eclipse.edc:auth-tokenbased", version.ref = "edc" }
@@ -106,6 +107,7 @@ edc-spi-dataplane-selector = { module = "org.eclipse.edc:data-plane-selector-spi
 edc-dpf-transferclient = { module = "org.eclipse.edc:data-plane-transfer-client", version.ref = "edc" }
 edc-dpf-selector-client = { module = "org.eclipse.edc:data-plane-selector-client", version.ref = "edc" }
 edc-dpf-selector-spi = { module = "org.eclipse.edc:data-plane-selector-spi", version.ref = "edc" }
+edc-dpf-instance-store-sql = { module = "org.eclipse.edc:data-plane-instance-store-sql", version.ref = "edc" }
 edc-dpf-selector-core = { module = "org.eclipse.edc:data-plane-selector-core", version.ref = "edc" }
 edc-dpf-transfer = { module = "org.eclipse.edc:transfer-data-plane", version.ref = "edc" }
 edc-dpf-framework = { module = "org.eclipse.edc:data-plane-framework", version.ref = "edc" }
@@ -152,5 +154,5 @@ apicatalog-iron-vc = { module = "com.apicatalog:iron-verifiable-credentials", ve
 [bundles]
 edc-connector = ["edc.boot", "edc.core-connector", "edc.core-controlplane", "edc.api-observability"]
 edc-dpf = ["edc.dpf-transfer", "edc.dpf-selector-core", "edc.dpf-selector-client", "edc.spi-dataplane-selector"]
-edc-sqlstores = ["edc.sql-assetindex", "edc.sql-contract-definition", "edc.sql-contract-negotiation", "edc.sql-transferprocess", "edc.sql-policydef"]
+edc-sqlstores = ["edc.sql-assetindex", "edc.sql-contract-definition", "edc.sql-contract-negotiation", "edc.sql-transferprocess", "edc.sql-policydef", "edc.dpf-instance-store-sql"]
 edc-monitoring = ["edc.micrometer-core", "edc.micrometer-jersey", "edc.micrometer-jetty"]