allow easy access to flattened crds from parser

Author: DirectXMan12

pkg/crd/parser.go

@@ -58,6 +58,10 @@ type Parser struct {
 	GroupVersions map[*loader.Package]schema.GroupVersion
 	// CustomResourceDefinitions contains the known CustomResourceDefinitions for types in this parser.
 	CustomResourceDefinitions map[schema.GroupKind]apiext.CustomResourceDefinition
+	// FlattenedSchemata contains fully flattened schemata for use in building
+	// CustomResourceDefinition validation.  Each schema has been flattened by the flattener,
+	// and then embedded fields have been flattened with FlattenEmbedded.
+	FlattenedSchemata map[TypeIdent]apiext.JSONSchemaProps
 
 	// PackageOverrides indicates that the loading of any package with
 	// the given path should be handled by the given overrider.
@@ -95,6 +99,9 @@ func (p *Parser) init() {
 	if p.CustomResourceDefinitions == nil {
 		p.CustomResourceDefinitions = make(map[schema.GroupKind]apiext.CustomResourceDefinition)
 	}
+	if p.FlattenedSchemata == nil {
+		p.FlattenedSchemata = make(map[TypeIdent]apiext.JSONSchemaProps)
+	}
 }
 
 // indexTypes loads all types in the package into Types.
@@ -162,8 +169,20 @@ func (p *Parser) NeedSchemaFor(typ TypeIdent) {
 	schema := infoToSchema(ctxForInfo)
 
 	p.Schemata[typ] = *schema
+}
+
+func (p *Parser) NeedFlattenedSchemaFor(typ TypeIdent) {
+	p.init()
+
+	if _, knownSchema := p.FlattenedSchemata[typ]; knownSchema {
+		return
+	}
+
+	p.NeedSchemaFor(typ)
+	partialFlattened := p.flattener.FlattenType(typ)
+	fullyFlattened := FlattenEmbedded(partialFlattened, typ.Package)
 
-	return
+	p.FlattenedSchemata[typ] = *fullyFlattened
 }
 
 // NeedCRDFor lives off in spec.go

pkg/crd/spec.go

@@ -160,15 +160,17 @@ func (p *Parser) NeedCRDFor(groupKind schema.GroupKind, maxDescLen *int) {
 		if typeInfo == nil {
 			continue
 		}
-		fullSchema := FlattenEmbedded(p.flattener.FlattenType(typeIdent), pkg)
+		p.NeedFlattenedSchemaFor(typeIdent)
+		fullSchema := p.FlattenedSchemata[typeIdent]
+		fullSchema = *fullSchema.DeepCopy() // don't mutate the cache (we might be truncating description, etc)
 		if maxDescLen != nil {
-			TruncateDescription(fullSchema, *maxDescLen)
+			TruncateDescription(&fullSchema, *maxDescLen)
 		}
 		ver := apiext.CustomResourceDefinitionVersion{
 			Name:   p.GroupVersions[pkg].Version,
 			Served: true,
 			Schema: &apiext.CustomResourceValidation{
-				OpenAPIV3Schema: fullSchema,
+				OpenAPIV3Schema: &fullSchema,  // fine to take a reference since we deepcopy above
 			},
 		}
 		crd.Spec.Versions = append(crd.Spec.Versions, ver)