From 8e4bcb343f5dc33a11aef5268db8c173131ec72a Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 8 Nov 2022 12:05:19 +0100
Subject: [PATCH] OZG-3119 Neuer interneurl parameter
---
goofy-client/apps/goofy-e2e/docker-compose.yml | 5 +++--
goofy-server/src/main/resources/application-e2e.yml | 3 ++-
goofy-server/src/main/resources/application-local.yml | 1 +
goofy-server/src/test/resources/application-itcase.yml | 1 +
goofy-server/src/test/resources/application.yml | 1 +
5 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/goofy-client/apps/goofy-e2e/docker-compose.yml b/goofy-client/apps/goofy-e2e/docker-compose.yml
index b3efc1f9f9..2d2323edb8 100644
--- a/goofy-client/apps/goofy-e2e/docker-compose.yml
+++ b/goofy-client/apps/goofy-e2e/docker-compose.yml
@@ -25,11 +25,12 @@ services:
- ozg-elastic
ozg-goofy:
- image: docker.ozg-sh.de/goofy:snapshot-latest
+ image: docker.ozg-sh.de/goofy:PR-118-1.0.1-SNAPSHOT
environment:
- GRPC_CLIENT_PLUTO_ADDRESS=static://ozg-pluto:9090
- SPRING_PROFILES_ACTIVE=remotekc, e2e
- - KOP_USER-MANAGER_URL=http://${DOCKER_GATEWAY_HOST:-host.docker.internal}:9092
+ - KOP_USER-MANAGER_URL=http://localhost:9092
+ - KOP_USER-MANAGER_INTERNALURL=http://ozg-usermanager:8080
ports:
- 8080:8080
depends_on:
diff --git a/goofy-server/src/main/resources/application-e2e.yml b/goofy-server/src/main/resources/application-e2e.yml
index 3ab8ea8cc5..ae50cc668e 100644
--- a/goofy-server/src/main/resources/application-e2e.yml
+++ b/goofy-server/src/main/resources/application-e2e.yml
@@ -7,4 +7,5 @@ kop:
lninfo:
url: classpath:files/LandesnetzInfo.html
user-manager:
- url: http://localhost:9092
\ No newline at end of file
+ url: http://localhost:9092
+ internalurl: http://ozg-usermanager:8080
\ No newline at end of file
diff --git a/goofy-server/src/main/resources/application-local.yml b/goofy-server/src/main/resources/application-local.yml
index 5cddb11cd6..336c6f9170 100644
--- a/goofy-server/src/main/resources/application-local.yml
+++ b/goofy-server/src/main/resources/application-local.yml
@@ -18,5 +18,6 @@ server:
kop:
user-manager:
url: http://localhost:9092
+ internalurl: http://localhost:9092
profile-template: /api/userProfiles/%s
search-template: /api/userProfiles/?searchBy={searchBy}
\ No newline at end of file
diff --git a/goofy-server/src/test/resources/application-itcase.yml b/goofy-server/src/test/resources/application-itcase.yml
index 1a114d7a6c..9d197cc5d6 100644
--- a/goofy-server/src/test/resources/application-itcase.yml
+++ b/goofy-server/src/test/resources/application-itcase.yml
@@ -5,6 +5,7 @@ logging:
kop:
user-manager:
url: https://localhost
+ internalurl: http://localhost:8080
search-template: /api/userProfiles/?searchBy={searchBy}
profile-template: /api/userProfiles/%s
upload:
diff --git a/goofy-server/src/test/resources/application.yml b/goofy-server/src/test/resources/application.yml
index 4eca32e39a..21d2eb21d9 100644
--- a/goofy-server/src/test/resources/application.yml
+++ b/goofy-server/src/test/resources/application.yml
@@ -14,6 +14,7 @@ kop:
validity: 60000
user-manager:
url: https://localhost
+ internalurl: http://localhost:8080
search-template: /api/userProfiles/?searchBy={searchBy}
profile-template: /api/userProfiles/%s
--
GitLab