Skip to content

Replace inheritVariables with explicit in-mappings for undeployAppSubProcess #1897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yavor16 merged 3 commits into from
Aug 18, 2026
Merged

Replace inheritVariables with explicit in-mappings for undeployAppSubProcess #1897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
812677d
Replace inheritVariables with explicit in-mappings for undeployAppSub…
Yavor16 Aug 14, 2026
23694cb
Add missing appToProcess to undeployAppSubProcess flowable:in mappings
Yavor16 Aug 14, 2026
76ee27b
fix comment from Stoyan
Yavor16 Aug 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion ...rocess/src/main/resources/org/cloudfoundry/multiapps/controller/process/rollback-mta.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,37 @@
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
</callActivity>
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
<flowable:in source="phase" target="phase"></flowable:in>
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="keepFiles" target="keepFiles"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="mtaExtDescriptorId" target="mtaExtDescriptorId"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
Expand Down
64 changes: 62 additions & 2 deletions ...ocess/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,37 @@
<sequenceFlow id="sid-59F0AF3A-1E41-4A9D-8C78-9B94151006DE" sourceRef="detectSchemaVersionTask" targetRef="mergeDescriptorsTask"></sequenceFlow>
<inclusiveGateway id="setUndeployPhaseInclusiveGateway" name="setUndeployPhaseInclusiveGateway"></inclusiveGateway>
<sequenceFlow id="flow39" sourceRef="deleteSubscriptionsTask" targetRef="deleteDiscontinuedConfigurationEntriesTask"></sequenceFlow>
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
<flowable:in source="phase" target="phase"></flowable:in>
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="keepFiles" target="keepFiles"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="mtaExtDescriptorId" target="mtaExtDescriptorId"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
Expand All @@ -136,7 +166,37 @@
<serviceTask id="detectApplicationsToRenameTask" name="Detect apps to rename" flowable:async="true" flowable:delegateExpression="${detectApplicationsToRenameStep}"></serviceTask>
<sequenceFlow id="flow8" sourceRef="detectDeployedMtaTask" targetRef="detectApplicationsToRenameTask"></sequenceFlow>
<serviceTask id="updateModulesAppNames" name="Update Modules App Names " flowable:async="true" flowable:delegateExpression="${updateModulesAppNames}"></serviceTask>
<callActivity id="sid-C6BBB2C9-B681-4FAE-A33C-57CEF185997B" name="Undeploy Old Apps Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="sid-C6BBB2C9-B681-4FAE-A33C-57CEF185997B" name="Undeploy Old Apps Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
<flowable:in source="phase" target="phase"></flowable:in>
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="keepFiles" target="keepFiles"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="mtaExtDescriptorId" target="mtaExtDescriptorId"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
Expand Down
32 changes: 31 additions & 1 deletion ...-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-deploy.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,37 @@
<sequenceFlow id="sid-25422585-0CF1-4EDA-A191-9FC317F996E6" sourceRef="createSubscriptionsTask" targetRef="deleteSubscriptionsTask"></sequenceFlow>
<sequenceFlow id="sid-71D9747E-4053-4C4D-B8AF-714F9C35DE48" sourceRef="detectSchemaVersionTask" targetRef="mergeDescriptorsTask"></sequenceFlow>
<exclusiveGateway id="shouldDeleteDiscontinuedServicesGateway" name="Should Delete Discontinued Services" default="doNotDeleteDiscontinuedServicesFlow"></exclusiveGateway>
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
<flowable:in source="phase" target="phase"></flowable:in>
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="keepFiles" target="keepFiles"></flowable:in>
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
<flowable:in source="mtaExtDescriptorId" target="mtaExtDescriptorId"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
Expand Down
29 changes: 28 additions & 1 deletion ...rocess/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-undeploy.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,34 @@
</multiInstanceLoopCharacteristics>
</callActivity>
<exclusiveGateway id="shouldDeleteDiscontinuedServicesGateway" name="Should Delete Discontinued Services" default="doNotDeleteDiscontinuedServicesFlow"></exclusiveGateway>
<callActivity id="undeployAppsCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="undeployAppsCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
<flowable:in source="correlationId" target="correlationId"></flowable:in>
<flowable:in source="user" target="user"></flowable:in>
<flowable:in source="userGuid" target="userGuid"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
<flowable:in source="phase" target="phase"></flowable:in>
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="processId" target="processId"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
<extensionElements></extensionElements>
</multiInstanceLoopCharacteristics>
Expand Down
Loading