All checks were successful
PR build (required check) / changes (pull_request) Successful in 6s
secrets-guard / encrypted (pull_request) Successful in 7s
PR build (required check) / build-backend (pull_request) Has been skipped
shell-lint / shellcheck (pull_request) Successful in 7s
PR build (required check) / validate-observability (pull_request) Has been skipped
PR build (required check) / build-frontend (pull_request) Successful in 1m0s
PR build (required check) / gate (pull_request) Successful in 2s
Ports frontend/ (Jinja2/FastAPI, ~1180 LOC) to Go with html/template. No climate math, no DB, no auth here -- every route fetches from the backend's /content/* API, so this is I/O-bound glue with no hard-porting wall; the risk was always in reproducing the rendering exactly, not the language. Verified with a golden-HTML diff, not just unit tests: both the Python original and the Go rewrite were run against the same committed fixtures (frontend/tests/fixtures/) and every one of the 11 routes compared byte-for-byte. The only surviving differences after that process are insignificant inter-tag whitespace and one attribute where Go's stricter escaper HTML-encodes an apostrophe Jinja left literal (functionally identical in every browser) -- confirmed programmatically by normalizing whitespace and unescaping before diffing, not by eyeballing. That process caught defects unit tests alone would have missed, because map[string]any has no compile-time field check: - Render-context keys were snake_case throughout (content.py's Jinja convention, ported verbatim) while the templates -- written independently -- read PascalCase fields. A missing map key doesn't error in html/template, it silently renders empty, so this was invisible in every status code and every "it built" signal: title, meta description, canonical URL, OpenGraph tags, the homepage's entire ranked list, and the brand-tag/nav-active state were all blank across every page. Fixed by renaming every key to match each template's own header comment (the authoritative per-page field contract) and, where an API struct's exported fields already matched what a template needed (contentapi.CityInfo, Crumb, HomeRanked, HubCountry, ...), passing the struct straight through instead of hand-rewrapping it in a map -- removes a whole layer of future drift risk, not just this instance of it. - Three pages 500'd outright: `.ToolHref` needed a fully-composed href string, not the bare "lat,lon" fragment the handlers were building; the all-time-records table needed the raw contentapi.AllTimeRecords struct, not a re-wrapped map. - JSON-LD was being double-encoded: `<script type="application/ld+json">` is JAVASCRIPT context to html/template's contextual escaper regardless of the script's `type` attribute, so a template.HTML-typed value placed there gets re-escaped as a quoted JS string instead of emitted raw -- the entire structured-data payload shipped as a JSON string containing JSON, which no crawler would parse as the intended object. Needed template.JS instead, the type that actually means "trusted JS source." The glossary term page's JSON-LD was simply never built at all (the Jinja original assembled it inline in the template rather than through content.py's context dict, and that got lost in translation) -- added. - html/template silently strips literal HTML comments AND JavaScript comments from the parsed output (verified in isolation, zero template actions involved) -- confirmed as real engine behavior, not a bug in either port, so both need a FuncMap function returning template.HTML / template.JS respectively to survive parsing rather than a literal `<!-- -->` or `//` in the template source. Packaging: multi-stage Go build, final image alpine (not distroless -- the Swarm stack's env-entrypoint.sh shim needs bash), 187MB -> 22.6MB. Two defects caught before they reached a host: - The Swarm stack overrides `entrypoint:` with no `command:`, which drops the image's own CMD entirely (Docker/Swarm semantics, not merged) -- env-entrypoint.sh then fell through to its hardcoded `exec uvicorn app:app` fallback, which doesn't exist in this image. Every deploy would have exited 127. Fixed with an explicit `command:` on the stack's frontend service, and corrected the shim's stale comment claiming CMD passes through automatically. - `COPY --chown=thermograph` resolves the group by NAME at copy time; Alpine's `adduser -S` with no `-G` doesn't create a same-named group, so the classic (non-BuildKit) Docker builder -- which this CI runner falls back to, since it installs plain `docker.io` with no buildx plugin -- failed outright. Fixed with an explicit group and numeric --chown. Verification: go build/vet/test -race clean across all packages; the Docker image builds and passes its embedded go test step under both BuildKit and the classic builder; shellcheck 0 findings on the one script touched; rebased onto current main (the ERA5 lake stack landed on both main and dev during this work -- confirmed additive, no overlap with frontend/daemon).
136 lines
5.5 KiB
Go
136 lines
5.5 KiB
Go
// Package render wires the HTML template engine: an embed.FS of templates
|
|
// (self-contained binary — no template files to ship beside it), a Render
|
|
// helper, and the FuncMap seam the template/format port fills in.
|
|
//
|
|
// The templates themselves are owned elsewhere (the Jinja -> html/template
|
|
// port); this package only establishes HOW they are parsed and executed:
|
|
//
|
|
// - Files live in internal/render/templates/*.tmpl and are named by base
|
|
// filename (html/template's ParseFS convention), e.g. "city.html.tmpl".
|
|
// Jinja's {% extends %}/{% block %} maps to {{define}}/{{template}} with a
|
|
// shared base layout; each page template {{define}}s the blocks the base
|
|
// references and is executed by its own file name.
|
|
// - Formatting helpers arrive via the FuncMap passed to New. html/template
|
|
// FuncMaps are engine-global, so anything unit-scoped (the Python used a
|
|
// ContextVar the handlers set per request — format.py's unit_scope) must
|
|
// NOT be a bare FuncMap closure over mutable state; either pre-format in
|
|
// the handler (content.py already did for most values) or pass a
|
|
// formatter value in the render data and call its methods.
|
|
//
|
|
// It also owns the response-side ETag behavior ported from content.py's
|
|
// _respond_html and app.py's _page: a weak SHA-1 ETag over the rendered
|
|
// bytes, and the two If-None-Match comparison flavors the Python had.
|
|
package render
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/sha1"
|
|
"embed"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"html/template"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
)
|
|
|
|
//go:embed templates
|
|
var templatesFS embed.FS
|
|
|
|
// Engine holds the parsed template set. Templates only change on a redeploy
|
|
// (a fresh process), so everything is parsed exactly once, at New — the Go
|
|
// analogue of the Jinja environment's auto_reload=False.
|
|
type Engine struct {
|
|
t *template.Template
|
|
}
|
|
|
|
// New parses every embedded template with the given FuncMap. Call it once at
|
|
// boot with the full FuncMap — the function NAMES must all be registered
|
|
// before parsing, because html/template resolves them at parse time.
|
|
//
|
|
// The FuncMap keys the templates rely on (the Jinja globals/filters
|
|
// content.py registered; implementations come from the format port):
|
|
//
|
|
// "temp" func(f *float64) template.HTML — <span class="temp" …>N°F</span>
|
|
// "temp_bare" func(f *float64) template.HTML — bare-degree variant
|
|
// "temp_class" func(f *float64) string — diverging-palette tier name
|
|
// "ordinal" func(pct any) string — percentile -> "66th", floored into 1..99
|
|
// "head_verify" func() template.HTML — search-console <meta> tags
|
|
// "comment" func(s string) template.HTML — a visible <!-- --> that
|
|
// survives parsing (html/template strips literal HTML
|
|
// comments; wrapping the string template.HTML inserts it as
|
|
// trusted content instead of markup the parser interprets)
|
|
// "jscomment" func(s string) template.JS — a visible "// ..." line
|
|
// that survives inside <script> (html/template ALSO strips
|
|
// literal JS comments there; needs template.JS specifically,
|
|
// not template.HTML, which gets re-escaped as a JS value)
|
|
func New(funcs template.FuncMap) (*Engine, error) {
|
|
t, err := template.New("").Funcs(funcs).ParseFS(templatesFS, "templates/*.tmpl")
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parse templates: %w", err)
|
|
}
|
|
return &Engine{t: t}, nil
|
|
}
|
|
|
|
// Render executes template `name` (its base filename, e.g. "city.html.tmpl")
|
|
// into w.
|
|
func (e *Engine) Render(w io.Writer, name string, data any) error {
|
|
return e.t.ExecuteTemplate(w, name, data)
|
|
}
|
|
|
|
// RenderBytes executes into memory. Page handlers need the full body anyway
|
|
// (the ETag is a hash of the rendered HTML), so this is the primary entry.
|
|
func (e *Engine) RenderBytes(name string, data any) ([]byte, error) {
|
|
var buf bytes.Buffer
|
|
if err := e.t.ExecuteTemplate(&buf, name, data); err != nil {
|
|
return nil, err
|
|
}
|
|
return buf.Bytes(), nil
|
|
}
|
|
|
|
// ETag computes the weak ETag the Python stamped on every rendered page:
|
|
// W/"<first 20 hex chars of sha1(body)>".
|
|
func ETag(body []byte) string {
|
|
sum := sha1.Sum(body)
|
|
return `W/"` + hex.EncodeToString(sum[:])[:20] + `"`
|
|
}
|
|
|
|
// NotModifiedAny reports whether the If-None-Match header value matches etag
|
|
// under content.py's _respond_html semantics: the header is split on commas
|
|
// and each candidate whitespace-trimmed (a browser may send several).
|
|
func NotModifiedAny(ifNoneMatch, etag string) bool {
|
|
if ifNoneMatch == "" {
|
|
return false
|
|
}
|
|
for _, cand := range strings.Split(ifNoneMatch, ",") {
|
|
if strings.TrimSpace(cand) == etag {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// NotModifiedExact reports whether the header exactly equals etag — app.py's
|
|
// _page (SPA shells) compared the raw header, no splitting. Kept separate so
|
|
// the port preserves each route's precise behavior.
|
|
func NotModifiedExact(ifNoneMatch, etag string) bool {
|
|
return ifNoneMatch != "" && ifNoneMatch == etag
|
|
}
|
|
|
|
// WriteHTML writes a rendered page with its ETag, answering a matching
|
|
// If-None-Match with an empty 304 (content.py's comma-set semantics). The
|
|
// Content-Type matches the Python service's exactly.
|
|
func WriteHTML(w http.ResponseWriter, r *http.Request, body []byte) {
|
|
etag := ETag(body)
|
|
h := w.Header()
|
|
h.Set("ETag", etag)
|
|
if NotModifiedAny(r.Header.Get("If-None-Match"), etag) {
|
|
w.WriteHeader(http.StatusNotModified)
|
|
return
|
|
}
|
|
h.Set("Content-Type", "text/html; charset=utf-8")
|
|
w.WriteHeader(http.StatusOK)
|
|
if r.Method != http.MethodHead {
|
|
w.Write(body)
|
|
}
|
|
}
|