Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(cloudwatchlogs): return creationTime in DescribeLogGroups and DescribeLogStreams (#4137)

Matheus Andrécde8f48084a5
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsCreationTimeTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsCreationTimeTest.java
new file mode 100644
index 0000000000..58013476eb
--- /dev/null
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsCreationTimeTest.java
@@ -0,0 +1,54 @@
+package com.floci.test;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
+import software.amazon.awssdk.services.cloudwatchlogs.model.LogGroup;
+import software.amazon.awssdk.services.cloudwatchlogs.model.LogStream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("CloudWatch Logs creationTime")
+class CloudWatchLogsCreationTimeTest {
+
+ @Test
+ @DisplayName("DescribeLogGroups and DescribeLogStreams return creationTime")
+ void describeReturnsCreationTime() {
+ String groupName = "/test/" + TestFixtures.uniqueName("logs-creation-time");
+ String streamName = "s1";
+ long before = System.currentTimeMillis();
+ try (CloudWatchLogsClient logs = TestFixtures.cloudWatchLogsClient()) {
+ try {
+ logs.createLogGroup(request -> request.logGroupName(groupName));
+ logs.createLogStream(request -> request.logGroupName(groupName).logStreamName(streamName));
+
+ LogGroup group = logs.describeLogGroups(request -> request.logGroupNamePrefix(groupName))
+ .logGroups()
+ .stream()
+ .filter(candidate -> groupName.equals(candidate.logGroupName()))
+ .findFirst()
+ .orElseThrow();
+ LogStream stream = logs.describeLogStreams(request -> request.logGroupName(groupName))
+ .logStreams()
+ .stream()
+ .filter(candidate -> streamName.equals(candidate.logStreamName()))
+ .findFirst()
+ .orElseThrow();
+
+ assertThat(group.creationTime()).isNotNull().isGreaterThanOrEqualTo(before);
+ assertThat(stream.creationTime()).isNotNull().isGreaterThanOrEqualTo(before);
+ } finally {
+ deleteIfPresent(logs, groupName);
+ }
+ }
+ }
+
+ private static void deleteIfPresent(CloudWatchLogsClient logs, String groupName) {
+ logs.describeLogGroups(request -> request.logGroupNamePrefix(groupName))
+ .logGroups()
+ .stream()
+ .filter(group -> groupName.equals(group.logGroupName()))
+ .findFirst()
+ .ifPresent(group -> logs.deleteLogGroup(request -> request.logGroupName(groupName)));
+ }
+}
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandler.java b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandler.java
index 4a5681a8e9..d02cbc3aa8 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandler.java
@@ -125,7 +125,7 @@ public class CloudWatchLogsHandler {
for (LogGroup g : groups) {
ObjectNode node = objectMapper.createObjectNode();
node.put("logGroupName", g.getLogGroupName());
- node.put("createdTime", g.getCreatedTime());
+ node.put("creationTime", g.getCreatedTime());
String logGroupArn = logsService.buildArn(g.getLogGroupName(), region);
node.put("arn", logGroupArn + ":*");
node.put("logGroupArn", logGroupArn);
@@ -276,7 +276,7 @@ public class CloudWatchLogsHandler {
ObjectNode node = objectMapper.createObjectNode();
node.put("logStreamName", s.getLogStreamName());
node.put("arn", logGroupArn + ":log-stream:" + s.getLogStreamName());
- node.put("createdTime", s.getCreatedTime());
+ node.put("creationTime", s.getCreatedTime());
node.put("lastIngestionTime", s.getLastIngestionTime());
node.put("uploadSequenceToken", s.getUploadSequenceToken());
node.put("storedBytes", s.getStoredBytes());
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest.java
index 9f8f609c64..f81bfe052c 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudwatch/logs/CloudWatchLogsHandlerTest.java
@@ -112,6 +112,32 @@ class CloudWatchLogsHandlerTest {
assertFalse(nextEntity.has("nextToken"));
}
+ // ──────────────────────────── creationTime (issue #4084) ────────────────────────────
+
+ @Test
+ void describeLogGroupsReturnsCreationTimeNotCreatedTime() {
+ ObjectNode request = MAPPER.createObjectNode().put("logGroupNamePrefix", GROUP);
+
+ JsonNode group = ((JsonNode) handler.handle("DescribeLogGroups", request, REGION).getEntity())
+ .path("logGroups").get(0);
+
+ assertTrue(group.path("creationTime").isNumber());
+ assertTrue(group.path("creationTime").asLong() > 0);
+ assertFalse(group.has("createdTime"));
+ }
+
+ @Test
+ void describeLogStreamsReturnsCreationTimeNotCreatedTime() {
+ ObjectNode request = MAPPER.createObjectNode().put("logGroupName", GROUP);
+
+ JsonNode stream = ((JsonNode) handler.handle("DescribeLogStreams", request, REGION).getEntity())
+ .path("logStreams").get(0);
+
+ assertTrue(stream.path("creationTime").isNumber());
+ assertTrue(stream.path("creationTime").asLong() > 0);
+ assertFalse(stream.has("createdTime"));
+ }
+
// ──────────────────────────── GetDataProtectionPolicy ────────────────────────────
@Test