Skip to content

Ministack: Free, open-source local AWS emulator - 60+ services, Terraform compatible, real databases. Free forever. MIT licensed.

Support ECS awslogs forwarding (#1785)

Bob Szabo27dcf516519a
diff --git a/ministack/services/ecs.py b/ministack/services/ecs.py
index cf3ccacb..19c9ddc8 100644
--- a/ministack/services/ecs.py
+++ b/ministack/services/ecs.py
@@ -1398,6 +1398,103 @@ def _build_run_kwargs(cdef, td, env, port_bindings, ecs_network,
return kwargs
+def _awslogs_config(cdef, task_id):
+ log_config = cdef.get("logConfiguration") or cdef.get("LogConfiguration") or {}
+ log_driver = log_config.get("logDriver") or log_config.get("LogDriver")
+ if log_driver != "awslogs":
+ return None
+
+ options = log_config.get("options") or log_config.get("Options") or {}
+ group_name = options.get("awslogs-group")
+ if not group_name:
+ return None
+
+ container_name = cdef.get("name", "container")
+ stream_prefix = options.get("awslogs-stream-prefix")
+ if stream_prefix:
+ stream_name = f"{stream_prefix}/{container_name}/{task_id}"
+ else:
+ stream_name = f"{container_name}/{task_id}"
+
+ return {
+ "group": group_name,
+ "stream": stream_name,
+ "create_group": str(options.get("awslogs-create-group", "")).lower() == "true",
+ }
+
+
+def _ensure_awslogs_stream(config):
+ from ministack.services import cloudwatch_logs as _cwl
+
+ group_name = config["group"]
+ stream_name = config["stream"]
+
+ if group_name not in _cwl._log_groups:
+ if not config["create_group"]:
+ logger.warning(
+ "ECS: awslogs group %s does not exist; container output is not forwarded",
+ group_name,
+ )
+ return False
+ status, _, _ = _cwl._create_log_group({"logGroupName": group_name})
+ if status >= 400 and group_name not in _cwl._log_groups:
+ return False
+
+ if stream_name not in _cwl._log_groups[group_name]["streams"]:
+ status, _, _ = _cwl._create_log_stream({
+ "logGroupName": group_name,
+ "logStreamName": stream_name,
+ })
+ if status >= 400 and stream_name not in _cwl._log_groups[group_name]["streams"]:
+ return False
+
+ return True
+
+
+def _emit_awslogs_event(config, message):
+ from ministack.services import cloudwatch_logs as _cwl
+
+ _cwl._put_log_events({
+ "logGroupName": config["group"],
+ "logStreamName": config["stream"],
+ "logEvents": [{
+ "timestamp": int(time.time() * 1000),
+ "message": message,
+ }],
+ })
+
+
+def _forward_awslogs(container, config, account_id, region):
+ with request_scope(account_id, region):
+ if not _ensure_awslogs_stream(config):
+ return
+ try:
+ for chunk in container.logs(
+ stream=True, follow=True, stdout=True, stderr=True):
+ if not chunk:
+ continue
+ text = chunk.decode("utf-8", errors="replace")
+ for line in text.splitlines():
+ _emit_awslogs_event(config, line)
+ except Exception as exc:
+ logger.debug("ECS: awslogs forwarding stopped: %s", exc)
+
+
+def _start_awslogs_forwarder(container, cdef, task_id):
+ config = _awslogs_config(cdef, task_id)
+ if not config:
+ return
+ account_id = get_account_id()
+ region = get_region()
+ thread = threading.Thread(
+ target=_forward_awslogs,
+ args=(container, config, account_id, region),
+ daemon=True,
+ name=f"ministack-ecs-awslogs-{task_id[:8]}-{cdef.get('name', 'container')}",
+ )
+ thread.start()
+
+
class _SecretResolutionError(Exception):
"""A container secret's ``valueFrom`` could not be resolved.
@@ -1811,6 +1908,7 @@ def _start_task_worker(task, td, container_overrides, docker_client):
task, container, i, metadata_token, ecs_network):
_cleanup_task_resources(task, docker_client, container)
return
+ _start_awslogs_forwarder(container, effective_cdef, task_id)
if not _mark_task_running(task_arn, task):
_cleanup_task_resources(task, docker_client)
diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index b140ad08..6db7a31c 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -98,6 +98,58 @@ def test_ecs_run_task_stops_after_exit(ecs):
assert stopped, "Task should transition to STOPPED after container exits"
+def test_ecs_run_task_forwards_awslogs_to_cloudwatch_logs(ecs, logs):
+ cluster = f"awslogs-{_uuid_mod.uuid4().hex[:8]}"
+ family = f"{cluster}-td"
+ group = f"/ecs/{cluster}"
+ marker = f"ECS-AWSLOGS-{_uuid_mod.uuid4().hex[:8]}"
+ stream_prefix = "ecs"
+
+ logs.create_log_group(logGroupName=group)
+ ecs.create_cluster(clusterName=cluster)
+ ecs.register_task_definition(
+ family=family,
+ containerDefinitions=[{
+ "name": "app",
+ "image": "alpine:latest",
+ "command": ["sh", "-c", f"echo {marker}"],
+ "essential": True,
+ "logConfiguration": {
+ "logDriver": "awslogs",
+ "options": {
+ "awslogs-group": group,
+ "awslogs-region": "us-east-1",
+ "awslogs-stream-prefix": stream_prefix,
+ },
+ },
+ }],
+ )
+
+ try:
+ resp = ecs.run_task(cluster=cluster, taskDefinition=family)
+ except Exception as exc:
+ pytest.skip(f"ECS RunTask unavailable in this environment: {exc}")
+
+ task_arn = resp["tasks"][0]["taskArn"]
+ task_id = task_arn.rsplit("/", 1)[-1]
+ stream_name = f"{stream_prefix}/app/{task_id}"
+
+ def marker_reached_cloudwatch_logs():
+ streams = logs.describe_log_streams(
+ logGroupName=group,
+ logStreamNamePrefix=stream_name,
+ )["logStreams"]
+ if not streams:
+ return False
+ events = logs.get_log_events(
+ logGroupName=group,
+ logStreamName=stream_name,
+ )["events"]
+ return any(marker in event["message"] for event in events)
+
+ _wait_until(marker_reached_cloudwatch_logs, timeout=20)
+
+
def test_ecs_list_tasks_reflects_natural_container_exit(ecs):
"""ListTasks must also reconcile lifecycle when a container has exited
on its own. Previously only DescribeTasks ran the reconciler, so a user