Merge branch 'master' into OZG-7047-tooltip

alfa-client/apps/alfa-e2e/src/fixtures/kommentar/kommentar.json

 {
   "createdAt": "2024-01-10T12:57:35Z[UTC]",
   "createdBy": "SetInCode",
-  "text": "Test text to test the test text test"
+  "text": "Test text to test the test text test",
+  "attachments": null
 }

alfa-server/src/main/resources/application-dev.yml

@@ -14,7 +14,3 @@ ozgcloud:
   production: false
   stage:
     production: false
-  xdomea:
-    behoerdenschluessel: "DUMMY-SCHLUESSEL"
-    behoerdenschluessel-uri: "DUMMY-URI"
-    behoerdenschluessel-version: "DUMMY-VERSION"
\ No newline at end of file

alfa-server/src/main/resources/application-e2e.yml

@@ -13,7 +13,3 @@ ozgcloud:
       url: /assets/benutzerleitfaden/benutzerleitfaden.pdf
   user-manager:
     url: http://localhost:9092
-  xdomea:
-    behoerdenschluessel: "DUMMY-SCHLUESSEL-E2E"
-    behoerdenschluessel-uri: "DUMMY-URI-E2E"
-    behoerdenschluessel-version: "DUMMY-VERSION-E2E"
\ No newline at end of file

alfa-server/src/main/resources/application.yml

@@ -100,7 +100,3 @@ ozgcloud:
   user-manager:
     profile-template: /api/userProfiles/%s
     search-template: /api/userProfiles/?searchBy={searchBy}
-  xdomea:
-    behoerdenschluessel:
-    behoerdenschluessel-uri:
-    behoerdenschluessel-version:

src/main/helm/templates/deployment.yaml

@@ -107,12 +107,6 @@ spec:
           value: {{ $bescheid.formEngineName }}
         {{- end }}
         {{- end}}
-        - name: ozgcloud_xdomea_behoerdenschluessel
-          value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluessel | quote }}
-        - name: ozgcloud_xdomea_behoerdenschluesselUri
-          value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselUri}}
-        - name: ozgcloud_xdomea_behoerdenschluesselVersion
-          value: {{ ((.Values.ozgcloud).xdomea).behoerdenschluesselVersion | quote }}
         - name: ozgcloud_administration_address
           value: {{ include "app.spring_cloud_config_administration_address" . }}
         - name: grpc_client_zufi-manager_address

src/test/helm/deployment_xdomea_env_test.yaml

-suite: deployment xdomea env
-release:
-  name: alfa
-  namespace: sh-helm-test
-templates:
-  - templates/deployment.yaml
-set:
-  baseUrl: test.company.local
-  ozgcloud:
-    environment: test
-    bundesland: sh
-    bezeichner: helm
-  sso:
-    serverUrl: https://sso.company.local
-  imagePullSecret: image-pull-secret
-tests:
-  - it: should not require on behoerdenschlüssel properties
-    set:
-      # note: explicitly non-set behoerdenschlüssel properties
-    asserts:
-      - notContains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_xdomea_behoerdenschluessel
-      - notContains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_xdomea_behoerdenschluesselUri
-      - notContains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_xdomea_behoerdenschluesselVersion
-  - it: should set (optional) behoerdenschlüssel properties
-    set:
-      ozgcloud:
-        xdomea:
-          behoerdenschluessel: "123456"
-          behoerdenschluesselUri: "uri.uri:uri"
-          behoerdenschluesselVersion: "version 1"
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_xdomea_behoerdenschluessel
-            value: "123456"
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_xdomea_behoerdenschluesselUri
-            value: "uri.uri:uri"
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: ozgcloud_xdomea_behoerdenschluesselVersion
-            value: "version 1"
\ No newline at end of file