fix: make sure the field and matching pattern are ordered correctly (#…

…315) * fix: make sure the field and matching pattern are ordered correctly * fix: test repair * fix: test repair v2
omissis · Jan 4, 2025 · 3227b81 · 3227b81
1 parent fce606f
commit 3227b81
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/generator/validator.go b/pkg/generator/validator.go
@@ -250,8 +250,8 @@ func (v *stringValidator) generate(out *codegen.Emitter) {
 		)
 		out.Indent(1)
 		out.Printlnf(
-			`return fmt.Errorf("field %%s pattern match: must match %%s", `+"`%s`"+`, "%s")`,
-			v.pattern, v.fieldName,
+			`return fmt.Errorf("field %%s pattern match: must match %%s", "%s", `+"`%s`"+`)`,
+			v.fieldName, v.pattern,
 		)
 		out.Indent(-1)
 		out.Printlnf("}")

diff --git a/tests/data/validation/pattern/pattern.go b/tests/data/validation/pattern/pattern.go
diff --git a/tests/validation_test.go b/tests/validation_test.go
@@ -169,7 +169,7 @@ func TestPattern(t *testing.T) {
 		{
 			desc:    "myString does not match pattern",
 			data:    `{"myString": "0x123456"}`,
-			wantErr: errors.New("field ^0x[0-9a-f]{10}\\.$ pattern match: must match MyString"),
+			wantErr: errors.New("field MyString pattern match: must match ^0x[0-9a-f]{10}\\.$"),
 		},
 	}