Closing gaps and cleaning house

internal/topdata/family_expansion.go

@@ -31,6 +31,7 @@ type familyExpansionSpec struct {
 	IdentitySource    string
 	AllowExistingOnly bool
 	AutoPrereqFields  map[string]string
+	LegacyFamilyKeys  []string
 }
 
 func splitFamilyExpansionIdentity(text string) familyIdentity {
@@ -114,6 +115,13 @@ func parseFamilyExpansionSpec(path string, obj map[string]any) (familyExpansionS
 	if err != nil {
 		return familyExpansionSpec{}, fmt.Errorf("generated file %s: %w", path, err)
 	}
+	legacyFamilyKeys, err := parseOptionalStringArray(obj["legacy_family_keys"], "legacy_family_keys")
+	if err != nil {
+		return familyExpansionSpec{}, fmt.Errorf("generated file %s: %w", path, err)
+	}
+	if err := validateLegacyFamilyKeys(familyKey, legacyFamilyKeys); err != nil {
+		return familyExpansionSpec{}, fmt.Errorf("generated file %s: %w", path, err)
+	}
 	allowExistingOnly, err := parseOptionalBoolField(obj["allow_existing_only"], "allow_existing_only")
 	if err != nil {
 		return familyExpansionSpec{}, fmt.Errorf("generated file %s: %w", path, err)
@@ -133,9 +141,26 @@ func parseFamilyExpansionSpec(path string, obj map[string]any) (familyExpansionS
 		IdentitySource:    identitySource,
 		AllowExistingOnly: allowExistingOnly,
 		AutoPrereqFields:  autoPrereqFields,
+		LegacyFamilyKeys:  legacyFamilyKeys,
 	}, nil
 }
 
+func validateLegacyFamilyKeys(familyKey string, legacyFamilyKeys []string) error {
+	seen := map[string]string{}
+	normalizedFamilyKey := normalizeKeyIdentity(familyKey)
+	for _, legacyKey := range legacyFamilyKeys {
+		normalizedLegacyKey := normalizeKeyIdentity(legacyKey)
+		if normalizedLegacyKey == normalizedFamilyKey {
+			return fmt.Errorf("legacy_family_keys must not include family_key %q", familyKey)
+		}
+		if previous, ok := seen[normalizedLegacyKey]; ok {
+			return fmt.Errorf("legacy_family_keys contains duplicate-equivalent keys %q and %q", previous, legacyKey)
+		}
+		seen[normalizedLegacyKey] = legacyKey
+	}
+	return nil
+}
+
 func isFamilyExpansionObject(obj map[string]any) bool {
 	_, hasFamilyKey := obj["family_key"]
 	_, hasTemplate := obj["template"]
@@ -150,9 +175,10 @@ func isFamilyExpansionObject(obj map[string]any) bool {
 	_, hasIdentitySource := obj["identity_source"]
 	_, hasAllowExistingOnly := obj["allow_existing_only"]
 	_, hasAutoPrereqFields := obj["auto_prereq_fields"]
+	_, hasLegacyFamilyKeys := obj["legacy_family_keys"]
 	return hasFamilyKey || hasTemplate || hasChildSource || hasNamePrefix || hasLabelPrefix ||
 		hasConstantPrefix || hasTemplateFields || hasDefaultFields || hasApplyAfterModules || hasChildRefField ||
-		hasIdentitySource || hasAllowExistingOnly || hasAutoPrereqFields
+		hasIdentitySource || hasAllowExistingOnly || hasAutoPrereqFields || hasLegacyFamilyKeys
 }
 
 func optionalTrimmedString(obj map[string]any, field string) (string, bool) {