Resolve merge conflict in PR #8: keep newer pure ASGI middleware implementation - #13
Merged
badry-dev merged 1 commit intoMar 7, 2026
Conversation
Copilot
AI
changed the title
[WIP] Resolve code conflict by using most recent changes
Resolve merge conflict in PR #8: keep newer pure ASGI middleware implementation
Mar 7, 2026
badry-dev
marked this pull request as ready for review
March 7, 2026 20:55
badry-dev
merged commit Mar 7, 2026
00ca66b
into
claude/phase-7-integration-hardening-xl99G
1 check passed
badry-dev
added a commit
that referenced
this pull request
Mar 7, 2026
…ion, deployment docs (#8) * feat(phase7): add integration hardening — E2E tests, security validation, deployment docs Phase 7 delivers production readiness validation: - E2E smoke tests: full lifecycle (connection → auth → endpoint → schedule → snapshot → data consumption), all 3 auth types, health dashboard, settings - Security validation: SQL injection prevention (8 patterns), auth bypass negative paths, credential leakage audit, path traversal, malformed inputs - Migration validation: file structure, model-migration alignment, Alembic config, schema creation on fresh DB - Performance sanity: admin API latency budgets, data endpoint response times, bulk operation throughput - Deployment runbook: Docker Compose, bare metal, Kubernetes setup guides - Operations guide: backup/restore, monitoring, incident troubleshooting, upgrade/rollback procedures, performance tuning - Security checklist: 50-item checklist, 44 verified, 6 deployment-specific - Code hardening: fix pre-existing ruff UP038 lint error in executor.py, fix mypy attr-defined error in scheduler.py (snapshot_retention_count) 113 non-integration tests passing. All checks clean (ruff, mypy, eslint, prettier, vitest). https://claude.ai/code/session_01QTj6N3vwfGru3dNErcA2Sp * fix(ci): add ENCRYPTION_KEY placeholder to docker-compose validation step (#9) * fix: replace BaseHTTPMiddleware with pure ASGI middleware to resolve asyncpg RuntimeError in tests (#10) * Initial plan (#13) --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR #8 and a separate hotfix on
main(17ab592) independently replacedBaseHTTPMiddlewarewith a pure ASGI middleware inbackend/app/middleware.py, creating a merge conflict. The PR branch version is 5 minutes newer and more complete — it is kept as the resolved state.Conflict
main17ab592http+websocket; manual header list;status_code = 0defaultf728bb1MutableHeaders;http-only;status_code = 500default; fuller docstringResolution: keep PR #8's version
backend/tests/test_auth_methods.py— identical on both branches; no conflict.github/workflows/docker.yml— PR version retained (addsENCRYPTION_KEYto CI env)Original prompt
✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.