refactor: lay the repository out by role
All checks were successful
Build and deploy / Validate source (push) Successful in 7s
Build and deploy / Integration suite on a real stack (push) Successful in 1m25s
Build and deploy / Secret scan and release gate (push) Successful in 5s
Build and deploy / Publish images and notify Portainer (push) Successful in 1m31s
All checks were successful
Build and deploy / Validate source (push) Successful in 7s
Build and deploy / Integration suite on a real stack (push) Successful in 1m25s
Build and deploy / Secret scan and release gate (push) Successful in 5s
Build and deploy / Publish images and notify Portainer (push) Successful in 1m31s
local/ held six unrelated things under a name that stopped being true once it
became the production runtime: the service, the frontend, the tests, the ops
commands, the container definitions and the dependency lock, 65 files with
nothing to tell them apart.
app/ the service: api/ routers, core/ for identity, database, models,
prices and secret loading, and the worker, bootstrap and schema
tests/ the twelve suites, no longer inside the shipped package
ops/ backup, readiness, dependency audit, security summary
infra/ Dockerfiles, gateway templates, ClamAV and storage configuration,
the requirements and their hash lock
web/ the Site, Kanban and portal pages with their scripts
deploy/Dockerfile.api now copies app/ alone, so the tests stop shipping to
production; the local image still carries them, because the suites run inside
the stack's network.
Five kinds of reference had to follow, and each was found by something different
rather than by reading. Imports of the form "from . import db" survived a rewrite
that only matched "from .db import". Tests kept relative imports of modules that
had left the package. A mock.patch target names its module in a string, where no
import rewriting can see it. The browser test resolves a fixture by path. And the
release gate's markers pointed at local/runtime.py and local/worker.py, which is
the decay its new marker test exists to catch — it caught it.
Verified from docker compose down -v: the stack starts, all six integration
suites, both browser suites and the twenty-nine unit tests pass.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -38,10 +38,10 @@ SOURCE_BLOCKERS = {
|
||||
# matching when R2 support landed; they were removed rather than left to rot.
|
||||
# What remains is the real blocker: no production payment or messaging adapter
|
||||
# exists, so these lines must change before a release can be meaningful.
|
||||
'local/runtime.py': (
|
||||
'app/runtime.py': (
|
||||
'payment = FakePayment()',
|
||||
),
|
||||
'local/worker.py': (
|
||||
'app/worker.py': (
|
||||
"adapters = {'tiny': FakeTiny(), 'whatsapp': FakeWhatsApp()}",
|
||||
),
|
||||
}
|
||||
@@ -68,7 +68,7 @@ def secret_loading_errors(root=ROOT):
|
||||
import importlib.util
|
||||
import tempfile
|
||||
|
||||
module_path = root / 'local' / 'secrets.py'
|
||||
module_path = root / 'app' / 'core' / 'secrets.py'
|
||||
if not module_path.exists():
|
||||
return ['local runtime does not load the production Docker secret *_FILE settings']
|
||||
try:
|
||||
@@ -76,7 +76,7 @@ def secret_loading_errors(root=ROOT):
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(module)
|
||||
except Exception as exc:
|
||||
return [f'local/secrets.py could not be loaded: {exc}']
|
||||
return [f'app/core/secrets.py could not be loaded: {exc}']
|
||||
|
||||
stack_names = set()
|
||||
stack = root / 'deploy' / 'stack.yaml'
|
||||
@@ -97,7 +97,7 @@ def secret_loading_errors(root=ROOT):
|
||||
try:
|
||||
module.load(environ)
|
||||
except Exception as exc:
|
||||
failures.append(f'{name}_FILE is not resolved by local/secrets.py: {exc}')
|
||||
failures.append(f'{name}_FILE is not resolved by app/core/secrets.py: {exc}')
|
||||
continue
|
||||
if environ.get(name) != 'resolved-value':
|
||||
failures.append(f'{name}_FILE did not produce {name}')
|
||||
@@ -107,7 +107,7 @@ def secret_loading_errors(root=ROOT):
|
||||
except Exception:
|
||||
pass
|
||||
else:
|
||||
failures.append('local/secrets.py does not fail closed on an unreadable secret')
|
||||
failures.append('app/core/secrets.py does not fail closed on an unreadable secret')
|
||||
return failures
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user