RequestError Error() does not include reason if it is the same as err (…

…#517) Co-authored-by: Kanda <kanda@synctera.com>
getkin · Mar 30, 2022 · ca21ef5 · ca21ef5
1 parent a5284e9
commit ca21ef5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/openapi3filter/errors.go b/openapi3filter/errors.go
@@ -22,7 +22,7 @@ var _ interface{ Unwrap() error } = RequestError{}
 func (err *RequestError) Error() string {
 	reason := err.Reason
 	if e := err.Err; e != nil {
-		if len(reason) == 0 {
+		if len(reason) == 0 || reason == e.Error() {
 			reason = e.Error()
 		} else {
 			reason += ": " + e.Error()

diff --git a/openapi3filter/validation_error_test.go b/openapi3filter/validation_error_test.go
@@ -181,7 +181,7 @@ func getValidationTests(t *testing.T) []*validationTest {
 			},
 			wantErrParam:   "status",
 			wantErrParamIn: "query",
-			wantErrBody:    `parameter "status" in query has an error: value is required but missing: value is required but missing`,
+			wantErrBody:    `parameter "status" in query has an error: value is required but missing`,
 			wantErrReason:  "value is required but missing",
 			wantErrResponse: &ValidationError{Status: http.StatusBadRequest,
 				Title: `parameter "status" in query is required`},
@@ -214,7 +214,7 @@ func getValidationTests(t *testing.T) []*validationTest {
 			},
 			wantErrParam:   "tags",
 			wantErrParamIn: "query",
-			wantErrBody:    `parameter "tags" in query has an error: empty value is not allowed: empty value is not allowed`,
+			wantErrBody:    `parameter "tags" in query has an error: empty value is not allowed`,
 			wantErrReason:  "empty value is not allowed",
 			wantErrResponse: &ValidationError{Status: http.StatusBadRequest,
 				Title: `parameter "tags" in query is not allowed to be empty`},
@@ -444,7 +444,7 @@ func getValidationTests(t *testing.T) []*validationTest {
 			},
 			wantErrParam:   "petId",
 			wantErrParamIn: "path",
-			wantErrBody:    `parameter "petId" in path has an error: value is required but missing: value is required but missing`,
+			wantErrBody:    `parameter "petId" in path has an error: value is required but missing`,
 			wantErrReason:  "value is required but missing",
 			wantErrResponse: &ValidationError{Status: http.StatusBadRequest,
 				Title: `parameter "petId" in path is required`},