fix: complete post-merge product, dashboard header, and security follow-ups

cmd/slogen/main.go

@@ -21,48 +21,19 @@
 package main
 
 import (
-	"bufio"
 	"fmt"
 	"os"
-	"regexp"
-	"strconv"
-	"strings"
-)
 
-const (
-	requiredVersion = 1
-	indentUnit      = "  "
+	"github.com/ev-dev-labs/teslasync/internal/slo/catalogparser"
 )
 
 // Catalog mirrors the strict YAML subset described above and the JSON
 // Schema in slo/catalog.schema.json.
-type Catalog struct {
-	Version int
-	SLOs    []SLO
-}
+type Catalog = catalogparser.Catalog
 
-type SLO struct {
-	Name             string
-	Description      string
-	SLI              SLI
-	Objective        float64
-	Window           string
-	Owner            string
-	FastBurnSeverity string
-	Tags             []string
+type SLO = catalogparser.SLO
 
-	line int // 1-based line number of the `- name:` marker, used in errors.
-}
-
-type SLI struct {
-	GoodEvents  string
-	ValidEvents string
-}
-
-var (
-	nameRE   = regexp.MustCompile(`^[a-z][a-z0-9_]*$`)
-	windowRE = regexp.MustCompile(`^[0-9]+[mhdw]$`)
-)
+type SLI = catalogparser.SLI
 
 func main() {
 	if len(os.Args) < 2 {
@@ -116,272 +87,9 @@ func validateFile(path string) error {
 }
 
 func validateCatalog(c *Catalog) error {
-	if c.Version != requiredVersion {
-		return fmt.Errorf("version: got %d want %d", c.Version, requiredVersion)
-	}
-	if len(c.SLOs) == 0 {
-		return fmt.Errorf("slos: at least one entry required")
-	}
-	seen := make(map[string]struct{}, len(c.SLOs))
-	for i, s := range c.SLOs {
-		if err := validateSLO(i, s); err != nil {
-			return err
-		}
-		if _, dup := seen[s.Name]; dup {
-			return fmt.Errorf("slos[%d] (line %d).name: %q duplicates earlier entry", i, s.line, s.Name)
-		}
-		seen[s.Name] = struct{}{}
-	}
-	return nil
+	return catalogparser.Validate(c)
 }
 
-func validateSLO(idx int, s SLO) error {
-	tag := func(field string) string {
-		return fmt.Sprintf("slos[%d] (line %d).%s", idx, s.line, field)
-	}
-	if !nameRE.MatchString(s.Name) {
-		return fmt.Errorf("%s: %q must match %s", tag("name"), s.Name, nameRE)
-	}
-	if len(s.Description) < 10 {
-		return fmt.Errorf("%s: must be >= 10 chars", tag("description"))
-	}
-	if s.SLI.GoodEvents == "" {
-		return fmt.Errorf("%s: required", tag("sli.good_events"))
-	}
-	if s.SLI.ValidEvents == "" {
-		return fmt.Errorf("%s: required", tag("sli.valid_events"))
-	}
-	if s.Objective <= 0 || s.Objective >= 100 {
-		return fmt.Errorf("%s: %v must be in (0, 100)", tag("objective"), s.Objective)
-	}
-	if !windowRE.MatchString(s.Window) {
-		return fmt.Errorf("%s: %q must match %s", tag("window"), s.Window, windowRE)
-	}
-	if s.Owner == "" {
-		return fmt.Errorf("%s: required", tag("owner"))
-	}
-	if s.FastBurnSeverity != "" && s.FastBurnSeverity != "page" && s.FastBurnSeverity != "ticket" {
-		return fmt.Errorf("%s: %q must be page or ticket", tag("fast_burn_severity"), s.FastBurnSeverity)
-	}
-	tagSet := make(map[string]struct{}, len(s.Tags))
-	for _, t := range s.Tags {
-		if t == "" {
-			return fmt.Errorf("%s: empty tag forbidden", tag("tags"))
-		}
-		if _, dup := tagSet[t]; dup {
-			return fmt.Errorf("%s: duplicate %q", tag("tags"), t)
-		}
-		tagSet[t] = struct{}{}
-	}
-	return nil
-}
-
-// parseCatalog implements a small, strict YAML parser tailored to the
-// catalogue layout. The parser rejects any structure that does not match
-// the documented subset (no block scalars, no flow maps, two-space
-// indentation only).
 func parseCatalog(text string) (*Catalog, error) {
-	c := &Catalog{}
-	scanner := bufio.NewScanner(strings.NewReader(text))
-	scanner.Buffer(make([]byte, 0, 64*1024), 1<<20)
-
-	versionSeen := false
-	inSLOs := false
-	var current *SLO
-	var inSLI bool
-	lineNum := 0
-
-	for scanner.Scan() {
-		lineNum++
-		raw := scanner.Text()
-		line := stripComment(raw)
-		if strings.TrimSpace(line) == "" {
-			continue
-		}
-
-		// Top-level keys: version: / slos:
-		if !strings.HasPrefix(line, " ") {
-			head, val, _ := strings.Cut(line, ":")
-			head = strings.TrimSpace(head)
-			val = strings.TrimSpace(val)
-			switch head {
-			case "version":
-				if val == "" {
-					return nil, fmt.Errorf("line %d: version requires a value", lineNum)
-				}
-				v, err := strconv.Atoi(val)
-				if err != nil {
-					return nil, fmt.Errorf("line %d: version: %w", lineNum, err)
-				}
-				c.Version = v
-				versionSeen = true
-				inSLOs = false
-				current = nil
-			case "slos":
-				if val != "" {
-					return nil, fmt.Errorf("line %d: slos must be a block mapping (no inline value)", lineNum)
-				}
-				inSLOs = true
-				current = nil
-			default:
-				return nil, fmt.Errorf("line %d: unknown top-level key %q", lineNum, head)
-			}
-			continue
-		}
-
-		if !inSLOs {
-			return nil, fmt.Errorf("line %d: indented content outside slos block", lineNum)
-		}
-
-		// Item start: `  - name: <value>`
-		if strings.HasPrefix(line, indentUnit+"- ") {
-			if current != nil {
-				c.SLOs = append(c.SLOs, *current)
-			}
-			rest := strings.TrimPrefix(line, indentUnit+"- ")
-			head, val, _ := strings.Cut(rest, ":")
-			head = strings.TrimSpace(head)
-			val = unquote(strings.TrimSpace(val))
-			if head != "name" {
-				return nil, fmt.Errorf("line %d: SLO item must start with `- name:`, got %q", lineNum, head)
-			}
-			current = &SLO{Name: val, line: lineNum}
-			inSLI = false
-			continue
-		}
-
-		if current == nil {
-			return nil, fmt.Errorf("line %d: SLO field before any `- name:`", lineNum)
-		}
-
-		// Field lines must use 4-space indentation (one level deeper than `-`).
-		const fieldIndent = indentUnit + indentUnit
-		const subFieldIndent = fieldIndent + indentUnit
-
-		if strings.HasPrefix(line, subFieldIndent) {
-			if !inSLI {
-				return nil, fmt.Errorf("line %d: nested field outside `sli:` not supported", lineNum)
-			}
-			rest := strings.TrimPrefix(line, subFieldIndent)
-			head, val, _ := strings.Cut(rest, ":")
-			head = strings.TrimSpace(head)
-			val = unquote(strings.TrimSpace(val))
-			switch head {
-			case "good_events":
-				current.SLI.GoodEvents = val
-			case "valid_events":
-				current.SLI.ValidEvents = val
-			default:
-				return nil, fmt.Errorf("line %d: unknown sli field %q", lineNum, head)
-			}
-			continue
-		}
-
-		if !strings.HasPrefix(line, fieldIndent) {
-			return nil, fmt.Errorf("line %d: unexpected indentation %q", lineNum, line)
-		}
-
-		rest := strings.TrimPrefix(line, fieldIndent)
-		head, val, _ := strings.Cut(rest, ":")
-		head = strings.TrimSpace(head)
-		val = strings.TrimSpace(val)
-
-		switch head {
-		case "description":
-			current.Description = unquote(val)
-			inSLI = false
-		case "sli":
-			if val != "" {
-				return nil, fmt.Errorf("line %d: sli must be a block mapping (no inline value)", lineNum)
-			}
-			inSLI = true
-		case "objective":
-			f, err := strconv.ParseFloat(val, 64)
-			if err != nil {
-				return nil, fmt.Errorf("line %d: objective: %w", lineNum, err)
-			}
-			current.Objective = f
-			inSLI = false
-		case "window":
-			current.Window = unquote(val)
-			inSLI = false
-		case "owner":
-			current.Owner = unquote(val)
-			inSLI = false
-		case "fast_burn_severity":
-			current.FastBurnSeverity = unquote(val)
-			inSLI = false
-		case "tags":
-			tags, err := parseInlineArray(val)
-			if err != nil {
-				return nil, fmt.Errorf("line %d: tags: %w", lineNum, err)
-			}
-			current.Tags = tags
-			inSLI = false
-		default:
-			return nil, fmt.Errorf("line %d: unknown SLO field %q", lineNum, head)
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("scan: %w", err)
-	}
-	if current != nil {
-		c.SLOs = append(c.SLOs, *current)
-	}
-	if !versionSeen {
-		return nil, fmt.Errorf("missing top-level version key")
-	}
-	return c, nil
-}
-
-func stripComment(line string) string {
-	// A `#` outside a quoted string starts a comment. Walk the line and
-	// honour double-quoted scalars (the only quoting style the catalogue
-	// uses) so a `#` inside a PromQL label value is preserved.
-	out := make([]byte, 0, len(line))
-	inQuote := false
-	for i := 0; i < len(line); i++ {
-		ch := line[i]
-		if ch == '"' && (i == 0 || line[i-1] != '\\') {
-			inQuote = !inQuote
-		}
-		if ch == '#' && !inQuote {
-			break
-		}
-		out = append(out, ch)
-	}
-	return strings.TrimRight(string(out), " \t\r")
-}
-
-func unquote(v string) string {
-	if len(v) >= 2 && v[0] == '"' && v[len(v)-1] == '"' {
-		s, err := strconv.Unquote(v)
-		if err == nil {
-			return s
-		}
-	}
-	if len(v) >= 2 && v[0] == '\'' && v[len(v)-1] == '\'' {
-		return v[1 : len(v)-1]
-	}
-	return v
-}
-
-func parseInlineArray(v string) ([]string, error) {
-	v = strings.TrimSpace(v)
-	if v == "" {
-		return nil, nil
-	}
-	if v[0] != '[' || v[len(v)-1] != ']' {
-		return nil, fmt.Errorf("expected inline array `[a, b]`, got %q", v)
-	}
-	body := strings.TrimSpace(v[1 : len(v)-1])
-	if body == "" {
-		return []string{}, nil
-	}
-	parts := strings.Split(body, ",")
-	out := make([]string, 0, len(parts))
-	for _, p := range parts {
-		out = append(out, unquote(strings.TrimSpace(p)))
-	}
-	return out, nil
+	return catalogparser.Parse(text)
 }

cmd/slogen/main_test.go

@@ -4,6 +4,8 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+
+	"github.com/ev-dev-labs/teslasync/internal/slo/catalogparser"
 )
 
 func TestValidateRealCatalog(t *testing.T) {
@@ -153,7 +155,7 @@ func TestValidateCatalog_BadFastBurnSeverity(t *testing.T) {
 
 func TestStripComment_PreservesHashInsideQuotes(t *testing.T) {
 	t.Parallel()
-	got := stripComment(`good_events: "rate(x{tag=\"#foo\"}[5m])" # tail`)
+	got := catalogparser.StripComment(`good_events: "rate(x{tag=\"#foo\"}[5m])" # tail`)
 	want := `good_events: "rate(x{tag=\"#foo\"}[5m])"`
 	if got != want {
 		t.Fatalf("got %q, want %q", got, want)

docs/.vitepress/config.ts

@@ -1,11 +1,10 @@
 import { defineConfig } from 'vitepress'
-import { withMermaid } from 'vitepress-plugin-mermaid'
 
 // teslasync.dev serves the site from /. Forks without a custom domain can
 // set DOCS_BASE to their GitHub Pages project path (e.g. /teslasync/).
 const base = process.env.DOCS_BASE || '/'
 
-export default withMermaid(defineConfig({
+export default defineConfig({
   title: 'TeslaSync Docs',
   titleTemplate: ':title — TeslaSync Docs',
   description:
@@ -76,6 +75,15 @@ export default withMermaid(defineConfig({
   },
 
   markdown: {
+    config(md) {
+      const fence = md.renderer.rules.fence!
+      md.renderer.rules.fence = (tokens, index, options, env, self) => {
+        if (tokens[index].info.trim() === 'mermaid') {
+          return `<MermaidDiagram :source="${md.utils.escapeHtml(JSON.stringify(tokens[index].content))}" />`
+        }
+        return fence(tokens, index, options, env, self)
+      }
+    },
     theme: { light: 'github-light', dark: 'github-dark' },
     image: { lazyLoading: true },
   },
@@ -219,16 +227,4 @@ export default withMermaid(defineConfig({
     lastUpdatedText: 'Updated',
   },
 
-  mermaid: {
-    theme: 'neutral',
-    themeVariables: {
-      fontFamily: 'Inter, ui-sans-serif, system-ui, sans-serif',
-      primaryColor: '#f5f4f0',
-      primaryTextColor: '#1c1917',
-      primaryBorderColor: '#e82127',
-      lineColor: '#78716c',
-      secondaryColor: '#fafaf9',
-      tertiaryColor: '#ffffff',
-    },
-  },
-}))
+})