fix(bom): add missing dependencies (#4603)

* fix(bom): add missing dependencies * add config to tests
eclipse-edc · Nov 5, 2024 · 740c552 · 740c552
1 parent 672192a
commit 740c552
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/dist/bom/controlplane-base-bom/build.gradle.kts b/dist/bom/controlplane-base-bom/build.gradle.kts
@@ -37,8 +37,10 @@ dependencies {
     api(project(":extensions:common:auth:auth-delegated"))
     api(project(":extensions:control-plane:api:management-api"))
     api(project(":extensions:data-plane-selector:data-plane-selector-api"))
+    api(project(":extensions:data-plane-selector:data-plane-selector-control-api"))
     api(project(":extensions:data-plane:data-plane-signaling:data-plane-signaling-client"))
     api(project(":extensions:common:api:api-observability"))
+    api(project(":extensions:common:api:control-api-configuration"))
     api(project(":extensions:common:api:version-api"))
     api(project(":extensions:common:http"))
     api(project(":extensions:control-plane:callback:callback-event-dispatcher"))

diff --git a/system-tests/bom-tests/src/test/java/org/eclipse/edc/test/bom/BomSmokeTests.java b/system-tests/bom-tests/src/test/java/org/eclipse/edc/test/bom/BomSmokeTests.java
@@ -27,6 +27,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.mockserver.integration.ClientAndServer;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import static io.restassured.RestAssured.given;
@@ -64,16 +65,21 @@ class ControlPlaneDcp extends SmokeTest {
         @RegisterExtension
         protected RuntimeExtension runtime =
                 new RuntimePerMethodExtension(new EmbeddedRuntime("control-plane-dcp-bom",
-                        Map.of(
-                                "edc.iam.sts.oauth.token.url", "https://sts.com/token",
-                                "edc.iam.sts.oauth.client.id", "test-client",
-                                "edc.iam.sts.oauth.client.secret.alias", "test-alias",
-                                "web.http.port", DEFAULT_PORT,
-                                "web.http.path", DEFAULT_PATH,
-                                "web.http.version.port", String.valueOf(getFreePort()),
-                                "web.http.version.path", "/api/version",
-                                "web.http.management.port", "8081",
-                                "web.http.management.path", "/api/management"),
+                        new HashMap<>() {
+                            {
+                                put("edc.iam.sts.oauth.token.url", "https://sts.com/token");
+                                put("edc.iam.sts.oauth.client.id", "test-client");
+                                put("edc.iam.sts.oauth.client.secret.alias", "test-alias");
+                                put("web.http.port", DEFAULT_PORT);
+                                put("web.http.path", DEFAULT_PATH);
+                                put("web.http.version.port", String.valueOf(getFreePort()));
+                                put("web.http.version.path", "/api/version");
+                                put("web.http.control.port", String.valueOf(getFreePort()));
+                                put("web.http.control.path", "/api/control");
+                                put("web.http.management.port", "8081");
+                                put("web.http.management.path", "/api/management");
+                            }
+                        },
                         ":dist:bom:controlplane-dcp-bom"
                 ));
     }
@@ -96,6 +102,8 @@ class ControlPlaneOauth2 extends SmokeTest {
                     put("web.http.management.path", "/api/management");
                     put("web.http.port", DEFAULT_PORT);
                     put("web.http.path", DEFAULT_PATH);
+                    put("web.http.control.port", String.valueOf(getFreePort()));
+                    put("web.http.control.path", "/api/control");
                     put("web.http.version.port", String.valueOf(getFreePort()));
                     put("web.http.version.path", "/api/version");