fix(abac): resolve merge with durable-ids config reload - #1015
fix(abac): resolve merge with durable-ids config reload#1015nickmisasi wants to merge 2 commits into
Conversation
A follower that waits on the migration lock sees Migrated=false and must still read the winner's remapped service/MCP IDs before EnsureBots. Co-authored-by: Cursor <cursoragent@cursor.com>
Keep ID migration before the in-memory config load so lock-losers see remapped service IDs. Drop the duplicate post-load call from this branch. Co-authored-by: Nick Misasi <nick13misasi@gmail.com>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI (base), Organization UI (inherited) Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (2)
Included review availability: 3 reviews are currently available. Your included PR review attempts over the past 7 days set your current allowance at 4 reviews per hour. 📝 WalkthroughWalkthroughABAC ID migrations now run against the persisted store before configuration loads into memory. The migration function no longer reloads or persists the configuration container. Startup returns migration failures as activation errors. ChangesABAC migration ordering
Estimated code review effort: 2 (Simple) | ~10 minutes Merge Risk: ⚪ Minimal · up to This localized change preserves durable-ID migration ordering and removes a duplicate migration call; no actionable merge-blocking risk remains after normal checks and review. Suggested labels: 🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment |
🤖 LLM Evaluation ResultsOpenAI
❌ Failed EvaluationsShow 1 failuresOPENAI1. TestReactEval/[openai]_react_cat_message
Anthropic
❌ Failed EvaluationsShow 1 failuresANTHROPIC1. TestReactEval/[anthropic]_react_cat_message
This comment was automatically generated by the eval CI pipeline. |
Summary
Resolves the merge conflict between
abac/pep-and-api(PR 971) and its baseabac/durable-ids.durable-idsmoved ABAC ID migration before the in-memory config load (ef5936f5) so a cluster lock-loser still sees remapped service IDs. This branch had a secondrunABACIDMigrationscall after load (and still passed the old*config.Containerargument). Keep the durable-ids ordering and drop the duplicate call. PEP wiring (accessCheckerinto bots/MCP/API) is unchanged.After this lands on
abac/pep-and-api, PR 971 should be mergeable intoabac/durable-ids.Ticket Link
Stacked on #971
Screenshots
N/A (activation-path merge resolution, no UI).
Release Note
Summary by CodeRabbit