Merge pull request #1118 from cbandy/intorstring-length

🌱 Allow string validation on XIntOrString

Author: k8s-ci-robot

pkg/crd/markers/validation.go

@@ -316,6 +316,10 @@ func hasNumericType(schema *apiext.JSONSchemaProps) bool {
 	return schema.Type == "integer" || schema.Type == "number"
 }
 
+func hasTextualType(schema *apiext.JSONSchemaProps) bool {
+	return schema.Type == "string" || schema.XIntOrString
+}
+
 func isIntegral(value float64) bool {
 	return value == math.Trunc(value) && !math.IsNaN(value) && !math.IsInf(value, 0)
 }
@@ -394,29 +398,26 @@ func (m MultipleOf) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
 }
 
 func (m MaxLength) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
-	if schema.Type != "string" {
-		return fmt.Errorf("must apply maxlength to a string")
+	if !hasTextualType(schema) {
+		return fmt.Errorf("must apply maxlength to a textual value, found type %q", schema.Type)
 	}
 	val := int64(m)
 	schema.MaxLength = &val
 	return nil
 }
 
 func (m MinLength) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
-	if schema.Type != "string" {
-		return fmt.Errorf("must apply minlength to a string")
+	if !hasTextualType(schema) {
+		return fmt.Errorf("must apply minlength to a textual value, found type %q", schema.Type)
 	}
 	val := int64(m)
 	schema.MinLength = &val
 	return nil
 }
 
 func (m Pattern) ApplyToSchema(schema *apiext.JSONSchemaProps) error {
-	// Allow string types or IntOrStrings. An IntOrString will still
-	// apply the pattern validation when a string is detected, the pattern
-	// will not apply to ints though.
-	if schema.Type != "string" && !schema.XIntOrString {
-		return fmt.Errorf("must apply pattern to a `string` or `IntOrString`")
+	if !hasTextualType(schema) {
+		return fmt.Errorf("must apply pattern to a textual value, found type %q", schema.Type)
 	}
 	schema.Pattern = string(m)
 	return nil

pkg/crd/testdata/cronjob_types.go

@@ -249,11 +249,12 @@ type CronJobSpec struct {
 	// +kubebuilder:validation:Schemaless
 	Schemaless []byte `json:"schemaless,omitempty"`
 
-	// This tests that an IntOrString can also have a pattern attached
-	// to it.
+	// This tests that an IntOrString can also have string validation.
 	// This can be useful if you want to limit the string to a percentage or integer.
 	// The XIntOrString marker is a requirement for having a pattern on this type.
 	// +kubebuilder:validation:XIntOrString
+	// +kubebuilder:validation:MaxLength=11
+	// +kubebuilder:validation:MinLength=2
 	// +kubebuilder:validation:Pattern="^((100|[0-9]{1,2})%|[0-9]+)$"
 	IntOrStringWithAPattern *intstr.IntOrString `json:"intOrStringWithAPattern,omitempty"`
 
@@ -358,10 +359,12 @@ type CronJobSpec struct {
 	// +kubebuilder:validation:MinItems=3
 	LongerStringArray []LongerString `json:"longerStringArray,omitempty"`
 
-	// This tests that a slice of IntOrString can also have a pattern attached to it.
+	// This tests that a slice of IntOrString can also have string validation.
 	// This can be useful if you want to limit the string to a percentage or integer.
 	// The XIntOrString marker is a requirement for having a pattern on this type.
 	// +kubebuilder:validation:items:XIntOrString
+	// +kubebuilder:validation:items:MaxLength=10
+	// +kubebuilder:validation:items:MinLength=1
 	// +kubebuilder:validation:items:Pattern="^((100|[0-9]{1,2})%|[0-9]+)$"
 	IntOrStringArrayWithAPattern []*intstr.IntOrString `json:"intOrStringArrayWithAPattern,omitempty"`
 

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

@@ -266,13 +266,15 @@ spec:
                 type: integer
               intOrStringArrayWithAPattern:
                 description: |-
-                  This tests that a slice of IntOrString can also have a pattern attached to it.
+                  This tests that a slice of IntOrString can also have string validation.
                   This can be useful if you want to limit the string to a percentage or integer.
                   The XIntOrString marker is a requirement for having a pattern on this type.
                 items:
                   anyOf:
                   - type: integer
                   - type: string
+                  maxLength: 10
+                  minLength: 1
                   pattern: ^((100|[0-9]{1,2})%|[0-9]+)$
                   x-kubernetes-int-or-string: true
                 type: array
@@ -281,10 +283,11 @@ spec:
                 - type: integer
                 - type: string
                 description: |-
-                  This tests that an IntOrString can also have a pattern attached
-                  to it.
+                  This tests that an IntOrString can also have string validation.
                   This can be useful if you want to limit the string to a percentage or integer.
                   The XIntOrString marker is a requirement for having a pattern on this type.
+                maxLength: 11
+                minLength: 2
                 pattern: ^((100|[0-9]{1,2})%|[0-9]+)$
                 x-kubernetes-int-or-string: true
               intWithValidations: