feat: fun with email templates aka. thymeleaf

smardigo/provisioning/mail-template/smardigo-up-and-running.html

@@ -15,7 +15,7 @@
         </p>
         <p>
           Zum Abschließen der Installation müssen Sie sich mit den folgend angegebenen initialen Zugangsdaten
-          anmelden. Sie werden danach aufgefordert, ihre eigenen Passwörter zu setzen. Beachten Sie, dass die
+          anmelden. Sie werden danach aufgefordert, Ihre eigenen Passwörter zu setzen. Beachten Sie, dass die
           zugehörigen Benutzer über alle Ihre Smardigo-Instanzen hin geteilt werden. Die initialen Passwörter
           können nur für die allererste Anmeldung verwendet werden. Von Ihnen gesetzte Passwörter werden nicht
           überschrieben.
@@ -30,21 +30,27 @@
           </tr>
           <tr>
             <td>Connect</td>
-            <td>${ connect_admin_username }</td>
+            <td th:text="${ connect_admin_username }">some-username</td>
-            <td>${ connect_admin_password }</td>
+            <td th:text="${ connect_admin_password }">some-password</td>
-            <td>https://${ cluster.stage }-${ tenant.key }-${ cluster.name }-01-connect.smardigo.digital</td>
+            <td th:text="'https://' + ${ cluster.stage } + '-' + ${ tenant.key } + '-' + ${ cluster.name } + '-01-connect.smardigo.digital'">some-link</td>
            </tr>
           <tr>
             <td>Keycloak</td>
-            <td>${ keycloak_admin_username }</td>
+            <td th:text="${ keycloak_admin_username }">some-username</td>
-            <td>${ keycloak_admin_password }</td>
+            <td th:text="${ keycloak_admin_password }">some-password</td>
-            <td>https://${ cluster.stage }-keycloak-01.smardigo.digital/auth/admin/${ tenant.key }/console</td>
+            <td th:text="'https://' + ${ cluster.stage } + '-keycloak-01.smardigo.digital/auth/admin/' + ${ tenant.key } + '/console'">some-link</td>
            </tr>
           <tr>
             <td>Wordpress</td>
-            <td>${ wordpress_admin_username }</td>
+            <td th:text="${ wordpress_admin_username }">some-username</td>
-            <td>${ wordpress_admin_password }</td>
+            <td th:text="${ wordpress_admin_password }">some-password</td>
-            <td>https://${ cluster.stage }-${ tenant.key }-${ cluster.name }-01-wordpress.smardigo.digital</td>
+            <td th:text="'https://' + ${ cluster.stage } + '-' + ${ tenant.key } + '-' + ${ cluster.name } + '-01-wordpress.smardigo.digital'">some-link</td>
+           </tr>
+          <tr>
+            <td>ELK</td>
+            <td th:text="${ tenant.key }">some-username</td>
+            <td th:text="${ tenant.key }">some-password</td>
+            <td th:text="'https://' + ${ cluster.stage } + '-elastic-stack-kibana-01-kibana.smardigo.digital/s/' + ${ cluster.stage } + '-' + ${ tenant.key } + '/app/home#/'">some-link</td>
            </tr>
         </table>
         <p></p>

smardigo/provisioning/process/simple-connect.bpmn

@@ -1127,7 +1127,7 @@ Variables.userId(authenticatedUserId)</camunda:script>
           <camunda:inputParameter name="to" />
           <camunda:inputParameter name="toUsers">${creation_user_id}</camunda:inputParameter>
           <camunda:inputParameter name="subject">Neue Smardigo Instanz</camunda:inputParameter>
-          <camunda:inputParameter name="messageBody">template(smardigo-up-and-running.html)</camunda:inputParameter>
+          <camunda:inputParameter name="messageBody">template(smardigo-up-and-running)</camunda:inputParameter>
         </camunda:inputOutput>
       </bpmn2:extensionElements>
       <bpmn2:incoming>Flow_1gzjfsr</bpmn2:incoming>
@@ -1257,6 +1257,14 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id :
       <bpmndi:BPMNShape id="Participant_19lpjee_di" bpmnElement="Participant_19lpjee" isHorizontal="true">
         <dc:Bounds x="160" y="900" width="6160" height="3650" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_1381iar_di" bpmnElement="Flow_1381iar">
+        <di:waypoint x="3518" y="2900" />
+        <di:waypoint x="3565" y="2900" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_10y7ypm_di" bpmnElement="Flow_10y7ypm">
+        <di:waypoint x="3430" y="2900" />
+        <di:waypoint x="3482" y="2900" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_11b4s64_di" bpmnElement="Flow_11b4s64">
         <di:waypoint x="3080" y="2958" />
         <di:waypoint x="3080" y="3080" />
@@ -1514,14 +1522,6 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id :
         <di:waypoint x="460" y="1170" />
         <di:waypoint x="512" y="1170" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_10y7ypm_di" bpmnElement="Flow_10y7ypm">
-        <di:waypoint x="3430" y="2900" />
-        <di:waypoint x="3482" y="2900" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1381iar_di" bpmnElement="Flow_1381iar">
-        <di:waypoint x="3518" y="2900" />
-        <di:waypoint x="3565" y="2900" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Activity_0bhz4p5_di" bpmnElement="Activity_1lo3ui2">
         <dc:Bounds x="1540" y="2860" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -1585,25 +1585,6 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id :
       <bpmndi:BPMNShape id="Event_0ermhxm_di" bpmnElement="Event_0ermhxm">
         <dc:Bounds x="1282" y="2522" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1lyxxh0_di" bpmnElement="Gateway_134tk0f">
-        <dc:Bounds x="3225" y="2875" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1lly48x_di" bpmnElement="Event_1lly48x">
-        <dc:Bounds x="3232" y="2802" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3279" y="2806" width="62" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1b4c8ot" bpmnElement="Event_1r67mi9" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
-        <dc:Bounds x="3482" y="2882" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3459" y="2936" width="83" height="40" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0aw6pf2" bpmnElement="Activity_1lyywu3">
-        <dc:Bounds x="3330" y="2860" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_17cc1q7_di" bpmnElement="Activity_17cc1q7" isExpanded="true">
         <dc:Bounds x="1120" y="2230" width="350" height="200" />
       </bpmndi:BPMNShape>
@@ -2166,6 +2147,25 @@ processes.byId(contextScopeId, contextProcessId).createComment('current_job_id :
           <dc:Bounds x="1966" y="1947" width="88" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1lyxxh0_di" bpmnElement="Gateway_134tk0f">
+        <dc:Bounds x="3225" y="2875" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1lly48x_di" bpmnElement="Event_1lly48x">
+        <dc:Bounds x="3232" y="2802" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3279" y="2806" width="62" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1b4c8ot" bpmnElement="Event_1r67mi9" bioc:stroke="rgb(67, 160, 71)" bioc:fill="rgb(200, 230, 201)">
+        <dc:Bounds x="3482" y="2882" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3459" y="2936" width="83" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0aw6pf2" bpmnElement="Activity_1lyywu3">
+        <dc:Bounds x="3330" y="2860" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_06c2k4p" bpmnElement="Event_1wpa1a6">
         <dc:Bounds x="3062" y="2922" width="36" height="36" />
       </bpmndi:BPMNShape>