Migrate to net/http middleware

Instead of just being for chi, we can take this opportunity to make it
clear this works for any net/http compatible router.

We can also make sure we've got test coverage for both Chi and Gorilla,
the routers that right now would be using this middleware.

Author: jamietanna

README.md

@@ -1,7 +1,13 @@
-# Chi Middleware
+# `net/http` Middleware
 
 ⚠️ This README may be for the latest development version, which may contain unreleased changes. Please ensure you're looking at the README for the latest release version.
 
-Middleware for the [Chi web server](https://github.com/go-chi/chi) for use with [deepmap/oapi-codegen](https://github.com/deepmap/oapi-codegen).
+Middleware for servers that implement `net/http` handlers, for use with [deepmap/oapi-codegen](https://github.com/deepmap/oapi-codegen), which has been tested to work with:
+
+- [Chi](https://github.com/go-chi/chi)
+- [gorilla/mux](https://github.com/gorilla/mux)
+- [net/http](https://pkg.go.dev/net/http)
+
+But if you're using something that's compliant with `net/http` it should work as-is.
 
 Licensed under the Apache-2.0.

go.mod

@@ -6,14 +6,14 @@ require (
 	github.com/deepmap/oapi-codegen v1.14.0
 	github.com/getkin/kin-openapi v0.118.0
 	github.com/go-chi/chi/v5 v5.0.10
+	github.com/gorilla/mux v1.8.0
 	github.com/stretchr/testify v1.8.4
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/labstack/echo/v4 v4.11.1 // indirect

oapi_validate.go

@@ -1,7 +1,7 @@
-// Package middleware implements middleware function for go-chi or net/http,
+// Package middleware implements middleware function for net/http compatible router
 // which validates incoming HTTP requests to make sure that they conform to the given OAPI 3.0 specification.
 // When OAPI validation fails on the request, we return an HTTP/400.
-package chimiddleware
+package nethttpmiddleware
 
 import (
 	"errors"
@@ -32,13 +32,11 @@ type Options struct {
 }
 
 // OapiRequestValidator Creates middleware to validate request by swagger spec.
-// This middleware is good for net/http either since go-chi is 100% compatible with net/http.
 func OapiRequestValidator(swagger *openapi3.T) func(next http.Handler) http.Handler {
 	return OapiRequestValidatorWithOptions(swagger, nil)
 }
 
 // OapiRequestValidatorWithOptions Creates middleware to validate request by swagger spec.
-// This middleware is good for net/http either since go-chi is 100% compatible with net/http.
 func OapiRequestValidatorWithOptions(swagger *openapi3.T, options *Options) func(next http.Handler) http.Handler {
 	if swagger.Servers != nil && (options == nil || !options.SilenceServersWarning) {
 		log.Println("WARN: OapiRequestValidatorWithOptions called with an OpenAPI spec that has `Servers` set. This may lead to an HTTP 400 with `no matching operation was found` when sending a valid request, as the validator performs `Host` header validation. If you're expecting `Host` header validation, you can silence this warning by setting `Options.SilenceServersWarning = true`. See https://github.com/deepmap/oapi-codegen/issues/882 for more information.")

oapi_validate_test.go renamed to oapi_validate_chi_test.go

@@ -1,4 +1,4 @@
-package chimiddleware
+package nethttpmiddleware
 
 import (
 	"context"
@@ -41,7 +41,7 @@ func doPost(t *testing.T, mux http.Handler, rawURL string, jsonBody interface{})
 	return response.Recorder
 }
 
-func TestOapiRequestValidator(t *testing.T) {
+func TestOapiRequestValidator_chi(t *testing.T) {
 	swagger, err := openapi3.NewLoader().LoadFromData(testSchema)
 	require.NoError(t, err, "Error initializing swagger")
 
@@ -51,10 +51,10 @@ func TestOapiRequestValidator(t *testing.T) {
 	r.Use(OapiRequestValidator(swagger))
 
 	// basic cases
-	testRequestValidatorBasicFunctions(t, r)
+	testChiRequestValidatorBasicFunctions(t, r)
 }
 
-func TestOapiRequestValidatorWithOptionsMultiError(t *testing.T) {
+func TestOapiRequestValidatorWithOptionsMultiError_chi(t *testing.T) {
 	swagger, err := openapi3.NewLoader().LoadFromData(testSchema)
 	require.NoError(t, err, "Error initializing swagger")
 
@@ -153,7 +153,7 @@ func TestOapiRequestValidatorWithOptionsMultiError(t *testing.T) {
 	}
 }
 
-func TestOapiRequestValidatorWithOptionsMultiErrorAndCustomHandler(t *testing.T) {
+func TestOapiRequestValidatorWithOptionsMultiErrorAndCustomHandler_chi(t *testing.T) {
 	swagger, err := openapi3.NewLoader().LoadFromData(testSchema)
 	require.NoError(t, err, "Error initializing swagger")
 
@@ -255,7 +255,7 @@ func TestOapiRequestValidatorWithOptionsMultiErrorAndCustomHandler(t *testing.T)
 	}
 }
 
-func TestOapiRequestValidatorWithOptions(t *testing.T) {
+func TestOapiRequestValidatorWithOptions_chi(t *testing.T) {
 	swagger, err := openapi3.NewLoader().LoadFromData(testSchema)
 	require.NoError(t, err, "Error initializing swagger")
 
@@ -284,7 +284,7 @@ func TestOapiRequestValidatorWithOptions(t *testing.T) {
 	r.Use(OapiRequestValidatorWithOptions(swagger, &options))
 
 	// basic cases
-	testRequestValidatorBasicFunctions(t, r)
+	testChiRequestValidatorBasicFunctions(t, r)
 
 	called := false
 
@@ -328,7 +328,7 @@ func TestOapiRequestValidatorWithOptions(t *testing.T) {
 
 }
 
-func testRequestValidatorBasicFunctions(t *testing.T, r *chi.Mux) {
+func testChiRequestValidatorBasicFunctions(t *testing.T, r *chi.Mux) {
 
 	called := false