Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix an issue where configured backing services are not being deleted
When a service instance is deleted, all configured backing services will be deleted as well as all services bound to any backing applications Resolve #344
- Loading branch information
1 parent
d370ae5
commit f09bd96
Showing
5 changed files
with
263 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
159 changes: 159 additions & 0 deletions
159
...framework/cloud/appbroker/integration/DeleteInstanceWithAppsAndServicesComponentTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| /* | ||
| * Copyright 2002-2020 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.appbroker.integration; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.cloud.appbroker.integration.fixtures.CloudControllerStubFixture; | ||
| import org.springframework.cloud.appbroker.integration.fixtures.OpenServiceBrokerApiFixture; | ||
| import org.springframework.cloud.servicebroker.model.instance.OperationState; | ||
| import org.springframework.http.HttpStatus; | ||
| import org.springframework.test.context.TestPropertySource; | ||
|
|
||
| import static io.restassured.RestAssured.given; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.hamcrest.Matchers.either; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.is; | ||
| import static org.springframework.cloud.appbroker.integration.DeleteInstanceWithAppsAndServicesComponentTest.APP_NAME; | ||
| import static org.springframework.cloud.appbroker.integration.DeleteInstanceWithAppsAndServicesComponentTest.BACKING_PLAN_NAME; | ||
| import static org.springframework.cloud.appbroker.integration.DeleteInstanceWithAppsAndServicesComponentTest.BACKING_SERVICE_NAME; | ||
| import static org.springframework.cloud.appbroker.integration.DeleteInstanceWithAppsAndServicesComponentTest.BACKING_SI_NAME; | ||
| import static org.springframework.cloud.appbroker.integration.DeleteInstanceWithAppsAndServicesComponentTest.PLAN_NAME; | ||
| import static org.springframework.cloud.appbroker.integration.DeleteInstanceWithAppsAndServicesComponentTest.SERVICE_NAME; | ||
|
|
||
| @TestPropertySource(properties = { | ||
| "spring.cloud.appbroker.services[0].service-name=" + SERVICE_NAME, | ||
| "spring.cloud.appbroker.services[0].plan-name=" + PLAN_NAME, | ||
| "spring.cloud.appbroker.services[0].apps[0].path=classpath:demo.jar", | ||
| "spring.cloud.appbroker.services[0].apps[0].name=" + APP_NAME, | ||
| "spring.cloud.appbroker.services[0].apps[0].services[0].service-instance-name=" + BACKING_SI_NAME, | ||
| "spring.cloud.appbroker.services[0].services[0].service-instance-name=" + BACKING_SI_NAME, | ||
| "spring.cloud.appbroker.services[0].services[0].name=" + BACKING_SERVICE_NAME, | ||
| "spring.cloud.appbroker.services[0].services[0].plan=" + BACKING_PLAN_NAME | ||
| }) | ||
| class DeleteInstanceWithAppsAndServicesComponentTest extends WiremockComponentTest { | ||
|
|
||
| protected static final String APP_NAME = "app-delete-with-services"; | ||
|
|
||
| protected static final String SERVICE_NAME = "example"; | ||
|
|
||
| protected static final String PLAN_NAME = "standard"; | ||
|
|
||
| protected static final String BACKING_SI_NAME = "my-db-service"; | ||
|
|
||
| protected static final String BACKING_SERVICE_NAME = "db-service"; | ||
|
|
||
| protected static final String BACKING_PLAN_NAME = "backing-standard"; | ||
|
|
||
| @Autowired | ||
| private OpenServiceBrokerApiFixture brokerFixture; | ||
|
|
||
| @Autowired | ||
| private CloudControllerStubFixture cloudControllerFixture; | ||
|
|
||
| @Test | ||
| void deleteAppsAndServicesWhenTheyExist() { | ||
| cloudControllerFixture.stubGetServiceInstanceWithNoBinding("instance-id", "instance-name", | ||
| SERVICE_NAME, PLAN_NAME); | ||
| cloudControllerFixture.stubAppExistsWithBackingService(APP_NAME, BACKING_SI_NAME, | ||
| BACKING_SERVICE_NAME, BACKING_PLAN_NAME); | ||
| cloudControllerFixture.stubServiceBindingDoesNotExist(APP_NAME); | ||
| cloudControllerFixture.stubDeleteApp(APP_NAME); | ||
|
|
||
| cloudControllerFixture.stubGetBackingServiceInstance(BACKING_SI_NAME, BACKING_SERVICE_NAME, BACKING_PLAN_NAME); | ||
|
|
||
| cloudControllerFixture.stubServiceBindingExists(APP_NAME, BACKING_SI_NAME); | ||
| cloudControllerFixture.stubDeleteServiceBinding(APP_NAME, BACKING_SI_NAME); | ||
| cloudControllerFixture.stubDeleteServiceInstance(BACKING_SI_NAME); | ||
|
|
||
| // when the service instance is deleted | ||
| given(brokerFixture.serviceInstanceRequest()) | ||
| .when() | ||
| .delete(brokerFixture.deleteServiceInstanceUrl(), "instance-id") | ||
| .then() | ||
| .statusCode(HttpStatus.ACCEPTED.value()); | ||
|
|
||
| // when the "last_operation" API is polled | ||
| given(brokerFixture.serviceInstanceRequest()) | ||
| .when() | ||
| .get(brokerFixture.getLastInstanceOperationUrl(), "instance-id") | ||
| .then() | ||
| .statusCode(HttpStatus.OK.value()) | ||
| .body("state", is(equalTo(OperationState.IN_PROGRESS.toString()))); | ||
|
|
||
| String state = brokerFixture.waitForAsyncOperationComplete("instance-id"); | ||
| assertThat(state).isEqualTo(OperationState.SUCCEEDED.toString()); | ||
| } | ||
|
|
||
| @Test | ||
| void deleteAppsWhenTheyExistAndServicesWhenTheyDoNotExist() { | ||
| cloudControllerFixture.stubGetServiceInstanceWithNoBinding("instance-id", "instance-name", | ||
| SERVICE_NAME, PLAN_NAME); | ||
| cloudControllerFixture.stubAppExists(APP_NAME); | ||
| cloudControllerFixture.stubServiceBindingDoesNotExist(APP_NAME); | ||
| cloudControllerFixture.stubDeleteApp(APP_NAME); | ||
|
|
||
| // when the service instance is deleted | ||
| given(brokerFixture.serviceInstanceRequest()) | ||
| .when() | ||
| .delete(brokerFixture.deleteServiceInstanceUrl(), "instance-id") | ||
| .then() | ||
| .statusCode(HttpStatus.ACCEPTED.value()); | ||
|
|
||
| // when the "last_operation" API is polled | ||
| given(brokerFixture.serviceInstanceRequest()) | ||
| .when() | ||
| .get(brokerFixture.getLastInstanceOperationUrl(), "instance-id") | ||
| .then() | ||
| .statusCode(HttpStatus.OK.value()) | ||
| .body("state", is(equalTo(OperationState.IN_PROGRESS.toString()))); | ||
|
|
||
| String state = brokerFixture.waitForAsyncOperationComplete("instance-id"); | ||
| assertThat(state).isEqualTo(OperationState.SUCCEEDED.toString()); | ||
| } | ||
|
|
||
| @Test | ||
| void deleteAppsAndServicesWhenTheyDoNotExist() { | ||
| cloudControllerFixture.stubGetServiceInstanceWithNoBinding("instance-id", "instance-name", | ||
| SERVICE_NAME, PLAN_NAME); | ||
| cloudControllerFixture.stubAppDoesNotExist(APP_NAME); | ||
|
|
||
| // when the service instance is deleted | ||
| given(brokerFixture.serviceInstanceRequest()) | ||
| .when() | ||
| .delete(brokerFixture.deleteServiceInstanceUrl(), "instance-id") | ||
| .then() | ||
| .statusCode(HttpStatus.ACCEPTED.value()); | ||
|
|
||
| // when the "last_operation" API is polled | ||
| given(brokerFixture.serviceInstanceRequest()) | ||
| .when() | ||
| .get(brokerFixture.getLastInstanceOperationUrl(), "instance-id") | ||
| .then() | ||
| .statusCode(HttpStatus.OK.value()) | ||
| .body("state", | ||
| either(equalTo(OperationState.IN_PROGRESS.toString())) | ||
| // if the error occurs immediately it will return succeeded status | ||
| .or(equalTo(OperationState.SUCCEEDED.toString()))); | ||
|
|
||
| String state = brokerFixture.waitForAsyncOperationComplete("instance-id"); | ||
| assertThat(state).isEqualTo(OperationState.SUCCEEDED.toString()); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.