Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(cloudwatchlogs): add logGroupArn to DescribeLogGroups (#3868)

Chiara Forresi0108b9653ab0
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsDescribeLogGroupsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsDescribeLogGroupsTest.java
new file mode 100644
index 0000000000..c214b62985
--- /dev/null
+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/CloudWatchLogsDescribeLogGroupsTest.java
@@ -0,0 +1,48 @@
+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 static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("CloudWatch Logs DescribeLogGroups")
+class CloudWatchLogsDescribeLogGroupsTest {
+
+ @Test
+ @DisplayName("returns the AWS LogGroup ARN fields with their distinct formats")
+ void returnsAwsLogGroupArnFields() {
+ String groupName = "/test/" + TestFixtures.uniqueName("logs-describe-arn");
+ try (CloudWatchLogsClient logs = TestFixtures.cloudWatchLogsClient()) {
+ try {
+ logs.createLogGroup(request -> request.logGroupName(groupName));
+
+ LogGroup group = logs.describeLogGroups(request -> request
+ .logGroupNamePrefix(groupName))
+ .logGroups()
+ .stream()
+ .filter(candidate -> groupName.equals(candidate.logGroupName()))
+ .findFirst()
+ .orElseThrow();
+
+ assertThat(group.arn())
+ .isEqualTo("arn:aws:logs:us-east-1:000000000000:log-group:" + groupName + ":*");
+ assertThat(group.logGroupArn())
+ .isEqualTo("arn:aws:logs:us-east-1:000000000000:log-group:" + groupName);
+ assertThat(group.logGroupArn()).doesNotEndWith(":*");
+ } 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)));
+ }
+}
\ No newline at end of file
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 43da18d4c1..4a5681a8e9 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
@@ -126,7 +126,9 @@ public class CloudWatchLogsHandler {
ObjectNode node = objectMapper.createObjectNode();
node.put("logGroupName", g.getLogGroupName());
node.put("createdTime", g.getCreatedTime());
- node.put("arn", logsService.buildArn(g.getLogGroupName(), region));
+ String logGroupArn = logsService.buildArn(g.getLogGroupName(), region);
+ node.put("arn", logGroupArn + ":*");
+ node.put("logGroupArn", logGroupArn);
if (g.getRetentionInDays() != null) {
node.put("retentionInDays", g.getRetentionInDays());
}