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

Ensure that backing app space is deleted, even if backing app doesn't exist.

Browse Source
This commit is contained in:
Craig Walls
2019-04-03 08:24:03 -06:00
committed by Scott Frederick
parent e808d1b36e
commit 86eab17359
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java
View File

@@ -464,7 +464,8 @@ public class CloudFoundryAppDeployer implements AppDeployer, ResourceLoaderAware
Mono<Void> requestDeleteApplication;
if (deploymentProperties.containsKey(DeploymentProperties.TARGET_PROPERTY_KEY)) {
String space = deploymentProperties.get(DeploymentProperties.TARGET_PROPERTY_KEY);
requestDeleteApplication = deleteApplicationInSpace(appName, space);
requestDeleteApplication = deleteApplicationInSpace(appName, space)
.then(deleteSpace(space));
} else {
requestDeleteApplication = deleteApplication(appName);
}
@@ -494,8 +495,7 @@ public class CloudFoundryAppDeployer implements AppDeployer, ResourceLoaderAware
.deleteRoutes(this.defaultDeploymentProperties.isDeleteRoutes())
.name(name)
.build())
.doOnError(error -> logger.warn("Unable to delete application: {} ", name))
.then(deleteSpace(spaceName)))
.doOnError(error -> logger.warn("Unable to delete application: {} ", name)))
.onErrorResume(e -> Mono.empty());
}
@@ -893,4 +893,4 @@ public class CloudFoundryAppDeployer implements AppDeployer, ResourceLoaderAware
}
};
}
}
}