DefaultApplications: setHealthCheck uses v3 api

Author: Kehrlann

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/Applications.java

@@ -225,7 +225,7 @@ public interface Applications {
     Mono<Void> setEnvironmentVariable(SetEnvironmentVariableApplicationRequest request);
 
     /**
-     * Set the Health Check Type of an application
+     * Set the Health Check Type of the web process of an application
      *
      * @param request the set health check request
      * @return a completion indicator

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java

@@ -139,6 +139,7 @@
 import org.cloudfoundry.client.v3.processes.HealthCheckType;
 import org.cloudfoundry.client.v3.processes.ProcessState;
 import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
+import org.cloudfoundry.client.v3.processes.UpdateProcessRequest;
 import org.cloudfoundry.client.v3.resourcematch.MatchedResource;
 import org.cloudfoundry.client.v3.spaces.ApplyManifestRequest;
 import org.cloudfoundry.client.v3.tasks.CancelTaskRequest;
@@ -641,12 +642,12 @@ public Mono<Void> setEnvironmentVariable(SetEnvironmentVariableApplicationReques
 
     @Override
     public Mono<Void> setHealthCheck(SetApplicationHealthCheckRequest request) {
-        return getApplicationId(request.getName())
+        return getApplicationIdV3(request.getName())
+                .flatMap(this::requestApplicationWebProcess)
                 .flatMap(
-                        applicationId ->
-                                requestUpdateApplicationHealthCheckType(
-                                        applicationId, request.getType()))
-                .then()
+                        webProcess ->
+                                this.requestUpdateProcessHealthCheckType(
+                                        webProcess.getId(), fromHealthCheck(request.getType())))
                 .transform(OperationsLogging.log("Set Application Health Check"))
                 .checkpoint();
     }
@@ -1668,6 +1669,18 @@ private Mono<GetApplicationProcessResponse> requestApplicationWebProcess(String
                                 .build());
     }
 
+    private Mono<Void> requestUpdateProcessHealthCheckType(
+            String processId, HealthCheckType healthCheckType) {
+        return this.cloudFoundryClient
+                .processes()
+                .update(
+                        UpdateProcessRequest.builder()
+                                .processId(processId)
+                                .healthCheck(HealthCheck.builder().type(healthCheckType).build())
+                                .build())
+                .then();
+    }
+
     private Flux<org.cloudfoundry.client.v3.routes.RouteResource> requestApplicationRoutes(
             String applicationId) {
         return PaginationUtils.requestClientV3Resources(
@@ -2460,6 +2473,20 @@ private static ApplicationHealthCheck toHealthCheck(HealthCheckType type) {
         }
     }
 
+    private static HealthCheckType fromHealthCheck(ApplicationHealthCheck type) {
+        if (type == ApplicationHealthCheck.HTTP) {
+            return HealthCheckType.HTTP;
+        } else if (type == ApplicationHealthCheck.PORT) {
+            return HealthCheckType.PORT;
+        } else if (type == ApplicationHealthCheck.PROCESS) {
+            return HealthCheckType.PROCESS;
+        } else if (type == ApplicationHealthCheck.NONE) {
+            return HealthCheckType.NONE;
+        } else {
+            return null;
+        }
+    }
+
     private static InstanceDetail toInstanceDetail(
             Map.Entry<String, ApplicationInstanceInfo> entry,
             ApplicationStatisticsResponse statisticsResponse) {

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/DefaultApplicationsTest.java

@@ -21,8 +21,10 @@
 import static org.cloudfoundry.client.v3.LifecycleType.DOCKER;
 import static org.cloudfoundry.operations.TestObjects.fill;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.RETURNS_SMART_NULLS;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
@@ -140,6 +142,8 @@
 import org.cloudfoundry.client.v3.processes.HealthCheckType;
 import org.cloudfoundry.client.v3.processes.ProcessState;
 import org.cloudfoundry.client.v3.processes.ProcessStatisticsResource;
+import org.cloudfoundry.client.v3.processes.UpdateProcessRequest;
+import org.cloudfoundry.client.v3.processes.UpdateProcessResponse;
 import org.cloudfoundry.client.v3.tasks.CancelTaskRequest;
 import org.cloudfoundry.client.v3.tasks.CancelTaskResponse;
 import org.cloudfoundry.client.v3.tasks.CreateTaskRequest;
@@ -3695,13 +3699,15 @@ void setEnvironmentVariableNoApp() {
 
     @Test
     void setHealthCheck() {
-        requestApplications(
+        requestApplicationsV3(
                 this.cloudFoundryClient,
                 "test-application-name",
                 TEST_SPACE_ID,
                 "test-application-id");
+        requestApplicationProcesses(
+                cloudFoundryClient, "test-application-id", HealthCheckType.HTTP);
         requestUpdateApplicationHealthCheck(
-                this.cloudFoundryClient, "test-application-id", ApplicationHealthCheck.PORT);
+                this.cloudFoundryClient, "test-process-id", ApplicationHealthCheck.PORT);
 
         this.applications
                 .setHealthCheck(
@@ -3712,6 +3718,14 @@ void setHealthCheck() {
                 .as(StepVerifier::create)
                 .expectComplete()
                 .verify(Duration.ofSeconds(5));
+
+        verify(this.cloudFoundryClient.processes())
+                .update(
+                        argThat(
+                                argument ->
+                                        argument.getHealthCheck()
+                                                .getType()
+                                                .equals(HealthCheckType.PORT)));
     }
 
     @Test
@@ -4782,7 +4796,7 @@ private static void requestApplicationProcesses(
                                         .build()))
                 .thenReturn(
                         Mono.just(
-                                fill(GetApplicationProcessResponse.builder())
+                                fill(GetApplicationProcessResponse.builder(), "process-")
                                         .healthCheck(fill(HealthCheck.builder()).type(type).build())
                                         .build()));
     }
@@ -5860,25 +5874,18 @@ private static void requestUpdateApplicationEnvironment(
     }
 
     private static void requestUpdateApplicationHealthCheck(
-            CloudFoundryClient cloudFoundryClient,
-            String applicationId,
-            ApplicationHealthCheck type) {
+            CloudFoundryClient cloudFoundryClient, String processId, ApplicationHealthCheck type) {
         when(cloudFoundryClient
-                        .applicationsV2()
+                        .processes()
                         .update(
-                                UpdateApplicationRequest.builder()
-                                        .applicationId(applicationId)
-                                        .healthCheckType(type.getValue())
-                                        .build()))
-                .thenReturn(
-                        Mono.just(
-                                fill(UpdateApplicationResponse.builder())
-                                        .entity(
-                                                fill(
-                                                                ApplicationEntity.builder(),
-                                                                "application-entity-")
+                                UpdateProcessRequest.builder()
+                                        .processId(processId)
+                                        .healthCheck(
+                                                HealthCheck.builder()
+                                                        .type(HealthCheckType.from(type.getValue()))
                                                         .build())
-                                        .build()));
+                                        .build()))
+                .thenReturn(Mono.just(fill(UpdateProcessResponse.builder()).build()));
     }
 
     private static void requestUpdateApplicationRename(