Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(ecs): send container logs to the task's account (#4833)

Hyun Lee955264cf5d1a
diff --git a/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java b/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
index 35033b03d7..1e8861ac20 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManager.java
@@ -513,9 +513,12 @@ public class EcsContainerManager {
if (!awsFirelens) {
String logPrefix = "ecs:" + taskDef.getFamily() + ":" + def.getName();
AwsLogsDestination awsLogs = awsLogsDestination(def, taskId, dockerId, region);
+ // The lines are forwarded from Docker's log threads, which have no request context,
+ // so name the task's account explicitly, as the other container-backed services do.
Closeable logHandle = awsLogs == null
? logStreamer.attachConsoleOnly(dockerId, logPrefix)
- : logStreamer.attach(
+ : logStreamer.attachForAccount(
+ AwsArnUtils.accountOrDefault(task.getTaskArn(), regionResolver.getAccountId()),
dockerId, awsLogs.group(), awsLogs.stream(), awsLogs.region(), logPrefix);
if (logHandle != null) {
logStreamsByContainerId.put(dockerId, logHandle);
diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerFirelensTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerFirelensTest.java
index 97e879644e..5b7a7c7b45 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerFirelensTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerFirelensTest.java
@@ -150,8 +150,10 @@ class EcsContainerManagerFirelensTest {
assertTrue(logConfig.getValue().getConfig().get("fluentd-async-connect") == null,
"fluentd-async-connect was removed by Docker 28");
- verify(logStreamer).attach(eq("router-id"), anyString(), anyString(), anyString(), anyString());
- verify(logStreamer, never()).attach(eq("app-id"), anyString(), anyString(), anyString(), anyString());
+ verify(logStreamer).attachForAccount(eq("000000000000"), eq("router-id"), anyString(), anyString(), anyString(),
+ anyString());
+ verify(logStreamer, never()).attachForAccount(anyString(), eq("app-id"), anyString(), anyString(), anyString(),
+ anyString());
verify(logStreamer, never()).attachConsoleOnly(eq("app-id"), anyString());
assertTrue(handle.getFirelensVolumeName().contains("firelens"));
diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerLogConfigurationTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerLogConfigurationTest.java
index db2bf7ac50..a785b8e502 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerLogConfigurationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerLogConfigurationTest.java
@@ -77,14 +77,16 @@ class EcsContainerManagerLogConfigurationTest {
"awslogs-region", "us-east-1",
"awslogs-stream-prefix", "web"), null));
- verify(logStreamer).attach(eq("docker-id"), eq("my-app"), eq("web/main/abc123"), eq("us-east-1"), anyString());
+ verify(logStreamer).attachForAccount(eq("000000000000"), eq("docker-id"), eq("my-app"), eq("web/main/abc123"),
+ eq("us-east-1"), anyString());
}
@Test
void awslogsWithoutStreamPrefixNamesTheStreamAfterTheDockerContainer() {
startTask(new LogConfiguration("awslogs", Map.of("awslogs-group", "my-app"), null));
- verify(logStreamer).attach(eq("docker-id"), eq("my-app"), eq("docker-id"), eq("us-east-1"), anyString());
+ verify(logStreamer).attachForAccount(eq("000000000000"), eq("docker-id"), eq("my-app"), eq("docker-id"),
+ eq("us-east-1"), anyString());
}
@Test
@@ -94,7 +96,18 @@ class EcsContainerManagerLogConfigurationTest {
"awslogs-region", "eu-west-1",
"awslogs-stream-prefix", "web"), null));
- verify(logStreamer).attach(eq("docker-id"), eq("my-app"), eq("web/main/abc123"), eq("eu-west-1"), anyString());
+ verify(logStreamer).attachForAccount(eq("000000000000"), eq("docker-id"), eq("my-app"), eq("web/main/abc123"),
+ eq("eu-west-1"), anyString());
+ }
+
+ @Test
+ void awslogsSendsToTheGroupInTheAccountOfTheTask() {
+ // Docker's log threads have no request context, so the account comes from the task.
+ startTask("arn:aws:ecs:us-east-1:111111111111:task/test-cluster/abc123",
+ new LogConfiguration("awslogs", Map.of("awslogs-group", "my-app"), null));
+
+ verify(logStreamer).attachForAccount(eq("111111111111"), eq("docker-id"), eq("my-app"), eq("docker-id"),
+ eq("us-east-1"), anyString());
}
@Test
@@ -102,7 +115,7 @@ class EcsContainerManagerLogConfigurationTest {
startTask(null);
verify(logStreamer).attachConsoleOnly("docker-id", "ecs:logs-family:main");
- verify(logStreamer, never()).attach(any(), any(), any(), any(), any());
+ verify(logStreamer, never()).attachForAccount(any(), any(), any(), any(), any(), any());
}
@Test
@@ -110,7 +123,7 @@ class EcsContainerManagerLogConfigurationTest {
startTask(new LogConfiguration("splunk", Map.of("splunk-url", "https://splunk.example.com"), null));
verify(logStreamer).attachConsoleOnly("docker-id", "ecs:logs-family:main");
- verify(logStreamer, never()).attach(any(), any(), any(), any(), any());
+ verify(logStreamer, never()).attachForAccount(any(), any(), any(), any(), any(), any());
}
@Test
@@ -118,10 +131,14 @@ class EcsContainerManagerLogConfigurationTest {
startTask(new LogConfiguration("awslogs", Map.of("awslogs-stream-prefix", "web"), null));
verify(logStreamer).attachConsoleOnly("docker-id", "ecs:logs-family:main");
- verify(logStreamer, never()).attach(any(), any(), any(), any(), any());
+ verify(logStreamer, never()).attachForAccount(any(), any(), any(), any(), any(), any());
}
private void startTask(LogConfiguration logConfiguration) {
+ startTask(TASK_ARN, logConfiguration);
+ }
+
+ private void startTask(String taskArn, LogConfiguration logConfiguration) {
ContainerDefinition main = new ContainerDefinition();
main.setName("main");
main.setImage("busybox:latest");
@@ -132,7 +149,7 @@ class EcsContainerManagerLogConfigurationTest {
taskDef.setContainerDefinitions(List.of(main));
EcsTask task = new EcsTask();
- task.setTaskArn(TASK_ARN);
+ task.setTaskArn(taskArn);
manager.startTask(task, taskDef, List.of(), "us-east-1");
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerVolumesFromTest.java b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerVolumesFromTest.java
index d40ac4d8be..01ca2f8575 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerVolumesFromTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ecs/container/EcsContainerManagerVolumesFromTest.java
@@ -181,9 +181,9 @@ class EcsContainerManagerVolumesFromTest {
verify(appBuilder, never()).withLogRotation();
verify(sourceBuilder).withLogRotation();
verify(routerBuilder).withLogRotation();
- verify(logStreamer, never()).attach(eq("app-id"), any(), any(), any(), any());
- verify(logStreamer).attach(eq("source-id"), any(), any(), eq("us-east-1"), any());
- verify(logStreamer).attach(eq("router-id"), any(), any(), eq("us-east-1"), any());
+ verify(logStreamer, never()).attachForAccount(any(), eq("app-id"), any(), any(), any(), any());
+ verify(logStreamer).attachForAccount(eq("000000000000"), eq("source-id"), any(), any(), eq("us-east-1"), any());
+ verify(logStreamer).attachForAccount(eq("000000000000"), eq("router-id"), any(), any(), eq("us-east-1"), any());
assertEquals("floci-aws-ecs-firelens-volumesfrom1", handle.getFirelensVolumeName());
assertEquals(List.of("source", "router", "app"), handle.getContainerIds().keySet().stream().toList());
assertEquals(List.of("app", "router", "source"),