diff --git a/goofy-client/apps/goofy-e2e/docker-compose.yml b/goofy-client/apps/goofy-e2e/docker-compose.yml index b3efc1f9f95476e8a5a2bb6552b5b54671ee0f57..c8822644b5107b69512a0d41682a773d95713345 100644 --- a/goofy-client/apps/goofy-e2e/docker-compose.yml +++ b/goofy-client/apps/goofy-e2e/docker-compose.yml @@ -29,7 +29,8 @@ services: 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/java/de/itvsh/goofy/common/user/InternalUserIdService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/user/InternalUserIdService.java index 603e51a5c4d5660fb6b56dc66d756c89bb02a4b0..d5bbc99d03318437158b0dd12cda322eb485d4b2 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/common/user/InternalUserIdService.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/common/user/InternalUserIdService.java @@ -16,7 +16,7 @@ public class InternalUserIdService { private static final String PATH = "/migration/user/{externalUserId}"; // NOSONAR - @Value("${kop.user-manager.url}") + @Value("${kop.user-manager.internalurl}") private String userManagerUrl; private RestTemplate restTemplate = new RestTemplate(); diff --git a/goofy-server/src/main/resources/application-e2e.yml b/goofy-server/src/main/resources/application-e2e.yml index 3ab8ea8cc5d1edecd02cc3d4709b109b9471aafa..ae50cc668ec4497e586270ac708e3a23dbd60720 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 5cddb11cd66f7f3c659059c076d70c3fe511b8fb..336c6f9170989e553e7e5d33999774709f502a03 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 1a114d7a6ce822bb4f1b9aef6e7beeaa32d62827..9d197cc5d6fe6d4eed19ff1b6619c47ac3437ad2 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 4eca32e39a9b8f1c59903072282545b5eed77429..21d2eb21d9d2215ef3ee7cd635fde3ccf446e47e 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