feat(worker): move mailing and invitation configuration to worker (#127)

eclipse-tractusx · Mar 15, 2024 · ca09a1b · ca09a1b
2 parents 6528bc0 + 1bc78fc
commit ca09a1b
Show file tree

Hide file tree

Showing 13 changed files with 193 additions and 86 deletions.
diff --git a/charts/portal/templates/cronjob-backend-processes.yaml b/charts/portal/templates/cronjob-backend-processes.yaml
@@ -221,16 +221,16 @@ spec:
               value: "{{ .Values.backend.processesworker.dim.maxValidationTimeInDays }}"
             - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGINDEX"
               value: "{{ .Values.backend.processesworker.dim.encryptionConfigIndex }}"
-            - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONMODECONFIGS__0__INDEX"
+            - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGS__0__INDEX"
               value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.index }}"
-            - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONMODECONFIGS__0__ENCRYPTIONKEY"
+            - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY"
               valueFrom:
                 secretKeyRef:
                   name: "{{ .Values.backend.interfaces.secret }}"
                   key: "dim-encryption-key0"
-            - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONMODECONFIGS__0__CIPHERMODE"
+            - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGS__0__CIPHERMODE"
               value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.cipherMode }}"
-            - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONMODECONFIGS__0__PADDINGMODE"
+            - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGS__0__PADDINGMODE"
               value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.paddingMode }}"
             - name: "KEYCLOAK__CENTRAL__AUTHREALM"
               value: "{{ .Values.backend.keycloak.central.authRealm }}"
@@ -279,6 +279,10 @@ spec:
                 secretKeyRef:
                   name: "{{ .Values.backend.mailing.secret }}"
                   key: "password"
+            - name: "MAILINGSERVICE__MAIL__SMTPPORT"
+              value: "{{ .Values.backend.mailing.port }}"
+            - name: "MAILINGSERVICE__MAIL__SMTPUSER"
+              value: "{{ .Values.backend.mailing.user }}"
             - name: "NETWORKREGISTRATION__INITIALROLES__0__CLIENTID"
               value: "{{ .Values.backend.clients.registration }}"
             - name: "NETWORKREGISTRATION__INITIALROLES__0__USERROLENAMES__0"
@@ -368,7 +372,7 @@ spec:
               value: "{{ .Values.backend.placeholder }}"
             - name: "PROCESSIDENTITY__PROCESSUSERID"
               value: "{{ .Values.backend.processesworker.processIdentity.processUserId }}"
-            - name: "ONBOARDINGSERVICEPROVIDER__ENCRYPTIONCONFIG__ENCRYPTIONCONFIGINDEX"
+            - name: "ONBOARDINGSERVICEPROVIDER__ENCRYPTIONCONFIGINDEX"
               value: "{{ .Values.backend.processesworker.onboardingServiceProvider.encryptionConfigIndex }}"
             - name: "ONBOARDINGSERVICEPROVIDER__ENCRYPTIONCONFIGS__0__INDEX"
               value: "{{ .Values.backend.processesworker.onboardingServiceProvider.encryptionConfigs.index0.index}}"
@@ -392,6 +396,42 @@ spec:
                 secretKeyRef:
                   name: "{{ .Values.backend.interfaces.secret }}"
                   key: "onboardingserviceprovider-encryption-key1"
+            - name: "INVITATION__INVITEDUSERINITIALROLES__0__CLIENTID"
+              value: "{{ .Values.backend.clients.registration }}"
+            - name: "INVITATION__INVITEDUSERINITIALROLES__0__USERROLENAMES__0"
+              value: "{{ .Values.backend.processesworker.invitation.invitedUserInitialRoles.role0 }}"
+            - name: "INVITATION__REGISTRATIONAPPADDRESS"
+              value: "{{ .Values.portalAddress }}{{ .Values.backend.registration.portalRegistrationPath }}"
+            - name: "INVITATION__PASSWORDRESENDADDRESS"
+              value: "{{ .Values.portalAddress }}{{ .Values.backend.portalPasswordResendPath }}"
+            - name: "INVITATION__INITIALLOGINTHEME"
+              value: "{{ .Values.backend.processesworker.invitation.initialLoginTheme }}"
+            - name: "INVITATION__ENCRYPTIONCONFIGINDEX"
+              value: "{{ .Values.backend.processesworker.invitation.encryptionConfigIndex }}"
+            - name: "INVITATION__ENCRYPTIONCONFIGS__0__INDEX"
+              value: "{{ .Values.backend.processesworker.invitation.encryptionConfigs.index0.index }}"
+            - name: "INVITATION__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.backend.interfaces.secret }}"
+                  key: "invitation-encryption-key0"
+            - name: "INVITATION__ENCRYPTIONCONFIGS__0__CIPHERMODE"
+              value: "{{ .Values.backend.processesworker.invitation.encryptionConfigs.index0.cipherMode }}"
+            - name: "INVITATION__ENCRYPTIONCONFIGS__0__PADDINGMODE"
+              value: "{{ .Values.backend.processesworker.invitation.encryptionConfigs.index0.paddingMode }}"
+            - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGINDEX"
+              value: "{{ .Values.backend.processesworker.mailing.encryptionConfigIndex }}"
+            - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__INDEX"
+              value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.index }}"
+            - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Values.backend.interfaces.secret }}"
+                  key: "mailing-encryption-key0"
+            - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__CIPHERMODE"
+              value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.cipherMode }}"
+            - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__PADDINGMODE"
+              value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.paddingMode }}"
             ports:
             - name: http
               containerPort: {{ .Values.portContainer }}

diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml
@@ -212,16 +212,16 @@ spec:
           value: "{{ .Values.backend.processesworker.dim.maxValidationTimeInDays }}"
         - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGINDEX"
           value: "{{ .Values.backend.processesworker.dim.encryptionConfigIndex }}"
-        - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONMODECONFIGS__0__INDEX"
+        - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGS__0__INDEX"
           value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.index }}"
-        - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONMODECONFIGS__0__ENCRYPTIONKEY"
+        - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY"
           valueFrom:
             secretKeyRef:
               name: "{{ .Values.backend.interfaces.secret }}"
               key: "dim-encryption-key0"
-        - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONMODECONFIGS__0__CIPHERMODE"
+        - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGS__0__CIPHERMODE"
           value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.cipherMode }}"
-        - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONMODECONFIGS__0__PADDINGMODE"
+        - name: "APPLICATIONCHECKLIST__DIM__ENCRYPTIONCONFIGS__0__PADDINGMODE"
           value: "{{ .Values.backend.processesworker.dim.encryptionConfigs.index0.paddingMode }}"
         - name: "COMPANYDATA__USECASEPARTICIPATIONMEDIATYPES__0"
           value: "{{ .Values.backend.administration.companyData.useCaseParticipationMediaTypes.type0 }}"
@@ -286,18 +286,6 @@ spec:
           value: "{{ .Values.backend.administration.identityProviderAdmin.deactivateIdpRoles.role0 }}"
         - name: "IDENTITYPROVIDERADMIN__DEACTIVATEIDPROLES__0__USERROLENAMES__1"
           value: "{{ .Values.backend.administration.identityProviderAdmin.deactivateIdpRoles.role1 }}"
-        - name: "INVITATION__INVITEDUSERINITIALROLES__0__CLIENTID"
-          value: "{{ .Values.backend.clients.registration }}"
-        - name: "INVITATION__INVITEDUSERINITIALROLES__0__USERROLENAMES__0"
-          value: "{{ .Values.backend.administration.invitation.invitedUserInitialRoles.role0 }}"
-        - name: "INVITATION__REGISTRATIONAPPADDRESS"
-          value: "{{ .Values.portalAddress }}{{ .Values.backend.registration.portalRegistrationPath }}"
-        - name: "INVITATION__PASSWORDRESENDADDRESS"
-          value: "{{ .Values.portalAddress }}{{ .Values.backend.portalPasswordResendPath }}"
-        - name: "INVITATION__INITIALLOGINTHEME"
-          value: "{{ .Values.backend.administration.invitation.initialLoginTheme }}"
-        - name: "INVITATION__CLOSEAPPLICATIONADDRESS"
-          value: "{{ .Values.portalAddress }}{{ .Values.backend.administration.invitation.closeApplicationPath }}"
         - name: "JWTBEAREROPTIONS__METADATAADDRESS"
           value: "{{ .Values.centralidpAddress }}{{ .Values.backend.keycloak.central.jwtBearerOptions.metadataPath }}"
         - name: "JWTBEAREROPTIONS__REQUIREHTTPSMETADATA"
@@ -344,26 +332,13 @@ spec:
           value: "{{ .Values.backend.administration.logging.custodianLibrary }}"
         - name: "SERILOG__MINIMUMLEVEL__OVERRIDE__Org.Eclipse.TractusX.Portal.Backend.Bpdm.Library"
           value: "{{ .Values.backend.administration.logging.bpdmLibrary }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPHOST"
-          value: "{{ .Values.backend.mailing.host }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPPASSWORD"
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Values.backend.mailing.secret }}"
-              key: "password"
-        - name: "MAILINGSERVICE__MAIL__SMTPPORT"
-          value: "{{ .Values.backend.mailing.port }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPUSER"
-          value: "{{ .Values.backend.mailing.user }}"
-        - name: "MAILINGSERVICE__MAIL__SENDEREMAIL"
-          value: "{{ .Values.backend.mailing.senderEmail }}"
         - name: "NETWORK2NETWORK__INITIALROLES__0__CLIENTID"
           value: "{{ .Values.backend.clients.registration }}"
         - name: "NETWORK2NETWORK__INITIALROLES__0__USERROLENAMES__0"
           value: "{{ .Values.backend.provisioning.invitedUserInitialRoles.registration }}"
         - name: "NETWORK2NETWORK__BASEPORTALADDRESS"
           value: "{{ .Values.portalAddress }}{{ .Values.backend.portalHomePath }}"
-        - name: "ONBOARDINGSERVICEPROVIDER__ENCRYPTIONCONFIG__INDEX"
+        - name: "ONBOARDINGSERVICEPROVIDER__ENCRYPTIONCONFIGINDEX"
           value: "{{ .Values.backend.processesworker.onboardingServiceProvider.encryptionConfigIndex }}"
         - name: "ONBOARDINGSERVICEPROVIDER__ENCRYPTIONCONFIGS__0__INDEX"
           value: "{{ .Values.backend.processesworker.onboardingServiceProvider.encryptionConfigs.index0.index}}"
@@ -443,6 +418,19 @@ spec:
           value: "{{ .Values.portalAddress }}{{ .Values.backend.portalPasswordResendPath }}"
         - name: "USERMANAGEMENT__PORTAL__KEYCLOAKCLIENTID"
           value: "{{ .Values.backend.administration.keycloakClientId }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGINDEX"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigIndex }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__INDEX"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.index }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY"
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Values.backend.interfaces.secret }}"
+              key: "mailing-encryption-key0"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__CIPHERMODE"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.cipherMode }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__PADDINGMODE"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.paddingMode }}"
         ports:
         - name: http
           containerPort: {{ .Values.portContainer }}

diff --git a/charts/portal/templates/deployment-backend-appmarketplace.yaml b/charts/portal/templates/deployment-backend-appmarketplace.yaml
@@ -305,23 +305,23 @@ spec:
           value: "{{ .Values.backend.appmarketplace.logging.default }}"
         - name: "SERILOG__MINIMUMLEVEL__OVERRIDE__Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Service"
           value: "{{ .Values.backend.appmarketplace.logging.offersLibrary }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPHOST"
-          value: "{{ .Values.backend.mailing.host }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPPASSWORD"
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Values.backend.mailing.secret }}"
-              key: "password"
-        - name: "MAILINGSERVICE__MAIL__SMTPPORT"
-          value: "{{ .Values.backend.mailing.port }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPUSER"
-          value: "{{ .Values.backend.mailing.user }}"
-        - name: "MAILINGSERVICE__MAIL__SENDEREMAIL"
-          value: "{{ .Values.backend.mailing.senderEmail }}"
         - name: "PROVISIONING__CENTRALREALM"
           value: "{{ .Values.backend.provisioning.centralRealm }}"
         - name: "PROVISIONING__CENTRALREALMID"
           value: "{{ .Values.backend.provisioning.centralRealmId }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGINDEX"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigIndex }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__INDEX"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.index }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY"
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Values.backend.interfaces.secret }}"
+              key: "mailing-encryption-key0"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__CIPHERMODE"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.cipherMode }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__PADDINGMODE"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.paddingMode }}"
         - name: "SWAGGERENABLED"
           value: "{{ .Values.backend.appmarketplace.swaggerEnabled }}"
         ports:

diff --git a/charts/portal/templates/deployment-backend-registration.yaml b/charts/portal/templates/deployment-backend-registration.yaml
@@ -145,19 +145,6 @@ spec:
           value: "{{ .Values.backend.registration.logging.bpdmLibrary }}"
         - name: "SERILOG__MINIMUMLEVEL__OVERRIDE__Org.Eclipse.TractusX.Portal.Backend.Registration.Service.BusinessLogic"
           value: "{{ .Values.backend.registration.logging.registrationService }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPHOST"
-          value: "{{ .Values.backend.mailing.host }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPPASSWORD"
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Values.backend.mailing.secret }}"
-              key: "password"
-        - name: "MAILINGSERVICE__MAIL__SMTPPORT"
-          value: "{{ .Values.backend.mailing.port }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPUSER"
-          value: "{{ .Values.backend.mailing.user }}"
-        - name: "MAILINGSERVICE__MAIL__SENDEREMAIL"
-          value: "{{ .Values.backend.mailing.senderEmail }}"
         - name: "MVC_ROUTING_BASEPATH"
           value: "{{ .Values.backend.registration.basePath }}"
         - name: "PROVISIONING__CENTRALREALM"
@@ -202,6 +189,19 @@ spec:
           value: "{{ .Values.backend.registration.registrationDocumentTypeIds.type0 }}"
         - name: "REGISTRATION__SUBMITDOCUMENTTYPEIDS__0"
           value: "{{ .Values.backend.registration.submitDocumentTypeIds.type0 }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGINDEX"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigIndex }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__INDEX"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.index }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY"
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Values.backend.interfaces.secret }}"
+              key: "mailing-encryption-key0"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__CIPHERMODE"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.cipherMode }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__PADDINGMODE"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.paddingMode }}"
         ports:
         - name: http
           containerPort: {{ .Values.portContainer }}

diff --git a/charts/portal/templates/deployment-backend-services.yaml b/charts/portal/templates/deployment-backend-services.yaml
@@ -135,19 +135,6 @@ spec:
           value: "{{ .Values.backend.services.logging.default }}"
         - name: "SERILOG__MINIMUMLEVEL__OVERRIDE__Org.Eclipse.TractusX.Portal.Backend.Offers.Library.Service"
           value: "{{ .Values.backend.services.logging.offersLibrary }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPHOST"
-          value: "{{ .Values.backend.mailing.host }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPPASSWORD"
-          valueFrom:
-            secretKeyRef:
-              name: "{{ .Values.backend.mailing.secret }}"
-              key: "password"
-        - name: "MAILINGSERVICE__MAIL__SMTPPORT"
-          value: "{{ .Values.backend.mailing.port }}"
-        - name: "MAILINGSERVICE__MAIL__SMTPUSER"
-          value: "{{ .Values.backend.mailing.user }}"
-        - name: "MAILINGSERVICE__MAIL__SENDEREMAIL"
-          value: "{{ .Values.backend.mailing.senderEmail }}"
         - name: "MVC_ROUTING_BASEPATH"
           value: "{{ .Values.backend.services.basePath }}"
         - name: "PROVISIONING__CENTRALREALM"
@@ -246,6 +233,19 @@ spec:
           value: "{{ .Values.backend.clients.portal }}"
         - name: "SERVICES__COMPANYADMINROLES__0__USERROLENAMES__0"
           value: "{{ .Values.backend.services.companyAdminRoles.role0 }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGINDEX"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigIndex }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__INDEX"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.index }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__ENCRYPTIONKEY"
+          valueFrom:
+            secretKeyRef:
+              name: "{{ .Values.backend.interfaces.secret }}"
+              key: "mailing-encryption-key0"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__CIPHERMODE"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.cipherMode }}"
+        - name: "MAILINGPROCESSCREATION__ENCRYPTIONCONFIGS__0__PADDINGMODE"
+          value: "{{ .Values.backend.processesworker.mailing.encryptionConfigs.index0.paddingMode }}"
         ports:
         - name: http
           containerPort: {{ .Values.portContainer }}