Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6538406db2 | |||
| e2eacbc9fe | |||
| e639cc82d1 | |||
| f2931d7be2 | |||
| d4a4ddce37 | |||
| bd384bdf5c | |||
| 411c42b2c4 | |||
| bf97849324 | |||
| 7181d41b24 | |||
| 4e9c4c5e08 | |||
| 16c959434b | |||
| 23484dc90a | |||
| 6a81a52a50 | |||
| 5a4b9a98bd | |||
| f7f88156e1 | |||
| 8af5a49d14 |
@@ -147,6 +147,8 @@ Expected: one row, `role = 'groomer'`. If zero rows return, the request hit the
|
||||
| TC-API-3.19b | Get pet profile summary — customer cross-tenant blocked (GRO-2013) | Sign in as `uat-customer@groombook.dev`; reuse the customer's sessionId from TC-API-3.19a; `GET /api/pets/{otherClientPetId}/profile-summary` for a pet owned by a different client (`c0000002-...` or any non-customer pet) | 403 Forbidden (owner-bypass requires session.clientId === pet.clientId) |
|
||||
| TC-API-3.19c | Get pet profile summary — customer without portal session header | Same as TC-API-3.19a but omit the `X-Impersonation-Session-Id` header | 403 Forbidden (no owner-bypass without valid portal session) |
|
||||
| TC-API-3.19d | Get pet profile summary — owner-bypass writes audit row (GRO-2063) | Same setup as TC-API-3.19a (sign in as `uat-customer@groombook.dev`, establish a portal session for the customer's own clientId, call `GET /api/pets/{ownPetId}/profile-summary` with `X-Impersonation-Session-Id: {sessionId}` and a 200 OK response). Then call `GET /api/impersonation/sessions/{sessionId}/audit-log` and confirm there is exactly one entry with `action === "read_profile_summary"`, `pageVisited` matching the profile-summary path, and `metadata` containing `petId` and `actorStaffId` for the customer. Repeat TC-API-3.19b (cross-tenant attempt) and confirm NO new `read_profile_summary` row was written for the cross-tenant attempt. | 200 OK on the profile-summary call AND an audit log entry is present with the correct shape (defense-in-depth audit row; bypass attempts against other clients must NOT log) |
|
||||
| TC-UAT-2 | Groomer accesses linked pet profile summary (GRO-2100) | Sign in as `uat-groomer@groombook.dev`; `GET /api/pets/c0000001-0000-0000-0000-000000000002/profile-summary` (UAT Pup Alpha — linked via deterministic completed appointment `a0000001-0000-0000-0000-000000000001`, service `b0000001-…-0001` "Bath & Brush", `startTime` ~7 days ago) | 200 OK, `recentGroomingHistory[]` non-empty (>=1 entry), `visitCount >= 1`, `upcomingAppointment` null (the seeded appointment is in the past) |
|
||||
| TC-UAT-3 | Groomer blocked from unlinked pet profile summary (GRO-2100) | Sign in as `uat-groomer@groombook.dev`; `GET /api/pets/c0000001-0000-0000-0000-000000000003/profile-summary` (UAT Pup Beta — intentionally UNLINKED; no appointment row references this pet's clientId+groomerId combo) | 403 Forbidden (RBAC `groomer` role lacks the appointment-linkage grant for this pet). NOTE: if 404 is returned instead of 403, file a separate RBAC defect (not against the seed) — see GRO-2100 verification note |
|
||||
| TC-API-3.29 | Get pet profile summary — unknown UUID returns 404 (GRO-2014) | GET /api/pets/00000000-0000-0000-0000-000000000001/profile-summary while authenticated (any role) | 404 Not Found with body `{"error":"Not found"}` (was empty-body 500 in GRO-2014) |
|
||||
| TC-API-3.30 | Get pet profile summary — malformed UUID returns 404 (GRO-2014) | GET /api/pets/not-a-uuid/profile-summary while authenticated | 404 Not Found with body `{"error":"Not found"}` (was empty-body 500 in GRO-2014 — Postgres uuid cast failure) |
|
||||
| TC-API-3.31 | Get pet profile summary — never empty-body 500 (GRO-2014) | GET /api/pets/{anyId}/profile-summary across the test sweep | No response has status 500 with an empty body. Any 500 must include a JSON body `{"error":"Internal Server Error"}` |
|
||||
|
||||
@@ -18,10 +18,9 @@
|
||||
"scripts": {
|
||||
"build": "tsc --project .",
|
||||
"generate": "drizzle-kit generate",
|
||||
"wait-for-db": "node ./scripts/wait-for-db.mjs",
|
||||
"migrate": "node ./scripts/wait-for-db.mjs && drizzle-kit migrate",
|
||||
"seed": "node ./scripts/wait-for-db.mjs && tsx src/seed.ts",
|
||||
"reset": "node ./scripts/wait-for-db.mjs && tsx src/reset.ts && drizzle-kit migrate && tsx src/seed.ts",
|
||||
"migrate": "drizzle-kit migrate",
|
||||
"seed": "tsx src/seed.ts",
|
||||
"reset": "tsx src/reset.ts && drizzle-kit migrate && tsx src/seed.ts",
|
||||
"studio": "drizzle-kit studio",
|
||||
"typecheck": "tsc --noEmit"
|
||||
},
|
||||
|
||||
@@ -1,104 +0,0 @@
|
||||
#!/usr/bin/env node
|
||||
// wait-for-db.mjs
|
||||
//
|
||||
// GRO-2163: wait for / retry DNS resolution of the database hostname derived
|
||||
// from DATABASE_URL before invoking `drizzle-kit migrate`. The first attempt
|
||||
// of a fresh migrate-schema pod occasionally hits a transient CoreDNS miss
|
||||
// (EAI_AGAIN) on `groombook-postgres-rw.<ns>.svc`; with backoffLimit: 2 the
|
||||
// retry pod usually wins, but three unlucky attempts in a row trips
|
||||
// BackoffLimitExceeded. Resolving once here, with backoff, removes the dice
|
||||
// roll at the source so the first attempt reliably succeeds.
|
||||
//
|
||||
// Mirrors the belt-and-braces pattern used in GRO-1985 (no Corepack
|
||||
// download fallback): we don't try to outsmart CoreDNS, we just don't ask
|
||||
// drizzle-kit to do the very first DNS lookup of a freshly-scheduled pod.
|
||||
//
|
||||
// Configuration (env):
|
||||
// WAIT_FOR_DB_MAX_ATTEMPTS default 12 (~30s of total wait at default backoff)
|
||||
// WAIT_FOR_DB_BASE_DELAY_MS default 500
|
||||
// WAIT_FOR_DB_MAX_DELAY_MS default 5000
|
||||
// WAIT_FOR_DB_SKIP default unset; set to "1" to skip (debug only)
|
||||
//
|
||||
// On success: exit 0. On exhaustion: exit 1 so the Job's backoff is
|
||||
// preserved (we don't want to silently mask a real outage by giving up
|
||||
// after 30s and letting drizzle-kit fail with a less-actionable error).
|
||||
|
||||
import { setTimeout as delay } from "node:timers/promises";
|
||||
import dns from "node:dns/promises";
|
||||
|
||||
const MAX_ATTEMPTS = Number(process.env.WAIT_FOR_DB_MAX_ATTEMPTS ?? 12);
|
||||
const BASE_DELAY_MS = Number(process.env.WAIT_FOR_DB_BASE_DELAY_MS ?? 500);
|
||||
const MAX_DELAY_MS = Number(process.env.WAIT_FOR_DB_MAX_DELAY_MS ?? 5000);
|
||||
|
||||
function parseHost(databaseUrl) {
|
||||
try {
|
||||
return new URL(databaseUrl).hostname || null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
async function resolveOnce(host) {
|
||||
const start = Date.now();
|
||||
const result = await dns.lookup(host);
|
||||
return { address: result.address, ms: Date.now() - start };
|
||||
}
|
||||
|
||||
async function main() {
|
||||
if (process.env.WAIT_FOR_DB_SKIP === "1") {
|
||||
console.log("[wait-for-db] WAIT_FOR_DB_SKIP=1, skipping");
|
||||
return;
|
||||
}
|
||||
const databaseUrl = process.env.DATABASE_URL;
|
||||
if (!databaseUrl) {
|
||||
// Don't gate the migrate on a misconfigured env — let drizzle-kit fail
|
||||
// loudly with its own clear error.
|
||||
console.warn("[wait-for-db] DATABASE_URL not set; skipping");
|
||||
return;
|
||||
}
|
||||
const host = parseHost(databaseUrl);
|
||||
if (!host) {
|
||||
console.warn(`[wait-for-db] could not parse hostname from DATABASE_URL; skipping`);
|
||||
return;
|
||||
}
|
||||
console.log(
|
||||
`[wait-for-db] host=${host} max_attempts=${MAX_ATTEMPTS} ` +
|
||||
`base_delay_ms=${BASE_DELAY_MS} max_delay_ms=${MAX_DELAY_MS}`,
|
||||
);
|
||||
|
||||
for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
|
||||
try {
|
||||
const { address, ms } = await resolveOnce(host);
|
||||
console.log(`[wait-for-db] ok attempt=${attempt} host=${host} -> ${address} (${ms}ms)`);
|
||||
return;
|
||||
} catch (err) {
|
||||
const code = err?.code ?? "UNKNOWN";
|
||||
const transient = code === "EAI_AGAIN" || code === "ENOTFOUND" || code === "EAI_NODATA";
|
||||
if (!transient) {
|
||||
// Hard error (e.g. invalid hostname): surface and let drizzle-kit fail
|
||||
// with a real error rather than spinning.
|
||||
console.error(`[wait-for-db] non-transient DNS error attempt=${attempt} code=${code}: ${err.message}`);
|
||||
process.exit(1);
|
||||
}
|
||||
if (attempt === MAX_ATTEMPTS) {
|
||||
console.error(
|
||||
`[wait-for-db] exhausted attempts=${MAX_ATTEMPTS} host=${host} last_code=${code}; exiting 1`,
|
||||
);
|
||||
process.exit(1);
|
||||
}
|
||||
const backoff = Math.min(
|
||||
MAX_DELAY_MS,
|
||||
BASE_DELAY_MS * 2 ** (attempt - 1) + Math.floor(Math.random() * BASE_DELAY_MS),
|
||||
);
|
||||
console.log(
|
||||
`[wait-for-db] transient attempt=${attempt} code=${code} retry_in_ms=${backoff}`,
|
||||
);
|
||||
await delay(backoff);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
main().catch((err) => {
|
||||
console.error(`[wait-for-db] fatal: ${err?.message ?? err}`);
|
||||
process.exit(1);
|
||||
});
|
||||
Reference in New Issue
Block a user