cleanup

.env.dev

@@ -1,5 +1,5 @@
 # Env variables for docker-compose-dev.yaml
-EDC_IMAGE=ghcr.io/sovity/edc-ce-mds:pr-1025
-TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:10.1.0
-EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:4.1.1
+EDC_IMAGE=ghcr.io/sovity/edc-dev:latest
+TEST_BACKEND_IMAGE=ghcr.io/sovity/test-backend:latest
+EDC_UI_IMAGE=ghcr.io/sovity/edc-ui:latest
 EDC_UI_ACTIVE_PROFILE=sovity-open-source

docker-compose-dev.yaml

@@ -8,9 +8,9 @@ services:
     environment:
       EDC_UI_ACTIVE_PROFILE: ${EDC_UI_ACTIVE_PROFILE}
       EDC_UI_CONFIG_URL: edc-ui-config
-      EDC_UI_CATALOG_URLS: http://edc2:11003/api/dsp
       EDC_UI_MANAGEMENT_API_URL: http://localhost:11002/api/management
       EDC_UI_MANAGEMENT_API_KEY: ApiKeyDefaultValue
+      EDC_UI_CATALOG_URLS: http://edc2:11003/api/dsp
       EDC_UI_MANAGEMENT_API_URL_SHOWN_IN_DASHBOARD: http://localhost:11002/control/api/management
       NGINX_ACCESS_LOG: off
 
@@ -20,14 +20,7 @@ services:
       postgresql:
         condition: service_healthy
     environment:
-      MY_EDC_PARTICIPANT_ID: sovity-demo-a
-      EDC_OAUTH_TOKEN_URL: https://keycloak.stage-sovity.azure.sovity.io/realms/DAPS/protocol/openid-connect/token
-      EDC_OAUTH_PROVIDER_JWKS_URL: https://keycloak.stage-sovity.azure.sovity.io/realms/DAPS/protocol/openid-connect/certs
-      EDC_OAUTH_CLIENT_ID: 74:BE:81:48:61:F9:0E:06:2D:E4:CB:96:2E:36:30:11:83:4C:32:29:keyid:EB:8E:86:7F:A2:B6:19:8A:10:58:46:CF:88:38:D6:F1:E1:E2:FC:69
-      EDC_KEYSTORE: "/keystore.jks"
-      EDC_KEYSTORE_PASSWORD: 'changeit'
-      EDC_OAUTH_CERTIFICATE_ALIAS: 1
-      EDC_OAUTH_PRIVATE_KEY_ALIAS: 1
+      MY_EDC_PARTICIPANT_ID: "my-edc"
       MY_EDC_TITLE: "EDC Connector"
       MY_EDC_DESCRIPTION: "sovity Community Edition EDC Connector"
       MY_EDC_CURATOR_URL: "https://example.com"
@@ -48,14 +41,7 @@ services:
       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_AGENT_IDENTITY_KEY: 'client_id' # required for Mock IAM to work
-
-      # LH-Extension
-      EDC_LOGGINGHOUSE_EXTENSION_ENABLED: 'true' #Deaktivierte LH-Extension
-      EDC_LOGGINGHOUSE_EXTENSION_URL: https://webhook.site/5de03553-60fb-4654-a39f-86ab7bf98950
-      EDC_DATASOURCE_LOGGINGHOUSE_URL: jdbc:postgresql://postgresql:5432/edc
-      EDC_DATASOURCE_LOGGINGHOUSE_USER: edc
-      EDC_DATASOURCE_LOGGINGHOUSE_PASSWORD: edc
+      EDC_AGENT_IDENTITY_KEY: 'client_id' # required for Mock IAM to work
 
     ports:
       - '11001:11001'
@@ -64,9 +50,6 @@ services:
       - '11004:11004'
       - '11005:5005'
 
-    volumes:
-      - /home/uuh/dev/.more/daps/server.keystore:/keystore.jks
-
   edc-ui2:
     image: ${EDC_UI_IMAGE}
     ports:
@@ -159,4 +142,3 @@ volumes:
     driver: local
   postgresql2:
     driver: local
-

docker-compose.yaml

@@ -10,7 +10,7 @@ services:
       EDC_UI_CONFIG_URL: edc-ui-config
       EDC_UI_MANAGEMENT_API_URL: http://localhost:11002/api/management
       EDC_UI_MANAGEMENT_API_KEY: ApiKeyDefaultValue
-      EDC_UI_CATALOG_URLS:
+      EDC_UI_CATALOG_URLS: http://edc2:11003/api/dsp
       EDC_UI_MANAGEMENT_API_URL_SHOWN_IN_DASHBOARD: http://localhost:11002/control/api/management
       NGINX_ACCESS_LOG: off
 

docs/api/sovity-edc-api-wrapper.yaml

@@ -603,11 +603,11 @@ components:
     DataSourceType:
       type: string
       description: Supported Data Source Types by UiDataSource
+      default: CUSTOM
       enum:
       - HTTP_DATA
       - ON_REQUEST
       - CUSTOM
-      default: CUSTOM
     SecretValue:
       type: object
       properties:
@@ -815,14 +815,14 @@ components:
     UiDataSourceHttpDataMethod:
       type: string
       description: Supported HTTP Methods by UiDataSource
+      default: GET
       enum:
       - GET
       - POST
       - PUT
       - PATCH
       - DELETE
       - OPTIONS
-      default: GET
     UiDataSourceOnRequest:
       required:
       - contactEmail

utils/test-utils/src/main/java/de/sovity/edc/extension/e2e/connector/config/ConnectorConfig.java

@@ -37,8 +37,4 @@ public void setProperty(String key, String value) {
     public void setProperties(Map<String, String> properties) {
         this.properties.putAll(properties);
     }
-
-    public WellKnowProperties getWellKnownProperties() {
-        return new WellKnowProperties(properties);
-    }
 }