Found by running the stack for the first time: - compose build context pointed outside the repo. Relative paths in .devcontainer/compose.override.yaml resolve against the project directory (the repo root), not the file's own directory, so "context: .." escaped the repository and the image could not build at all. - The devcontainers/python base image ships a yarn apt source whose signing key has rotated, failing apt-get update and the whole build. Drop that source list; we don't use yarn. - pytest-asyncio ran fixtures on a session-scoped loop while tests ran on per-function loops, so asyncmy raised "Future attached to a different loop" on every database-backed test. aiosqlite masked this; MySQL does not. Fixture loop scope now matches the test loop scope. - MySQL DATETIME stores no offset, so timestamps serialized bare and left clients guessing. Connections are pinned to UTC, so DeviceRead now attaches that offset explicitly, with a test covering it. Verified end to end against real MySQL 8.4 and Keycloak 26.7: cold start from destroyed volumes, uv sync --frozen, migrations, 41 tests, ruff, mypy --strict, and the live authorization matrix driven by real tokens. Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
1 parent
0526d34e42
commit
c7838acbbf
5 files changed
+37
-5
No files matched your search
@@ -1,7 +1,12 @@
|
|||||||
FROM mcr.microsoft.com/devcontainers/python:1-3.13-bookworm
|
FROM mcr.microsoft.com/devcontainers/python:1-3.13-bookworm
|
||||||
|
|
||||||
# `mysql` CLI for poking at the database during development.
|
# `mysql` CLI for poking at the database during development.
|
||||||
RUN apt-get update \
|
#
|
||||||
|
# The base image ships a yarn apt source whose signing key has since rotated,
|
||||||
|
# which makes `apt-get update` fail outright. We don't use yarn, so drop that
|
||||||
|
# source list rather than carrying its key.
|
||||||
|
RUN rm -f /etc/apt/sources.list.d/yarn.list \
|
||||||
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends default-mysql-client \
|
&& apt-get install -y --no-install-recommends default-mysql-client \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|||||||
@@ -1,16 +1,20 @@
|
|||||||
# Adds the development container to the stack defined in ../compose.yaml.
|
# Adds the development container to the stack defined in ../compose.yaml.
|
||||||
# Merged by devcontainer.json; not useful on its own.
|
# Merged by devcontainer.json; not useful on its own.
|
||||||
|
#
|
||||||
|
# NOTE: relative paths below resolve against the *project directory* -- the
|
||||||
|
# directory of the first compose file (the repo root), not this file's own
|
||||||
|
# directory. Hence "." rather than "..".
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
build:
|
build:
|
||||||
context: ..
|
context: .
|
||||||
dockerfile: .devcontainer/Dockerfile
|
dockerfile: .devcontainer/Dockerfile
|
||||||
command: sleep infinity
|
command: sleep infinity
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
volumes:
|
volumes:
|
||||||
- ..:/workspaces/v2x-server:cached
|
- .:/workspaces/v2x-server:cached
|
||||||
# Keep the Linux venv out of the macOS/Windows bind mount. Without this,
|
# Keep the Linux venv out of the macOS/Windows bind mount. Without this,
|
||||||
# host-side tooling and platform-specific wheels collide.
|
# host-side tooling and platform-specific wheels collide.
|
||||||
- venv:/workspaces/v2x-server/.venv
|
- venv:/workspaces/v2x-server/.venv
|
||||||
|
|||||||
+4
-1
@@ -81,7 +81,10 @@ ignore_missing_imports = true
|
|||||||
|
|
||||||
[tool.pytest.ini_options]
|
[tool.pytest.ini_options]
|
||||||
asyncio_mode = "auto"
|
asyncio_mode = "auto"
|
||||||
asyncio_default_fixture_loop_scope = "session"
|
# Must match the test loop scope (function). If fixtures run on a session loop
|
||||||
|
# while tests run on a per-function loop, asyncmy's loop-bound futures raise
|
||||||
|
# "attached to a different loop". aiosqlite hides this; MySQL does not.
|
||||||
|
asyncio_default_fixture_loop_scope = "function"
|
||||||
testpaths = ["tests"]
|
testpaths = ["tests"]
|
||||||
addopts = "-ra --strict-markers"
|
addopts = "-ra --strict-markers"
|
||||||
filterwarnings = ["error"]
|
filterwarnings = ["error"]
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from __future__ import annotations
|
|||||||
|
|
||||||
import datetime as dt
|
import datetime as dt
|
||||||
|
|
||||||
from pydantic import BaseModel, ConfigDict, Field
|
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
||||||
|
|
||||||
from v2x_server.models.device import DeviceStatus
|
from v2x_server.models.device import DeviceStatus
|
||||||
|
|
||||||
@@ -40,6 +40,18 @@ class DeviceRead(DeviceBase):
|
|||||||
created_at: dt.datetime
|
created_at: dt.datetime
|
||||||
updated_at: dt.datetime
|
updated_at: dt.datetime
|
||||||
|
|
||||||
|
@field_validator("created_at", "updated_at")
|
||||||
|
@classmethod
|
||||||
|
def _mark_as_utc(cls, value: dt.datetime) -> dt.datetime:
|
||||||
|
"""Attach the offset MySQL cannot store.
|
||||||
|
|
||||||
|
DATETIME columns carry no timezone, so these come back naive. Every
|
||||||
|
connection is pinned to UTC (see db/session.py), so a naive value read
|
||||||
|
from the database *is* UTC -- say so explicitly rather than emitting a
|
||||||
|
bare timestamp the client has to guess about.
|
||||||
|
"""
|
||||||
|
return value.replace(tzinfo=dt.UTC) if value.tzinfo is None else value
|
||||||
|
|
||||||
|
|
||||||
class DevicePage(BaseModel):
|
class DevicePage(BaseModel):
|
||||||
items: list[DeviceRead]
|
items: list[DeviceRead]
|
||||||
|
|||||||
@@ -101,6 +101,14 @@ class TestCrud:
|
|||||||
assert patched.json()["description"] == "original"
|
assert patched.json()["description"] == "original"
|
||||||
assert patched.json()["name"] == created["name"]
|
assert patched.json()["name"] == created["name"]
|
||||||
|
|
||||||
|
async def test_timestamps_carry_an_explicit_utc_offset(
|
||||||
|
self, client: AsyncClient, as_user: AsUser
|
||||||
|
) -> None:
|
||||||
|
"""MySQL DATETIME has no offset; the API must not emit a bare timestamp."""
|
||||||
|
as_user("operator")
|
||||||
|
created = (await client.post(PREFIX, json=_payload())).json()
|
||||||
|
assert created["created_at"].endswith(("Z", "+00:00"))
|
||||||
|
|
||||||
async def test_missing_device_is_404(self, client: AsyncClient, as_user: AsUser) -> None:
|
async def test_missing_device_is_404(self, client: AsyncClient, as_user: AsUser) -> None:
|
||||||
as_user("viewer")
|
as_user("viewer")
|
||||||
response = await client.get(f"{PREFIX}/999999")
|
response = await client.get(f"{PREFIX}/999999")
|
||||||
|
|||||||
Reference in new issue
Block a user