feat(api): M4.2 — REST surface + pgx Postgres store + OpenAPI 3.1

Full M4.2 deliverable: 16 endpoints (tenants CRUD + lifecycle, catalog, entitlements, API keys with argon2 hashing, audit append + filter), Store interface with pgx-backed Postgres + in-memory parallel implementations exercised by the same eachStore harness, openapi.yaml at 3.1 with kin-openapi contract test. M4.3 adds auth.

Refs: M4.2

internal/server/server.go

@@ -1,106 +1,71 @@
+// Package server wires the HTTP surface for tenant-registry.
+//
+// All routes are registered in NewRouter; per-concern handlers live in
+// peer files (tenants.go, catalog.go, apikeys.go, audit.go).
 package server
 
 import (
-	"context"
-	"encoding/json"
-	"errors"
 	"log/slog"
 	"net/http"
-	"time"
 
 	"gitea.meghsakha.com/platform/tenant-registry/internal/config"
 	"gitea.meghsakha.com/platform/tenant-registry/internal/store"
 )
 
-type deps struct {
-	cfg    *config.Config
-	log    *slog.Logger
-	tenant *store.Memory
+// Server bundles the dependencies every handler needs.
+type Server struct {
+	Cfg   *config.Config
+	Log   *slog.Logger
+	Store store.Store
 }
 
-func NewRouter(cfg *config.Config, log *slog.Logger) http.Handler {
-	d := &deps{cfg: cfg, log: log, tenant: store.NewMemory()}
-
+// NewRouter builds the http.Handler with logging middleware applied.
+func NewRouter(s *Server) http.Handler {
 	mux := http.NewServeMux()
-	mux.HandleFunc("GET /healthz", d.healthz)
-	mux.HandleFunc("GET /v1/tenants/by-slug/{slug}", d.tenantBySlug)
-	mux.HandleFunc("GET /v1/tenants/{id}", d.tenantByID)
 
-	return logRequest(log)(mux)
+	// health + status
+	mux.HandleFunc("GET /healthz", s.healthz)
+	mux.HandleFunc("GET /readyz", s.readyz)
+
+	// tenants
+	mux.HandleFunc("POST /v1/tenants", s.createTenant)
+	mux.HandleFunc("GET /v1/tenants/{id}", s.getTenant)
+	mux.HandleFunc("GET /v1/tenants/by-slug/{slug}", s.getTenantBySlug)
+	mux.HandleFunc("POST /v1/tenants/{id}/activate", s.activateTenant)
+	mux.HandleFunc("POST /v1/tenants/{id}/cancel", s.cancelTenant)
+
+	// entitlements — top-level path so it doesn't conflict with
+	// /v1/tenants/by-slug/{slug} (Go 1.22 ServeMux can't disambiguate
+	// /v1/tenants/{id}/products vs /v1/tenants/by-slug/{slug=products}).
+	mux.HandleFunc("GET /v1/entitlements", s.listTenantProducts)
+
+	// catalog
+	mux.HandleFunc("GET /v1/catalog", s.getCatalog)
+	mux.HandleFunc("POST /v1/catalog/request", s.catalogRequest)
+	mux.HandleFunc("POST /v1/catalog/trial-request", s.catalogTrialRequest)
+
+	// api keys — same disambiguation: list lives at /v1/api-keys?tenant_id=X
+	// instead of /v1/tenants/{id}/api-keys.
+	mux.HandleFunc("POST /v1/api-keys", s.createAPIKey)
+	mux.HandleFunc("GET /v1/api-keys", s.listAPIKeys)
+	mux.HandleFunc("DELETE /v1/api-keys/{id}", s.revokeAPIKey)
+	mux.HandleFunc("POST /v1/internal/api-keys/verify", s.verifyAPIKey)
+
+	// audit
+	mux.HandleFunc("POST /v1/audit", s.appendAudit)
+	mux.HandleFunc("GET /v1/audit", s.listAudit)
+
+	return logRequest(s.Log)(mux)
 }
 
-func (d *deps) healthz(w http.ResponseWriter, _ *http.Request) {
+func (s *Server) healthz(w http.ResponseWriter, _ *http.Request) {
 	writeJSON(w, http.StatusOK, map[string]string{"status": "ok"})
 }
 
-func (d *deps) tenantBySlug(w http.ResponseWriter, r *http.Request) {
-	slug := r.PathValue("slug")
-	ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second)
-	defer cancel()
-
-	t, err := d.tenant.BySlug(ctx, slug)
-	if errors.Is(err, store.ErrNotFound) {
-		writeError(w, http.StatusNotFound, "tenant_not_found", "no tenant with that slug")
+func (s *Server) readyz(w http.ResponseWriter, r *http.Request) {
+	if err := s.Store.Ping(r.Context()); err != nil {
+		writeError(w, http.StatusServiceUnavailable, "store_unavailable", err.Error())
 		return
 	}
-	if err != nil {
-		d.log.Error("tenant lookup failed", "err", err)
-		writeError(w, http.StatusInternalServerError, "internal", "lookup failed")
-		return
-	}
-	writeJSON(w, http.StatusOK, t)
-}
-
-func (d *deps) tenantByID(w http.ResponseWriter, r *http.Request) {
-	id := r.PathValue("id")
-	ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second)
-	defer cancel()
-
-	t, err := d.tenant.ByID(ctx, id)
-	if errors.Is(err, store.ErrNotFound) {
-		writeError(w, http.StatusNotFound, "tenant_not_found", "no tenant with that id")
-		return
-	}
-	if err != nil {
-		d.log.Error("tenant lookup failed", "err", err)
-		writeError(w, http.StatusInternalServerError, "internal", "lookup failed")
-		return
-	}
-	writeJSON(w, http.StatusOK, t)
-}
-
-func writeJSON(w http.ResponseWriter, code int, body any) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(code)
-	_ = json.NewEncoder(w).Encode(body)
-}
-
-func writeError(w http.ResponseWriter, code int, kind, msg string) {
-	writeJSON(w, code, map[string]string{"error": kind, "message": msg})
-}
-
-func logRequest(log *slog.Logger) func(http.Handler) http.Handler {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			start := time.Now()
-			ww := &statusRecorder{ResponseWriter: w, code: 200}
-			next.ServeHTTP(ww, r)
-			log.Info("http",
-				"method", r.Method,
-				"path", r.URL.Path,
-				"status", ww.code,
-				"duration_ms", time.Since(start).Milliseconds(),
-			)
-		})
-	}
-}
-
-type statusRecorder struct {
-	http.ResponseWriter
-	code int
-}
-
-func (s *statusRecorder) WriteHeader(c int) {
-	s.code = c
-	s.ResponseWriter.WriteHeader(c)
+	writeJSON(w, http.StatusOK, map[string]string{"status": "ready"})
 }