sq

Author: Jamie Tanna

oapi_validate_example_test.go

@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"reflect"
-	"strings"
 
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/getkin/kin-openapi/openapi3filter"
@@ -357,6 +356,10 @@ paths:
                 id:
                   type: string
                   minLength: 100
+                name:
+                  type: string
+                  enum:
+                  - Marcin
               additionalProperties: false
   /protected_resource:
     get:
@@ -468,10 +471,6 @@ components:
 		case *openapi3filter.RequestError:
 			out := fmt.Sprintf("A RequestError was returned when attempting to validate the request to %s %s: %s\n", opts.MatchedRoute.Route.Method, opts.MatchedRoute.Route.Path, e.Error())
 
-			fmt.Printf("e: %#v\n", e)
-			// fmt.Printf("ErrorHandlerWithOpts: An HTTP %d was returned by the middleware with error message:  request body has an error: value is required but missing TODO TODO TODO\n", opts.StatusCode)
-			// http.Error(w, e.Error(), opts.StatusCode)
-
 			if e.RequestBody != nil {
 				out += "This operation has a request body, which was "
 				if !e.RequestBody.Required {
@@ -480,6 +479,9 @@ components:
 				out += "required\n"
 			}
 
+			fmt.Printf("e: %#v\n", e)
+			fmt.Printf("e.Err: %#v\n", e.Err)
+
 			if childErr := e.Unwrap(); childErr != nil {
 				out += "There was a child error, which was "
 				switch e := childErr.(type) {
@@ -492,7 +494,7 @@ components:
 
 			fmt.Printf("ErrorHandlerWithOpts: %s\n", out)
 
-			http.Error(w, "TODO TODO TODO", opts.StatusCode)
+			http.Error(w, "A bad request was made - but I'm not going to tell you where or how", opts.StatusCode)
 			return
 		}
 
@@ -528,7 +530,15 @@ components:
 	// ================================================================================
 	fmt.Println("# A request that is malformed is rejected with HTTP 400 Bad Request (with an invalid request body), and is then logged by the ErrorHandlerWithOpts")
 
-	req, err = http.NewRequest(http.MethodPost, "/resource", strings.NewReader(`{"id":"not-long-enough"}`))
+	body := map[string]string{
+		"id":   "not-long-enough",
+		"name": "Jamie",
+	}
+
+	data, err := json.Marshal(body)
+	must(err)
+
+	req, err = http.NewRequest(http.MethodPost, "/resource", bytes.NewReader(data))
 	must(err)
 	req.Header.Set("Content-Type", "application/json")
 
@@ -570,9 +580,11 @@ components:
 
 	// Output:
 	// # A request that is malformed is rejected with HTTP 400 Bad Request (with no request body), and is then logged by the ErrorHandlerWithOpts
-	// ErrorHandlerWithOpts: An HTTP 400 was returned by the middleware with error message: request body has an error: value is required but missing TODO TODO TODO
+	// ErrorHandlerWithOpts: A RequestError was returned when attempting to validate the request to POST /resource: request body has an error: value is required but missing
+	// This operation has a request body, which was required
+	// There was a child error, which was an unknown type (*errors.errorString)
 	// Received an HTTP 400 response. Expected HTTP 400
-	// Response body: This was rewritten by the ErrorHandlerWithOpts TODO
+	// Response body: A bad request was made - but I'm not going to tell you where or how
 	//
 	// # A request that is malformed is rejected with HTTP 400 Bad Request (with an invalid request body), and is then logged by the ErrorHandlerWithOpts
 	// ErrorHandlerWithOpts: A RequestError was returned when attempting to validate the request to POST /resource: request body has an error: doesn't match schema: Error at "/id": minimum string length is 100
@@ -585,12 +597,13 @@ components:
 	// Value:
 	//   "not-long-enough"
 	//
-	//
+	// This operation has a request body, which was required
+	// There was a child error, which was a SchemaError, which failed to validate on the minLength field
 	// Received an HTTP 400 response. Expected HTTP 400
-	// Response body: This was rewritten by the ErrorHandlerWithOpts TODO
+	// Response body: A bad request was made - but I'm not going to tell you where or how
 	//
 	// # A request that to an unknown path is rejected with HTTP 404 Not Found, and is then logged by the ErrorHandlerWithOpts
-	// ErrorHandlerWithOpts: An HTTP 400 was returned by the middleware with error message: no matching operation was found
+	// ErrorHandlerWithOpts: An HTTP 404 was returned by the middleware with error message: no matching operation was found
 	// Received an HTTP 404 response. Expected HTTP 404
 	// Response body: No route was found (according to ErrorHandlerWithOpts), and we changed the HTTP status code to 404
 	//