DEV-1262: process 'service-change' supplies variable 'data.wordpress.admin.username' to awx

smardigo/pmci/process/service-change.bpmn

@@ -422,24 +422,10 @@
       <bpmn2:incoming>Flow_02ixndu</bpmn2:incoming>
       <bpmn2:incoming>Flow_0j3iasf</bpmn2:incoming>
     </bpmn2:endEvent>
-    <bpmn2:task id="Activity_0c593fe" name="Create data objects">
+    <bpmn2:scriptTask id="Activity_0c593fe" name="Create data objects" scriptFormat="groovy" camunda:resultVariable="in_data" camunda:resource="create-data.groovy">
-      <bpmn2:extensionElements>
-        <camunda:inputOutput>
-          <camunda:outputParameter name="connect">
-            <camunda:script scriptFormat="groovy">def connect_admin = [:]
-connect_admin["username"] = service.cluster.key + "-connect-admin"
-
-def connect = [:]
-connect["admin"] = connect_admin
-connect["version"] = service.connect_version
-
-connect</camunda:script>
-          </camunda:outputParameter>
-        </camunda:inputOutput>
-      </bpmn2:extensionElements>
       <bpmn2:incoming>Flow_1je7ve0</bpmn2:incoming>
       <bpmn2:outgoing>Flow_0ole7x1</bpmn2:outgoing>
-    </bpmn2:task>
+    </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="Flow_0ole7x1" sourceRef="Activity_0c593fe" targetRef="Activity_17sje46" />
     <bpmn2:callActivity id="Activity_17sje46" name="pmci-service-create" calledElement="smardigo-management-action">
       <bpmn2:extensionElements>
@@ -447,12 +433,8 @@ connect</camunda:script>
         <camunda:in variables="all" />
         <camunda:in sourceExpression="pmci-service-create" target="smardigoManagementAction" />
         <camunda:in sourceExpression="Service erstellen" target="comment" />
+        <camunda:in source="in_data" target="data" />
         <camunda:inputOutput>
-          <camunda:inputParameter name="data">
-            <camunda:map>
-              <camunda:entry key="connect">${connect}</camunda:entry>
-            </camunda:map>
-          </camunda:inputParameter>
           <camunda:outputParameter name="progress_current">${progress_current + 1}</camunda:outputParameter>
         </camunda:inputOutput>
       </bpmn2:extensionElements>
@@ -465,12 +447,8 @@ connect</camunda:script>
         <camunda:in variables="all" />
         <camunda:in sourceExpression="pmci-service-create" target="smardigoManagementAction" />
         <camunda:in sourceExpression="Service erstellen" target="comment" />
+        <camunda:in source="in_data" target="data" />
         <camunda:inputOutput>
-          <camunda:inputParameter name="data">
-            <camunda:map>
-              <camunda:entry key="connect">${connect}</camunda:entry>
-            </camunda:map>
-          </camunda:inputParameter>
           <camunda:outputParameter name="progress_current">${progress_current + 1}</camunda:outputParameter>
         </camunda:inputOutput>
       </bpmn2:extensionElements>
@@ -483,12 +461,8 @@ connect</camunda:script>
         <camunda:in variables="all" />
         <camunda:in sourceExpression="pmci-service-create" target="smardigoManagementAction" />
         <camunda:in sourceExpression="Service erstellen" target="comment" />
+        <camunda:in source="in_data" target="data" />
         <camunda:inputOutput>
-          <camunda:inputParameter name="data">
-            <camunda:map>
-              <camunda:entry key="connect">${connect}</camunda:entry>
-            </camunda:map>
-          </camunda:inputParameter>
           <camunda:outputParameter name="progress_current">${progress_current + 1}</camunda:outputParameter>
         </camunda:inputOutput>
       </bpmn2:extensionElements>
@@ -635,43 +609,15 @@ connect</camunda:script>
       <bpmn2:incoming>Flow_01w1l99</bpmn2:incoming>
       <bpmn2:outgoing>Flow_1yp3qlu</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:task id="Activity_0xzbzgx" name="Create data objects">
+    <bpmn2:scriptTask id="Activity_0xzbzgx" name="Create data objects" scriptFormat="groovy" camunda:resultVariable="in_data" camunda:resource="create-data.groovy">
-      <bpmn2:extensionElements>
-        <camunda:inputOutput>
-          <camunda:outputParameter name="connect">
-            <camunda:script scriptFormat="groovy">def connect_admin = [:]
-connect_admin["username"] = service.cluster.key + "-connect-admin"
-
-def connect = [:]
-connect["admin"] = connect_admin
-connect["version"] = service.connect_version
-
-connect</camunda:script>
-          </camunda:outputParameter>
-        </camunda:inputOutput>
-      </bpmn2:extensionElements>
       <bpmn2:incoming>Flow_0n6vvh4</bpmn2:incoming>
       <bpmn2:outgoing>Flow_07h5sbj</bpmn2:outgoing>
-    </bpmn2:task>
+    </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="Flow_07h5sbj" sourceRef="Activity_0xzbzgx" targetRef="Activity_1iygoas" />
-    <bpmn2:task id="Activity_11t07no" name="Create data objects">
+    <bpmn2:scriptTask id="Activity_11t07no" name="Create data objects" scriptFormat="groovy" camunda:resultVariable="in_data" camunda:resource="create-data.groovy">
-      <bpmn2:extensionElements>
-        <camunda:inputOutput>
-          <camunda:outputParameter name="connect">
-            <camunda:script scriptFormat="groovy">def connect_admin = [:]
-connect_admin["username"] = service.cluster.key + "-connect-admin"
-
-def connect = [:]
-connect["admin"] = connect_admin
-connect["version"] = service.connect_version
-
-connect</camunda:script>
-          </camunda:outputParameter>
-        </camunda:inputOutput>
-      </bpmn2:extensionElements>
       <bpmn2:incoming>Flow_1lm92r1</bpmn2:incoming>
       <bpmn2:outgoing>Flow_0yadymj</bpmn2:outgoing>
-    </bpmn2:task>
+    </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="Flow_0yadymj" sourceRef="Activity_11t07no" targetRef="Activity_1wf6a7j" />
     <bpmn2:intermediateThrowEvent id="Event_0mz1sst" name="&#34;changed&#34; (202)" camunda:asyncAfter="true">
       <bpmn2:extensionElements>

smardigo/pmci/script/create-data.groovy

@@ -17,7 +17,9 @@ def data = [:]
 
 def connect_admin = [:]
 connect_admin["username"] = service.cluster.key + "-connect-admin"
+if (binding.hasVariable('connect_admin_password')) {
   connect_admin["password"] = connect_admin_password
+}
 def connect = [:]
 connect["admin"] = connect_admin
 connect["version"] = service.connect_version
@@ -28,7 +30,9 @@ execution.setVariable('connect_admin', connect_admin)
 if (service.connect_features.contains("connect_wordpress")) {
   def wordpress_admin = [:]
   wordpress_admin["username"] = service.cluster.key + "-wordpress-admin"
+  if (binding.hasVariable('wordpress_admin_password')) {
     wordpress_admin["password"] = wordpress_admin_password
+  }
   def wordpress = [:]
   wordpress["admin"] = wordpress_admin
   data["wordpress"] = wordpress