fix: harden skipped ledger resolution paths
Co-authored-by: genichin <4282227+genichin@users.noreply.github.com>
This commit is contained in:
co-authored by
genichin
parent
b88b21b772
commit
48dfc3e76f
@@ -9,8 +9,13 @@ from trex_core.application.ledger_skip import LedgerSkipRecord
|
||||
from trex_core.runtime import cli
|
||||
|
||||
|
||||
def _cfg():
|
||||
return SimpleNamespace(dsn="postgresql://x/y", rabbitmq=None)
|
||||
def _cfg(*, live: bool = False):
|
||||
return SimpleNamespace(
|
||||
dsn="postgresql://x/y",
|
||||
rabbitmq=None,
|
||||
broker="kis",
|
||||
kis=SimpleNamespace(allow_live=live),
|
||||
)
|
||||
|
||||
|
||||
def _record(*, status="unresolved", resolution_reason=None):
|
||||
@@ -46,7 +51,7 @@ def test_ledger_skips_parser_accepts_list_and_resolve():
|
||||
args = parser.parse_args(["ledger", "skips", "list", "--status", "all"])
|
||||
assert args.ledger_cmd == "skips"
|
||||
assert args.ledger_skips_cmd == "list"
|
||||
args = parser.parse_args(["ledger", "skips", "resolve", "--skip-key", "abc"])
|
||||
args = parser.parse_args(["ledger", "skips", "resolve", "--skip-key", "abc", "--yes"])
|
||||
assert args.ledger_skips_cmd == "resolve"
|
||||
|
||||
|
||||
@@ -91,8 +96,9 @@ def test_ledger_skips_resolve_marks_record_and_emits_alert(monkeypatch, capsys):
|
||||
def __init__(self, *_args, **_kwargs):
|
||||
pass
|
||||
|
||||
def resolve_by_key(self, skip_key, *, resolution_reason):
|
||||
def resolve_by_key(self, skip_key, *, instance_key, resolution_reason):
|
||||
assert skip_key == "abc"
|
||||
assert instance_key == "inst-1"
|
||||
return _record(status="resolved", resolution_reason=resolution_reason)
|
||||
|
||||
published = []
|
||||
@@ -117,6 +123,9 @@ def test_ledger_skips_resolve_marks_record_and_emits_alert(monkeypatch, capsys):
|
||||
skip_key="abc",
|
||||
reason="operator_reconciled",
|
||||
instance="inst-1",
|
||||
yes=True,
|
||||
live=False,
|
||||
audit_dir="audit-dir",
|
||||
config=None,
|
||||
config_path=None,
|
||||
env_file=None,
|
||||
@@ -124,9 +133,42 @@ def test_ledger_skips_resolve_marks_record_and_emits_alert(monkeypatch, capsys):
|
||||
timeout=10.0,
|
||||
)
|
||||
|
||||
rc = cli._cmd_ledger_skips_resolve(args, _cfg())
|
||||
rc = cli._cmd_ledger_skips_resolve(args, _cfg(), lambda _: True)
|
||||
|
||||
assert rc == 0
|
||||
out = json.loads(capsys.readouterr().out)
|
||||
assert out["result"] == "resolved"
|
||||
assert out["audit_path"].endswith(".json")
|
||||
assert published[0][0] == "ledger_skip_resolved"
|
||||
|
||||
|
||||
def test_ledger_skips_resolve_live_requires_live_flag(monkeypatch, tmp_path, capsys):
|
||||
monkeypatch.setattr(
|
||||
"trex_core.adapters.persistence.ledger_skip_store.PostgreSQLLedgerSkipStore",
|
||||
lambda *_args, **_kwargs: object(),
|
||||
)
|
||||
args = SimpleNamespace(
|
||||
cmd="ledger",
|
||||
ledger_cmd="skips",
|
||||
ledger_skips_cmd="resolve",
|
||||
skip_key="abc",
|
||||
reason="operator_reconciled",
|
||||
instance="inst-1",
|
||||
yes=True,
|
||||
live=False,
|
||||
audit_dir=str(tmp_path),
|
||||
config=None,
|
||||
config_path=None,
|
||||
env_file=None,
|
||||
json=True,
|
||||
timeout=10.0,
|
||||
)
|
||||
|
||||
rc = cli._cmd_ledger_skips_resolve(args, _cfg(live=True), lambda _: True)
|
||||
|
||||
assert rc == 2
|
||||
err = capsys.readouterr().err
|
||||
assert "--live" in err
|
||||
audit = json.loads(next(tmp_path.glob("*.json")).read_text(encoding="utf-8"))
|
||||
assert audit["request"]["instance"] == "inst-1"
|
||||
assert audit["result"]["status"] == "rejected"
|
||||
|
||||
Reference in New Issue
Block a user