From 3d9ad0fb5fb6dacdfd7c2e38250625c80eb3e5bf Mon Sep 17 00:00:00 2001 From: Davide Bianchi Date: Sat, 16 Oct 2021 19:23:52 +0200 Subject: [PATCH] feat: upgrade deps --- go.mod | 6 +++--- go.sum | 22 ++++++++-------------- integration_test.go | 2 +- main.go | 6 +++--- main_test.go | 24 ++++++++++++------------ route_test.go | 4 ++-- 6 files changed, 29 insertions(+), 35 deletions(-) diff --git a/go.mod b/go.mod index 8675136..7de84b8 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module github.com/davidebianchi/gswagger go 1.15 require ( - github.com/alecthomas/jsonschema v0.0.0-20210203201211-9145459e837c - github.com/getkin/kin-openapi v0.60.0 + github.com/alecthomas/jsonschema v0.0.0-20210920000243-787cd8204a0d + github.com/getkin/kin-openapi v0.79.0 github.com/ghodss/yaml v1.0.0 - github.com/go-openapi/swag v0.19.14 // indirect + github.com/go-openapi/swag v0.19.15 // indirect github.com/gorilla/mux v1.8.0 github.com/iancoleman/orderedmap v0.2.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect diff --git a/go.sum b/go.sum index 0248e25..38b8e71 100644 --- a/go.sum +++ b/go.sum @@ -1,26 +1,26 @@ github.com/alecthomas/jsonschema v0.0.0-20210203201211-9145459e837c h1:0nnrMRzKPPMexveuPcSWeuGUsdn4d8L8hUFjiudYvos= github.com/alecthomas/jsonschema v0.0.0-20210203201211-9145459e837c/go.mod h1:/n6+1/DWPltRLWL/VKyUxg6tzsl5kHUCcraimt4vr60= +github.com/alecthomas/jsonschema v0.0.0-20210920000243-787cd8204a0d h1:sUHuJQ3zwLmUgKM1v51WLWRtoy9r+hc/m7DoNftpUdA= +github.com/alecthomas/jsonschema v0.0.0-20210920000243-787cd8204a0d/go.mod h1:/n6+1/DWPltRLWL/VKyUxg6tzsl5kHUCcraimt4vr60= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/getkin/kin-openapi v0.39.0 h1:Dy0xS0Vct2bmAIXsGq/ioagVQStca9QUBD3/4XpAORA= -github.com/getkin/kin-openapi v0.39.0/go.mod h1:ZJSfy1PxJv2QQvH9EdBj3nupRTVvV42mkW6zKUlRBwk= -github.com/getkin/kin-openapi v0.48.0/go.mod h1:ZJSfy1PxJv2QQvH9EdBj3nupRTVvV42mkW6zKUlRBwk= -github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getkin/kin-openapi v0.60.0 h1:wnTPS0Vrq4CmlmLCACY/bQXduBThkZOb5OLQfBW5FiM= github.com/getkin/kin-openapi v0.60.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getkin/kin-openapi v0.79.0 h1:YLZIgIhZLq9z5WFHHIK+oWORRfn6jjwr7qN0xak0xbE= +github.com/getkin/kin-openapi v0.79.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= +github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 h1:i462o439ZjprVSFSZLZxcsoAe592sZB1rci2Z8j4wdk= github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= github.com/iancoleman/orderedmap v0.2.0 h1:sq1N/TFpYH++aViPcaKjys3bDClUEU7s5B+z6jq8pNA= github.com/iancoleman/orderedmap v0.2.0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= @@ -32,9 +32,7 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= @@ -46,22 +44,18 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/integration_test.go b/integration_test.go index 85e1657..9f65ae9 100644 --- a/integration_test.go +++ b/integration_test.go @@ -63,7 +63,7 @@ func setupSwagger(t *testing.T) *mux.Router { router, err := NewRouter(muxRouter, Options{ Context: context, - Openapi: &openapi3.Swagger{ + Openapi: &openapi3.T{ Info: &openapi3.Info{ Title: swaggerOpenapiTitle, Version: swaggerOpenapiVersion, diff --git a/main.go b/main.go index 8aeef7d..538f672 100644 --- a/main.go +++ b/main.go @@ -30,7 +30,7 @@ const ( // Router handle the gorilla mux router and the swagger schema type Router struct { router *mux.Router - swaggerSchema *openapi3.Swagger + swaggerSchema *openapi3.T context context.Context jsonDocumentationPath string yamlDocumentationPath string @@ -39,7 +39,7 @@ type Router struct { // Options to be passed to create the new router and swagger type Options struct { Context context.Context - Openapi *openapi3.Swagger + Openapi *openapi3.T // JSONDocumentationPath is the path exposed by json endpoint. Default to /documentation/json. JSONDocumentationPath string // YAMLDocumentationPath is the path exposed by yaml endpoint. Default to /documentation/yaml. @@ -83,7 +83,7 @@ func NewRouter(router *mux.Router, options Options) (*Router, error) { }, nil } -func generateNewValidSwagger(swagger *openapi3.Swagger) (*openapi3.Swagger, error) { +func generateNewValidSwagger(swagger *openapi3.T) (*openapi3.T, error) { if swagger == nil { return nil, fmt.Errorf("swagger is required") } diff --git a/main_test.go b/main_test.go index 70a190d..f03da81 100644 --- a/main_test.go +++ b/main_test.go @@ -21,7 +21,7 @@ func TestNewRouter(t *testing.T) { Title: "my title", Version: "my version", } - openapi := &openapi3.Swagger{ + openapi := &openapi3.T{ Info: info, Paths: openapi3.Paths{}, } @@ -117,7 +117,7 @@ func TestNewRouter(t *testing.T) { func TestGenerateValidSwagger(t *testing.T) { t.Run("not ok - empty swagger info", func(t *testing.T) { - swagger := &openapi3.Swagger{} + swagger := &openapi3.T{} swagger, err := generateNewValidSwagger(swagger) require.Nil(t, swagger) @@ -125,7 +125,7 @@ func TestGenerateValidSwagger(t *testing.T) { }) t.Run("not ok - empty info title", func(t *testing.T) { - swagger := &openapi3.Swagger{ + swagger := &openapi3.T{ Info: &openapi3.Info{}, } @@ -135,7 +135,7 @@ func TestGenerateValidSwagger(t *testing.T) { }) t.Run("not ok - empty info version", func(t *testing.T) { - swagger := &openapi3.Swagger{ + swagger := &openapi3.T{ Info: &openapi3.Info{ Title: "title", }, @@ -147,7 +147,7 @@ func TestGenerateValidSwagger(t *testing.T) { }) t.Run("ok - custom swagger", func(t *testing.T) { - swagger := &openapi3.Swagger{ + swagger := &openapi3.T{ Info: &openapi3.Info{}, } @@ -167,13 +167,13 @@ func TestGenerateValidSwagger(t *testing.T) { Title: "my title", Version: "my version", } - swagger := &openapi3.Swagger{ + swagger := &openapi3.T{ Info: info, } swagger, err := generateNewValidSwagger(swagger) require.NoError(t, err) - require.Equal(t, &openapi3.Swagger{ + require.Equal(t, &openapi3.T{ OpenAPI: defaultOpenapiVersion, Info: info, Paths: openapi3.Paths{}, @@ -185,7 +185,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) { t.Run("fails swagger validation", func(t *testing.T) { mRouter := mux.NewRouter() router, err := NewRouter(mRouter, Options{ - Openapi: &openapi3.Swagger{ + Openapi: &openapi3.T{ Info: &openapi3.Info{ Title: "title", Version: "version", @@ -207,7 +207,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) { t.Run("correctly expose json documentation from loaded swagger file", func(t *testing.T) { mRouter := mux.NewRouter() - swagger, err := openapi3.NewSwaggerLoader().LoadSwaggerFromFile("testdata/users_employees.json") + swagger, err := openapi3.NewLoader().LoadFromFile("testdata/users_employees.json") require.NoError(t, err) router, err := NewRouter(mRouter, Options{ @@ -233,7 +233,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) { t.Run("correctly expose json documentation from loaded swagger file - custom path", func(t *testing.T) { mRouter := mux.NewRouter() - swagger, err := openapi3.NewSwaggerLoader().LoadSwaggerFromFile("testdata/users_employees.json") + swagger, err := openapi3.NewLoader().LoadFromFile("testdata/users_employees.json") require.NoError(t, err) router, err := NewRouter(mRouter, Options{ @@ -260,7 +260,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) { t.Run("correctly expose yaml documentation from loaded swagger file", func(t *testing.T) { mRouter := mux.NewRouter() - swagger, err := openapi3.NewSwaggerLoader().LoadSwaggerFromFile("testdata/users_employees.json") + swagger, err := openapi3.NewLoader().LoadFromFile("testdata/users_employees.json") require.NoError(t, err) router, err := NewRouter(mRouter, Options{ @@ -286,7 +286,7 @@ func TestGenerateAndExposeSwagger(t *testing.T) { t.Run("correctly expose yaml documentation from loaded swagger file - custom path", func(t *testing.T) { mRouter := mux.NewRouter() - swagger, err := openapi3.NewSwaggerLoader().LoadSwaggerFromFile("testdata/users_employees.json") + swagger, err := openapi3.NewLoader().LoadFromFile("testdata/users_employees.json") require.NoError(t, err) router, err := NewRouter(mRouter, Options{ diff --git a/route_test.go b/route_test.go index 9367548..1398e24 100644 --- a/route_test.go +++ b/route_test.go @@ -936,10 +936,10 @@ func TestResolveParametersSchema(t *testing.T) { } } -func getBaseSwagger(t *testing.T) *openapi3.Swagger { +func getBaseSwagger(t *testing.T) *openapi3.T { t.Helper() - return &openapi3.Swagger{ + return &openapi3.T{ Info: &openapi3.Info{ Title: swaggerOpenapiTitle, Version: swaggerOpenapiVersion,