Merge pull request kubernetes#130857 from thockin/kk_small_vg_diffs

Port small deltas from validation-gen dev branch to master

Author: k8s-ci-robot

staging/src/k8s.io/apimachinery/pkg/api/validate/each_test.go

@@ -59,6 +59,7 @@ func TestEachSliceVal(t *testing.T) {
 }
 
 func testEachSliceVal[T any](t *testing.T, name string, input []T) {
+	t.Helper()
 	var zero T
 	t.Run(fmt.Sprintf("%s(%T)", name, zero), func(t *testing.T) {
 		calls := 0
@@ -77,6 +78,7 @@ func testEachSliceVal[T any](t *testing.T, name string, input []T) {
 }
 
 func testEachSliceValUpdate[T any](t *testing.T, name string, input []T) {
+	t.Helper()
 	var zero T
 	t.Run(fmt.Sprintf("%s(%T)", name, zero), func(t *testing.T) {
 		calls := 0
@@ -116,6 +118,7 @@ func TestEachMapVal(t *testing.T) {
 }
 
 func testEachMapVal[T any](t *testing.T, name string, input map[string]T) {
+	t.Helper()
 	var zero T
 	t.Run(fmt.Sprintf("%s(%T)", name, zero), func(t *testing.T) {
 		calls := 0
@@ -141,6 +144,7 @@ func TestEachMapKey(t *testing.T) {
 }
 
 func testEachMapKey[K ~string, V any](t *testing.T, name string, input map[K]V) {
+	t.Helper()
 	var zero K
 	t.Run(fmt.Sprintf("%s(%T)", name, zero), func(t *testing.T) {
 		calls := 0

staging/src/k8s.io/apimachinery/pkg/api/validate/testing.go

@@ -30,6 +30,6 @@ func FixedResult[T any](_ context.Context, op operation.Operation, fldPath *fiel
 		return nil
 	}
 	return field.ErrorList{
-		field.Invalid(fldPath, value, "forced failure: "+arg),
+		field.Invalid(fldPath, value, "forced failure: "+arg).WithOrigin("validateFalse"),
 	}
 }

staging/src/k8s.io/apimachinery/pkg/api/validate/testing_test.go

@@ -121,6 +121,7 @@ func TestFixedResult(t *testing.T) {
 		pass:  true,
 	}}
 
+	matcher := field.ErrorMatcher{}.ByOrigin().ByDetailExact()
 	for i, tc := range cases {
 		result := FixedResult(context.Background(), operation.Operation{}, field.NewPath("fldpath"), tc.value, nil, tc.pass, "detail string")
 		if len(result) != 0 && tc.pass {
@@ -136,9 +137,10 @@ func TestFixedResult(t *testing.T) {
 				t.Errorf("case %d: unexepected multi-error: %v", i, fmtErrs(result))
 				continue
 			}
-			if want, got := "forced failure: detail string", result[0].Detail; got != want {
-				t.Errorf("case %d: wrong error, expected: %q, got: %q", i, want, got)
+			wantErrorList := field.ErrorList{
+				field.Invalid(field.NewPath("fldpath"), tc.value, "forced failure: detail string").WithOrigin("validateFalse"),
 			}
+			matcher.Test(t, wantErrorList, result)
 		}
 	}
 }

staging/src/k8s.io/apimachinery/pkg/util/validation/field/errors.go

@@ -44,6 +44,9 @@ type Error struct {
 	// - A structured format using "format=<dash-style-identifier>" for validation errors related to specific formats
 	//   (e.g., "format=dns-label", "format=qualified-name")
 	//
+	// If the Origin corresponds to an existing declarative validation tag or JSON Schema keyword,
+	// use that same name for consistency.
+	//
 	// Origin should be set in the most deeply nested validation function that
 	// can still identify the unique source of the error.
 	Origin string

staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_field_validations/testdata/validate-false.json

@@ -1,26 +1,26 @@
 {
-    "*withfieldvalidations.T1": {
-      "s": [
-        "field T1.S"
-      ],
-      "t2": [
-        "field T1.T2"
-      ],
-      "t2.s": [
-        "field T2.S"
-      ],
-      "t3": [
-        "field T1.T3"
-      ]
-    },
-    "*withfieldvalidations.T2": {
-      "s": [
-        "field T2.S"
-      ]
-    },
-    "*withfieldvalidations.T4": {
-      "s": [
-        "field T4.S"
-      ]
-    }
-  }
+  "*withfieldvalidations.T1": {
+    "s": [
+      "field T1.S"
+    ],
+    "t2": [
+      "field T1.T2"
+    ],
+    "t2.s": [
+      "field T2.S"
+    ],
+    "t3": [
+      "field T1.T3"
+    ]
+  },
+  "*withfieldvalidations.T2": {
+    "s": [
+      "field T2.S"
+    ]
+  },
+  "*withfieldvalidations.T4": {
+    "s": [
+      "field T4.S"
+    ]
+  }
+}

staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/all_types_match/with_type_validations/testdata/validate-false.json

@@ -1,15 +1,15 @@
 {
-    "*withtypevalidations.E1": {
-      "": [
-        "type E1"
-      ]
-    },
-    "*withtypevalidations.T1": {
-      "": [
-        "type T1"
-      ],
-      "s": [
-        "field T1.S"
-      ]
-    }
-  }
+  "*withtypevalidations.E1": {
+    "": [
+      "type E1"
+    ]
+  },
+  "*withtypevalidations.T1": {
+    "": [
+      "type T1"
+    ],
+    "s": [
+      "field T1.S"
+    ]
+  }
+}