DefaultApplications: use process statistics for disk and memory quota

Author: Kehrlann

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

@@ -1090,7 +1090,7 @@ private Mono<ApplicationResource> getApplicationV3(String application) {
                             List<String>,
                             SummaryApplicationResponse,
                             String,
-                            List<InstanceDetail>,
+                            GetApplicationProcessStatisticsResponse,
                             ApplicationResource>>
             getAuxiliaryContent(ApplicationResource applicationResource) {
         String applicationId = applicationResource.getId();
@@ -1102,14 +1102,11 @@ private Mono<ApplicationResource> getApplicationV3(String application) {
             stackName = ((BuildpackData) data).getStack();
         }
 
-        Mono<List<InstanceDetail>> appInstanceDetails =
-                requestApplicationStatisticsV3(applicationId).map(this::toInstanceDetailList);
-
         return Mono.zip(
                 getApplicationBuildpacks(applicationId),
                 requestApplicationSummary(applicationId),
                 Mono.just(stackName),
-                appInstanceDetails,
+                requestApplicationStatisticsV3(applicationId),
                 Mono.just(applicationResource));
     }
 
@@ -2280,27 +2277,35 @@ private static ApplicationDetail toApplicationDetail(
             List<String> buildpacks,
             SummaryApplicationResponse summaryApplicationResponse,
             String stackName,
-            List<InstanceDetail> instanceDetails,
+            GetApplicationProcessStatisticsResponse processStats,
             ApplicationResource application) {
-        Long runningInstances =
-                instanceDetails.stream()
+        List<InstanceDetail> instanceDetails = toInstanceDetailList(processStats);
+        long runningInstances =
+                processStats.getResources().stream()
                         .filter(
                                 details ->
-                                        details.getState().equals(ProcessState.RUNNING.getValue())
-                                                || details.getState()
-                                                        .equals(ProcessState.STARTING.getValue()))
+                                        details.getState() == ProcessState.RUNNING
+                                                || details.getState() == ProcessState.STARTING)
                         .count();
 
+        // TODO: we should use the `/v3/apps/:guid/manifest` endpoint to get the requested quotas
+        long diskQuota = -1;
+        long memoryLimit = -1;
+        if (!instanceDetails.isEmpty()) {
+            diskQuota = instanceDetails.get(0).getDiskQuota();
+            memoryLimit = instanceDetails.get(0).getMemoryQuota();
+        }
+
         return ApplicationDetail.builder()
                 .buildpacks(buildpacks)
                 .id(application.getId())
                 .name(application.getName())
                 .requestedState(application.getState().getValue())
                 .instanceDetails(instanceDetails)
-                .instances(instanceDetails.size())
-                .runningInstances(runningInstances.intValue())
-                .diskQuota(summaryApplicationResponse.getDiskQuota())
-                .memoryLimit(summaryApplicationResponse.getMemory())
+                .instances(processStats.getResources().size())
+                .runningInstances((int) runningInstances)
+                .diskQuota((int) diskQuota)
+                .memoryLimit((int) memoryLimit)
                 .lastUploaded(toDate(summaryApplicationResponse.getPackageUpdatedAt()))
                 .urls(toUrls(summaryApplicationResponse.getRoutes()))
                 .stack(stackName)
@@ -2434,7 +2439,7 @@ private static HealthCheckType fromHealthCheck(ApplicationHealthCheck type) {
         }
     }
 
-    private List<InstanceDetail> toInstanceDetailList(
+    private static List<InstanceDetail> toInstanceDetailList(
             GetApplicationProcessStatisticsResponse statisticsResponse) {
         return statisticsResponse.getResources().stream()
                 .map(

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

@@ -710,6 +710,8 @@ void getBuildpackError() {
                 .as(StepVerifier::create)
                 .expectNext(
                         fill(ApplicationDetail.builder())
+                                .diskQuota(-1)
+                                .memoryLimit(-1)
                                 .instances(0)
                                 .runningInstances(0)
                                 .buildpack("test-buildpack")
@@ -993,6 +995,8 @@ void getInstancesError() {
                 .as(StepVerifier::create)
                 .expectNext(
                         fill(ApplicationDetail.builder())
+                                .diskQuota(-1)
+                                .memoryLimit(-1)
                                 .instances(0)
                                 .runningInstances(0)
                                 .buildpack("test-buildpack")
@@ -1064,6 +1068,10 @@ void getStagingError() {
                 .as(StepVerifier::create)
                 .expectNext(
                         fill(ApplicationDetail.builder())
+                                .diskQuota(-1)
+                                .memoryLimit(-1)
+                                .diskQuota(-1)
+                                .memoryLimit(-1)
                                 .instances(0)
                                 .runningInstances(0)
                                 .buildpack("test-buildpack")
@@ -1092,6 +1100,8 @@ void getStoppedError() {
                 .as(StepVerifier::create)
                 .expectNext(
                         fill(ApplicationDetail.builder())
+                                .diskQuota(-1)
+                                .memoryLimit(-1)
                                 .instances(0)
                                 .runningInstances(0)
                                 .buildpack("test-buildpack")
@@ -1120,6 +1130,8 @@ void getWithEmptyInstance() {
                 .as(StepVerifier::create)
                 .expectNext(
                         fill(ApplicationDetail.builder())
+                                .diskQuota(-1)
+                                .memoryLimit(-1)
                                 .instances(0)
                                 .runningInstances(0)
                                 .buildpack("test-buildpack")