return 404 when no matching route is found (#1067)

* return 404 when a matching route is not found * update other middleware and tests

Author: sonu27

oapi_validate.go

@@ -88,10 +88,18 @@ func OapiRequestValidatorWithOptions(swagger *openapi3.T, options *Options) gin.
 return func(c *gin.Context) {
 err := ValidateRequestFromContext(c, router, options)
 if err != nil {
-if options != nil && options.ErrorHandler != nil {
-options.ErrorHandler(c, err.Error(), http.StatusBadRequest)
+// using errors.Is did not work
+if options != nil && options.ErrorHandler != nil && err.Error() == routers.ErrPathNotFound.Error() {
+options.ErrorHandler(c, err.Error(), http.StatusNotFound)
 // in case the handler didn't internally call Abort, stop the chain
 c.Abort()
+} else if options != nil && options.ErrorHandler != nil {
+options.ErrorHandler(c, err.Error(), http.StatusBadRequest)
+// in case the handler didn't internally call Abort, stop the chain
+c.Abort()
+} else if err.Error() == routers.ErrPathNotFound.Error() {
+// note: i am not sure if this is the best way to handle this
+c.AbortWithStatusJSON(http.StatusNotFound, gin.H{"error": err.Error()})
 } else {
 // note: i am not sure if this is the best way to handle this
 c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": err.Error()})

oapi_validate_test.go

@@ -101,10 +101,10 @@ func TestOapiRequestValidator(t *testing.T) {
 g.GET("/resource", func(c *gin.Context) {
 called = true
 })
-// Let's send the request to the wrong server, this should fail validation
+// Let's send the request to the wrong server, this should return 404
 {
 rec := doGet(t, g, "http://not.deepmap.ai/resource")
-assert.Equal(t, http.StatusBadRequest, rec.Code)
+assert.Equal(t, http.StatusNotFound, rec.Code)
 assert.False(t, called, "Handler should not have been called")
 }