Merge pull request 'OZG-3388 rename helm chart value' (#78) from...

Merge pull request 'OZG-3388 rename helm chart value' (#78) from OZG-3388-helm-chart-adjustments into master

Reviewed-on: https://git.ozg-sh.de/mgm/user-manager/pulls/78

README.md

-# user-manager Project
+# user-manager
 
 This project uses Quarkus, the Supersonic Subatomic Java Framework.
 
@@ -36,12 +36,21 @@ You can run your application in dev mode that enables live coding using:
 > ```yaml
 > keycloak:
 >   realm: your-realm
-> kop:
->   keycloak:
->     sync:
+> ozgcloud:
+>   usersync:
 >     period: "6h"
 > ```
 
+## Running the server with custom realm
+In order to start user-manager-server connecting againts dev keycloak locally with custom realm 
+use below configuration in your IDE or CLI. 
+```
+-Dquarkus.profile=local,remotekc
+-Dquarkus.oidc.auth-server-url=https://sso.dev.by.ozg-cloud.de/realms/sebo-test
+-Dkop.keycloak.api.realm=sebo-test
+-Dozgcloud.usersync.period="5s"
+```
+
 ## Packaging and running the application
 
 The application can be packaged using:
@@ -133,7 +142,7 @@ Usermanager als native Anwendung erstellen und lokal starten:
     -Dkop.keycloak.api.password=hlc_j1I1Ji0trC0 \
     -Dkop.keycloak.api.realm=by-kiel-dev \
     -Dkop.keycloak.api.client=alfa \
-    -Dkop.keycloak.sync.cron="* */3 * * * ?" \
+    -Dozgcloud.usersync.period="5m" \
     -Xmx32m
 ```
 

src/main/helm/templates/deployment.yaml

@@ -98,8 +98,10 @@ spec:
           value: {{ include "app.ssoServerUrl" . }}
         - name: KOP_USER_MANAGER_URL
           value: {{ include "app.baseUrl" . }}
-        - name: KOP_KEYCLOAK_SYNC_CRON
-          value: {{ .Values.kop.keycloak.sync.cron }}
+        {{- if ((.Values.ozgcloud).usersync).period }}
+        - name: OZGCLOUD_USERSYNC_PERIOD
+          value: {{ .Values.ozgcloud.usersync.period }}
+        {{- end }}
         - name: QUARKUS_HTTP_CORS_ORIGINS
           value: {{ (include "app.goofyAddress" .) }}
         {{- with (.Values.env).customList }}

src/main/helm/values.yaml

@@ -38,8 +38,6 @@ kop:
   keycloak:
     api:
       user: userManagerApiUser
-    sync:
-      cron: 0 15 1 * * ?
 
 imageCredentials:
   registry: docker.ozg-sh.de

src/test/helm/deployment-keycloak-values-test.yaml

@@ -52,11 +52,6 @@ tests:
           content: 
             name: KOP_KEYCLOAK_API_REALM
             value: sh-helm-test
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content: 
-            name: KOP_KEYCLOAK_SYNC_CRON
-            value: 0 15 1 * * ?
       - contains:
           path: spec.template.spec.containers[0].env
           content: 

src/test/helm/deployment_env_test.yaml

@@ -69,3 +69,19 @@ tests:
           content: 
             name: QUARKUS_MONGODB_DATABASE
             value: test-database
+  - it: check user sync period set
+    set:
+      ozgcloud.usersync.period: "6h"
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OZGCLOUD_USERSYNC_PERIOD
+            value: "6h"
+  - it: check user sync period NOT set
+    asserts:
+      - notContains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: OZGCLOUD_USERSYNC_PERIOD
+            value: "6h"
\ No newline at end of file

user-manager-server/src/main/java/de/itvsh/kop/user/sync/SyncScheduler.java

@@ -41,7 +41,7 @@ public class SyncScheduler {
 	@Inject
 	LockService syncLockService;
 
-	@Scheduled(every = "{kop.keycloak.sync.period}", concurrentExecution = SKIP)
+	@Scheduled(every = "{ozgcloud.usersync.period}", concurrentExecution = SKIP)
 	public void start() {
 		if (syncLockService.isNotLocked()) {
 			var lock = syncLockService.lockCollection();

user-manager-server/src/main/resources/application-e2e.yaml

@@ -21,8 +21,10 @@ kop:
       password: S9UEMuLG9y9ev99
       realm: by-e2e-local-dev
       client: alfa
-    sync:
-      period: disabled
 
 keycloak:
   url: https://sso.dev.by.ozg-cloud.de
+
+ozgcloud:
+  usersync:
+    period: disabled
\ No newline at end of file

user-manager-server/src/main/resources/application-remotekc.yaml

@@ -15,8 +15,6 @@ kop:
   user-manager:
     url: http://localhost:9092
   keycloak:
-    sync:
-      period: disabled
     api:
       user: userManagerApiUser
       password: hlc_j1I1Ji0trC0
@@ -24,3 +22,7 @@ kop:
       organisations-einheit-id-key: organisationseinheitId
       client: alfa
       ldap-id-key: LDAP_ID
+
+ozgcloud:
+  usersync:
+    period: disabled
\ No newline at end of file

user-manager-server/src/main/resources/application.yaml

@@ -42,5 +42,7 @@ kop:
       password: "-"
       realm: by-kiel-dev
       client: alfa
-    sync:
+
+ozgcloud:
+  usersync:
     period: "6h"
\ No newline at end of file

user-manager-server/src/test/resources/application.yml

@@ -18,8 +18,6 @@ quarkus:
 
 kop:
   keycloak:
-  sync:
-   cron: "0 15 13 * * ?"
     api:
       user: "-"
       password: "-"
@@ -31,3 +29,7 @@ kop:
     url: http://localhost:9092
 keycloak:
   url: http://localhost:8088
+
+ozgcloud:
+  usersync:
+    period: disabled
\ No newline at end of file