Merge branch 'master' into OZG-6710-Update-common-lib

src/main/helm/templates/_helpers.tpl

@@ -62,7 +62,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.grpc_client_user-manager_address" -}}
-{{ printf "%s.%s:9000" .Values.usermanagerName .Release.Namespace }}
+{{ printf "dns:///%s.%s:9000" .Values.usermanagerName .Release.Namespace }}
 {{- end -}}
 
 {{- define "app.ozgcloud_migration_user-manager_address" -}}
@@ -70,7 +70,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.ozgcloud_vorgangmanager_address" -}}
-{{ printf "%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
+{{ printf "dns:///%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }}
 {{- end -}}
 
 {{- define "app.ozgcloud_administration_address" -}}

src/main/helm/templates/deployment.yaml

@@ -156,11 +156,11 @@ spec:
           - name: ozgcloud_user-manager_url
             value: {{ include "app.ozgcloud_migration_user-manager_address" . }}
           - name: ozgcloud_zufi-manager_address
-            value: {{ ((.Values.ozgcloud).zufiManager).address }}
+            value: {{ (.Values.zufiManager).address }}
           - name: grpc_client_zufi-manager_address
-            value: {{ ((.Values.ozgcloud).zufiManager).address }}
+            value: {{ (.Values.zufiManager).address }}
           - name: grpc_client_zufi-manager_negotiationType
-            value: {{ ((.Values.ozgcloud).zufiManager).negotiationType }}
+            value: {{ (.Values.zufiManager).grpcClientNegotiationType }}
           {{- if not (.Values.database).useExternal }}
           - name: spring_data_mongodb_uri
             valueFrom:
@@ -236,6 +236,10 @@ spec:
           - name: ozgcloud_feature_bescheid_kielHackathonRoute
             value: {{ quote (((.Values.ozgcloud).feature).bescheid).kielHackathonRoute }}
           {{- end }}
+          {{- if (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
+          - name: ozgcloud_notification_eingangsbestaetigung_replyAllowed
+            value: {{ quote (((.Values.ozgcloud).notification).eingangsbestaetigung).replyAllowed }}
+          {{- end }}
 
           {{- if (.Values.ozgcloud).processors}}
           {{- range $processor_index, $processor := (.Values.ozgcloud).processors }}

src/main/helm/values.yaml

@@ -60,7 +60,7 @@ usermanagerName: user-manager
 administrationName: administration
 
 zufiManager:
-  address: dns://zufi-manager.zufi:9090
+  address: dns:///zufi-server.zufi:9090
 
 elasticsearch:
     certificateSecretName: elasticsearch-certificate

src/test/helm/deployment_env_test.yaml

@@ -141,3 +141,15 @@ tests:
           content:
             name: ozgcloud_processors_1_forms_0_formEngineName
             value: FormSolutions
+  - it: should have notification properties
+    set:
+      ozgcloud:
+        notification:
+          eingangsbestaetigung:
+            replyAllowed: true
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_notification_eingangsbestaetigung_replyAllowed
+            value: "true"
\ No newline at end of file

src/test/helm/deployment_grpc_user_manager_address_test.yaml

@@ -39,7 +39,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_user-manager_address
-            value: user-manager.sh-helm-test:9000
+            value: dns:///user-manager.sh-helm-test:9000
   - it: should contain default user-manager grpc negotiationType tls
     asserts:
       - contains:

src/test/helm/deployment_nachrichten_manager_address_test.yaml

@@ -39,4 +39,4 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_nachrichten-manager_address
-            value:  vorgang-manager.sh-helm-test:9090
+            value:  dns:///vorgang-manager.sh-helm-test:9090

src/test/helm/deployment_vorgang_manager_env_test.yaml

@@ -39,4 +39,4 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_application_address
-            value: vorgang-manager.by-helm-test:9090
\ No newline at end of file
+            value: dns:///vorgang-manager.by-helm-test:9090
\ No newline at end of file

src/test/helm/deployment_zufimanager_address_env_test.yaml

@@ -31,29 +31,50 @@ templates:
 set:
   ozgcloud:
     environment: dev
-    zufiManager:
-      address: zufi-manager.zufi:9090
   imagePullSecret: test-image-pull-secret
 tests:
-  - it: check if zufi-manager address is correct
+  - it: check default zufi-manager address
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: ozgcloud_zufi-manager_address
+            value: dns:///zufi-server.zufi:9090
+
+  - it: should set custom zufi-manager address
+    set:
+      zufiManager:
+        address: dns://other.zufi:9090
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_zufi-manager_address
-            value: zufi-manager.zufi:9090
-  - it: check if zufi-manager grpc client address is set
+            value: dns://other.zufi:9090
+
+  - it: check default zufi-manager grpc client address
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_zufi-manager_address
-            value: zufi-manager.zufi:9090
+            value: dns:///zufi-server.zufi:9090
+
+  - it: should set custom zufi-manager grpc client address
+    set:
+      zufiManager:
+        address: dns://other.zufi:9090
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: grpc_client_zufi-manager_address
+            value: dns://other.zufi:9090
+
   - it: check if zufi-manager negotiationType is set
     set:
-      ozgcloud:
       zufiManager:
-            negotiationType: NOT_DEFAULT
+        grpcClientNegotiationType: NOT_DEFAULT
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env

vorgang-manager-server/src/main/java/de/ozgcloud/vorgang/registry/ZufiRemoteService.java

@@ -21,8 +21,10 @@ class ZufiRemoteService {
 	private VorgangManagerRegistrationServiceBlockingStub serviceStub;
 
 	public void registerVorgangManager(@NonNull List<String> organistationsEinheitenIds, String vorgangManagerAddress) {
-		boolean success = getServiceStub().register(buildRequest(organistationsEinheitenIds, vorgangManagerAddress)).getSuccess();
-		LOG.info("Register success: {}", success);
+		var result = getServiceStub().register(buildRequest(organistationsEinheitenIds, vorgangManagerAddress));
+		if (!result.getSuccess()) {
+			LOG.warn("Registration failed: {}", result.getMessage());
+		}
 	}
 
 	private VorgangManagerRegistrationServiceBlockingStub getServiceStub() {