From 8aa669d392db703828b3e588ab708ef5e74fb073 Mon Sep 17 00:00:00 2001 From: Jens Kutzsche Date: Mon, 15 Nov 2021 14:48:42 +0100 Subject: [PATCH 1/4] fix: With the stand alone installation, there is no longer an error at startup because a property is set with the wrong name. Thanks to @jl-sitnrw Refs: #466 --- infrastructure/deployment/docker-compose-ext-postgres.yml | 2 +- infrastructure/deployment/docker-compose.yml | 2 +- infrastructure/dev/docker-compose.yml | 2 +- .../stand-alone-deployment/scripts/start-iris-client-bff.sh | 2 +- iris-client-bff/src/main/resources/messages.properties | 2 +- iris-client-bff/src/main/resources/messages_de.properties | 2 +- iris-client-bff/src/main/resources/messages_en.properties | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/infrastructure/deployment/docker-compose-ext-postgres.yml b/infrastructure/deployment/docker-compose-ext-postgres.yml index 28464440f..25c8141ea 100644 --- a/infrastructure/deployment/docker-compose-ext-postgres.yml +++ b/infrastructure/deployment/docker-compose-ext-postgres.yml @@ -24,7 +24,7 @@ services: SECURITY_AUTH_DB_ADMIN_USER_NAME: SECURITY_AUTH_DB_ADMIN_USER_PASSWORD: SECURITY_JWT_JWT_SHARED_SECRET: - IRIS_LOCATION_SERVICE_ENDPOINT: ${EPS_LS_NAME} + IRIS_BACKEND_SERVICE_ENDPOINT: ${EPS_LS_NAME} IRIS_CLIENT_BASEPATH: "https://${IRIS_CLIENT_DOMAIN}" EXT_APP_DW_BASEURL: restart: unless-stopped diff --git a/infrastructure/deployment/docker-compose.yml b/infrastructure/deployment/docker-compose.yml index 44fb2ef77..38897a8a1 100644 --- a/infrastructure/deployment/docker-compose.yml +++ b/infrastructure/deployment/docker-compose.yml @@ -53,7 +53,7 @@ services: SECURITY_AUTH_DB_ADMIN_USER_NAME: SECURITY_AUTH_DB_ADMIN_USER_PASSWORD: SECURITY_JWT_JWT_SHARED_SECRET: - IRIS_BACKEND-SERVICE_ENDPOINT: ${EPS_LS_NAME} + IRIS_BACKEND_SERVICE_ENDPOINT: ${EPS_LS_NAME} IRIS_CLIENT_BASEPATH: "https://${IRIS_CLIENT_DOMAIN}" EXT_APP_DW_BASEURL: depends_on: diff --git a/infrastructure/dev/docker-compose.yml b/infrastructure/dev/docker-compose.yml index 8ad12faf5..730bb7691 100644 --- a/infrastructure/dev/docker-compose.yml +++ b/infrastructure/dev/docker-compose.yml @@ -55,7 +55,7 @@ services: EPS_CLIENT_PROXY_CLIENT_URL: https://private-proxy-1:7766/jsonrpc PROXY_SERVICE_TARGET_SUBDOMAIN: proxy.dev.test-gesundheitsamt.de IRIS_CLIENT_BASEPATH: https://iris-frontend:28080 - IRIS_BACKEND-SERVICE_ENDPOINT: ls-1 + IRIS_BACKEND_SERVICE_ENDPOINT: ls-1 SPRING_MAIL_PROPERTIES_RECIPIENT_CASE_DATA_RECEIVED_NAME: "Tester" SPRING_MAIL_PROPERTIES_RECIPIENT_CASE_DATA_RECEIVED_EMAIL: "tester@iris-gateway.de" SPRING_MAIL_PROPERTIES_RECIPIENT_EVENT_DATA_RECEIVED_NAME: "Tester" diff --git a/infrastructure/stand-alone-deployment/scripts/start-iris-client-bff.sh b/infrastructure/stand-alone-deployment/scripts/start-iris-client-bff.sh index 9f63af397..15b06c3b1 100755 --- a/infrastructure/stand-alone-deployment/scripts/start-iris-client-bff.sh +++ b/infrastructure/stand-alone-deployment/scripts/start-iris-client-bff.sh @@ -11,7 +11,7 @@ export SECURITY_AUTH_DB_ADMIN_USER_NAME=$SECURITY_AUTH_DB_ADMIN_USER_NAME export SECURITY_AUTH_DB_ADMIN_USER_PASSWORD=$SECURITY_AUTH_DB_ADMIN_USER_PASSWORD export PROXY_SERVICE_TARGET_SUBDOMAIN=$PROXY_SUBDOMAIN export PROXY_SERVICE_TARGET_PROXY=$EPS_PP_NAME -export IRIS_BACKEND-SERVICE_ENDPOINT=$EPS_LS_NAME +export IRIS_BACKEND_SERVICE_ENDPOINT=$EPS_LS_NAME ## Fixed Variables export SPRING_PROFILES_ACTIVE=prod diff --git a/iris-client-bff/src/main/resources/messages.properties b/iris-client-bff/src/main/resources/messages.properties index b58c1465f..78775cb06 100644 --- a/iris-client-bff/src/main/resources/messages.properties +++ b/iris-client-bff/src/main/resources/messages.properties @@ -1,4 +1,4 @@ EventDataReceivedEmail.subject=Neue Event Daten sind verfügbar auf dem IRIS Portal CaseDataReceivedEmail.subject=Neue Indexfall Daten sind verfügbar auf dem IRIS Portal -missing.property.iris.backend-service.endpoint=Über die Umgebungsvariable IRIS_BACKEND-SERVICE_ENDPOINT oder die entsprechende Property muss der Endpunkt des Backend-Service konfiguriert sein! +missing.property.iris.backend-service.endpoint=Über die Umgebungsvariable IRIS_BACKEND_SERVICE_ENDPOINT oder die entsprechende Property muss der Endpunkt des Backend-Service konfiguriert sein! UserController.username.notunique=Der Nutzername wird bereits verwendet! diff --git a/iris-client-bff/src/main/resources/messages_de.properties b/iris-client-bff/src/main/resources/messages_de.properties index b58c1465f..78775cb06 100644 --- a/iris-client-bff/src/main/resources/messages_de.properties +++ b/iris-client-bff/src/main/resources/messages_de.properties @@ -1,4 +1,4 @@ EventDataReceivedEmail.subject=Neue Event Daten sind verfügbar auf dem IRIS Portal CaseDataReceivedEmail.subject=Neue Indexfall Daten sind verfügbar auf dem IRIS Portal -missing.property.iris.backend-service.endpoint=Über die Umgebungsvariable IRIS_BACKEND-SERVICE_ENDPOINT oder die entsprechende Property muss der Endpunkt des Backend-Service konfiguriert sein! +missing.property.iris.backend-service.endpoint=Über die Umgebungsvariable IRIS_BACKEND_SERVICE_ENDPOINT oder die entsprechende Property muss der Endpunkt des Backend-Service konfiguriert sein! UserController.username.notunique=Der Nutzername wird bereits verwendet! diff --git a/iris-client-bff/src/main/resources/messages_en.properties b/iris-client-bff/src/main/resources/messages_en.properties index cb2cb47d4..fe1c170df 100644 --- a/iris-client-bff/src/main/resources/messages_en.properties +++ b/iris-client-bff/src/main/resources/messages_en.properties @@ -1,4 +1,4 @@ EventDataReceivedEmail.subject=New Event data is available in the IRIS portal CaseDataReceivedEmail.subject=New Index Case data is available in the IRIS portal -missing.property.iris.backend-service.endpoint=Via the environment variable IRIS_BACKEND-SERVICE_ENDPOINT or the corresponding property the endpoint of the backend service must be configured! +missing.property.iris.backend-service.endpoint=Via the environment variable IRIS_BACKEND_SERVICE_ENDPOINT or the corresponding property the endpoint of the backend service must be configured! UserController.username.notunique=The username is already used! From 71ea8239b07729729c9b4916e0b8ba28eef1222d Mon Sep 17 00:00:00 2001 From: Jens Kutzsche Date: Mon, 15 Nov 2021 15:17:58 +0100 Subject: [PATCH 2/4] fix: The configuration for the private proxy now contains the necessary variable declarations again. Thanks to @jl-sitnrw Refs: #467 --- .../conf/proxy/roles/live/private-proxy/001_default.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml b/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml index 9f66ae6da..10aae01cd 100644 --- a/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml +++ b/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml @@ -23,6 +23,10 @@ vars: source: env variable: PROXY_TLS_CERT_KEY type: string + IRIS_CLIENT_BFF_ENDPOINT: + source: env + variable: IRIS_CLIENT_BFF_ENDPOINT + type: string private: name: "$PROXY_OP" From 9d598bc3267f69ceeaa4e84d34d8abfe4f0ffd33 Mon Sep 17 00:00:00 2001 From: Jens Kutzsche Date: Mon, 15 Nov 2021 15:21:24 +0100 Subject: [PATCH 3/4] fix: The endpoint of the JSONRPC client is set to the right variable now. --- .../conf/proxy/roles/live/private-proxy/001_default.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml b/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml index 10aae01cd..6d95823ae 100644 --- a/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml +++ b/infrastructure/stand-alone-deployment/conf/proxy/roles/live/private-proxy/001_default.yml @@ -27,6 +27,10 @@ vars: source: env variable: IRIS_CLIENT_BFF_ENDPOINT type: string + PRIVATE_PROXY_EPS_ENDPOINT: + source: env + variable: PRIVATE_PROXY_EPS_ENDPOINT + type: string private: name: "$PROXY_OP" @@ -48,7 +52,7 @@ private: key_file: "$DIR/../../../certs/$PROXY_TLS_CERT_KEY" jsonrpc_client: - endpoint: https://private-proxy-eps:7766/jsonrpc + endpoint: "$PRIVATE_PROXY_EPS_ENDPOINT" tls: server_name: "$PROXY_OP" ca_certificate_files: From 09f4e1e84cbd180f3e0658760925ec5b3379e951 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 17 Nov 2021 20:16:11 +0000 Subject: [PATCH 4/4] chore(release): 1.1.1 [skip ci] ## [1.1.1](https://github.com/iris-connect/iris-client/compare/v1.1.0...v1.1.1) (2021-11-17) ### Bug Fixes * The configuration for the private proxy now contains the necessary variable declarations again. Thanks to [@jl-sitnrw](https://github.com/jl-sitnrw) ([71ea823](https://github.com/iris-connect/iris-client/commit/71ea8239b07729729c9b4916e0b8ba28eef1222d)), closes [#467](https://github.com/iris-connect/iris-client/issues/467) * The endpoint of the JSONRPC client is set to the right variable now. ([9d598bc](https://github.com/iris-connect/iris-client/commit/9d598bc3267f69ceeaa4e84d34d8abfe4f0ffd33)) * With the stand alone installation, there is no longer an error at startup because a property is set with the wrong name. Thanks to [@jl-sitnrw](https://github.com/jl-sitnrw) ([8aa669d](https://github.com/iris-connect/iris-client/commit/8aa669d392db703828b3e588ab708ef5e74fb073)), closes [#466](https://github.com/iris-connect/iris-client/issues/466) --- CHANGELOG.md | 9 +++++++++ iris-client-bff/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36155cb9c..fc3a07c63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [1.1.1](https://github.com/iris-connect/iris-client/compare/v1.1.0...v1.1.1) (2021-11-17) + + +### Bug Fixes + +* The configuration for the private proxy now contains the necessary variable declarations again. Thanks to [@jl-sitnrw](https://github.com/jl-sitnrw) ([71ea823](https://github.com/iris-connect/iris-client/commit/71ea8239b07729729c9b4916e0b8ba28eef1222d)), closes [#467](https://github.com/iris-connect/iris-client/issues/467) +* The endpoint of the JSONRPC client is set to the right variable now. ([9d598bc](https://github.com/iris-connect/iris-client/commit/9d598bc3267f69ceeaa4e84d34d8abfe4f0ffd33)) +* With the stand alone installation, there is no longer an error at startup because a property is set with the wrong name. Thanks to [@jl-sitnrw](https://github.com/jl-sitnrw) ([8aa669d](https://github.com/iris-connect/iris-client/commit/8aa669d392db703828b3e588ab708ef5e74fb073)), closes [#466](https://github.com/iris-connect/iris-client/issues/466) + # [1.1.0](https://github.com/iris-connect/iris-client/compare/v1.0.1...v1.1.0) (2021-11-03) diff --git a/iris-client-bff/pom.xml b/iris-client-bff/pom.xml index 64f73a5c9..fd340af8e 100644 --- a/iris-client-bff/pom.xml +++ b/iris-client-bff/pom.xml @@ -12,7 +12,7 @@ iris-gateway iris-client-bff - 1.1.0-POST_RELEASE + 1.1.1-POST_RELEASE IRIS Client Backend for Frontend Backend for frontend (BFF) of the client for the health departments. Communicates directly with the SORMAS of this department. diff --git a/pom.xml b/pom.xml index 08bbe0ea3..5f6271cff 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ iris-gateway parent - 1.1.0-POST_RELEASE + 1.1.1-POST_RELEASE pom IRIS Parent