use format string as a first argument to Message()

vektah · Sep 26, 2024 · a4cc52c · a4cc52c
1 parent c596152
commit a4cc52c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/validator/rules/fields_on_correct_type.go b/validator/rules/fields_on_correct_type.go
@@ -28,7 +28,7 @@ var FieldsOnCorrectTypeRule = Rule{
 			}
 
 			addError(
-				Message(message),
+				Message("%s", message),
 				At(field.Position),
 			)
 		})

diff --git a/validator/rules/fragments_on_composite_types.go b/validator/rules/fragments_on_composite_types.go
@@ -21,7 +21,7 @@ var FragmentsOnCompositeTypesRule = Rule{
 			message := fmt.Sprintf(`Fragment cannot condition on non composite type "%s".`, inlineFragment.TypeCondition)
 
 			addError(
-				Message(message),
+				Message("%s", message),
 				At(inlineFragment.Position),
 			)
 		})
@@ -34,7 +34,7 @@ var FragmentsOnCompositeTypesRule = Rule{
 			message := fmt.Sprintf(`Fragment "%s" cannot condition on non composite type "%s".`, fragment.Name, fragment.TypeCondition)
 
 			addError(
-				Message(message),
+				Message("%s", message),
 				At(fragment.Position),
 			)
 		})

diff --git a/validator/validator_test.go b/validator/validator_test.go
@@ -141,18 +141,17 @@ func TestNoUnusedVariables(t *testing.T) {
 }
 
 func TestCustomRuleSet(t *testing.T) {
-
 	someRule := validator.Rule{
 		Name: "SomeRule",
 		RuleFunc: func(observers *validator.Events, addError validator.AddErrFunc) {
-			addError(validator.Message("some error message"))
+			addError(validator.Message("%s", "some error message"))
 		},
 	}
 
 	someOtherRule := validator.Rule{
 		Name: "SomeOtherRule",
 		RuleFunc: func(observers *validator.Events, addError validator.AddErrFunc) {
-			addError(validator.Message("some other error message"))
+			addError(validator.Message("%s", "some other error message"))
 		},
 	}