Skip to content

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

fix(ecs): inject containerDefinitions[].secrets (Secrets Manager) into RunTask containers (#922)

Yuriy Rdb30264bca34
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a148334d..50d4f89e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Versioning follows [Semantic Versioning](https://semver.org/).
- **CloudFormation — `GetTemplateSummary` now returns `Capabilities` and `CapabilitiesReason`** — the handler already accepted `TemplateBody` and returned `Parameters` / `ResourceTypes` correctly, but omitted the `Capabilities` and `CapabilitiesReason` fields. These are now computed from the template: `CAPABILITY_NAMED_IAM` for IAM resources with explicit name properties (`RoleName`, `UserName`, etc.), `CAPABILITY_IAM` for unnamed IAM resources, and `CAPABILITY_AUTO_EXPAND` for templates with a `Transform`. `CapabilitiesReason` uses the format confirmed against the AWS API: `"The following resource(s) require capabilities: [<type>]"`. Contributed by @maximoosemine.
- **Lambda - CreateEventSourceMapping persists FilterCriteria** — CreateEventSourceMapping was silently dropping the FilterCriteria parameter, so any filter specified at creation time was never applied.
- **ECS — `RunTask` now applies `containerOverrides.command` to the launched Docker container** — Overridden commands (including an explicit empty command) were ignored at runtime because the Docker `containers.run(...)` call still used the task-definition command. The effective container definition now carries the matched override command into Docker, while non-overridden containers keep their defaults.
+- **ECS — `RunTask` now injects `containerDefinitions[].secrets` from Secrets Manager** — secret `valueFrom` references (including the `:json-key:` form that selects one field from a JSON secret) were silently dropped, so containers started without those environment variables. They are now resolved in-process and merged into the container environment before container overrides are applied; SSM Parameter Store references are not yet resolved. Reported by @kamegoro.
- **S3 — `DeletePublicAccessBlock` now actually clears the configuration** — after delete, `GetPublicAccessBlock` returned a default all-blocked configuration with HTTP 200 instead of `NoSuchPublicAccessBlockConfiguration` (404), so the delete was not observable and Terraform's `aws_s3_bucket_public_access_block` delete waiter timed out (`found resource`), blocking `terraform destroy`. `GetPublicAccessBlock` now returns 404 when no configuration is set (never configured, or deleted). Reported by @kamegoro.
- **Lambda - CloudFormation-created ESMs now poll DynamoDB Streams** — Before, these streams were not getting polled.
diff --git a/ministack/services/ecs.py b/ministack/services/ecs.py
index caf19f08..a65d7f5f 100644
--- a/ministack/services/ecs.py
+++ b/ministack/services/ecs.py
@@ -41,7 +41,7 @@ from ministack.core.responses import (
new_uuid,
now_iso,
)
-from ministack.services import ecs_metadata
+from ministack.services import ecs_metadata, secretsmanager
logger = logging.getLogger("ecs")
@@ -999,6 +999,41 @@ def _build_run_kwargs(cdef, td, env, port_bindings, ecs_network,
return kwargs
+def _resolve_container_secrets(cdef):
+ """Resolve a container definition's ``secrets`` into a {name: value} mapping.
+
+ Each entry's ``valueFrom`` is a Secrets Manager secret ARN, optionally with
+ a ``:json-key:version-stage:version-id`` suffix (the json-key selects one
+ field from a JSON SecretString). SSM Parameter Store references are not
+ resolved; unresolvable entries are skipped with a warning.
+ """
+ resolved = {}
+ for secret in cdef.get("secrets", []):
+ name = secret.get("name")
+ value_from = secret.get("valueFrom", "")
+ if not name or "secretsmanager" not in value_from:
+ continue
+ # A Secrets Manager ARN has 7 colon-separated fields; ECS may append
+ # :json-key:version-stage:version-id after it.
+ parts = value_from.split(":")
+ secret_arn = ":".join(parts[:7])
+ json_key = parts[7] if len(parts) > 7 and parts[7] else None
+ value = secretsmanager.resolve_secret_string(secret_arn)
+ if value is None:
+ logger.warning("ECS: could not resolve secret %s for env var %s",
+ value_from, name)
+ continue
+ if json_key:
+ try:
+ value = json.loads(value)[json_key]
+ except (ValueError, KeyError, TypeError):
+ logger.warning("ECS: secret %s has no JSON key %s",
+ secret_arn, json_key)
+ continue
+ resolved[name] = str(value)
+ return resolved
+
+
def _run_task(data):
cluster_name = _resolve_cluster_name(data.get("cluster", "default"))
if cluster_name not in _clusters:
@@ -1102,6 +1137,7 @@ def _run_task(data):
env_override[e["name"]] = e["value"]
env = {e["name"]: e["value"] for e in cdef.get("environment", [])}
+ env.update(_resolve_container_secrets(cdef))
env.update(env_override)
effective_cdef = dict(cdef)
if "command" in container_override:
diff --git a/ministack/services/secretsmanager.py b/ministack/services/secretsmanager.py
index 9afac1c6..8e1dc6da 100644
--- a/ministack/services/secretsmanager.py
+++ b/ministack/services/secretsmanager.py
@@ -107,6 +107,22 @@ def _find_stage_version(secret, stage):
return None, None
+def resolve_secret_string(secret_id, version_stage="AWSCURRENT"):
+ """Return the SecretString for *secret_id* at *version_stage*, or None.
+
+ Used by other services (e.g. ECS) that need to read a secret value
+ in-process without going through the HTTP API. Returns None if the secret
+ does not exist, is scheduled for deletion, or has no value for the stage.
+ """
+ _, secret = _resolve(secret_id)
+ if not secret or secret.get("DeletedDate"):
+ return None
+ _, ver = _find_stage_version(secret, version_stage)
+ if not ver:
+ return None
+ return ver.get("SecretString")
+
+
def _apply_current_promotion(secret, new_vid):
"""
Promote *new_vid* to AWSCURRENT.
diff --git a/tests/test_ecs.py b/tests/test_ecs.py
index 7c161338..a648de18 100644
--- a/tests/test_ecs.py
+++ b/tests/test_ecs.py
@@ -317,6 +317,59 @@ def test_ecs_run_task_command_override_allows_empty_command(monkeypatch):
assert fake_containers.calls[0][1]["command"] == []
+def test_ecs_run_task_injects_secrets_manager_secrets(monkeypatch):
+ """RunTask must resolve containerDefinitions[].secrets (Secrets Manager
+ valueFrom) and inject them into the container environment, including the
+ json-key form."""
+ from ministack.services import ecs as _ecs
+ from ministack.services import secretsmanager as _sm
+
+ _sm._create_secret({"Name": "ecs-secret-plain", "SecretString": "s3cr3t"})
+ _sm._create_secret({"Name": "ecs-secret-json",
+ "SecretString": json.dumps({"password": "pa55"})})
+ plain_arn = _sm._resolve("ecs-secret-plain")[1]["ARN"]
+ json_arn = _sm._resolve("ecs-secret-json")[1]["ARN"]
+
+ class FakeContainers:
+ def __init__(self):
+ self.calls = []
+
+ def get(self, _name):
+ raise Exception("not found")
+
+ def list(self, *args, **kwargs):
+ return []
+
+ def run(self, image, **kwargs):
+ self.calls.append((image, kwargs))
+ return SimpleNamespace(id=f"container-{len(self.calls):012d}")
+
+ fake_containers = FakeContainers()
+ monkeypatch.setattr(_ecs, "_get_docker",
+ lambda: SimpleNamespace(containers=fake_containers))
+
+ _ecs._register_task_definition({
+ "family": "secrets-td",
+ "containerDefinitions": [
+ {
+ "name": "app",
+ "image": "busybox",
+ "environment": [{"name": "FOO", "value": "bar"}],
+ "secrets": [
+ {"name": "SECRET_VAL", "valueFrom": plain_arn},
+ {"name": "DB_PASS", "valueFrom": f"{json_arn}:password::"},
+ ],
+ },
+ ],
+ })
+
+ _ecs._run_task({"cluster": "secrets-c", "taskDefinition": "secrets-td"})
+
+ env = fake_containers.calls[0][1]["environment"]
+ assert env["FOO"] == "bar"
+ assert env["SECRET_VAL"] == "s3cr3t"
+ assert env["DB_PASS"] == "pa55"
+
def test_ecs_service(ecs):
ecs.create_service(
cluster="test-cluster",