chore: Fix comments/imports (#789)

* Format yaml

* Format imports

* Fix comments

* Format yamls

* Tidy

* Renames

* Generate

* Revert generated

Author: Jleagle

oapi_validate.go

@@ -18,8 +18,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 	"net/http"
+	"os"
 	"strings"
 
 	"github.com/getkin/kin-openapi/openapi3"
@@ -35,10 +35,9 @@ const (
 	UserDataKey    = "oapi-codegen/user-data"
 )
 
-// This is an Echo middleware function which validates incoming HTTP requests
+// OapiValidatorFromYamlFile is an Echo middleware function 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.
-
 // Create validator middleware from a YAML file path
 func OapiValidatorFromYamlFile(path string) (echo.MiddlewareFunc, error) {
 	data, err := os.ReadFile(path)
@@ -54,7 +53,7 @@ func OapiValidatorFromYamlFile(path string) (echo.MiddlewareFunc, error) {
 	return OapiRequestValidator(swagger), nil
 }
 
-// Create a validator from a swagger object.
+// OapiRequestValidator creates a validator from a swagger object.
 func OapiRequestValidator(swagger *openapi3.T) echo.MiddlewareFunc {
 	return OapiRequestValidatorWithOptions(swagger, nil)
 }
@@ -183,7 +182,7 @@ func ValidateRequestFromContext(ctx echo.Context, router routers.Router, options
 	return nil
 }
 
-// Helper function to get the echo context from within requests. It returns
+// GetEchoContext gets the echo context from within requests. It returns
 // nil if not found or wrong type.
 func GetEchoContext(c context.Context) echo.Context {
 	iface := c.Value(EchoContextKey)

oapi_validate_test.go

@@ -24,14 +24,13 @@ import (
 	"net/url"
 	"testing"
 
+	"github.com/deepmap/oapi-codegen/pkg/testutil"
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/getkin/kin-openapi/openapi3filter"
 	"github.com/labstack/echo/v4"
 	echomiddleware "github.com/labstack/echo/v4/middleware"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/deepmap/oapi-codegen/pkg/testutil"
 )
 
 //go:embed test_spec.yaml
@@ -208,7 +207,7 @@ func TestOapiRequestValidator(t *testing.T) {
 }
 
 func TestOapiRequestValidatorWithOptionsMultiError(t *testing.T) {
-	swagger, err := openapi3.NewLoader().LoadFromData([]byte(testSchema))
+	swagger, err := openapi3.NewLoader().LoadFromData(testSchema)
 	require.NoError(t, err, "Error initializing swagger")
 
 	// Create a new echo router
@@ -309,7 +308,7 @@ func TestOapiRequestValidatorWithOptionsMultiError(t *testing.T) {
 }
 
 func TestOapiRequestValidatorWithOptionsMultiErrorAndCustomHandler(t *testing.T) {
-	swagger, err := openapi3.NewLoader().LoadFromData([]byte(testSchema))
+	swagger, err := openapi3.NewLoader().LoadFromData(testSchema)
 	require.NoError(t, err, "Error initializing swagger")
 
 	// Create a new echo router

test_spec.yaml

@@ -86,15 +86,15 @@ paths:
             maximum: 100
       responses:
         '200':
-            description: success
-            content:
-              application/json:
-                schema:
-                  properties:
-                    name:
-                      type: string
-                    id:
-                      type: integer
+          description: success
+          content:
+            application/json:
+              schema:
+                properties:
+                  name:
+                    type: string
+                  id:
+                    type: integer
 components:
   securitySchemes:
     BearerAuth: