Skip to content
Snippets Groups Projects
Commit 3ba85115 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' into new-build-agent

parents 64110746 d2edd1f5
Branches
Tags
No related merge requests found
...@@ -10,7 +10,7 @@ import java.util.Arrays; ...@@ -10,7 +10,7 @@ import java.util.Arrays;
import java.util.Map; import java.util.Map;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.inject.Inject; import jakarta.inject.Inject;
import org.bson.Document; import org.bson.Document;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
...@@ -28,9 +28,9 @@ import de.itvsh.kop.user.UserTestFactory; ...@@ -28,9 +28,9 @@ import de.itvsh.kop.user.UserTestFactory;
import de.itvsh.kop.user.common.MongoDbTestProfile; import de.itvsh.kop.user.common.MongoDbTestProfile;
import de.itvsh.kop.user.common.lock.Lock; import de.itvsh.kop.user.common.lock.Lock;
import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
import io.quarkus.test.InjectMock;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile; import io.quarkus.test.junit.TestProfile;
import io.quarkus.test.junit.mockito.InjectMock;
import io.quarkus.test.junit.mockito.InjectSpy; import io.quarkus.test.junit.mockito.InjectSpy;
@QuarkusTest @QuarkusTest
......
...@@ -32,7 +32,7 @@ import java.util.Arrays; ...@@ -32,7 +32,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.inject.Inject; import jakarta.inject.Inject;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
...@@ -46,9 +46,9 @@ import de.itvsh.kop.user.UserService; ...@@ -46,9 +46,9 @@ import de.itvsh.kop.user.UserService;
import de.itvsh.kop.user.UserTestFactory; import de.itvsh.kop.user.UserTestFactory;
import de.itvsh.kop.user.common.MongoDbTestProfile; import de.itvsh.kop.user.common.MongoDbTestProfile;
import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService; import de.itvsh.kop.user.keycloak.KeycloakUserRemoteService;
import io.quarkus.test.InjectMock;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile; import io.quarkus.test.junit.TestProfile;
import io.quarkus.test.junit.mockito.InjectMock;
import io.quarkus.test.junit.mockito.InjectSpy; import io.quarkus.test.junit.mockito.InjectSpy;
@QuarkusTest @QuarkusTest
......
...@@ -16,8 +16,8 @@ import de.itvsh.kop.user.common.callcontext.CallContextInterceptorTestFactory; ...@@ -16,8 +16,8 @@ import de.itvsh.kop.user.common.callcontext.CallContextInterceptorTestFactory;
import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub; import de.itvsh.kop.user.grpc.userprofile.UserProfileServiceGrpc.UserProfileServiceBlockingStub;
import io.grpc.StatusRuntimeException; import io.grpc.StatusRuntimeException;
import io.quarkus.grpc.GrpcClient; import io.quarkus.grpc.GrpcClient;
import io.quarkus.test.InjectMock;
import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.mockito.InjectMock;
@QuarkusTest @QuarkusTest
class UserProfileGrpcServiceITCase { class UserProfileGrpcServiceITCase {
......
...@@ -14,16 +14,14 @@ quarkus: ...@@ -14,16 +14,14 @@ quarkus:
log: log:
level: INFO level: INFO
oidc: oidc:
auth-server-url: https://sso.dev.ozg-sh.de/realms/sh-kiel-dev auth-server-url: https://sso.dev.by.ozg-cloud.de/realms/by-kiel-dev
kop: kop:
keycloak: keycloak:
sync:
cron: "0 15 13 * * ?"
api: api:
user: "-" user: "-"
password: "-" password: "-"
realm: sh-kiel-dev realm: by-kiel-dev
organisations-einheit-id-key: organisationseinheitId organisations-einheit-id-key: organisationseinheitId
ldap-id-key: LDAP_ID ldap-id-key: LDAP_ID
client: sh-kiel-dev-goofy client: sh-kiel-dev-goofy
...@@ -31,3 +29,7 @@ kop: ...@@ -31,3 +29,7 @@ kop:
url: http://localhost:9092 url: http://localhost:9092
keycloak: keycloak:
url: http://localhost:8088 url: http://localhost:8088
ozgcloud:
usersync:
period: disabled
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment