From c16403768d3091f8220ebdb09a593b095e873772 Mon Sep 17 00:00:00 2001 From: "D.Hommen" <75446820+dhommen@users.noreply.github.com> Date: Thu, 1 Aug 2024 08:21:41 +0200 Subject: [PATCH 1/9] Feat/lh buffering (#1014) * feat: update lh client version with buffering feature * chore: update CHANGELOG.md with new env --- CHANGELOG.md | 3 +++ gradle/libs.versions.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15ba7f037..ec6c12f7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,9 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). #### Minor Changes ### Deployment Migration Notes +- ```EDC_DATASOURCE_LOGGINGHOUSE_URL```: "postgres://some-url" +- ```EDC_DATASOURCE_LOGGINGHOUSE_USER```: "username" +- ```EDC_DATASOURCE_LOGGINGHOUSE_PASSWORD```: "password" #### Compatible Versions diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 748f8b6ec..fe13c11b3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -43,7 +43,7 @@ json = "20220924" jsonAssert = "1.5.1" jsonUnit = "3.2.7" junit = "5.10.0" -loggingHouse = "0.2.10" +loggingHouse = "v1.1.0" lombok = "1.18.30" mockito = "5.12.0" mockserver = "5.15.0" From 4df1a63bc07ca4e968e82b8e5fa65bf837fc0528 Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Thu, 1 Aug 2024 12:17:08 +0200 Subject: [PATCH 2/9] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec6c12f7d..81adbf479 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,15 +9,15 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). ### Detailed Changes -#### Minor - -#### Patch - #### Major Changes #### Minor Changes +#### Patch Changes +- Logginghouse-Client: Update logging-house-client extension to v1.1.0 + ### Deployment Migration Notes +As the updated logging-house-client extension now also saves data locally in a database, the following additional proerties must be added and set accordingly: - ```EDC_DATASOURCE_LOGGINGHOUSE_URL```: "postgres://some-url" - ```EDC_DATASOURCE_LOGGINGHOUSE_USER```: "username" - ```EDC_DATASOURCE_LOGGINGHOUSE_PASSWORD```: "password" From 5b666fbcfe10671795403fde14dc3375e96f188d Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:11:26 +0200 Subject: [PATCH 3/9] Update README.md --- docs/deployment-guide/goals/production/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/deployment-guide/goals/production/README.md b/docs/deployment-guide/goals/production/README.md index b679811e6..a7ed7adc0 100644 --- a/docs/deployment-guide/goals/production/README.md +++ b/docs/deployment-guide/goals/production/README.md @@ -151,9 +151,14 @@ EDC_OAUTH_PRIVATE_KEY_ALIAS: 1 A LoggingHouse extension is included in the MDS variant, which means that additional properties must be set for it: ```yaml -# LoggingHouse Extension +# LoggingHouse Extension general settings EDC_LOGGINGHOUSE_EXTENSION_ENABLED: "true" EDC_LOGGINGHOUSE_EXTENSION_URL: https://clearing.test.mobility-dataspace.eu + +# LoggingHouse Extension database connection +EDC_DATASOURCE_LOGGINGHOUSE_URL: jdbc:postgresql://postgresql:5432/edc +EDC_DATASOURCE_LOGGINGHOUSE_USER: edc +EDC_DATASOURCE_LOGGINGHOUSE_PASSWORD: edc ``` You can also optionally set the following config properties: From e3e4bbcaf7ced1e7dc30103837e678f5c272e872 Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:14:27 +0200 Subject: [PATCH 4/9] Update README.md --- docs/deployment-guide/goals/local-demo/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/deployment-guide/goals/local-demo/README.md b/docs/deployment-guide/goals/local-demo/README.md index 7d15efd51..d709441f0 100644 --- a/docs/deployment-guide/goals/local-demo/README.md +++ b/docs/deployment-guide/goals/local-demo/README.md @@ -48,6 +48,8 @@ EDC_UI_ACTIVE_PROFILE=mds-open-source docker compose up +This type of start for a local demo does not activate the LoggingHouse extension, which is otherwise available in the MDS variant. + ## Quick Start: Default Configuration The default configuration launches two local EDC Connectors with the following credentials: From 742f3b62c499e5d040747afea41fcbf7704b88a7 Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Thu, 1 Aug 2024 14:15:16 +0200 Subject: [PATCH 5/9] Update README.md --- docs/deployment-guide/goals/development/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/deployment-guide/goals/development/README.md b/docs/deployment-guide/goals/development/README.md index 09239430c..f82f49f89 100644 --- a/docs/deployment-guide/goals/development/README.md +++ b/docs/deployment-guide/goals/development/README.md @@ -57,6 +57,8 @@ EDC_UI_ACTIVE_PROFILE=mds-open-source docker compose --env-file .env.dev -f dock +This type of start for development purposes does not activate the LoggingHouse extension, which is otherwise available in the MDS variant. + ## Dev Docker Compose: Default Configuration The default configuration launches two local EDC Connectors with the following credentials: From 824e84c8ce9ea074c187d0efd3bf96f338e794a7 Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Thu, 1 Aug 2024 15:51:31 +0200 Subject: [PATCH 6/9] Update CHANGELOG.md --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81adbf479..715c2ac15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,11 +17,16 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). - Logginghouse-Client: Update logging-house-client extension to v1.1.0 ### Deployment Migration Notes -As the updated logging-house-client extension now also saves data locally in a database, the following additional proerties must be added and set accordingly: +#### logging-house-client extension +As the updated logging-house-client extension now also saves data locally in a database, the following additional proerties must be added and set accordingly to a second additional database since the extension has its own flyway migration: - ```EDC_DATASOURCE_LOGGINGHOUSE_URL```: "postgres://some-url" - ```EDC_DATASOURCE_LOGGINGHOUSE_USER```: "username" - ```EDC_DATASOURCE_LOGGINGHOUSE_PASSWORD```: "password" +If the extension is to be switched off, the following must now be set, as the extension is now activated by default when integrated: +- ```EDC_LOGGINGHOUSE_EXTENSION_ENABLED: 'false'``` + + #### Compatible Versions - Connector Backend Docker Images: From b70c576bb3e650a8ab1fd191812f13b87f9d9492 Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Thu, 1 Aug 2024 15:53:21 +0200 Subject: [PATCH 7/9] Update README.md --- docs/deployment-guide/goals/development/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/deployment-guide/goals/development/README.md b/docs/deployment-guide/goals/development/README.md index f82f49f89..f67884732 100644 --- a/docs/deployment-guide/goals/development/README.md +++ b/docs/deployment-guide/goals/development/README.md @@ -48,8 +48,8 @@ docker login ghcr.io # Pull the latest images docker compose --env-file .env.dev -f docker-compose-dev.yaml pull -# Start MDS EDC Connectors -EDC_UI_ACTIVE_PROFILE=mds-open-source docker compose --env-file .env.dev -f docker-compose-dev.yaml up +# Start MDS EDC Connectors without activating the logging-house-extension +EDC_UI_ACTIVE_PROFILE=mds-open-source EDC_LOGGINGHOUSE_EXTENSION_ENABLED=false docker compose --env-file .env.dev -f docker-compose-dev.yaml up ``` @@ -57,8 +57,6 @@ EDC_UI_ACTIVE_PROFILE=mds-open-source docker compose --env-file .env.dev -f dock -This type of start for development purposes does not activate the LoggingHouse extension, which is otherwise available in the MDS variant. - ## Dev Docker Compose: Default Configuration The default configuration launches two local EDC Connectors with the following credentials: From 56458a660d593b40b5b4f4d4fc0fac453812954c Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Thu, 1 Aug 2024 15:54:55 +0200 Subject: [PATCH 8/9] Update README.md --- docs/deployment-guide/goals/local-demo/README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/deployment-guide/goals/local-demo/README.md b/docs/deployment-guide/goals/local-demo/README.md index d709441f0..6675355f6 100644 --- a/docs/deployment-guide/goals/local-demo/README.md +++ b/docs/deployment-guide/goals/local-demo/README.md @@ -39,8 +39,8 @@ docker compose up # Log-In to the Github Container Registry docker login ghcr.io -# Start MDS EDC Connectors -EDC_UI_ACTIVE_PROFILE=mds-open-source docker compose up +# Start MDS EDC Connectors without activating the logging-house-extension +EDC_UI_ACTIVE_PROFILE=mds-open-source EDC_LOGGINGHOUSE_EXTENSION_ENABLED=false docker compose up ``` @@ -48,8 +48,6 @@ EDC_UI_ACTIVE_PROFILE=mds-open-source docker compose up -This type of start for a local demo does not activate the LoggingHouse extension, which is otherwise available in the MDS variant. - ## Quick Start: Default Configuration The default configuration launches two local EDC Connectors with the following credentials: From eb31ab73abbc2364fda22afaeb387258c3ee27c8 Mon Sep 17 00:00:00 2001 From: Tim Berthold <75306992+tmberthold@users.noreply.github.com> Date: Thu, 1 Aug 2024 15:57:11 +0200 Subject: [PATCH 9/9] Update README.md --- docs/deployment-guide/goals/production/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/deployment-guide/goals/production/README.md b/docs/deployment-guide/goals/production/README.md index a7ed7adc0..849c7971c 100644 --- a/docs/deployment-guide/goals/production/README.md +++ b/docs/deployment-guide/goals/production/README.md @@ -29,7 +29,7 @@ To deploy an EDC multiple deployment units must be deployed and configured. |-------------------------------------------------------------------|---------------------------------------------------------------------------------------------| | An Auth Proxy / Auth solution of your choice. | (deployment specific, required to secure UI and management API) | | Reverse Proxy that merges multiple services and removes the ports | (deployment specific) | -| Postgresql | 13 or compatible version | +| Postgresql | 13 or compatible version, one for the EDC-data one for the LH-data | | EDC Backend | edc-ce or edc-ce-mds, see [CHANGELOG.md](../../../../CHANGELOG.md) for compatible versions. | | EDC UI | edc-ui, see [CHANGELOG.md](../../../../CHANGELOG.md) for compatible versions. | @@ -155,8 +155,8 @@ A LoggingHouse extension is included in the MDS variant, which means that additi EDC_LOGGINGHOUSE_EXTENSION_ENABLED: "true" EDC_LOGGINGHOUSE_EXTENSION_URL: https://clearing.test.mobility-dataspace.eu -# LoggingHouse Extension database connection -EDC_DATASOURCE_LOGGINGHOUSE_URL: jdbc:postgresql://postgresql:5432/edc +# LoggingHouse Extension database connection for its own database +EDC_DATASOURCE_LOGGINGHOUSE_URL: jdbc:postgresql://postgresql2:5432/edc EDC_DATASOURCE_LOGGINGHOUSE_USER: edc EDC_DATASOURCE_LOGGINGHOUSE_PASSWORD: edc ```