test only recent logs request

Author: David O'Sullivan

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

@@ -124,7 +124,7 @@ public interface Applications {
      * @param request the application logs request
      * @return the applications logs
      */
-    Flux<Log> logs(ReadRequest request);
+    Flux<Log> logs(LogsRequest request);
 
     /**
      * Push a specific application

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

@@ -542,13 +542,13 @@ public Flux<Task> listTasks(ListApplicationTasksRequest request) {
     }
 
     @Override
-    public Flux<Log> logs(ReadRequest request) {
+    public Flux<Log> logs(LogsRequest request) {
         return Mono.zip(this.cloudFoundryClient, this.spaceId)
                 .flatMap(
                         function(
                                 (cloudFoundryClient, spaceId) ->
                                         getApplicationId(
-                                                cloudFoundryClient, request.getSourceId(), spaceId)))
+                                                cloudFoundryClient, request.getName(), spaceId)))
                 .flatMapMany(
                         applicationId ->
                                 getRecentLogs(this.logCacheClient, applicationId))

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

@@ -156,6 +156,7 @@
 import org.cloudfoundry.util.DateUtils;
 import org.cloudfoundry.util.FluentMap;
 import org.cloudfoundry.util.ResourceMatchingUtils;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.core.io.ClassPathResource;
 import reactor.core.publisher.Flux;
@@ -1325,7 +1326,7 @@ void logs() {
         requestLogsRecentLogCache(this.logCacheClient, "test-application-name");
 
         this.applications
-                .logs(ReadRequest.builder().sourceId("test-application-name").build())
+                .logs(LogsRequest.builder().name("test-application-name").recent(true).build())
                 .as(StepVerifier::create)
                 .expectNextMatches(log -> log.getPayload().equals("test-payload"))
                 .expectComplete()
@@ -1337,7 +1338,7 @@ void logsNoApp() {
         requestApplicationsEmpty(this.cloudFoundryClient, "test-application-name", TEST_SPACE_ID);
 
         this.applications
-                .logs(ReadRequest.builder().sourceId("test-application-name").build())
+                .logs(LogsRequest.builder().name("test-application-name").build())
                 .as(StepVerifier::create)
                 .consumeErrorWith(
                         t ->
@@ -1348,39 +1349,40 @@ void logsNoApp() {
                 .verify(Duration.ofSeconds(5));
     }
 
-    @Test
-    void logsRecent() {
-        requestApplications(
-                this.cloudFoundryClient,
-                "test-application-name",
-                TEST_SPACE_ID,
-                "test-metadata-id");
-        requestLogsRecentLogCache(this.logCacheClient, "test-metadata-id");
-
-        this.applications
-                .logs(ReadRequest.builder().sourceId("test-application-name").build())
-                .as(StepVerifier::create)
-                .expectNext(fill(Log.builder(), "log-message-").build())
-                .expectComplete()
-                .verify(Duration.ofSeconds(5));
-    }
-
-    @Test
-    void logsRecentNotSet() {
-        requestApplications(
-                this.cloudFoundryClient,
-                "test-application-name",
-                TEST_SPACE_ID,
-                "test-metadata-id");
-        requestLogsStream(this.dopplerClient, "test-metadata-id");
-
-        this.applications
-                .logs(ReadRequest.builder().sourceId("test-application-name").build())
-                .as(StepVerifier::create)
-                .expectNext(fill(Log.builder(), "log-message-").build())
-                .expectComplete()
-                .verify(Duration.ofSeconds(5));
-    }
+     //    TODO: it's not passing since recentLogs is not properly implemented yet with logcacheclient
+     @Test
+     void logsRecent() {
+         requestApplications(
+                 this.cloudFoundryClient,
+                 "test-application-name",
+                 TEST_SPACE_ID,
+                 "test-metadata-id");
+         requestLogsRecentLogCache(this.logCacheClient, "test-metadata-id");
+
+         this.applications
+                 .logs(LogsRequest.builder().name("test-application-name").build())
+                 .as(StepVerifier::create)
+                 .expectNext(fill(Log.builder(), "log-message-").build())
+                 .expectComplete()
+                 .verify(Duration.ofSeconds(5));
+     }
+     //    TODO: it's not passing since recentLogs is not properly implemented yet with logcacheclient
+     @Test
+     void logsRecentNotSet() {
+         requestApplications(
+                 this.cloudFoundryClient,
+                 "test-application-name",
+                 TEST_SPACE_ID,
+                 "test-metadata-id");
+         requestLogsStream(this.dopplerClient, "test-metadata-id");
+
+         this.applications
+                 .logs(LogsRequest.builder().name("test-application-name").build())
+                 .as(StepVerifier::create)
+                 .expectNext(fill(Log.builder(), "log-message-").build())
+                 .expectComplete()
+                 .verify(Duration.ofSeconds(5));
+     }
 
     @Test
     void pushDocker() {
@@ -5262,14 +5264,16 @@ private static void requestLogsRecentLogCache(LogCacheClient logCacheClient, Str
                             any()))
                             .thenReturn(
                                             Mono.just(fill(ReadResponse.builder())
-                .envelopes(fill(EnvelopeBatch.builder())
-                        .batch(fill(org.cloudfoundry.logcache.v1.Envelope.builder())
-                                .log(fill(Log.builder())
-                                        .payload("test-payload")
-                                        .type(LogType.OUT).build())
-                                .build())
-                        .build())
-                                                     .build()));
+                                                            .envelopes(fill(EnvelopeBatch.builder())
+                                                                            .batch(fill(org.cloudfoundry.logcache.v1.Envelope
+                                                                                            .builder())
+                                                                                            .log(fill(Log.builder())
+                                                                                                            .payload("test-payload")
+                                                                                                            .type(LogType.OUT)
+                                                                                                            .build())
+                                                                                            .build())
+                                                                            .build())
+                                                            .build()));
     }
 
     private static void requestLogsStream(DopplerClient dopplerClient, String applicationId) {