From ff1a4a7b26ca1859635a0b7a54fe67a4f7f90fe4 Mon Sep 17 00:00:00 2001
From: Krasimir Kargov <krasikargov0703@gmail.com>
Date: Fri, 22 Aug 2025 14:36:38 +0300
Subject: [PATCH 1/3] Remove inherit variables in Flowable for
 executeHooksCallActivity LMCROSSITXSADEPLOY-3026

---
 .../process/backup-existing-app.bpmn          | 12 ++++++--
 .../controller/process/undeploy-app.bpmn      | 28 ++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
index 15ceb6f91b..84d82ec9b1 100644
--- a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
+++ b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
@@ -10,9 +10,17 @@
     <serviceTask id="stopApplicationUndeploymentTask" name="Stop Application Undeployment Step" flowable:async="true" flowable:delegateExpression="${stopApplicationUndeploymentStep}"></serviceTask>
     <endEvent id="endEvent"></endEvent>
     <exclusiveGateway id="hasStepWithHooksCompleted" default="reExecuteStepFlow"></exclusiveGateway>
-    <callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+    <callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+    <extensionElements>
+      <flowable:in source="appToProcess" target="appToProcess"></flowable:in>
+      <flowable:in source="namespace" target="namespace"></flowable:in>
+      <flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
+      <flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
+      <flowable:in source="hookForExecution" target="hookForExecution"></flowable:in>
+    </extensionElements>
       <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="hooksForExecution" flowable:elementVariable="hookForExecution">
-        <extensionElements></extensionElements>
+        <extensionElements>
+        </extensionElements>
       </multiInstanceLoopCharacteristics>
     </callActivity>
     <sequenceFlow id="checkIfStepHasCompleted" sourceRef="executeHooksCallActivity" targetRef="hasStepWithHooksCompleted"></sequenceFlow>
diff --git a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/undeploy-app.bpmn b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/undeploy-app.bpmn
index f9ff02888a..4beb858f9d 100644
--- a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/undeploy-app.bpmn
+++ b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/undeploy-app.bpmn
@@ -11,9 +11,19 @@
     <serviceTask id="deleteApplicationTask" name="Delete Application Step" flowable:async="true" flowable:delegateExpression="${deleteApplicationStep}"></serviceTask>
     <endEvent id="endEvent"></endEvent>
     <exclusiveGateway id="hasStepWithHooksCompleted" default="reExecuteStepFlow"></exclusiveGateway>
-    <callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+    <callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+      <extensionElements>
+        <flowable:in source="appToProcess" target="appToProcess"></flowable:in>
+        <flowable:in source="user" target="user"></flowable:in>
+        <flowable:in source="userGuid" target="userGuid"></flowable:in>
+        <flowable:in source="correlationId" target="correlationId"></flowable:in>
+        <flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
+        <flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
+        <flowable:in source="hookForExecution" target="hookForExecution"></flowable:in>
+      </extensionElements>
       <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="hooksForExecution" flowable:elementVariable="hookForExecution">
-        <extensionElements></extensionElements>
+        <extensionElements>
+        </extensionElements>
       </multiInstanceLoopCharacteristics>
     </callActivity>
     <sequenceFlow id="checkIfStepHasCompleted" sourceRef="executeHooksCallActivity" targetRef="hasStepWithHooksCompleted"></sequenceFlow>
@@ -26,9 +36,19 @@
     </sequenceFlow>
     <serviceTask id="deleteApplicationRoutesTask" name="Delete Application Routes Step" flowable:async="true" flowable:delegateExpression="${deleteApplicationRoutesStep}"></serviceTask>
     <exclusiveGateway id="sid-C0D28E29-9B86-4F49-940D-0B0B4D49814F" default="sid-5284C7E5-D22E-44C5-AB00-3A8646246978"></exclusiveGateway>
-    <callActivity id="sid-E6248AA7-20A0-416A-BB01-8226A84DDBDA" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+    <callActivity id="sid-E6248AA7-20A0-416A-BB01-8226A84DDBDA" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
+      <extensionElements>
+        <flowable:in source="appToProcess" target="appToProcess"></flowable:in>
+        <flowable:in source="user" target="user"></flowable:in>
+        <flowable:in source="userGuid" target="userGuid"></flowable:in>
+        <flowable:in source="correlationId" target="correlationId"></flowable:in>
+        <flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
+        <flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
+        <flowable:in source="hookForExecution" target="hookForExecution"></flowable:in>
+      </extensionElements>
       <multiInstanceLoopCharacteristics isSequential="false" flowable:collection="hooksForExecution" flowable:elementVariable="hookForExecution">
-        <extensionElements></extensionElements>
+        <extensionElements>
+        </extensionElements>
       </multiInstanceLoopCharacteristics>
     </callActivity>
     <sequenceFlow id="sid-BC0FC2FE-4289-4744-BB2F-C6472CE2C33A" sourceRef="sid-E6248AA7-20A0-416A-BB01-8226A84DDBDA" targetRef="sid-C0D28E29-9B86-4F49-940D-0B0B4D49814F"></sequenceFlow>

From fed32ccd55469cd4b9ba6e0d7ee4df1a6e3c7208 Mon Sep 17 00:00:00 2001
From: Krasimir Kargov <krasikargov0703@gmail.com>
Date: Wed, 27 Aug 2025 14:31:07 +0300
Subject: [PATCH 2/3] Adding more needed variables for a successful deployment
 LMCROSSITXSADEPLOY-3026

---
 .../multiapps/controller/process/backup-existing-app.bpmn      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
index 84d82ec9b1..5e09c0116e 100644
--- a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
+++ b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
@@ -13,7 +13,10 @@
     <callActivity id="executeHooksCallActivity" name="Execute Hooks Call Activity" flowable:async="true" calledElement="${hookProcessGetter.get(hookForExecution, execution)}" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
     <extensionElements>
       <flowable:in source="appToProcess" target="appToProcess"></flowable:in>
+      <flowable:in source="user" target="user"></flowable:in>
+      <flowable:in source="userGuid" target="userGuid"></flowable:in>
       <flowable:in source="namespace" target="namespace"></flowable:in>
+      <flowable:in source="correlationId" target="correlationId"></flowable:in>
       <flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
       <flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
       <flowable:in source="hookForExecution" target="hookForExecution"></flowable:in>

From f77b99afeacaedd34099abf49542ea1969fe1af4 Mon Sep 17 00:00:00 2001
From: Krasimir Kargov <krasikargov0703@gmail.com>
Date: Wed, 27 Aug 2025 16:18:38 +0300
Subject: [PATCH 3/3] Removing namespace variable setting
 LMCROSSITXSADEPLOY-3026

---
 .../multiapps/controller/process/backup-existing-app.bpmn        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
index 5e09c0116e..6ff559a157 100644
--- a/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
+++ b/multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/backup-existing-app.bpmn
@@ -15,7 +15,6 @@
       <flowable:in source="appToProcess" target="appToProcess"></flowable:in>
       <flowable:in source="user" target="user"></flowable:in>
       <flowable:in source="userGuid" target="userGuid"></flowable:in>
-      <flowable:in source="namespace" target="namespace"></flowable:in>
       <flowable:in source="correlationId" target="correlationId"></flowable:in>
       <flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
       <flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>