Make report module overrides explicit

internal/config/config_test.go

@@ -3,6 +3,7 @@ package config
 import (
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 	"time"
@@ -91,7 +92,10 @@ func TestLoadExampleConfig(t *testing.T) {
 	if len(cfg.Notify.Distributor.ReportPathTemplates) != 1 {
 		t.Fatalf("ReportPathTemplates = %#v, want example archive path", cfg.Notify.Distributor.ReportPathTemplates)
 	}
-	overrides := cfg.ReportModuleOverrides()
+	overrides, err := cfg.ReportModuleOverrides()
+	if err != nil {
+		t.Fatalf("ReportModuleOverrides() error = %v", err)
+	}
 	hourly := overrides[report.Hourly]
 	if len(hourly) != 9 {
 		t.Fatalf("hourly example override length = %d, want 9", len(hourly))
@@ -155,7 +159,10 @@ reports:
 	if err != nil {
 		t.Fatalf("LoadFile() error = %v", err)
 	}
-	overrides := cfg.ReportModuleOverrides()
+	overrides, err := cfg.ReportModuleOverrides()
+	if err != nil {
+		t.Fatalf("ReportModuleOverrides() error = %v", err)
+	}
 	items := overrides[report.DailyToday]
 	if len(items) != 6 {
 		t.Fatalf("daily override length = %d, want 6", len(items))
@@ -192,7 +199,10 @@ reports:
 	if err != nil {
 		t.Fatalf("LoadFile() error = %v", err)
 	}
-	overrides := cfg.ReportModuleOverrides()
+	overrides, err := cfg.ReportModuleOverrides()
+	if err != nil {
+		t.Fatalf("ReportModuleOverrides() error = %v", err)
+	}
 	items := overrides[report.Hourly]
 	if len(items) != 4 {
 		t.Fatalf("hourly override length = %d, want 4", len(items))
@@ -223,7 +233,10 @@ reports:
 	if err != nil {
 		t.Fatalf("LoadFile() error = %v", err)
 	}
-	overrides := cfg.ReportModuleOverrides()
+	overrides, err := cfg.ReportModuleOverrides()
+	if err != nil {
+		t.Fatalf("ReportModuleOverrides() error = %v", err)
+	}
 	if len(overrides[report.ThreeDay]) != 1 || overrides[report.ThreeDay][0].ID != module.Metadata {
 		t.Fatalf("three-day alias override = %#v, want metadata override", overrides[report.ThreeDay])
 	}
@@ -235,6 +248,84 @@ reports:
 	}
 }
 
+func TestValidateReportModuleKeysWithoutMutatingOptions(t *testing.T) {
+	cfg := Defaults()
+	rawOptions := map[string]any{
+		"sections": []any{"short_term"},
+	}
+	cfg.Reports = map[string]ReportConfig{
+		"daily": {
+			DeterministicModules: []ModuleConfigItem{
+				{ID: module.Metadata},
+				{ID: module.AreaForecastDiscussion, Options: rawOptions},
+			},
+			deterministicModulesSet: true,
+		},
+	}
+
+	if err := Validate(cfg); err != nil {
+		t.Fatalf("Validate() error = %v", err)
+	}
+	got, ok := cfg.Reports["daily"].DeterministicModules[1].Options.(map[string]any)
+	if !ok || !reflect.DeepEqual(got, rawOptions) {
+		t.Fatalf("Options after Validate = %#v, want original raw map", cfg.Reports["daily"].DeterministicModules[1].Options)
+	}
+}
+
+func TestValidateReportModuleAliasesDirectly(t *testing.T) {
+	tests := []struct {
+		name    string
+		reports map[string]ReportConfig
+		wantErr string
+	}{
+		{
+			name: "DuplicateAlias",
+			reports: map[string]ReportConfig{
+				"daily":       {},
+				"daily_today": {},
+			},
+			wantErr: "duplicates report override",
+		},
+		{
+			name: "UnknownReport",
+			reports: map[string]ReportConfig{
+				"moon": {},
+			},
+			wantErr: "reports.moon",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			cfg := Defaults()
+			cfg.Reports = tt.reports
+			err := Validate(cfg)
+			if err == nil {
+				t.Fatal("Validate() error = nil, want report key error")
+			}
+			if !strings.Contains(err.Error(), tt.wantErr) {
+				t.Fatalf("Validate() error = %q, want %q", err.Error(), tt.wantErr)
+			}
+		})
+	}
+}
+
+func TestReportModuleOverridesRejectsInvalidReportKeys(t *testing.T) {
+	cfg := Defaults()
+	cfg.Reports = map[string]ReportConfig{
+		"moon": {
+			DeterministicModules:    []ModuleConfigItem{{ID: module.Metadata}},
+			deterministicModulesSet: true,
+		},
+	}
+	_, err := cfg.ReportModuleOverrides()
+	if err == nil {
+		t.Fatal("ReportModuleOverrides() error = nil, want invalid report key")
+	}
+	if !strings.Contains(err.Error(), "reports.moon") {
+		t.Fatalf("ReportModuleOverrides() error = %q, want report key context", err.Error())
+	}
+}
+
 func TestReportModuleOverrideValidation(t *testing.T) {
 	tests := []struct {
 		name    string