Merge branch 'getkin:master' into master

slessard · Mar 31, 2022 · e320853 · e320853
2 parents 543f56e + 8287d36
commit e320853
Show file tree

Hide file tree

Showing 12 changed files with 659 additions and 132 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -61,6 +61,10 @@ jobs:
     - run: go fmt ./...
     - run: git --no-pager diff --exit-code
 
+    - if: runner.os == 'Linux'
+      run: go test ./...
+      env:
+        GOARCH: '386'
     - run: go test ./...
     - run: go test -v -run TestRaceyPatternSchema -race ./...
       env:

diff --git a/openapi2/openapi2.go b/openapi2/openapi2.go
@@ -151,6 +151,7 @@ type Operation struct {
 	Responses    map[string]*Response   `json:"responses" yaml:"responses"`
 	Consumes     []string               `json:"consumes,omitempty" yaml:"consumes,omitempty"`
 	Produces     []string               `json:"produces,omitempty" yaml:"produces,omitempty"`
+	Schemes      []string               `json:"schemes,omitempty" yaml:"schemes,omitempty"`
 	Security     *SecurityRequirements  `json:"security,omitempty" yaml:"security,omitempty"`
 }
 

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/fixtures/petstore.json b/openapi3filter/fixtures/petstore.json
@@ -211,6 +211,111 @@
         ]
       }
     },
+    "/pets/": {
+      "get": {
+        "tags": [
+          "pet"
+        ],
+        "summary": "Find pets by the specified filters",
+        "description": "Returns a list of pets that comply with the specified filters",
+        "operationId": "findPets",
+        "parameters": [
+          {
+            "name": "status",
+            "in": "query",
+            "description": "Status values that need to be considered for filter",
+            "required": false,
+            "explode": true,
+            "allowEmptyValue": true,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "available",
+                  "pending",
+                  "sold"
+                ],
+                "default": "available"
+              }
+            }
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "Tags to filter by",
+            "required": false,
+            "explode": true,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "kind",
+            "in": "query",
+            "description": "Kinds to filter by",
+            "required": false,
+            "explode": false,
+            "style": "pipeDelimited",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string",
+                "enum": [
+                  "dog",
+                  "cat",
+                  "turtle",
+                  "bird,with,commas"
+                ]
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "successful operation",
+            "content": {
+              "application/xml": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "allOf": [
+                      {"$ref": "#/components/schemas/Pet"},
+                      {"$ref": "#/components/schemas/PetRequiredProperties"}
+                    ]
+                  }
+                }
+              },
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "allOf": [
+                      {"$ref": "#/components/schemas/Pet"},
+                      {"$ref": "#/components/schemas/PetRequiredProperties"}
+                    ]
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid status value"
+          }
+        },
+        "security": [
+          {
+            "petstore_auth": [
+              "write:pets",
+              "read:pets"
+            ]
+          }
+        ]
+      }
+    },
     "/pet/findByTags": {
       "get": {
         "tags": [

diff --git a/openapi3filter/internal.go b/openapi3filter/internal.go
@@ -1,6 +1,7 @@
 package openapi3filter
 
 import (
+	"reflect"
 	"strings"
 )
 
@@ -11,3 +12,14 @@ func parseMediaType(contentType string) string {
 	}
 	return contentType[:i]
 }
+
+func isNilValue(value interface{}) bool {
+	if value == nil {
+		return true
+	}
+	switch reflect.TypeOf(value).Kind() {
+	case reflect.Ptr, reflect.Map, reflect.Array, reflect.Chan, reflect.Slice:
+		return reflect.ValueOf(value).IsNil()
+	}
+	return false
+}
diff --git a/openapi3filter/middleware_test.go b/openapi3filter/middleware_test.go
@@ -420,7 +420,7 @@ paths:
 	// requests.
 	squareHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		xParam := path.Base(r.URL.Path)
-		x, err := strconv.Atoi(xParam)
+		x, err := strconv.ParseInt(xParam, 10, 64)
 		if err != nil {
 			panic(err)
 		}