Reverse order of XValidations when flattening

cezarsa · cezarsa · commit 43d3d3a2a4df · 2024-08-09T09:39:31.000-03:00
diff --git a/pkg/crd/flatten.go b/pkg/crd/flatten.go
@@ -148,7 +148,7 @@ func flattenAllOfInto(dst *apiext.JSONSchemaProps, src apiext.JSONSchemaProps, e
 		case "XMapType":
 			dstField.Set(srcField)
 		case "XValidations":
-			dstField.Set(reflect.AppendSlice(dstField, srcField))
+			dstField.Set(reflect.AppendSlice(srcField, dstField))
 		// NB(directxman12): no need to explicitly handle nullable -- false is considered to be the zero value
 		// TODO(directxman12): src isn't necessarily the field value -- it's just the most recent allOf entry
 		default:
diff --git a/pkg/crd/flatten_all_of_test.go b/pkg/crd/flatten_all_of_test.go
@@ -246,8 +246,8 @@ var _ = Describe("AllOf Flattening", func() {
 			By("flattening a schema with multiple validation fields")
 			original := &apiext.JSONSchemaProps{
 				AllOf: []apiext.JSONSchemaProps{
-					{XValidations: apiext.ValidationRules{{Rule: "rule1"}, {Rule: "rule2"}}},
-					{XValidations: apiext.ValidationRules{{Rule: "rule3"}}},
+					{XValidations: apiext.ValidationRules{{Rule: "rule2"}, {Rule: "rule3"}}},
+					{XValidations: apiext.ValidationRules{{Rule: "rule1"}}},
 				},
 			}
 			flattened := crd.FlattenEmbedded(original, errRec)
diff --git a/pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml b/pkg/crd/testdata/testdata.kubebuilder.io_cronjobs.yaml
@@ -6845,10 +6845,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
               structWithSeveralFields:
                 description: A struct that can only be entirely replaced
                 properties:
