Skip to content

Remove inheritVariables for deleteServiceSubProcess call activities #1902

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
stiv03 merged 2 commits into from
Aug 27, 2026
Merged

Remove inheritVariables for deleteServiceSubProcess call activities #1902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4495c0c
Remove inheritVariables for deleteServiceSubProcess call activities
stiv03 Aug 26, 2026
b17cda4
Fix missing variable mappings for undeployAppsCallActivity abort handler
stiv03 Aug 26, 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
24 changes: 23 additions & 1 deletion ...in/resources/org/cloudfoundry/multiapps/controller/process/create_or_update_services.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,32 @@
</serviceTask>
<exclusiveGateway id="exclusivegateway2" name="Exclusive Gateway" default="SkipCoUFlow"></exclusiveGateway>
<serviceTask id="CreateServiceTask" name="Create" flowable:async="true" flowable:delegateExpression="${createServiceStep}"></serviceTask>
<callActivity id="DeleteServiceCallActivity" name="Delete" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="DeleteServiceCallActivity" name="Delete" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="servicesToDelete" target="servicesToDelete"></flowable:in>
<flowable:in source="serviceToDelete" target="serviceToDelete"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="serviceActionsToExecute" target="serviceActionsToExecute"></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="processId" target="processId"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="stepPhase" target="stepPhase"></flowable:in>
</extensionElements>
</callActivity>
<serviceTask id="UpdateServicePlanTask" name="Update service plan" flowable:async="true" default="flow48" flowable:delegateExpression="${updateServicePlanStep}"></serviceTask>
Expand Down
25 changes: 24 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 @@ -42,9 +42,32 @@
<exclusiveGateway id="deploymentModeGateway" name="Deployment Mode Gateway" default="shouldDeployModulesSequentialFlow"></exclusiveGateway>
<serviceTask id="computeNextModulesToDeployInParallel" name="Compute Next Modules To Deploy" flowable:async="true" flowable:delegateExpression="${computeNextModulesStep}"></serviceTask>
<exclusiveGateway id="hasParallelDeploymentCompletedGateway" name="Has Parallel Deployment Completed" default="deployAppsParallelNextIterationFlow"></exclusiveGateway>
<callActivity id="deleteServicesCallActivity" name="Delete Services Sub Process" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="deleteServicesCallActivity" name="Delete Services Sub Process" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="serviceToDelete" target="serviceToDelete"></flowable:in>
<flowable:in source="servicesToDelete" target="servicesToDelete"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="serviceActionsToExecute" target="serviceActionsToExecute"></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="processId" target="processId"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="stepPhase" target="stepPhase"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="servicesToDelete" flowable:elementVariable="serviceToDelete">
<extensionElements></extensionElements>
Expand Down
25 changes: 24 additions & 1 deletion ...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 @@ -93,9 +93,32 @@
<exclusiveGateway id="deploymentModeGateway" name="Deployment Mode Gateway" default="shouldDeployModulesSequentialFlow"></exclusiveGateway>
<serviceTask id="computeNextModulesToDeployInParallel" name="Compute Next Modules To Deploy" flowable:async="true" flowable:delegateExpression="${computeNextModulesStep}"></serviceTask>
<exclusiveGateway id="hasParallelDeploymentCompletedGateway" name="Has Parallel Deployment Completed" default="deployAppsParallelNextIterationFlow"></exclusiveGateway>
<callActivity id="deleteServicesCallActivity" name="Delete Services Sub Process" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="deleteServicesCallActivity" name="Delete Services Sub Process" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="serviceToDelete" target="serviceToDelete"></flowable:in>
<flowable:in source="servicesToDelete" target="servicesToDelete"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="serviceActionsToExecute" target="serviceActionsToExecute"></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="processId" target="processId"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="stepPhase" target="stepPhase"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="servicesToDelete" flowable:elementVariable="serviceToDelete">
<extensionElements></extensionElements>
Expand Down
25 changes: 24 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 @@ -94,9 +94,32 @@
<sequenceFlow id="flow119" sourceRef="computeNextModulesToDeployInParallel" targetRef="deployModulesParallel"></sequenceFlow>
<sequenceFlow id="flow120" sourceRef="deployModulesParallel" targetRef="hasParallelDeploymentCompletedGateway"></sequenceFlow>
<sequenceFlow id="deployAppsParallelNextIterationFlow" sourceRef="hasParallelDeploymentCompletedGateway" targetRef="computeNextModulesToDeployInParallel"></sequenceFlow>
<callActivity id="deleteServicesCallActivity" name="Delete Services Sub Process" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="deleteServicesCallActivity" name="Delete Services Sub Process" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="serviceToDelete" target="serviceToDelete"></flowable:in>
<flowable:in source="servicesToDelete" target="servicesToDelete"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="serviceActionsToExecute" target="serviceActionsToExecute"></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="processId" target="processId"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="stepPhase" target="stepPhase"></flowable:in>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="servicesToDelete" flowable:elementVariable="serviceToDelete">
<extensionElements></extensionElements>
Expand Down
28 changes: 27 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 @@ -54,9 +54,32 @@
</intermediateCatchEvent>
<serviceTask id="incrementServiceBrokerSubscribersToRestartIndexTask" name="Increment Index" flowable:async="true" flowable:delegateExpression="${incrementIndexStep}"></serviceTask>
<sequenceFlow id="flow38" sourceRef="incrementServiceBrokerSubscribersToRestartIndexTask" targetRef="areAllServiceBrokerSubscribersRestartedGateway"></sequenceFlow>
<callActivity id="deleteServicesCallActivity" name="Delete Services Sub Process" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<callActivity id="deleteServicesCallActivity" name="Delete Services Sub Process" flowable:async="true" calledElement="deleteServiceSubProcess" flowable:calledElementType="key" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
<extensionElements>
<flowable:in source="serviceToDelete" target="serviceToDelete"></flowable:in>
<flowable:in source="servicesToDelete" target="servicesToDelete"></flowable:in>
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
<flowable:in source="serviceActionsToExecute" target="serviceActionsToExecute"></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="processId" target="processId"></flowable:in>
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
<flowable:in source="__TASK_ID" target="__TASK_ID"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
<flowable:in source="mtaId" target="mtaId"></flowable:in>
<flowable:in source="bindingName" target="bindingName"></flowable:in>
<flowable:in source="serviceBindingParameters" target="serviceBindingParameters"></flowable:in>
<flowable:in source="serviceToUnbindBind" target="serviceToUnbindBind"></flowable:in>
<flowable:in source="shouldRecreateServiceBinding" target="shouldRecreateServiceBinding"></flowable:in>
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
<flowable:in source="stepPhase" target="stepPhase"></flowable:in>
Comment thread
stiv03 marked this conversation as resolved.
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="servicesToDelete" flowable:elementVariable="serviceToDelete">
<extensionElements></extensionElements>
Expand Down Expand Up @@ -90,6 +113,9 @@
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
<flowable:in source="namespace" target="namespace"></flowable:in>
<flowable:in source="appToProcess" target="appToProcess"></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>
</extensionElements>
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
<extensionElements></extensionElements>
Expand Down
Loading