Skip to content

Fixes issue where test was not waiting for the creation of service in stance to complete #1161

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
dmikusa merged 1 commit into from
Jul 27, 2022
Merged

Fixes issue where test was not waiting for the creation of service in stance to complete #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 7 additions & 17 deletions integration-test/src/test/java/org/cloudfoundry/client/v3/ServiceInstancesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,9 @@ private static Mono<String> updateServiceInstanceByName(CloudFoundryClient cloud
.build())
.map(serviceInstances -> serviceInstances.getResources().get(0))
.flatMap(serviceInstance -> updateServiceInstanceById(cloudFoundryClient, serviceInstance.getId()))
.flatMap(serviceInstance -> waitForCompletionOnUpdate(cloudFoundryClient, serviceInstance, serviceInstanceName));
.map(response -> response.getJobId().get())
.flatMap(jobId -> JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(5), jobId))
.then(getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName));
}

private static Mono<UpdateServiceInstanceResponse> updateServiceInstanceById(CloudFoundryClient cloudFoundryClient, String serviceInstanceId) {
Expand All @@ -287,26 +289,14 @@ private static Mono<UpdateServiceInstanceResponse> updateServiceInstanceById(Clo
.build());
}


private static Mono<String> waitForCompletionOnUpdate(CloudFoundryClient cloudFoundryClient, UpdateServiceInstanceResponse updateServiceInstanceResponse, String serviceInstanceName) {
if (updateServiceInstanceResponse.getJobId().isPresent()) {
JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(1), updateServiceInstanceResponse.getJobId().get());
}
return getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName);
}

private static Mono<String> createManagedServiceInstanceId(CloudFoundryClient cloudFoundryClient, Mono<String> serviceBrokerId, String serviceInstanceName, String serviceName, String spaceId) {
return serviceBrokerId
.flatMap(brokerId -> getPlanId(cloudFoundryClient, brokerId, serviceName))
.flatMap(planId -> requestCreateServiceInstance(cloudFoundryClient, planId, serviceInstanceName, spaceId))
.flatMap(serviceInstance -> waitForCompletionOnCreate(cloudFoundryClient, serviceInstance, serviceInstanceName));
}

private static Mono<String> waitForCompletionOnCreate(CloudFoundryClient cloudFoundryClient, CreateServiceInstanceResponse createServiceInstanceResponse, String serviceInstanceName) {
if (createServiceInstanceResponse.getJobId().isPresent()) {
JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(1), createServiceInstanceResponse.getJobId().get());
}
return getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName);
.map(response -> response.getJobId()
.get())
.flatMap(jobId -> JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(5), jobId))
.then(getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName));
}

private static Mono<String> getServiceInstanceIdByName(CloudFoundryClient cloudFoundryClient, String serviceInstanceName) {
Expand Down