Skip to content

fix null value from get existing offering and service plan during binding failure #1716

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 4 commits into from
Oct 6, 2025
Merged

fix null value from get existing offering and service plan during binding failure #1716

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74d2380
add fallback if SERVICE_TO_UNBIND_BIND is null for undeploy
stiv03 Oct 1, 2025
9cb893b
fix comments
stiv03 Oct 2, 2025
ae84d5a
retriving serviceInstanceName from SERVICE_TO_DELETE to avoid unneces…
stiv03 Oct 3, 2025
1ce5156
refactoring
stiv03 Oct 3, 2025
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
12 changes: 9 additions & 3 deletions ...multiapps/controller/process/steps/PollServiceBindingUnbindingOperationBaseExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,20 @@ protected Consumer<CloudAsyncJob> getOnCompleteHandler(ProcessContext context) {
@Override
protected Consumer<CloudAsyncJob> getOnErrorHandler(ProcessContext context) {
CloudApplication app = context.getVariable(Variables.APP_TO_PROCESS);
String serviceInstanceName = context.getVariable(Variables.SERVICE_TO_UNBIND_BIND);

CloudControllerClient client = context.getControllerClient();
CloudServiceInstance serviceInstance = client.getServiceInstance(serviceInstanceName, false);
String serviceInstanceName = resolveServiceInstanceName(context);
CloudServiceInstance serviceInstance = serviceInstanceName != null ? client.getServiceInstance(serviceInstanceName, false) : null;

return serviceBindingJob -> context.getStepLogger()
.error(buildErrorMessage(app, serviceInstance, serviceInstanceName, serviceBindingJob));
}

private String resolveServiceInstanceName(ProcessContext context) {
String serviceInstanceName = context.getVariable(Variables.SERVICE_TO_UNBIND_BIND);
if (serviceInstanceName == null) {
Copy link
Contributor

@theghost5800 theghost5800 Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extract into a new method whole logic related with getting service instance name and avoid setting finalServiceInstanceName because it is little bit confusing to have 2 variables for the same thing.

Copy link
Contributor Author

@stiv03 stiv03 Oct 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed! Done!

return context.getVariable(Variables.SERVICE_TO_DELETE);
}
return serviceInstanceName;
}

private String buildErrorMessage(CloudApplication app, CloudServiceInstance serviceInstance, String serviceInstanceName,
Expand Down
Loading