feat(multi-instance): dcy-009 BAT-013 — RabbitMQ 다중 인스턴스 토폴로지 (REQ-048~051)

dcy-009(다중 인스턴스 RabbitMQ 토폴로지) 전체 SDLC: draft-req → confirm-req → draft-batch(BAT-013) → run-batch-delivery → confirm-req-implemented. - REQ-048 (Configuration): DaemonInstanceConfig.from_toml + DaemonConfig.from_config (env 병합, portfolio_hub_token 주입) + 데몬 --config 필수 argparse + .gitignore 인스턴스 TOML + config/instance.example.toml - REQ-049 (Interface): topology 동적 큐명 빌더 intent/snapshot/control_queue(instance_key) — default=리터럴 큐명(하위호환), named=`{base}.{instance_key}` + daemon per-instance 구독 - REQ-050 (Integration): trex.direct(topic)/trex.broadcast(fanout) exchange + declare_topology(instance_key) per-instance binding + control dual binding + direct_routing_key - REQ-051 (Documentation): interface-contract/runtime-flows/project-structure 정합 하위호환: instance_key="default" → 기존 리터럴 큐명·RPC 경로 무회귀(FR-5). split-brain 방지(NFR-3): 인스턴스 전용 큐. 민감값(NFR-4): TOML + gitignore. 검증: 신규 9 단위 + RabbitMQ 라우팅 2, 단위 271 passed, 인프라 게이트 301 passed(directed 격리 S-2 + broadcast dual S-3 + default 무회귀 S-4), ruff clean. REQ-048~051 Implemented, BAT-013 release-candidate. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-07 15:10:36 +09:00
parent 7e23648489
commit 9f83c64a40
24 changed files with 1223 additions and 85 deletions
@@ -0,0 +1,114 @@
+"""Multi-instance topology tests (REQ-049/050 / BAT-013).
+
+Builder/routing-key tests run always. declare_topology + directed/broadcast
+routing tests are gated on TREX_RABBITMQ_TEST_URL.
+"""
+from __future__ import annotations
+
+import os
+import time
+import uuid
+
+import pytest
+
+from trex_core.adapters.messaging import topology
+from trex_core.adapters.messaging.rabbitmq import RabbitMQTransport
+
+
+# ---- builders (always run) --------------------------------------------------
+
+def test_named_instance_suffix():
+    """REQ-049 AC-1."""
+    assert topology.intent_queue("inst-1") == "trex.intent.req.inst-1"
+    assert topology.snapshot_queue("inst-1") == "trex.snapshot.req.inst-1"
+    assert topology.control_queue("inst-1") == "trex.control.req.inst-1"
+
+
+def test_default_is_literal():
+    """REQ-049 AC-2: default keeps legacy literal names (backward-compat)."""
+    assert topology.intent_queue("default") == "trex.intent.req"
+    assert topology.snapshot_queue(None) == "trex.snapshot.req"
+    assert topology.control_queue() == "trex.control.req"
+
+
+def test_direct_routing_key():
+    """REQ-050 AC-3."""
+    assert topology.direct_routing_key("inst-1", "control") == "inst-1.control"
+    assert topology.direct_routing_key("inst-2", "intent") == "inst-2.intent"
+
+
+# ---- RabbitMQ topology (gated) ----------------------------------------------
+
+@pytest.fixture
+def mq_url() -> str:
+    url = os.environ.get("TREX_RABBITMQ_TEST_URL")
+    if not url:
+        pytest.skip("TREX_RABBITMQ_TEST_URL not set; skipping RabbitMQ integration test")
+    return url
+
+
+def _delete_instance_queues(url, instance_key):
+    import pika
+    conn = pika.BlockingConnection(pika.URLParameters(url))
+    try:
+        ch = conn.channel()
+        for q in (topology.intent_queue(instance_key), topology.snapshot_queue(instance_key),
+                  topology.control_queue(instance_key)):
+            try:
+                ch.queue_delete(queue=q)
+            except Exception:  # noqa: BLE001
+                pass
+    finally:
+        conn.close()
+
+
+def test_directed_routing_isolation(mq_url):
+    """REQ-050 AC-4 (S-2): inst-1 routing key reaches only inst-1's queue."""
+    import pika
+    k1 = "it1-" + uuid.uuid4().hex[:6]
+    k2 = "it2-" + uuid.uuid4().hex[:6]
+    t1 = RabbitMQTransport(mq_url)
+    t1.declare_topology(k1)
+    t2 = RabbitMQTransport(mq_url)
+    t2.declare_topology(k2)
+    try:
+        conn = pika.BlockingConnection(pika.URLParameters(mq_url))
+        ch = conn.channel()
+        ch.basic_publish(exchange=topology.DIRECT_EXCHANGE,
+                         routing_key=topology.direct_routing_key(k1, "intent"), body=b"x")
+        time.sleep(0.4)
+        m1 = ch.basic_get(topology.intent_queue(k1), auto_ack=True)
+        m2 = ch.basic_get(topology.intent_queue(k2), auto_ack=True)
+        conn.close()
+        assert m1[0] is not None, "inst-1 intent queue should receive the directed message"
+        assert m2[0] is None, "inst-2 intent queue must NOT receive it"
+    finally:
+        t1.close()
+        t2.close()
+        _delete_instance_queues(mq_url, k1)
+        _delete_instance_queues(mq_url, k2)
+
+
+def test_broadcast_dual_binding(mq_url):
+    """REQ-050 AC-5 (S-3): broadcast reaches every instance's control queue."""
+    import pika
+    k1 = "bc1-" + uuid.uuid4().hex[:6]
+    k2 = "bc2-" + uuid.uuid4().hex[:6]
+    t1 = RabbitMQTransport(mq_url)
+    t1.declare_topology(k1)
+    t2 = RabbitMQTransport(mq_url)
+    t2.declare_topology(k2)
+    try:
+        conn = pika.BlockingConnection(pika.URLParameters(mq_url))
+        ch = conn.channel()
+        ch.basic_publish(exchange=topology.BROADCAST_EXCHANGE, routing_key="", body=b"halt")
+        time.sleep(0.4)
+        m1 = ch.basic_get(topology.control_queue(k1), auto_ack=True)
+        m2 = ch.basic_get(topology.control_queue(k2), auto_ack=True)
+        conn.close()
+        assert m1[0] is not None and m2[0] is not None, "both control queues should receive broadcast"
+    finally:
+        t1.close()
+        t2.close()
+        _delete_instance_queues(mq_url, k1)
+        _delete_instance_queues(mq_url, k2)
@@ -0,0 +1,68 @@
+"""Per-instance TOML config loader tests (REQ-048 / BAT-013)."""
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+
+import pytest
+
+from trex_core.runtime.config import DaemonConfig, DaemonInstanceConfig
+
+_REPO = Path(__file__).resolve().parents[2]
+
+
+def _write_toml(tmp_path, body: str) -> str:
+    p = tmp_path / "inst.toml"
+    p.write_text(body)
+    return str(p)
+
+
+def test_from_toml_parses(tmp_path):
+    """AC-1: from_toml reads instance_key + portfolio_hub_token."""
+    path = _write_toml(tmp_path, 'instance_key = "inst-1"\nportfolio_hub_token = "tok"\n')
+    cfg = DaemonInstanceConfig.from_toml(path)
+    assert cfg.instance_key == "inst-1"
+    assert cfg.portfolio_hub_token == "tok"
+
+
+def test_from_toml_missing_instance_key_raises(tmp_path):
+    """AC-4: missing required instance_key → error (no silent default)."""
+    path = _write_toml(tmp_path, 'portfolio_hub_token = "tok"\n')
+    with pytest.raises(RuntimeError):
+        DaemonInstanceConfig.from_toml(path)
+
+
+def test_from_config_injects_token(tmp_path, monkeypatch):
+    """AC-3 / S-5: TOML token is injected into PortfolioHubConfig when base_url is set,
+    even with TREX_PORTFOLIO_HUB_TOKEN absent from the environment."""
+    monkeypatch.setenv("TREX_POSTGRESQL_DSN", "postgresql://x/y")
+    monkeypatch.setenv("TREX_PORTFOLIO_HUB_BASE_URL", "http://hub:18000")
+    monkeypatch.delenv("TREX_PORTFOLIO_HUB_TOKEN", raising=False)
+    path = _write_toml(tmp_path, 'instance_key = "inst-9"\nportfolio_hub_token = "toml-tok"\n')
+    cfg = DaemonConfig.from_config(path)
+    assert cfg.instance_key == "inst-9"
+    assert cfg.portfolio_hub is not None
+    assert cfg.portfolio_hub.token == "toml-tok"
+
+
+def test_default_instance_key_when_from_env(monkeypatch):
+    monkeypatch.setenv("TREX_POSTGRESQL_DSN", "postgresql://x/y")
+    assert DaemonConfig.from_env().instance_key == "default"
+
+
+def test_config_required_cli_exits_nonzero():
+    """AC-2: daemon entry without --config exits non-zero (argparse required)."""
+    proc = subprocess.run(
+        [sys.executable, "-m", "trex_core.runtime.daemon"],
+        capture_output=True, text=True, timeout=30, cwd=str(_REPO),
+    )
+    assert proc.returncode != 0
+    assert "config" in (proc.stderr + proc.stdout).lower()
+
+
+def test_gitignore_excludes_instance_toml():
+    """AC-5: .gitignore excludes instance TOML but keeps the example."""
+    gi = (_REPO / ".gitignore").read_text()
+    assert "/config/*.toml" in gi
+    assert "!/config/instance.example.toml" in gi