Apply type and format from underlying named types

Author: JoelSpeed

pkg/crd/schema.go

@@ -60,6 +60,7 @@ type applyFirstMarker interface {
 // schemaRequester knows how to marker that another schema (e.g. via an external reference) is necessary.
 type schemaRequester interface {
 	NeedSchemaFor(typ TypeIdent)
+	LookupType(pkg *loader.Package, name string) *markers.TypeInfo
 }
 
 // schemaContext stores and provides information across a hierarchy of schema generation.
@@ -304,8 +305,26 @@ func localNamedToSchema(ctx *schemaContext, ident *ast.Ident) *apiext.JSONSchema
 	}
 	ctx.requestSchema(pkgPath, typeNameInfo.Name())
 	link := TypeRefLink(pkgPath, typeNameInfo.Name())
+
+	// In cases where we have a named type, apply the type and format from the named schema
+	// to allow markers that need this information to apply correctly.
+	var typ, fmt string
+	if namedInfo, isNamed := typeInfo.(*types.Named); isNamed {
+		// We don't want/need to do this for structs, maps, or arrays.
+		// These are already handled in infoToSchema if they have custom marshalling.
+		if _, isBasic := namedInfo.Underlying().(*types.Basic); isBasic {
+			namedTypeInfo := ctx.schemaRequester.LookupType(ctx.pkg, namedInfo.Obj().Name())
+
+			namedSchema := infoToSchema(ctx.ForInfo(namedTypeInfo))
+			typ = namedSchema.Type
+			fmt = namedSchema.Format
+		}
+	}
+
 	return &apiext.JSONSchemaProps{
-		Ref: &link,
+		Type:   typ,
+		Format: fmt,
+		Ref:    &link,
 	}
 }
 

pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml

@@ -226,18 +226,23 @@ spec:
                 format: int32
                 type: integer
               fieldLevelAliasOverride:
+                allOf:
+                - maxLength: 255
+                  minLength: 1
+                - maxLength: 10
+                  minLength: 10
                 description: |-
                   This tests that field-level overrides are handled correctly
                   for local type aliases.
-                maxLength: 10
-                minLength: 10
                 type: string
               fieldLevelLocalDeclarationOverride:
+                allOf:
+                - minLength: 4
+                - minLength: 10
                 description: |-
                   This tests that field-level overrides are handled correctly
                   for local type declarations.
                 maxLength: 10
-                minLength: 10
                 type: string
               float64WithValidations:
                 maximum: 1.5
@@ -9098,10 +9103,10 @@ spec:
                   and type.
                 type: string
                 x-kubernetes-validations:
-                - message: must have even length
-                  rule: self.size() % 2 == 0
                 - message: must have good prefix
                   rule: self.startsWith('good-')
+                - message: must have even length
+                  rule: self.size() % 2 == 0
               stringWithEvenLengthAndMessageExpression:
                 description: Test of the expression-based validation with messageExpression
                   marker.