Merge branch 'main' into ozg-3938-enable-grpc-tls

bayernid-proxy-impl/pom.xml

@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>de.ozgcloud.nachrichten</groupId>
 		<artifactId>nachrichten-bayernid-proxy</artifactId>
-		<version>0.4.0-SNAPSHOT</version>
+		<version>0.5.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 

bayernid-proxy-interface/pom.xml

@@ -30,13 +30,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.1.0</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>de.ozgcloud.nachrichten</groupId>
 	<artifactId>bayernid-proxy-interface</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.5.0-SNAPSHOT</version>
 
 	<name>OZG-Cloud BayernID Proxy Interface</name>
 	<description>Interface (gRPC) for BayernID Proxy Service</description>

pom.xml

@@ -31,13 +31,13 @@
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-parent</artifactId>
-		<version>4.1.0-SNAPSHOT</version>
+		<version>4.1.0</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>de.ozgcloud.nachrichten</groupId>
 	<artifactId>nachrichten-bayernid-proxy</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>OZG-Cloud BayernID Proxy</name>

src/main/helm/templates/_helpers.tpl

@@ -56,8 +56,9 @@ component: bayernid-proxy
 {{- end -}}
 
 {{- define "app.dictToList" -}}
+{{- $customList := list -}}
 {{- range $key, $value := . -}}
-- name: {{ $key }}
-  value: {{ $value }}
+{{- $customList = append $customList (dict "name" $key "value" $value) }}
 {{- end -}}
+{{- $customList | toYaml -}}
 {{- end -}}
\ No newline at end of file

src/test/helm/deployment_env_test.yaml

@@ -37,22 +37,35 @@ tests:
       env.customList:
         - name: my_test_environment_name
           value: "A test value"
+        - name: test_environment
+          value: "B test value"
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: my_test_environment_name
             value: "A test value"
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: test_environment
+            value: "B test value"
   - it: check customList as dict
     set:
       env.customList:
         my_test_environment_name: "A test value"
+        test_environment: "B test value"
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
             name: my_test_environment_name
             value: "A test value"
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: test_environment
+            value: "B test value"
 
   - it: check customList test value is not set by default
     asserts: