Fixes issue where test was not waiting for the creation of service instance to complete (#1161)

The update test does two things: 1.) it creates a managed service instance and 2.) it updates the managed service instance. The second part was failing because CloudController will refuse to update a service that's still being created.

The update job was calling a method `waitForCompletionOnCreate` which was looking at the CreateServiceInstanceResponse object to see if it had an job id, if it did, then it would call `JobUtils.waitForCompletion(cloudFoundryClient, Duration.ofMinutes(1), createServiceInstanceResponse.getJobId().get())` and then return `getServiceInstanceIdByName(cloudFoundryClient, serviceInstanceName)`. The problem is that the call to `JobUtils.waitForCompletion` was creating a flow but nothing was subscribing to it, so it never actually ran and the test would not pause until the creation finished.

The test has been modified such that it assumes the creation request will be asynch and return a job id. If it does not for some reason, the test would fail as wel call `.get()` on an optional object and calling that if the optional is empty will generate a NoSuchElementException. Then with the jobId, we call `JobUtils.waitForCompletion` wrapped in a flatMap, which ensures it's part of the overall flow which is being subscribed to.

The same change was made after the update request, which also returns an asynch response and needs to be polled.

Signed-off-by: Daniel Mikusa <[email protected]>

Author: Daniel Mikusa

.idea/misc.xml

@@ -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) {
@@ -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) {