Skip to content

Commit bfb0c86

Browse files
fix(env): read the reload's service names as strings
safe_load follows YAML 1.1, so a service named on, 123 or null came back as True, an int or None: shlex.quote raised, or quoted None as an empty name, after the database had already been swapped. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 parent 7d693e0 commit bfb0c86

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

‎src/agent_env/env/envs/multi_env.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,8 @@ async def _load_from_snapshot(self, snapshot) -> None:
662662
environment_names = list(dict.fromkeys(
663663
[env.environment_name for env in self.mcp_server_envs] + [env.environment_name for env in self.website_envs]
664664
))
665-
svc_list = " ".join(map(shlex.quote, (name for name in yaml.safe_load(compose)["services"]
665+
# BaseLoader keeps every name a string: safe_load reads a service named `on` as True and `123` as an int.
666+
svc_list = " ".join(map(shlex.quote, (name for name in yaml.load(compose, Loader=yaml.BaseLoader)["services"]
666667
if name != DATABASE_SERVICE_NAME)))
667668
logger.info(f"Recreating services: {svc_list}")
668669
await gw._compose_up(self._sandbox, f"--force-recreate {svc_list}")

‎tst/unit/env/envs/test_multi_env_snapshot_reload_name.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,17 @@ async def test_the_reload_recreates_every_service_but_the_servicedb_the_browser_
9393
assert wait.call_args.args[1] == AGENT_ENV_GATEWAY_MCP_PORT + 1000
9494

9595

96+
@pytest.mark.asyncio
97+
@pytest.mark.parametrize("name", ["on", "123", "null"])
98+
async def test_a_service_whose_name_yaml_reads_as_another_type_is_recreated_by_its_name(name):
99+
env = _env(_deployed_compose().replace("slack", name))
100+
101+
_, up, _ = await _reload(env)
102+
103+
(args,) = [call.args[1] for call in up.await_args_list]
104+
assert name in shlex.split(args.removeprefix("--force-recreate "))
105+
106+
96107
@pytest.mark.asyncio
97108
async def test_the_reload_writes_its_compose_as_one_argument():
98109
env = _env(_deployed_compose().replace(" slack:\n", " slack:\n labels:\n note: \"$(touch pwned) 'q' `x`\"\n", 1))

0 commit comments

Comments
 (0)