Skip to content

Commit

Permalink
Fix flaky CI (#278)
Browse files Browse the repository at this point in the history
  • Loading branch information
fenollp committed Dec 23, 2020
1 parent 9b9280d commit f05a913
Show file tree
Hide file tree
Showing 3 changed files with 636 additions and 599 deletions.
15 changes: 15 additions & 0 deletions openapi2/openapi2.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ package openapi2
import (
"fmt"
"net/http"
"sort"

"github.com/getkin/kin-openapi/jsoninfo"
"github.com/getkin/kin-openapi/openapi3"
Expand Down Expand Up @@ -168,6 +169,20 @@ func (operation *Operation) UnmarshalJSON(data []byte) error {

type Parameters []*Parameter

var _ sort.Interface = Parameters{}

func (ps Parameters) Len() int { return len(ps) }
func (ps Parameters) Swap(i, j int) { ps[i], ps[j] = ps[j], ps[i] }
func (ps Parameters) Less(i, j int) bool {
if ps[i].Name != ps[j].Name {
return ps[i].Name < ps[j].Name
}
if ps[i].In != ps[j].In {
return ps[i].In < ps[i].In
}
return ps[i].Ref < ps[j].Ref
}

type Parameter struct {
openapi3.ExtensionProps
Ref string `json:"$ref,omitempty"`
Expand Down
2 changes: 2 additions & 0 deletions openapi2conv/openapi2_conv.go
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,7 @@ func FromV3Swagger(swagger *openapi3.Swagger) (*openapi2.Swagger, error) {
}
params = append(params, p)
}
sort.Sort(params)
result.Paths[path].Parameters = params
}

Expand Down Expand Up @@ -922,6 +923,7 @@ func FromV3Operation(swagger *openapi3.Swagger, operation *openapi3.Operation) (
result.Consumes = consumesToArray(consumes)
}
}
sort.Sort(result.Parameters)

if responses := operation.Responses; responses != nil {
resultResponses, err := FromV3Responses(responses, &swagger.Components)
Expand Down

0 comments on commit f05a913

Please sign in to comment.