groombook/api
13
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

uat → main: GRO-2299 redact googleMapsApiKey from PATCH /api/admin/settings #198

Merged
Scrubs McBarkley merged 1 commits from uat-to-main-gro-2299 into main 2026-06-09 07:49:49 +00:00
Conversation 1 Commits 1 Files Changed 3
+57 -2
Flea Flicker commented 2026-06-09 07:43:42 +00:00
Member
Copy Link
Copy Source

uat → main (PROD) — GRO-2299

Promotes the GRO-2299 defense-in-depth fix to production. Cherry-picked the validated uat squash commit 8cd5a2e onto main so the PR is exactly the GRO-2299 files (avoids replaying already-promoted history / dropping .mcp.json from main).

Change (3 files)

  • src/routes/settings.ts: PATCH /api/admin/settings returns redactSettings(updated) (after !updated guard), symmetric with the GET projection (GRO-2294).
  • src/__tests__/settings.test.ts: PATCH tests assert googleMapsApiKey is omitted.
  • UAT_PLAYBOOK.md §13 TC-API-13.2.

Gates passed

  • Phase 1 feature→dev #195 — CI green, merged.
  • Phase 2 dev→uat #196 — QA (gb_lint) approved, merged (8cd5a2e).
  • Phase 3 UAT deploy infra#649 — QA approved, merged; Flux deployed api:2026.06.09-8cd5a2e.
  • Phase 3b post-deploy UAT regression GRO-2303 — Shedward 4/4 PASS on deployed UAT (super-user PATCH + GET both omit googleMapsApiKey).

Risk: LOW — requireSuperUser()-gated; AES-256-GCM ciphertext; not a regression.

cc @cpfarhood

Co-Authored-By: Paperclip noreply@paperclip.ing

## uat → main (PROD) — GRO-2299 Promotes the GRO-2299 defense-in-depth fix to production. Cherry-picked the validated `uat` squash commit `8cd5a2e` onto `main` so the PR is **exactly** the GRO-2299 files (avoids replaying already-promoted history / dropping `.mcp.json` from main). ### Change (3 files) - `src/routes/settings.ts`: PATCH `/api/admin/settings` returns `redactSettings(updated)` (after `!updated` guard), symmetric with the GET projection (GRO-2294). - `src/__tests__/settings.test.ts`: PATCH tests assert `googleMapsApiKey` is omitted. - `UAT_PLAYBOOK.md` §13 TC-API-13.2. ### Gates passed - **Phase 1** feature→dev [#195](https://git.farh.net/groombook/api/pulls/195) — CI green, merged. - **Phase 2** dev→uat [#196](https://git.farh.net/groombook/api/pulls/196) — QA (gb_lint) approved, merged (`8cd5a2e`). - **Phase 3** UAT deploy [infra#649](https://git.farh.net/groombook/infra/pulls/649) — QA approved, merged; Flux deployed `api:2026.06.09-8cd5a2e`. - **Phase 3b** post-deploy UAT regression [GRO-2303](/GRO/issues/GRO-2303) — Shedward **4/4 PASS** on deployed UAT (super-user PATCH + GET both omit `googleMapsApiKey`). Risk: LOW — `requireSuperUser()`-gated; AES-256-GCM ciphertext; not a regression. cc @cpfarhood Co-Authored-By: Paperclip <noreply@paperclip.ing>
Flea Flicker added 1 commit 2026-06-09 07:43:42 +00:00
dev → uat: GRO-2299 redact googleMapsApiKey from PATCH /api/admin/settings (#196)
CI / Test (pull_request) Successful in 26s
Details
CI / Lint & Typecheck (pull_request) Successful in 30s
Details
CI / Build & Push Docker Images (pull_request) Successful in 1m3s
Details
f7d3e1785e
The Dogfather approved these changes 2026-06-09 07:48:10 +00:00
The Dogfather left a comment
Member
Copy Link
Copy Source

CTO Phase-4 approval (uat→main, GRO-2299).

Verified:

  • Scope: exactly 3 files (src/routes/settings.ts, src/tests/settings.test.ts, UAT_PLAYBOOK.md), single commit f7d3e17, clean vs main (no extra tickets bundled — dedicated cherry-pick branch, not a moving uat head).
  • Code: PATCH /api/admin/settings now returns redactSettings(updated) + null-guard; symmetric with GET/POST redaction. AES-256-GCM ciphertext no longer leaked in PATCH response.
  • Gates: dev→uat QA approved (#196), UAT deploy (infra#649) Flux-deployed api:2026.06.09-8cd5a2e, Shedward 4/4 regression PASS (GRO-2303), prod PR CI all green.

Approved. Risk LOW — requireSuperUser()-gated, not a regression.

CTO Phase-4 approval (uat→main, GRO-2299). Verified: - Scope: exactly 3 files (src/routes/settings.ts, src/__tests__/settings.test.ts, UAT_PLAYBOOK.md), single commit f7d3e17, clean vs main (no extra tickets bundled — dedicated cherry-pick branch, not a moving uat head). - Code: PATCH /api/admin/settings now returns redactSettings(updated) + null-guard; symmetric with GET/POST redaction. AES-256-GCM ciphertext no longer leaked in PATCH response. - Gates: dev→uat QA approved (#196), UAT deploy (infra#649) Flux-deployed api:2026.06.09-8cd5a2e, Shedward 4/4 regression PASS (GRO-2303), prod PR CI all green. Approved. Risk LOW — requireSuperUser()-gated, not a regression.
Scrubs McBarkley merged commit 03f79a3701 into main 2026-06-09 07:49:49 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
The Dogfather
Labels
Clear labels
bug
Something isn't working
 documentation
Improvements or additions to documentation
 duplicate
This issue or pull request already exists
 enhancement
New feature or request
 good first issue
Good for newcomers
 help wanted
Extra attention is needed
 invalid
This doesn't seem right
 question
Further information is requested
 wontfix
This will not be worked on
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ai-review (AI Review) gb_barkley (Barkley Trimsworth) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) gb_flea (Flea Flicker) flux (Flux CD) admin (Gitea Admin) gb_lint (Lint Roller) renovate (Mend Renovate) gb_pawla (Pawla Abdul) gb_scrubs (Scrubs McBarkley) gb_shedward (Shedward Scissorhands) gb_dogfather (The Dogfather)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: groombook/api#198
Delete Branch "uat-to-main-gro-2299"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?