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

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

parents 25569d11 628e4767
No related branches found
No related tags found
No related merge requests found
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<parent> <parent>
<groupId>de.ozgcloud.nachrichten</groupId> <groupId>de.ozgcloud.nachrichten</groupId>
<artifactId>nachrichten-bayernid-proxy</artifactId> <artifactId>nachrichten-bayernid-proxy</artifactId>
<version>0.4.0-SNAPSHOT</version> <version>0.5.0-SNAPSHOT</version>
<relativePath>../</relativePath> <relativePath>../</relativePath>
</parent> </parent>
......
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-dependencies</artifactId> <artifactId>ozgcloud-common-dependencies</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0</version>
<relativePath/> <relativePath/>
</parent> </parent>
<groupId>de.ozgcloud.nachrichten</groupId> <groupId>de.ozgcloud.nachrichten</groupId>
<artifactId>bayernid-proxy-interface</artifactId> <artifactId>bayernid-proxy-interface</artifactId>
<version>0.4.0-SNAPSHOT</version> <version>0.5.0-SNAPSHOT</version>
<name>OZG-Cloud BayernID Proxy Interface</name> <name>OZG-Cloud BayernID Proxy Interface</name>
<description>Interface (gRPC) for BayernID Proxy Service</description> <description>Interface (gRPC) for BayernID Proxy Service</description>
......
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
<parent> <parent>
<groupId>de.ozgcloud.common</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-parent</artifactId> <artifactId>ozgcloud-common-parent</artifactId>
<version>4.1.0-SNAPSHOT</version> <version>4.1.0</version>
<relativePath/> <relativePath/>
</parent> </parent>
<groupId>de.ozgcloud.nachrichten</groupId> <groupId>de.ozgcloud.nachrichten</groupId>
<artifactId>nachrichten-bayernid-proxy</artifactId> <artifactId>nachrichten-bayernid-proxy</artifactId>
<version>0.4.0-SNAPSHOT</version> <version>0.5.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OZG-Cloud BayernID Proxy</name> <name>OZG-Cloud BayernID Proxy</name>
......
...@@ -56,8 +56,9 @@ component: bayernid-proxy ...@@ -56,8 +56,9 @@ component: bayernid-proxy
{{- end -}} {{- end -}}
{{- define "app.dictToList" -}} {{- define "app.dictToList" -}}
{{- $customList := list -}}
{{- range $key, $value := . -}} {{- range $key, $value := . -}}
- name: {{ $key }} {{- $customList = append $customList (dict "name" $key "value" $value) }}
value: {{ $value }}
{{- end -}} {{- end -}}
{{- $customList | toYaml -}}
{{- end -}} {{- end -}}
\ No newline at end of file
...@@ -37,22 +37,35 @@ tests: ...@@ -37,22 +37,35 @@ tests:
env.customList: env.customList:
- name: my_test_environment_name - name: my_test_environment_name
value: "A test value" value: "A test value"
- name: test_environment
value: "B test value"
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: my_test_environment_name name: my_test_environment_name
value: "A test value" 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 - it: check customList as dict
set: set:
env.customList: env.customList:
my_test_environment_name: "A test value" my_test_environment_name: "A test value"
test_environment: "B test value"
asserts: asserts:
- contains: - contains:
path: spec.template.spec.containers[0].env path: spec.template.spec.containers[0].env
content: content:
name: my_test_environment_name name: my_test_environment_name
value: "A test value" 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 - it: check customList test value is not set by default
asserts: asserts:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment