build(deps): upgrade EDC to milestone-9

.github/workflows/publish-test-connector-image.yml

@@ -11,7 +11,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  CONNECTOR_TAG: 0.0.1-milestone-8
+  CONNECTOR_TAG: 0.0.1-milestone-9
 
 jobs:
   build-and-push-image:

.gitignore

@@ -1,3 +1,6 @@
+.idea/
+connector/.gradle
+connector/build
 coverage/
 dist/
-node_modules/
+node_modules/

README.md

@@ -21,7 +21,7 @@ This project aims to increase the level of abstraction, bringing the _low-level_
 developers by providing an HTTP Client which is thoroughly tested and fully type-safe.
 
 > Similarly to the **EDC Connector**, this library is at its early stage.
-> It aims to maintain compatibility with the latest version of the _Connector_, currently `v0.0.1-milestone-8`.
+> It aims to maintain compatibility with the latest version of the _Connector_, currently `0.0.1-milestone-9`.
 > The compatibility is reflected in the library's versioning.
 
 ## Usage
@@ -53,8 +53,8 @@ object, representing a unique connector.
 
 const context = edcConnectorClient.createContext("123456", {
   default: "https://edc.think-it.io/api",
-  management: "https://edc.think-it.io/api/v1/data",
-  protocol: "https://edc.think-it.io/api/v1/ids",
+  management: "https://edc.think-it.io/management",
+  protocol: "https://edc.think-it.io/protocol",
   public: "https://edc.think-it.io/public",
   control: "https://edc.think-it.io/control",
 });

conf/consumer-connector.config/addresses.json

@@ -3,8 +3,8 @@
   "name": "consumer.edc.think-it.io",
   "addresses": {
     "default": "http://localhost:19191/api",
-    "data": "http://localhost:19193/api/v1/data",
-    "ids": "http://consumer-connector:9194/api/v1/ids",
+    "data": "http://localhost:19193/management",
+    "ids": "http://consumer-connector:9194/protocol",
     "public": "http://localhost:19291/public",
     "control": "http://localhost:19292/control"
   }

conf/consumer-connector.config/configuration.properties

@@ -1,5 +1,6 @@
 edc.ids.id=urn:connector:consumer-connector
-ids.webhook.address=http://consumer-connector:9194
+
+edc.dsp.callback.address=http://consumer-connector:9194/protocol
 
 web.http.port=9191
 web.http.path=/api
@@ -8,10 +9,10 @@ web.http.control.port=9192
 web.http.control.path=/control
 
 web.http.management.port=9193
-web.http.management.path=/api/v1/data
+web.http.management.path=/management
 
 web.http.protocol.port=9194
-web.http.protocol.path=/api/v1/ids
+web.http.protocol.path=/protocol
 
 edc.api.control.auth.apikey.value=123456
 

conf/provider-connector.config/addresses.json

@@ -3,8 +3,8 @@
   "name": "provider.edc.think-it.io",
   "addresses": {
     "default": "http://localhost:29191/api",
-    "data": "http://localhost:29193/api/v1/data",
-    "ids": "http://provider-connector:9194/api/v1/ids",
+    "data": "http://localhost:29193/management",
+    "ids": "http://provider-connector:9194/protocol",
     "public": "http://localhost:29291/public",
     "control": "http://localhost:29292/control"
   }

conf/provider-connector.config/configuration.properties

@@ -1,5 +1,5 @@
 edc.ids.id=urn:connector:provider-connector
-ids.webhook.address=http://provider-connector:9194
+edc.dsp.callback.address=http://provider-connector:9194/protocol
 
 web.http.port=9191
 web.http.path=/api
@@ -8,10 +8,10 @@ web.http.control.port=9192
 web.http.control.path=/control
 
 web.http.management.port=9193
-web.http.management.path=/api/v1/data
+web.http.management.path=/management
 
 web.http.protocol.port=9194
-web.http.protocol.path=/api/v1/ids
+web.http.protocol.path=/protocol
 
 edc.api.control.auth.apikey.value=123456
 

connector/build.gradle.kts

@@ -6,20 +6,14 @@ plugins {
 
 repositories {
     mavenCentral()
-    maven {
-        url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-    }
-    maven {
-        url = uri("https://maven.iais.fraunhofer.de/artifactory/eis-ids-public/")
-    }
 }
 
 val edcGroupId = "org.eclipse.edc"
-val edcVersion = "0.0.1-milestone-8"
+val edcVersion = "0.0.1-milestone-9"
 
 dependencies {
     implementation("${edcGroupId}:control-plane-core:${edcVersion}")
-    implementation("${edcGroupId}:ids:${edcVersion}")
+    implementation("${edcGroupId}:dsp:${edcVersion}")
     implementation("${edcGroupId}:configuration-filesystem:${edcVersion}")
     implementation("${edcGroupId}:vault-filesystem:${edcVersion}")
     implementation("${edcGroupId}:iam-mock:${edcVersion}")

connector/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

connector/gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

connector/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   consumer-connector:
-    image: ghcr.io/think-it-labs/edc-connector-client/test-connector:0.0.1-milestone-8
+    build: connector
     platform: ${DOCKER_PLATFORM:-linux/amd64}
     ports:
       - "19191:9191" # connector default
@@ -21,7 +21,7 @@ services:
       - "host.docker.internal:host-gateway"
 
   provider-connector:
-    image: ghcr.io/think-it-labs/edc-connector-client/test-connector:0.0.1-milestone-8
+    build: connector
     platform: ${DOCKER_PLATFORM:-linux/amd64}
     ports:
       - "29191:9191" # connector default

tests/controllers/management.test.ts

@@ -23,15 +23,15 @@ describe("DataController", () => {
   const apiToken = "123456";
   const consumer: Addresses = {
     default: "http://localhost:19191/api",
-    management: "http://localhost:19193/api/v1/data",
-    protocol: "http://consumer-connector:9194/api/v1/ids",
+    management: "http://localhost:19193/management",
+    protocol: "http://consumer-connector:9194/protocol",
     public: "http://localhost:19291/public",
     control: "http://localhost:19292/control",
   };
   const provider: Addresses = {
     default: "http://localhost:29191/api",
-    management: "http://localhost:29193/api/v1/data",
-    protocol: "http://provider-connector:9194/api/v1/ids",
+    management: "http://localhost:29193/management",
+    protocol: "http://provider-connector:9194/protocol",
     public: "http://localhost:29291/public",
     control: "http://localhost:29292/control",
   };

tests/controllers/observability.test.ts

@@ -4,8 +4,8 @@ describe("ObservabilityController", () => {
   const apiToken = "123456";
   const addresses: Addresses = {
     default: "http://localhost:19191/api",
-    management: "http://localhost:19193/api/v1/data",
-    protocol: "http://consumer-connector:9194/api/v1/ids",
+    management: "http://localhost:19193/management",
+    protocol: "http://consumer-connector:9194/protocol",
     public: "http://localhost:19291/public",
     control: "http://localhost:19292/control",
   };

tests/controllers/public.test.ts

@@ -12,15 +12,15 @@ describe("PublicController", () => {
   const apiToken = "123456";
   const consumer: Addresses = {
     default: "http://localhost:19191/api",
-    management: "http://localhost:19193/api/v1/data",
-    protocol: "http://consumer-connector:9194/api/v1/ids",
+    management: "http://localhost:19193/management",
+    protocol: "http://consumer-connector:9194/protocol",
     public: "http://localhost:19291/public",
     control: "http://localhost:19292/control",
   };
   const provider: Addresses = {
     default: "http://localhost:29191/api",
-    management: "http://localhost:29193/api/v1/data",
-    protocol: "http://provider-connector:9194/api/v1/ids",
+    management: "http://localhost:29193/management",
+    protocol: "http://provider-connector:9194/protocol",
     public: "http://localhost:29291/public",
     control: "http://localhost:29292/control",
   };