Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(kinesis): return StreamSummaries from ListStreams (#6425)

Stuart Langf22231a8a5e1
diff --git a/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandler.java
index f548505bca..da513a9685 100644
--- a/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisJsonHandler.java
@@ -244,17 +244,26 @@ public class KinesisJsonHandler {
throw invalidNextToken();
}
String after = token.isTextual() ? streamCursorFromToken(decodeNextToken(token.textValue()), region) : startName;
- List<String> streamNames = service.listStreams(region).stream()
- .filter(name -> after == null || name.compareTo(after) > 0)
+ List<KinesisStream> streams = service.listStreamDetails(region).stream()
+ .filter(stream -> after == null || stream.getStreamName().compareTo(after) > 0)
.toList();
- List<String> page = streamNames.stream().limit(limit).toList();
+ List<KinesisStream> page = streams.stream().limit(limit).toList();
ObjectNode response = objectMapper.createObjectNode();
ArrayNode names = response.putArray("StreamNames");
- page.forEach(names::add);
- response.put("HasMoreStreams", streamNames.size() > limit);
- if (streamNames.size() > limit) {
+ ArrayNode summaries = response.putArray("StreamSummaries");
+ for (KinesisStream stream : page) {
+ names.add(stream.getStreamName());
+ ObjectNode summary = summaries.addObject();
+ summary.put("StreamName", stream.getStreamName());
+ summary.put("StreamARN", stream.getStreamArn());
+ summary.put("StreamStatus", stream.getStreamStatus());
+ addStreamModeDetailsNode(summary, stream);
+ summary.put("StreamCreationTimestamp", epochSeconds(stream.getStreamCreationTimestamp()));
+ }
+ response.put("HasMoreStreams", streams.size() > limit);
+ if (streams.size() > limit) {
response.put("NextToken", encodeNextToken("ListStreams|" + region,
- Base64Url.encode(page.getLast()), System.currentTimeMillis()));
+ Base64Url.encode(page.getLast().getStreamName()), System.currentTimeMillis()));
}
return Response.ok(response).build();
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisService.java b/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisService.java
index a50383db94..3e0e51df60 100644
--- a/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/kinesis/KinesisService.java
@@ -191,14 +191,6 @@ public class KinesisService implements ResourceProvider {
}
}
- public List<String> listStreams(String region) {
- String prefix = region + "::";
- return store.scan(key -> key.startsWith(prefix)).stream()
- .map(KinesisStream::getStreamName)
- .sorted()
- .toList();
- }
-
public List<KinesisStream> listStreamDetails(String region) {
String prefix = region + "::";
return store.scan(key -> key.startsWith(prefix)).stream()
diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisListStreamsTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisListStreamsTest.java
index 1627113b01..253fe2d74a 100644
--- a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisListStreamsTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisListStreamsTest.java
@@ -1,5 +1,6 @@
package io.github.hectorvent.floci.services.kinesis;
+import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import io.github.hectorvent.floci.core.common.AwsException;
@@ -49,6 +50,32 @@ class KinesisListStreamsTest {
assertFalse(list(Map.of("Limit", 3)).path("HasMoreStreams").asBoolean());
}
+ @Test
+ void returnsAStreamSummaryForEveryNameOnThePage() {
+ create("alpha", REGION);
+ create("mu", REGION);
+
+ ObjectNode page = list(Map.of("Limit", 1));
+
+ assertEquals(1, page.path("StreamSummaries").size());
+ JsonNode summary = page.path("StreamSummaries").get(0);
+ assertEquals("alpha", summary.path("StreamName").asText());
+ assertEquals("arn:aws:kinesis:us-east-1:000000000000:stream/alpha", summary.path("StreamARN").asText());
+ assertTrue(summary.path("StreamStatus").isTextual());
+ assertEquals("PROVISIONED", summary.path("StreamModeDetails").path("StreamMode").asText());
+ assertTrue(summary.path("StreamCreationTimestamp").isNumber());
+ }
+
+ // AWS sends StreamSummaries even when there are no streams. The CLI's text output writes a
+ // None line for each paginator result key missing from the page.
+ @Test
+ void returnsEmptyStreamSummariesForAnEmptyRegion() {
+ ObjectNode page = list(Map.of());
+
+ assertTrue(page.path("StreamSummaries").isArray());
+ assertTrue(page.path("StreamSummaries").isEmpty());
+ }
+
@ParameterizedTest
@ValueSource(strings = {"{}", "{\"Limit\":101}", "{\"Limit\":10000}"})
void defaultsAndLargeLimitsStillCapEachPageAtOneHundred(String request) throws Exception {
diff --git a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceTest.java
index c674aa5562..b085b16757 100644
--- a/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/kinesis/KinesisServiceTest.java
@@ -80,14 +80,15 @@ class KinesisServiceTest {
}
@Test
- void listStreams() {
- kinesisService.createStream("stream-a", 1, REGION);
+ void listStreamDetails() {
kinesisService.createStream("stream-b", 1, REGION);
+ kinesisService.createStream("stream-a", 1, REGION);
kinesisService.createStream("other", 1, "eu-west-1");
- List<String> names = kinesisService.listStreams(REGION);
- assertEquals(2, names.size());
- assertTrue(names.containsAll(List.of("stream-a", "stream-b")));
+ List<String> names = kinesisService.listStreamDetails(REGION).stream()
+ .map(KinesisStream::getStreamName)
+ .toList();
+ assertEquals(List.of("stream-a", "stream-b"), names);
}
@Test
@@ -101,7 +102,7 @@ class KinesisServiceTest {
kinesisService.createStream("to-delete", 1, REGION);
kinesisService.deleteStream("to-delete", REGION);
- assertTrue(kinesisService.listStreams(REGION).isEmpty());
+ assertTrue(kinesisService.listStreamDetails(REGION).isEmpty());
}
@Test
@@ -1007,7 +1008,7 @@ class KinesisServiceTest {
// The delete ran after the producer's persist, so the stream must be gone, not resurrected
// by a stale trailing store.put.
- assertTrue(kinesisService.listStreams(REGION).isEmpty(),
+ assertTrue(kinesisService.listStreamDetails(REGION).isEmpty(),
"a deleted stream must not be resurrected by an overlapping append");
assertThrows(AwsException.class, () -> kinesisService.describeStream("res", REGION),
"the resurrected stream must not be describable");
@@ -1074,7 +1075,7 @@ class KinesisServiceTest {
assertEquals("ResourceNotFoundException", ((AwsException) t).getErrorCode(),
"a delete-before-append must surface the same missing-stream error as any absent stream");
- assertTrue(kinesisService.listStreams(REGION).isEmpty(),
+ assertTrue(kinesisService.listStreamDetails(REGION).isEmpty(),
"the deleted stream must not be resurrected by the failed append");
}
@@ -1270,7 +1271,7 @@ class KinesisServiceTest {
pool.shutdownNow();
}
- assertTrue(service.listStreams(REGION).isEmpty(),
+ assertTrue(service.listStreamDetails(REGION).isEmpty(),
() -> label + " must not resurrect a concurrently deleted stream");
AwsException notFound = assertThrows(AwsException.class,
() -> service.describeStream(META_STREAM, REGION),