From 0aee38f94a8f454684ea4059beb809e5890926c6 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 6 Dec 2024 15:17:11 +0100
Subject: [PATCH] ozg-7021 make ozgcloud.barrierefreiheitUrl required
---
src/main/helm/templates/deployment.yaml | 5 +--
src/test/helm-linter-values.yaml | 1 +
src/test/helm/deployment_63_char_test.yaml | 2 +-
...ment_archive_manager_address_env_test.yaml | 1 +
src/test/helm/deployment_bindings_test.yaml | 1 +
.../deployment_collaboration_env_test.yaml | 13 +-----
...ollaboration_manager_address_env_test.yaml | 1 +
.../deployment_config_client_env_test.yaml | 1 +
.../helm/deployment_customList_env_test.yaml | 1 +
.../deployment_defaults_affinity_test.yaml | 1 +
.../helm/deployment_defaults_env_test.yaml | 42 +++++++++++++++++++
.../helm/deployment_defaults_labels_test.yaml | 1 +
..._defaults_spec_containers_health_test.yaml | 1 +
..._spec_containers_securityContext_test.yaml | 1 +
...loyment_defaults_spec_containers_test.yaml | 1 +
.../deployment_defaults_sso_env_test.yaml | 1 +
...faults_topologySpreadConstraints_test.yaml | 1 +
.../helm/deployment_host_aliases_test.yaml | 1 +
src/test/helm/deployment_imageTag_test.yaml | 1 +
.../deployment_imagepull_secret_test.yaml | 1 +
.../helm/deployment_liveness_probe_test.yaml | 1 +
...ployment_pod_default_spec_values_test.yaml | 1 +
.../deployment_realm_name_length_test.yaml | 1 +
src/test/helm/deployment_resources_test.yaml | 1 +
.../deployment_springProfile_env_test.yaml | 1 +
...ployment_usermanager_address_env_test.yaml | 1 +
...ment_vorgang_manager_address_env_test.yaml | 1 +
...t_general_value_and_default_spec_test.yaml | 1 +
28 files changed, 70 insertions(+), 16 deletions(-)
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 6a6605eec6..57682225e7 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -121,11 +121,8 @@ spec:
- name: ozgcloud_feature_collaborationEnabled
value: {{ ((.Values.ozgcloud).feature).collaborationEnabled | quote }}
{{- end }}
- {{- if (.Values.ozgcloud).barrierefreiheitUrl }}
- name: ozgcloud_barrierefreiheitUrl
- value: {{ (.Values.ozgcloud).barrierefreiheitUrl }}
- {{- end }}
-
+ value: {{ required "ozgcloud.barrierefreiheitUrl muss angegeben sein" (.Values.ozgcloud).barrierefreiheitUrl }}
image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
imagePullPolicy: Always
name: alfa
diff --git a/src/test/helm-linter-values.yaml b/src/test/helm-linter-values.yaml
index 921400e84c..ef1e815825 100644
--- a/src/test/helm-linter-values.yaml
+++ b/src/test/helm-linter-values.yaml
@@ -28,6 +28,7 @@ ozgcloud:
bundesland: sh
bezeichner: helm
environment: test
+ barrierefreiheitUrl: http://barrierefreiheit.lint.url
networkPolicy:
ssoPublicIp: 51.89.117.53/32
diff --git a/src/test/helm/deployment_63_char_test.yaml b/src/test/helm/deployment_63_char_test.yaml
index a4bde43d1e..28fa4858c8 100644
--- a/src/test/helm/deployment_63_char_test.yaml
+++ b/src/test/helm/deployment_63_char_test.yaml
@@ -37,7 +37,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
-
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
baseUrl: test.company.local
diff --git a/src/test/helm/deployment_archive_manager_address_env_test.yaml b/src/test/helm/deployment_archive_manager_address_env_test.yaml
index 148184f0fa..62c21c0178 100644
--- a/src/test/helm/deployment_archive_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_archive_manager_address_env_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_bindings_test.yaml b/src/test/helm/deployment_bindings_test.yaml
index 5791677f19..1a97acbf75 100644
--- a/src/test/helm/deployment_bindings_test.yaml
+++ b/src/test/helm/deployment_bindings_test.yaml
@@ -33,6 +33,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
baseUrl: test.company.local
diff --git a/src/test/helm/deployment_collaboration_env_test.yaml b/src/test/helm/deployment_collaboration_env_test.yaml
index aa8eef8717..ba02d181e1 100644
--- a/src/test/helm/deployment_collaboration_env_test.yaml
+++ b/src/test/helm/deployment_collaboration_env_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
@@ -87,14 +88,4 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: grpc_client_zufi-manager_negotiationType
- value: TLS
- - it: should have barrierefreiheitUrl
- set:
- ozgcloud:
- barrierefreiheitUrl: http://barrierefreiheit.url
- asserts:
- - contains:
- path: spec.template.spec.containers[0].env
- content:
- name: ozgcloud_barrierefreiheitUrl
- value: http://barrierefreiheit.url
\ No newline at end of file
+ value: TLS
\ No newline at end of file
diff --git a/src/test/helm/deployment_collaboration_manager_address_env_test.yaml b/src/test/helm/deployment_collaboration_manager_address_env_test.yaml
index d5b281eb44..2d1d4f2ce1 100644
--- a/src/test/helm/deployment_collaboration_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_collaboration_manager_address_env_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_config_client_env_test.yaml b/src/test/helm/deployment_config_client_env_test.yaml
index 4576ce30e6..22160f51c4 100644
--- a/src/test/helm/deployment_config_client_env_test.yaml
+++ b/src/test/helm/deployment_config_client_env_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_customList_env_test.yaml b/src/test/helm/deployment_customList_env_test.yaml
index 12d8913054..747718c308 100644
--- a/src/test/helm/deployment_customList_env_test.yaml
+++ b/src/test/helm/deployment_customList_env_test.yaml
@@ -31,6 +31,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_affinity_test.yaml b/src/test/helm/deployment_defaults_affinity_test.yaml
index 10518783e3..f6f74091d4 100644
--- a/src/test/helm/deployment_defaults_affinity_test.yaml
+++ b/src/test/helm/deployment_defaults_affinity_test.yaml
@@ -33,6 +33,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
baseUrl: test.company.local
diff --git a/src/test/helm/deployment_defaults_env_test.yaml b/src/test/helm/deployment_defaults_env_test.yaml
index 2ae7c0e365..8c1ec32ef0 100644
--- a/src/test/helm/deployment_defaults_env_test.yaml
+++ b/src/test/helm/deployment_defaults_env_test.yaml
@@ -41,6 +41,8 @@ tests:
- it: check default values
set:
usermanagerName: user-manager
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- isKind:
of: Deployment
@@ -68,6 +70,8 @@ tests:
- it: should have service binding root
set:
usermanagerName: user-manager
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -84,6 +88,7 @@ tests:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -97,6 +102,7 @@ tests:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
vorgang:
bescheid:
- formEngineName: AFM
@@ -128,6 +134,8 @@ tests:
- it: should set user-manager negotiationType plaintext
set:
userManager.grpcClientNegotiationType: PLAINTEXT
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -136,6 +144,9 @@ tests:
value: PLAINTEXT
- it: should contain default user-manager negotiationType tls
+ set:
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -146,6 +157,8 @@ tests:
- it: should set vorgang-manager negotiationType plaintext
set:
vorgangManager.grpcClientNegotiationType: PLAINTEXT
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -154,6 +167,9 @@ tests:
value: PLAINTEXT
- it: should contain default vorgang-manager negotiationType tls
+ set:
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -163,6 +179,8 @@ tests:
- it: should set collaboration-manager negotiationType plaintext
set:
collaborationManager.grpcClientNegotiationType: PLAINTEXT
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -171,6 +189,9 @@ tests:
value: PLAINTEXT
- it: should contain default collaboration-manager negotiationType tls
+ set:
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -181,6 +202,8 @@ tests:
- it: should set archive-manager negotiationType plaintext
set:
archiveManager.grpcClientNegotiationType: PLAINTEXT
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
@@ -189,9 +212,28 @@ tests:
value: PLAINTEXT
- it: should contain default archive-manager negotiationType tls
+ set:
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- contains:
path: spec.template.spec.containers[0].env
content:
name: grpc_client_archive-manager_negotiationType
value: TLS
+
+ - it: should set barrierefreiheitUrl
+ set:
+ ozgcloud:
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
+ asserts:
+ - contains:
+ path: spec.template.spec.containers[0].env
+ content:
+ name: ozgcloud_barrierefreiheitUrl
+ value: http://barrierefreiheit.test.url
+
+ - it: should fail without barrierefreiheitUrl
+ asserts:
+ - failedTemplate:
+ errorMessage: ozgcloud.barrierefreiheitUrl muss angegeben sein
\ No newline at end of file
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index 2559f70d29..4a17358666 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -35,6 +35,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_spec_containers_health_test.yaml b/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
index 40588247ba..b794b72cdc 100644
--- a/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_health_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml b/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
index b9ef1310d6..76c0fb55c3 100644
--- a/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_securityContext_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_spec_containers_test.yaml b/src/test/helm/deployment_defaults_spec_containers_test.yaml
index b427a8127a..4a09b1cdef 100644
--- a/src/test/helm/deployment_defaults_spec_containers_test.yaml
+++ b/src/test/helm/deployment_defaults_spec_containers_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_sso_env_test.yaml b/src/test/helm/deployment_defaults_sso_env_test.yaml
index efe4bca4af..e64213f66e 100644
--- a/src/test/helm/deployment_defaults_sso_env_test.yaml
+++ b/src/test/helm/deployment_defaults_sso_env_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml b/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
index 4b99323e45..f89897b050 100644
--- a/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
+++ b/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_host_aliases_test.yaml b/src/test/helm/deployment_host_aliases_test.yaml
index d4dc00463a..42caa76552 100644
--- a/src/test/helm/deployment_host_aliases_test.yaml
+++ b/src/test/helm/deployment_host_aliases_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_imageTag_test.yaml b/src/test/helm/deployment_imageTag_test.yaml
index 6577992133..883f93ea58 100644
--- a/src/test/helm/deployment_imageTag_test.yaml
+++ b/src/test/helm/deployment_imageTag_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_imagepull_secret_test.yaml b/src/test/helm/deployment_imagepull_secret_test.yaml
index 9fd5ab7461..3a7972b0fc 100644
--- a/src/test/helm/deployment_imagepull_secret_test.yaml
+++ b/src/test/helm/deployment_imagepull_secret_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
tests:
diff --git a/src/test/helm/deployment_liveness_probe_test.yaml b/src/test/helm/deployment_liveness_probe_test.yaml
index 1957004a40..78f9912ff3 100644
--- a/src/test/helm/deployment_liveness_probe_test.yaml
+++ b/src/test/helm/deployment_liveness_probe_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_pod_default_spec_values_test.yaml b/src/test/helm/deployment_pod_default_spec_values_test.yaml
index bed9ec81b4..32ae31e9d6 100644
--- a/src/test/helm/deployment_pod_default_spec_values_test.yaml
+++ b/src/test/helm/deployment_pod_default_spec_values_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_realm_name_length_test.yaml b/src/test/helm/deployment_realm_name_length_test.yaml
index 8115f8e5fa..be7f37f658 100644
--- a/src/test/helm/deployment_realm_name_length_test.yaml
+++ b/src/test/helm/deployment_realm_name_length_test.yaml
@@ -36,6 +36,7 @@ tests:
bezeichner: test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890
environment: test
bundesland: by
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
asserts:
- failedTemplate:
errorMessage: ozgcloud.bezeichner test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 46 Zeichen)
\ No newline at end of file
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 6c19df3b7e..ced5244c86 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -33,6 +33,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_springProfile_env_test.yaml b/src/test/helm/deployment_springProfile_env_test.yaml
index 9e66c48cc8..075e2d7b3f 100644
--- a/src/test/helm/deployment_springProfile_env_test.yaml
+++ b/src/test/helm/deployment_springProfile_env_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_usermanager_address_env_test.yaml b/src/test/helm/deployment_usermanager_address_env_test.yaml
index 7c4e9b66ac..fdcd6d45a6 100644
--- a/src/test/helm/deployment_usermanager_address_env_test.yaml
+++ b/src/test/helm/deployment_usermanager_address_env_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deployment_vorgang_manager_address_env_test.yaml b/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
index 9f6f6aee7a..905ae5162a 100644
--- a/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
+++ b/src/test/helm/deployment_vorgang_manager_address_env_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
diff --git a/src/test/helm/deyploment_general_value_and_default_spec_test.yaml b/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
index cc5d2b373d..b22a8c5ec0 100644
--- a/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
+++ b/src/test/helm/deyploment_general_value_and_default_spec_test.yaml
@@ -34,6 +34,7 @@ set:
environment: test
bundesland: sh
bezeichner: helm
+ barrierefreiheitUrl: http://barrierefreiheit.test.url
sso:
serverUrl: https://sso.company.local
imagePullSecret: image-pull-secret
--
GitLab