Make report module overrides explicit

internal/config/reports.go

@@ -11,23 +11,24 @@ import (
 	"gopkg.in/yaml.v3"
 )
 
-func (cfg Config) ReportModuleOverrides() map[report.ID][]module.ConfigItem {
+func (cfg Config) ReportModuleOverrides() (map[report.ID][]module.ConfigItem, error) {
 	overrides := map[report.ID][]module.ConfigItem{}
+	seenReports := map[report.ID]string{}
 	for key, reportCfg := range cfg.Reports {
+		id, err := report.IDForConfigKey(key)
+		if err != nil {
+			return nil, fmt.Errorf("reports.%s: %w", key, err)
+		}
+		if previous, ok := seenReports[id]; ok {
+			return nil, fmt.Errorf("reports.%s duplicates report override %q", key, previous)
+		}
+		seenReports[id] = key
 		if !reportCfg.deterministicModulesSet {
 			continue
 		}
-		id, err := report.IDForConfigKey(key)
-		if err != nil {
-			continue
-		}
-		items := make([]module.ConfigItem, 0, len(reportCfg.DeterministicModules))
-		for _, item := range reportCfg.DeterministicModules {
-			items = append(items, module.ConfigItem{ID: item.ID, Options: item.Options})
-		}
-		overrides[id] = items
+		overrides[id] = moduleItemsFromConfig(reportCfg.DeterministicModules)
 	}
-	return overrides
+	return overrides, nil
 }
 
 func normalizeReportModules(cfg *Config) error {
@@ -55,15 +56,14 @@ func normalizeReportModules(cfg *Config) error {
 		if !reportCfg.deterministicModulesSet {
 			continue
 		}
-		items := make([]module.ConfigItem, 0, len(reportCfg.DeterministicModules))
 		for i, rawItem := range reportCfg.DeterministicModules {
 			options, err := normalizeModuleOptions(moduleRegistry, rawItem.ID, rawItem.Options)
 			if err != nil {
 				return fmt.Errorf("reports.%s.deterministic_modules[%d]: %w", key, i, err)
 			}
 			reportCfg.DeterministicModules[i].Options = options
-			items = append(items, module.ConfigItem{ID: rawItem.ID, Options: options})
 		}
+		items := moduleItemsFromConfig(reportCfg.DeterministicModules)
 		if err := moduleRegistry.ValidateComposition(reportID, items); err != nil {
 			return fmt.Errorf("reports.%s.deterministic_modules: %w", key, err)
 		}
@@ -72,6 +72,58 @@ func normalizeReportModules(cfg *Config) error {
 	return nil
 }
 
+func validateReportModules(cfg Config) error {
+	if cfg.Reports == nil {
+		return nil
+	}
+	moduleRegistry, err := briefing.DefaultModuleRegistry()
+	if err != nil {
+		return fmt.Errorf("initialize module registry: %w", err)
+	}
+	reportRegistry := report.DefaultRegistry()
+	seenReports := map[report.ID]string{}
+	for key, reportCfg := range cfg.Reports {
+		reportID, err := report.IDForConfigKey(key)
+		if err != nil {
+			return fmt.Errorf("reports.%s: %w", key, err)
+		}
+		if previous, ok := seenReports[reportID]; ok {
+			return fmt.Errorf("reports.%s duplicates report override %q", key, previous)
+		}
+		seenReports[reportID] = key
+		if _, err := reportRegistry.Lookup(reportID); err != nil {
+			return fmt.Errorf("reports.%s: %w", key, err)
+		}
+		if !reportCfg.deterministicModulesSet {
+			continue
+		}
+		items := make([]module.ConfigItem, 0, len(reportCfg.DeterministicModules))
+		for i, rawItem := range reportCfg.DeterministicModules {
+			options := rawItem.Options
+			if options != nil {
+				normalized, err := normalizeModuleOptions(moduleRegistry, rawItem.ID, options)
+				if err != nil {
+					return fmt.Errorf("reports.%s.deterministic_modules[%d]: %w", key, i, err)
+				}
+				options = normalized
+			}
+			items = append(items, module.ConfigItem{ID: rawItem.ID, Options: options})
+		}
+		if err := moduleRegistry.ValidateComposition(reportID, items); err != nil {
+			return fmt.Errorf("reports.%s.deterministic_modules: %w", key, err)
+		}
+	}
+	return nil
+}
+
+func moduleItemsFromConfig(items []ModuleConfigItem) []module.ConfigItem {
+	out := make([]module.ConfigItem, 0, len(items))
+	for _, item := range items {
+		out = append(out, module.ConfigItem{ID: item.ID, Options: item.Options})
+	}
+	return out
+}
+
 func normalizeModuleOptions(registry briefing.ModuleRegistry, id module.ID, raw any) (any, error) {
 	if raw == nil {
 		return nil, nil
@@ -83,6 +135,9 @@ func normalizeModuleOptions(registry briefing.ModuleRegistry, id module.ID, raw
 	if definition.DefaultOptions == nil {
 		return nil, fmt.Errorf("module %q does not accept options", id)
 	}
+	if err := definition.ValidateOptions(raw); err == nil {
+		return raw, nil
+	}
 	optionType := reflect.TypeOf(definition.DefaultOptions)
 	normalized, err := decodeKnownOptions(raw, optionType)
 	if err != nil {