Merge branch 'refs/heads/master' into...

Merge branch 'refs/heads/master' into OZG-5412-Dataport-Mantelantrag-Extend-intelliform-adapter-test

common/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>common</artifactId>

enterprise-adapter/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>enterprise-adapter</artifactId>
 	<name>EM - Enterprise Interface Adapter</name>

formcycle-adapter/formcycle-adapter-impl/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>formcycle-adapter</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

formcycle-adapter/formcycle-adapter-interface/pom.xml

@@ -29,14 +29,14 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.0.1</version>
+		<version>4.1.0</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>de.ozgcloud.eingang</groupId>
 	<artifactId>formcycle-adapter-interface</artifactId>
 	<name>EM - Formcycle Adapter - Interface</name>
-	<version>2.7.0-SNAPSHOT</version>
+	<version>2.8.0-SNAPSHOT</version>
 	
 	<properties>
 		<vorgang-manager.version>2.0.0</vorgang-manager.version>

formcycle-adapter/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>formcycle-adapter</artifactId>

formsolutions-adapter/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

forwarder/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

intelliform-adapter/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

pom.xml

@@ -31,13 +31,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.0.1</version>
+		<version>4.1.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
 	<groupId>de.ozgcloud.eingang</groupId>
 	<artifactId>eingang-manager</artifactId>
-	<version>2.7.0-SNAPSHOT</version>
+	<version>2.8.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>OZG-Cloud Eingang Manager</name>
 
@@ -54,7 +54,7 @@
 	</modules>
 
 	<properties>
-		<vorgang-manager.version>2.7.0-SNAPSHOT</vorgang-manager.version>
+		<vorgang-manager.version>2.7.0</vorgang-manager.version>
 
 		<jsoup.version>1.14.3</jsoup.version>
 		<xmlschema.version>2.3.0</xmlschema.version>

router/pom.xml

@@ -29,7 +29,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

run_helm_test.sh

@@ -4,4 +4,4 @@ set -e
 
 helm template  ./src/main/helm/ -f src/test/helm-linter-values.yaml
 helm lint -f src/test/helm-linter-values.yaml ./src/main/helm/
-cd src/main/helm && helm unittest  -f '../../test/helm/**/*test.yaml' .
+cd src/main/helm && helm unittest  -f '../../test/helm/**/*.yaml' .
\ No newline at end of file

semantik-adapter/pom.xml

@@ -30,7 +30,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 	
 	<artifactId>semantik-adapter</artifactId>

src/main/helm/templates/bindings_type_configmap.yaml

+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-bindings-type
+  namespace: {{ include "app.namespace" . }}
+data:
+  type: |
+    ca-certificates
\ No newline at end of file

src/main/helm/templates/deployment.yaml

@@ -59,6 +59,8 @@ spec:
             app.kubernetes.io/name: {{ .Release.Name }}
       containers:
       - env:
+        - name: SERVICE_BINDING_ROOT
+          value: "/bindings"
         {{- range (.Values.env).grpc }}
         - name: {{ .name }} 
           value: {{ .value }}
@@ -79,7 +81,7 @@ spec:
         - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_address
           value: 'vorgang-manager.{{ coalesce (.Values.routing).targetNamespace .Release.Namespace }}:9090'
         - name: grpc_client_vorgang-manager-{{ (.Values.routing).targetVorgangManagerName}}_negotiationType
-          value: {{ (.Values.routing).negotiationType | default "PLAINTEXT" }}
+          value: {{ (.Values.routing).negotiationType | default "TLS" }}
         {{- end }}
         {{- with include "app.getCustomList" . }}
 {{ . | indent 8 }}
@@ -150,9 +152,23 @@ spec:
         volumeMounts:
           - name: temp-dir
             mountPath: "/tmp"
+          - name: namespace-ca-cert
+            mountPath: "/bindings/namespace-certificate"
+            readOnly: true
       volumes:
         - name: temp-dir
           emptyDir: {}
+        - name: namespace-ca-cert
+          projected:
+            sources:
+            - secret:
+                name: {{ include "app.namespace" . }}-ca-cert
+                optional: true
+                items:
+                  - key: ca.crt
+                    path: ca.crt
+            - configMap:
+                name: {{ .Release.Name }}-bindings-type
       dnsConfig: {}
       dnsPolicy: ClusterFirst
       imagePullSecrets:

src/test/helm/bindings_type_test.yaml

+#
+# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
+# Ministerpräsidenten des Landes Schleswig-Holstein
+# Staatskanzlei
+# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
+#
+# Lizenziert unter der EUPL, Version 1.2 oder - sobald
+# diese von der Europäischen Kommission genehmigt wurden -
+# Folgeversionen der EUPL ("Lizenz");
+# Sie dürfen dieses Werk ausschließlich gemäß
+# dieser Lizenz nutzen.
+# Eine Kopie der Lizenz finden Sie hier:
+#
+# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
+#
+# Sofern nicht durch anwendbare Rechtsvorschriften
+# gefordert oder in schriftlicher Form vereinbart, wird
+# die unter der Lizenz verbreitete Software "so wie sie
+# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
+# ausdrücklich oder stillschweigend - verbreitet.
+# Die sprachspezifischen Genehmigungen und Beschränkungen
+# unter der Lizenz sind dem Lizenztext zu entnehmen.
+#
+
+suite: test bindings type configmap
+templates:
+  - templates/bindings_type_configmap.yaml
+release:
+  name: eingang-manager
+  namespace: sh-helm-test
+tests:
+  - it: xta bindings type
+    asserts:
+      - isKind:
+          of: ConfigMap
+      - isAPIVersion:
+          of: v1
+      - equal:
+          path: metadata.name
+          value: eingang-manager-bindings-type
+      - equal:
+          path: metadata.namespace
+          value: sh-helm-test
+      - equal:
+          path: data.type
+          value: ca-certificates

src/test/helm/deployment_bindings_test.yaml

@@ -25,6 +25,9 @@
 suite: deployment bindings
 templates:
   - templates/deployment.yaml
+release:
+  name: eingang-manager
+  namespace: sh-helm-test
 set:
   ozgcloud.environment: test
   imagePullSecret: image-pull-secret
@@ -45,3 +48,28 @@ tests:
             name: temp-dir
             emptyDir: {}
 
+  - it: should have projected namespace-ca-cert volume
+    asserts:
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: namespace-ca-cert
+            projected:
+              sources:
+              - secret:
+                  name: sh-helm-test-ca-cert
+                  optional: true
+                  items:
+                    - key: ca.crt
+                      path: ca.crt
+              - configMap:
+                  name: eingang-manager-bindings-type
+
+  - it: should have namespace-ca-cert volume mount
+    asserts:
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: namespace-ca-cert
+            mountPath: "/bindings/namespace-certificate"
+            readOnly: true
\ No newline at end of file

src/test/helm/deployment_routing_strategy_env.yaml

@@ -49,13 +49,13 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_vorgang-manager-vorgang-manager_negotiationType
-            value: PLAINTEXT
+            value: TLS
   - it: validate routing infos
     set:
       routing:
         routingStrategy: MULTI
         fallbackStrategy: FUNDSTELLE
-        negotiationType: TLS
+        negotiationType: PLAINTEXT
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -71,4 +71,4 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: grpc_client_vorgang-manager-vorgang-manager_negotiationType
-            value: TLS
+            value: PLAINTEXT
\ No newline at end of file

xta-adapter/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.ozgcloud.eingang</groupId>
 		<artifactId>eingang-manager</artifactId>
-		<version>2.7.0-SNAPSHOT</version>
+		<version>2.8.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>xta-adapter</artifactId>
 	<name>Eingangs Adapter - XTA</name>