SpringCloud/spring-cloud-app-broker
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix binding credentials permission deletion failure

Browse Source 
Connects to #368
This commit is contained in:
Yuxin Bai
2020-05-15 15:47:05 -04:00
committed by Yuxin Bai
parent d0ea13f2e6
commit 2ef46ced10
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-app-broker-security-credhub/src/main/java/org/springframework/cloud/appbroker/workflow/binding/CredHubPersistingDeleteServiceInstanceBindingWorkflow.java
View File

@@ -47,12 +47,12 @@ public class CredHubPersistingDeleteServiceInstanceBindingWorkflow extends CredH
DeleteServiceInstanceBindingResponseBuilder responseBuilder) {
return buildCredentialName(request.getServiceDefinitionId(), request.getBindingId())
.filterWhen(this::credentialExists)
.flatMap(this::deleteCredential)
.flatMap(this::deletePermission)
.delayUntil(this::deletePermission)
.delayUntil(this::deleteCredential)
.thenReturn(responseBuilder);
}
private Mono<ServiceInstanceCredentialName> deleteCredential(ServiceInstanceCredentialName credentialName) {
private Mono<Void> deleteCredential(ServiceInstanceCredentialName credentialName) {
return credHubOperations.credentials()
.deleteByName(credentialName)
.doOnRequest(
@@ -61,8 +61,7 @@ public class CredHubPersistingDeleteServiceInstanceBindingWorkflow extends CredH
.debug("Finished deleting binding credentials with name '{}' in CredHub", credentialName.getName()))
.doOnError(exception -> LOG.error(
String.format("Error deleting binding credentials with name '%s' in CredHub with error: '%s'",
credentialName.getName(), exception.getMessage()), exception))
.thenReturn(credentialName);
credentialName.getName(), exception.getMessage()), exception));
}
private Mono<Void> deletePermission(ServiceInstanceCredentialName credentialName) {