391 backend UI api wrapper GET & POST & DELETE contract definition endpoint with 02x

CHANGELOG.md

@@ -4,28 +4,28 @@ All notable changes to this project will be documented in this file.
 
 ## [x.x.x] - UNRELEASED
 
-### Overview
-
-### EDC UI
-
-### EDC-Extensions
-
-#### Major Changes
-
-#### Minor Changes
+### Major Changes
 
-#### Patch Changes
+- Upgrade to core-EDC version `0.1.2`
+- Now using the `Dataspace Protocol`
+- Major changes to the management API
+  - Examples for the new requests are located in the postman collection in the `docs` folder
+  - The `OpenAPI` file has been updated to represent the EDC version `0.1.2`
 
-### Deployment Migration Notes
+### Patch Changes
 
-#### Compatible Versions
+- Fix API Wrapper Broker Server API Spec not showing in client libraries.
 
-- Connector Backend Docker Images:
-  - Dev EDC: `ghcr.io/sovity/edc-dev:{{ VERSION HERE }}`
-  - Sovity EDC CE: `ghcr.io/sovity/edc-ce:{{ VERSION HERE }}`
-  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:{{ VERSION HERE }}`
-- Connector UI Docker Image: `ghcr.io/sovity/edc-ui:0.0.1-milestone-8-sovity{{ VERSION HERE }}`
+### Migration Notes
 
+- The `MY_EDC_IDS_BASE_URL` has been renamed to `MY_EDC_PROTOCOL_BASE_URL`
+- The default value of `WEB_HTTP_PROTOCOL_PATH` been changed from `${MY_EDC_BASE_PATH}/api/v1/ids` to `${MY_EDC_BASE_PATH}/api/v1/protocol`
+- The following new environment variables must be set
+  - `EDC_PARTICIPANT_ID`: `provider`
+  - `EDC_JSONLD_HTTPS_ENABLED`: `true`
+  - `EDC_DSP_CALLBACK_ADDRESS`: `http://edc:11003/api/v1/protocol`
+- All endpoints have a `v2` prefix now
+  - example: `http://localhost:11002/api/v1/management/assets/request` is now available at `http://localhost:11002/api/v1/management/v2/assets/request`
 
 ## [4.1.0] - 2023-07-24
 
@@ -52,9 +52,9 @@ Security improvements of container image and enhancements for the `ReferringConn
 #### Compatible Versions
 
 - Connector Backend Docker Images:
-    - Dev EDC: `ghcr.io/sovity/edc-dev:4.1.0`
-    - Sovity EDC CE: `ghcr.io/sovity/edc-ce:4.1.0`
-    - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:4.1.0`
+  - Dev EDC: `ghcr.io/sovity/edc-dev:4.1.0`
+  - Sovity EDC CE: `ghcr.io/sovity/edc-ce:4.1.0`
+  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:4.1.0`
 - Connector UI Docker Image: `ghcr.io/sovity/edc-ui:0.0.1-milestone-8-sovity12`
 
 ## [4.0.1] - 2023-07-07
@@ -80,9 +80,9 @@ No changes besides docker image versions.
 #### Compatible Versions
 
 - Connector Backend Docker Images:
-    - Dev EDC: `ghcr.io/sovity/edc-dev:4.0.1`
-    - Sovity EDC CE: `ghcr.io/sovity/edc-ce:4.0.1`
-    - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:4.0.1`
+  - Dev EDC: `ghcr.io/sovity/edc-dev:4.0.1`
+  - Sovity EDC CE: `ghcr.io/sovity/edc-ce:4.0.1`
+  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:4.0.1`
 - Connector UI Docker Image: `ghcr.io/sovity/edc-ui:0.0.1-milestone-8-sovity11`
 
 ## [4.0.0] - 2023-07-05
@@ -116,9 +116,9 @@ No changes besides docker image versions.
 #### Compatible Versions
 
 - Connector Backend Docker Images:
-    - Dev EDC: `ghcr.io/sovity/edc-dev:4.0.0`
-    - Sovity EDC CE: `ghcr.io/sovity/edc-ce:4.0.0`
-    - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:4.0.0`
+  - Dev EDC: `ghcr.io/sovity/edc-dev:4.0.0`
+  - Sovity EDC CE: `ghcr.io/sovity/edc-ce:4.0.0`
+  - MDS EDC CE: `ghcr.io/sovity/edc-ce-mds:4.0.0`
 - Connector UI Docker Image: `ghcr.io/sovity/edc-ui:0.0.1-milestone-8-sovity9`
 
 ## [3.3.0] - 2023-06-06
@@ -133,6 +133,7 @@ No changes besides docker image versions.
 
 - Minor EE API adjustments.
 
+
 ## [3.2.0] - 2023-05-17
 
 ### Minor Changes

connector/.env

@@ -38,16 +38,16 @@ WEB_HTTP_PROTOCOL_PORT=11003
 WEB_HTTP_CONTROL_PORT=11004
 WEB_HTTP_PATH=${MY_EDC_BASE_PATH}/api
 WEB_HTTP_MANAGEMENT_PATH=${MY_EDC_BASE_PATH}/api/v1/management
-WEB_HTTP_PROTOCOL_PATH=${MY_EDC_BASE_PATH}/api/v1/ids
+WEB_HTTP_PROTOCOL_PATH=${MY_EDC_BASE_PATH}/api/v1/protocol
 WEB_HTTP_CONTROL_PATH=${MY_EDC_BASE_PATH}/api/v1/control
 
 
 EDC_HOSTNAME=${MY_EDC_FQDN}
 EDC_UI_CONNECTOR_ID=${MY_EDC_PROTOCOL}${MY_EDC_FQDN}
 
-MY_EDC_IDS_BASE_URL=${MY_EDC_PROTOCOL}${MY_EDC_FQDN}
-IDS_WEBHOOK_ADDRESS=${MY_EDC_IDS_BASE_URL}
-EDC_IDS_ENDPOINT=${MY_EDC_IDS_BASE_URL}${WEB_HTTP_PROTOCOL_PATH}
+MY_EDC_PROTOCOL_BASE_URL=${MY_EDC_PROTOCOL}${MY_EDC_FQDN}
+IDS_WEBHOOK_ADDRESS=${MY_EDC_PROTOCOL_BASE_URL}
+EDC_IDS_ENDPOINT=${MY_EDC_PROTOCOL_BASE_URL}${WEB_HTTP_PROTOCOL_PATH}
 
 # Flyway Extension: Required
 MY_EDC_JDBC_URL=jdbc:postgresql://missing-postgresql-url

connector/Dockerfile

@@ -33,7 +33,7 @@ COPY --from=build /home/gradle/project/connector/build/libs/app.jar /app
 COPY ./connector/src/main/resources/logging.properties /app
 
 # health status is determined by the availability of the /health endpoint
-HEALTHCHECK --interval=5s --timeout=5s --retries=10 CMD curl -H "X-Api-Key: $EDC_API_AUTH_KEY" --fail http://localhost:11002/api/v1/management/check/health
+HEALTHCHECK --interval=5s --timeout=5s --retries=10 CMD curl --fail http://localhost:11001/api/check/health
 
 # Use "exec" for graceful termination (SIGINT) to reach JVM.
 # ARG can not be used in ENTRYPOINT so storing values in ENV variables

connector/build.gradle.kts

@@ -15,7 +15,9 @@ dependencies {
     implementation("${edcGroup}:configuration-filesystem:${edcVersion}")
     implementation("${edcGroup}:control-plane-aggregate-services:${edcVersion}")
     implementation("${edcGroup}:http:${edcVersion}")
-    implementation("${edcGroup}:ids:${edcVersion}")
+    implementation("${edcGroup}:dsp:${edcVersion}")
+    implementation("${edcGroup}:json-ld:${edcVersion}")
+    implementation("${edcGroup}:monitor-jdk-logger:${edcVersion}")
 
     // Control-plane to Data-plane
     implementation("${edcGroup}:transfer-data-plane:${edcVersion}")

docker-compose-dev.yaml

@@ -7,11 +7,16 @@ services:
     environment:
       - EDC_UI_ACTIVE_PROFILE=${EDC_UI_ACTIVE_PROFILE}
       - EDC_UI_CONFIG_URL=edc-ui-config
-      - EDC_UI_DATA_MANAGEMENT_API_URL=http://localhost:11002/api/v1/management
+      - EDC_UI_DATA_MANAGEMENT_API_URL=http://localhost:11002/api/v1/management/v2
       - EDC_UI_DATA_MANAGEMENT_API_KEY=ApiKeyDefaultValue
-      - EDC_UI_CATALOG_URLS=http://edc2:11003/api/v1/ids/data
+      - EDC_UI_CATALOG_URLS=http://edc2:11003/api/v1/protocol
   edc:
-    image: ${DEV_EDC_IMAGE}
+#    image: ${DEV_EDC_IMAGE}
+    build:
+      dockerfile: connector/Dockerfile
+      args:
+        JVM_ARGS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+        BUILD_ARGS: -Pfs-vault -Pdmgmt-api-key -Ppostgres-flyway -Poauth
     depends_on:
       - postgresql
     environment:
@@ -43,14 +48,18 @@ services:
 
       MY_EDC_PROTOCOL: "http://"
       MY_EDC_FQDN: "edc"
-      MY_EDC_IDS_BASE_URL: "http://edc:11003"
+      MY_EDC_PROTOCOL_BASE_URL: "http://edc:11003"
 
       MY_EDC_JDBC_URL: jdbc:postgresql://postgresql:5432/edc
       MY_EDC_JDBC_USER: edc
       MY_EDC_JDBC_PASSWORD: edc
       EDC_WEB_REST_CORS_ENABLED: 'true'
       EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key'
       EDC_WEB_REST_CORS_ORIGINS: '*'
+
+      EDC_PARTICIPANT_ID: provider
+      EDC_JSONLD_HTTPS_ENABLED: true
+      EDC_DSP_CALLBACK_ADDRESS: http://edc:11003/api/v1/protocol
     ports:
       - '11001:11001'
       - '11002:11002'
@@ -78,11 +87,15 @@ services:
     environment:
       - EDC_UI_ACTIVE_PROFILE=${EDC_UI_ACTIVE_PROFILE}
       - EDC_UI_CONFIG_URL=edc-ui-config
-      - EDC_UI_DATA_MANAGEMENT_API_URL=http://localhost:22002/api/v1/management
+      - EDC_UI_DATA_MANAGEMENT_API_URL=http://localhost:22002/api/v1/management/v2
       - EDC_UI_DATA_MANAGEMENT_API_KEY=ApiKeyDefaultValue
-      - EDC_UI_CATALOG_URLS=http://edc:11003/api/v1/ids/data
+      - EDC_UI_CATALOG_URLS=http://edc:11003/api/v1/protocol
   edc2:
-    image: ${DEV_EDC_IMAGE}
+    build:
+      dockerfile: connector/Dockerfile
+      args:
+        JVM_ARGS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005
+        BUILD_ARGS: -Pfs-vault -Pdmgmt-api-key -Ppostgres-flyway -Poauth
     depends_on:
       - postgresql2
     environment:
@@ -114,14 +127,18 @@ services:
 
       MY_EDC_PROTOCOL: "http://"
       MY_EDC_FQDN: "edc2"
-      MY_EDC_IDS_BASE_URL: "http://edc2:11003"
+      MY_EDC_PROTOCOL_BASE_URL: "http://edc2:11003"
 
       MY_EDC_JDBC_URL: jdbc:postgresql://postgresql2:5432/edc
       MY_EDC_JDBC_USER: edc
       MY_EDC_JDBC_PASSWORD: edc
       EDC_WEB_REST_CORS_ENABLED: 'true'
       EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key'
       EDC_WEB_REST_CORS_ORIGINS: '*'
+
+      EDC_PARTICIPANT_ID: consumer
+      EDC_JSONLD_HTTPS_ENABLED: true
+      EDC_DSP_CALLBACK_ADDRESS: http://edc2:11003/api/v1/protocol
     ports:
       - '22001:11001'
       - '22002:11002'