From 3dbed452cdd7a1e11484d5f58b47ea92e349123f Mon Sep 17 00:00:00 2001 From: Frederic BIDON Date: Sun, 9 Nov 2025 17:04:44 +0100 Subject: [PATCH] tests: replaced stretchr/testify by go-openapi/testify Signed-off-by: Frederic BIDON --- authinfo_test.go | 4 +- bytestream_test.go | 4 +- client-middleware/opentracing/go.mod | 28 +++++----- client-middleware/opentracing/go.sum | 54 ++++++++++--------- .../opentracing/opentracing_test.go | 8 +-- client-middleware/opentracing/runtime.go | 1 + client/auth_info_test.go | 4 +- client/keepalive_test.go | 4 +- client/opentelemetry_test.go | 4 +- client/request_test.go | 4 +- client/response_test.go | 2 +- client/runtime_test.go | 4 +- client/runtime_tls_test.go | 4 +- client_request_test.go | 2 +- client_response_test.go | 4 +- csv_test.go | 4 +- file_test.go | 4 +- flagext/byte_size_test.go | 4 +- go.mod | 31 +++++------ go.sum | 54 ++++++++++--------- go.work.sum | 5 ++ headers_test.go | 6 +-- internal/testing/data_test.go | 2 +- internal/testing/petstore/api.go | 2 +- internal/testing/petstore/api_test.go | 2 +- internal/testing/simplepetstore/api_test.go | 4 +- json_test.go | 4 +- logger/logger_test.go | 2 +- middleware/body_test.go | 4 +- middleware/context_test.go | 4 +- middleware/debug_test.go | 4 +- middleware/denco/router_test.go | 4 +- middleware/denco/server_test.go | 4 +- middleware/header/header_test.go | 2 +- middleware/not_implemented_test.go | 2 +- middleware/operation_test.go | 4 +- middleware/parameter_test.go | 4 +- middleware/rapidoc_test.go | 4 +- middleware/redoc_test.go | 4 +- middleware/request_test.go | 4 +- middleware/route_authenticator_test.go | 2 +- middleware/route_param_test.go | 2 +- middleware/router_test.go | 4 +- middleware/security_test.go | 4 +- middleware/spec_test.go | 6 +-- middleware/string_conversion_test.go | 4 +- middleware/swaggerui_oauth2_test.go | 4 +- middleware/swaggerui_test.go | 4 +- middleware/ui_options_test.go | 2 +- middleware/untyped/api_test.go | 4 +- middleware/untyped_request_test.go | 4 +- middleware/validation_test.go | 6 +-- request_test.go | 8 +-- security/apikey_auth_test.go | 4 +- security/authorizer_test.go | 4 +- security/basic_auth_test.go | 4 +- security/bearer_auth_test.go | 4 +- text_test.go | 4 +- values_test.go | 2 +- xml_test.go | 4 +- yamlpc/yaml_test.go | 5 +- 61 files changed, 194 insertions(+), 190 deletions(-) diff --git a/authinfo_test.go b/authinfo_test.go index d3d8b22..2ffab29 100644 --- a/authinfo_test.go +++ b/authinfo_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestAuthInfoWriter(t *testing.T) { diff --git a/bytestream_test.go b/bytestream_test.go index 38b45e6..6e6d342 100644 --- a/bytestream_test.go +++ b/bytestream_test.go @@ -12,8 +12,8 @@ import ( "sync/atomic" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestByteStreamConsumer(t *testing.T) { diff --git a/client-middleware/opentracing/go.mod b/client-middleware/opentracing/go.mod index 039d409..a766e40 100644 --- a/client-middleware/opentracing/go.mod +++ b/client-middleware/opentracing/go.mod @@ -2,22 +2,20 @@ module github.com/go-openapi/runtime/client-middleware/opentracing require ( github.com/go-openapi/runtime v0.28.0 - github.com/go-openapi/strfmt v0.24.0 + github.com/go-openapi/strfmt v0.25.0 + github.com/go-openapi/testify/v2 v2.0.2 github.com/opentracing/opentracing-go v1.2.0 - github.com/stretchr/testify v1.11.1 ) require ( - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-openapi/analysis v0.24.0 // indirect - github.com/go-openapi/errors v0.22.3 // indirect + github.com/go-openapi/analysis v0.24.1 // indirect + github.com/go-openapi/errors v0.22.4 // indirect github.com/go-openapi/jsonpointer v0.22.1 // indirect - github.com/go-openapi/jsonreference v0.21.2 // indirect - github.com/go-openapi/loads v0.23.1 // indirect - github.com/go-openapi/spec v0.22.0 // indirect + github.com/go-openapi/jsonreference v0.21.3 // indirect + github.com/go-openapi/loads v0.23.2 // indirect + github.com/go-openapi/spec v0.22.1 // indirect github.com/go-openapi/swag/conv v0.25.1 // indirect github.com/go-openapi/swag/fileutils v0.25.1 // indirect github.com/go-openapi/swag/jsonname v0.25.1 // indirect @@ -27,21 +25,19 @@ require ( github.com/go-openapi/swag/stringutils v0.25.1 // indirect github.com/go-openapi/swag/typeutils v0.25.1 // indirect github.com/go-openapi/swag/yamlutils v0.25.1 // indirect - github.com/go-openapi/validate v0.25.0 // indirect + github.com/go-openapi/validate v0.25.1 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/oklog/ulid v1.3.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - go.mongodb.org/mongo-driver v1.17.4 // indirect + go.mongodb.org/mongo-driver v1.17.6 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/otel v1.38.0 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect go.opentelemetry.io/otel/trace v1.38.0 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/net v0.44.0 // indirect - golang.org/x/sync v0.17.0 // indirect - golang.org/x/text v0.29.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + golang.org/x/net v0.46.0 // indirect + golang.org/x/sync v0.18.0 // indirect + golang.org/x/text v0.30.0 // indirect ) replace github.com/go-openapi/runtime => ../.. diff --git a/client-middleware/opentracing/go.sum b/client-middleware/opentracing/go.sum index 9a074a4..25f19f3 100644 --- a/client-middleware/opentracing/go.sum +++ b/client-middleware/opentracing/go.sum @@ -1,5 +1,3 @@ -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= 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= @@ -8,20 +6,20 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-openapi/analysis v0.24.0 h1:vE/VFFkICKyYuTWYnplQ+aVr45vlG6NcZKC7BdIXhsA= -github.com/go-openapi/analysis v0.24.0/go.mod h1:GLyoJA+bvmGGaHgpfeDh8ldpGo69fAJg7eeMDMRCIrw= -github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs= -github.com/go-openapi/errors v0.22.3/go.mod h1:+WvbaBBULWCOna//9B9TbLNGSFOfF8lY9dw4hGiEiKQ= +github.com/go-openapi/analysis v0.24.1 h1:Xp+7Yn/KOnVWYG8d+hPksOYnCYImE3TieBa7rBOesYM= +github.com/go-openapi/analysis v0.24.1/go.mod h1:dU+qxX7QGU1rl7IYhBC8bIfmWQdX4Buoea4TGtxXY84= +github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM= +github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk= github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk= github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= -github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU= -github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ= -github.com/go-openapi/loads v0.23.1 h1:H8A0dX2KDHxDzc797h0+uiCZ5kwE2+VojaQVaTlXvS0= -github.com/go-openapi/loads v0.23.1/go.mod h1:hZSXkyACCWzWPQqizAv/Ye0yhi2zzHwMmoXQ6YQml44= -github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw= -github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0= -github.com/go-openapi/strfmt v0.24.0 h1:dDsopqbI3wrrlIzeXRbqMihRNnjzGC+ez4NQaAAJLuc= -github.com/go-openapi/strfmt v0.24.0/go.mod h1:Lnn1Bk9rZjXxU9VMADbEEOo7D7CDyKGLsSKekhFr7s4= +github.com/go-openapi/jsonreference v0.21.3 h1:96Dn+MRPa0nYAR8DR1E03SblB5FJvh7W6krPI0Z7qMc= +github.com/go-openapi/jsonreference v0.21.3/go.mod h1:RqkUP0MrLf37HqxZxrIAtTWW4ZJIK1VzduhXYBEeGc4= +github.com/go-openapi/loads v0.23.2 h1:rJXAcP7g1+lWyBHC7iTY+WAF0rprtM+pm8Jxv1uQJp4= +github.com/go-openapi/loads v0.23.2/go.mod h1:IEVw1GfRt/P2Pplkelxzj9BYFajiWOtY2nHZNj4UnWY= +github.com/go-openapi/spec v0.22.1 h1:beZMa5AVQzRspNjvhe5aG1/XyBSMeX1eEOs7dMoXh/k= +github.com/go-openapi/spec v0.22.1/go.mod h1:c7aeIQT175dVowfp7FeCvXXnjN/MrpaONStibD2WtDA= +github.com/go-openapi/strfmt v0.25.0 h1:7R0RX7mbKLa9EYCTHRcCuIPcaqlyQiWNPTXwClK0saQ= +github.com/go-openapi/strfmt v0.25.0/go.mod h1:nNXct7OzbwrMY9+5tLX4I21pzcmE6ccMGXl3jFdPfn8= github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0= github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs= github.com/go-openapi/swag/fileutils v0.25.1 h1:rSRXapjQequt7kqalKXdcpIegIShhTPXx7yw0kek2uU= @@ -42,8 +40,12 @@ github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3 github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8= github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk= github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg= -github.com/go-openapi/validate v0.25.0 h1:JD9eGX81hDTjoY3WOzh6WqxVBVl7xjsLnvDo1GL5WPU= -github.com/go-openapi/validate v0.25.0/go.mod h1:SUY7vKrN5FiwK6LyvSwKjDfLNirSfWwHNgxd2l29Mmw= +github.com/go-openapi/testify/enable/yaml/v2 v2.0.2 h1:0+Y41Pz1NkbTHz8NngxTuAXxEodtNSI1WG1c/m5Akw4= +github.com/go-openapi/testify/enable/yaml/v2 v2.0.2/go.mod h1:kme83333GCtJQHXQ8UKX3IBZu6z8T5Dvy5+CW3NLUUg= +github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls= +github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54= +github.com/go-openapi/validate v0.25.1 h1:sSACUI6Jcnbo5IWqbYHgjibrhhmt3vR6lCzKZnmAgBw= +github.com/go-openapi/validate v0.25.1/go.mod h1:RMVyVFYte0gbSTaZ0N4KmTn6u/kClvAFp+mAVfS/DQc= github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= @@ -66,8 +68,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw= -go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= +go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss= +go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= @@ -80,14 +82,14 @@ go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJr go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= -golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= -golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= -golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= +golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/client-middleware/opentracing/opentracing_test.go b/client-middleware/opentracing/opentracing_test.go index aa2e911..da185bb 100644 --- a/client-middleware/opentracing/opentracing_test.go +++ b/client-middleware/opentracing/opentracing_test.go @@ -9,15 +9,15 @@ import ( "io" "testing" + "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" + "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" "github.com/opentracing/opentracing-go/mocktracer" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - - "github.com/go-openapi/runtime" ) type tres struct { diff --git a/client-middleware/opentracing/runtime.go b/client-middleware/opentracing/runtime.go index 727b671..c9759cc 100644 --- a/client-middleware/opentracing/runtime.go +++ b/client-middleware/opentracing/runtime.go @@ -6,6 +6,7 @@ package opentracing import ( "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/client" + opentracing "github.com/opentracing/opentracing-go" ) diff --git a/client/auth_info_test.go b/client/auth_info_test.go index 1efd5a7..666df91 100644 --- a/client/auth_info_test.go +++ b/client/auth_info_test.go @@ -7,8 +7,8 @@ import ( "net/http" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/runtime" ) diff --git a/client/keepalive_test.go b/client/keepalive_test.go index d97f4eb..26d010a 100644 --- a/client/keepalive_test.go +++ b/client/keepalive_test.go @@ -8,8 +8,8 @@ import ( "io" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func newCountingReader(rdr io.Reader, readOnce bool) *countingReadCloser { diff --git a/client/opentelemetry_test.go b/client/opentelemetry_test.go index 3c9a08a..8bf7c08 100644 --- a/client/opentelemetry_test.go +++ b/client/opentelemetry_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/go-openapi/runtime" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/codes" diff --git a/client/request_test.go b/client/request_test.go index 240fb48..adf2b31 100644 --- a/client/request_test.go +++ b/client/request_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/runtime" ) diff --git a/client/response_test.go b/client/response_test.go index c4b9a8b..50d851f 100644 --- a/client/response_test.go +++ b/client/response_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" "github.com/go-openapi/runtime" ) diff --git a/client/runtime_test.go b/client/runtime_test.go index 6dab300..0b63aac 100644 --- a/client/runtime_test.go +++ b/client/runtime_test.go @@ -20,8 +20,8 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) const ( diff --git a/client/runtime_tls_test.go b/client/runtime_tls_test.go index 3dd0cf1..cbb1993 100644 --- a/client/runtime_tls_test.go +++ b/client/runtime_tls_test.go @@ -21,8 +21,8 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestRuntimeTLSOptions(t *testing.T) { diff --git a/client_request_test.go b/client_request_test.go index 8d1e420..4827a9d 100644 --- a/client_request_test.go +++ b/client_request_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" ) func TestRequestWriterFunc(t *testing.T) { diff --git a/client_response_test.go b/client_response_test.go index 33a3929..8a0169b 100644 --- a/client_response_test.go +++ b/client_response_test.go @@ -10,8 +10,8 @@ import ( "io/fs" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) type response struct { diff --git a/csv_test.go b/csv_test.go index fc32641..c4357bc 100644 --- a/csv_test.go +++ b/csv_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) const ( diff --git a/file_test.go b/file_test.go index 6213723..637afd9 100644 --- a/file_test.go +++ b/file_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/go-openapi/spec" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/validate" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestValidateFile(t *testing.T) { diff --git a/flagext/byte_size_test.go b/flagext/byte_size_test.go index 79a4e9a..7c50888 100644 --- a/flagext/byte_size_test.go +++ b/flagext/byte_size_test.go @@ -6,8 +6,8 @@ package flagext import ( "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestMarshalBytesize(t *testing.T) { diff --git a/go.mod b/go.mod index b22ee02..a4ae56f 100644 --- a/go.mod +++ b/go.mod @@ -2,28 +2,27 @@ module github.com/go-openapi/runtime require ( github.com/docker/go-units v0.5.0 - github.com/go-openapi/analysis v0.24.0 - github.com/go-openapi/errors v0.22.3 - github.com/go-openapi/loads v0.23.1 - github.com/go-openapi/spec v0.22.0 - github.com/go-openapi/strfmt v0.24.0 + github.com/go-openapi/analysis v0.24.1 + github.com/go-openapi/errors v0.22.4 + github.com/go-openapi/loads v0.23.2 + github.com/go-openapi/spec v0.22.1 + github.com/go-openapi/strfmt v0.25.0 github.com/go-openapi/swag/fileutils v0.25.1 - github.com/go-openapi/validate v0.25.0 - github.com/stretchr/testify v1.11.1 + github.com/go-openapi/testify/enable/yaml/v2 v2.0.2 + github.com/go-openapi/testify/v2 v2.0.2 + github.com/go-openapi/validate v0.25.1 go.opentelemetry.io/otel v1.38.0 go.opentelemetry.io/otel/sdk v1.38.0 go.opentelemetry.io/otel/trace v1.38.0 go.yaml.in/yaml/v3 v3.0.4 - golang.org/x/sync v0.17.0 + golang.org/x/sync v0.18.0 ) require ( - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/jsonpointer v0.22.1 // indirect - github.com/go-openapi/jsonreference v0.21.2 // indirect + github.com/go-openapi/jsonreference v0.21.3 // indirect github.com/go-openapi/swag/conv v0.25.1 github.com/go-openapi/swag/jsonname v0.25.1 // indirect github.com/go-openapi/swag/jsonutils v0.25.1 @@ -35,14 +34,12 @@ require ( github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/oklog/ulid v1.3.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - go.mongodb.org/mongo-driver v1.17.4 // indirect + go.mongodb.org/mongo-driver v1.17.6 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect go.opentelemetry.io/otel/metric v1.38.0 // indirect - golang.org/x/net v0.44.0 // indirect - golang.org/x/sys v0.36.0 // indirect - golang.org/x/text v0.29.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect + golang.org/x/net v0.46.0 // indirect + golang.org/x/sys v0.37.0 // indirect + golang.org/x/text v0.30.0 // indirect ) go 1.24.0 diff --git a/go.sum b/go.sum index 2656b72..1532745 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= 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/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -9,20 +7,20 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-openapi/analysis v0.24.0 h1:vE/VFFkICKyYuTWYnplQ+aVr45vlG6NcZKC7BdIXhsA= -github.com/go-openapi/analysis v0.24.0/go.mod h1:GLyoJA+bvmGGaHgpfeDh8ldpGo69fAJg7eeMDMRCIrw= -github.com/go-openapi/errors v0.22.3 h1:k6Hxa5Jg1TUyZnOwV2Lh81j8ayNw5VVYLvKrp4zFKFs= -github.com/go-openapi/errors v0.22.3/go.mod h1:+WvbaBBULWCOna//9B9TbLNGSFOfF8lY9dw4hGiEiKQ= +github.com/go-openapi/analysis v0.24.1 h1:Xp+7Yn/KOnVWYG8d+hPksOYnCYImE3TieBa7rBOesYM= +github.com/go-openapi/analysis v0.24.1/go.mod h1:dU+qxX7QGU1rl7IYhBC8bIfmWQdX4Buoea4TGtxXY84= +github.com/go-openapi/errors v0.22.4 h1:oi2K9mHTOb5DPW2Zjdzs/NIvwi2N3fARKaTJLdNabaM= +github.com/go-openapi/errors v0.22.4/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk= github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk= github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= -github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU= -github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ= -github.com/go-openapi/loads v0.23.1 h1:H8A0dX2KDHxDzc797h0+uiCZ5kwE2+VojaQVaTlXvS0= -github.com/go-openapi/loads v0.23.1/go.mod h1:hZSXkyACCWzWPQqizAv/Ye0yhi2zzHwMmoXQ6YQml44= -github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw= -github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0= -github.com/go-openapi/strfmt v0.24.0 h1:dDsopqbI3wrrlIzeXRbqMihRNnjzGC+ez4NQaAAJLuc= -github.com/go-openapi/strfmt v0.24.0/go.mod h1:Lnn1Bk9rZjXxU9VMADbEEOo7D7CDyKGLsSKekhFr7s4= +github.com/go-openapi/jsonreference v0.21.3 h1:96Dn+MRPa0nYAR8DR1E03SblB5FJvh7W6krPI0Z7qMc= +github.com/go-openapi/jsonreference v0.21.3/go.mod h1:RqkUP0MrLf37HqxZxrIAtTWW4ZJIK1VzduhXYBEeGc4= +github.com/go-openapi/loads v0.23.2 h1:rJXAcP7g1+lWyBHC7iTY+WAF0rprtM+pm8Jxv1uQJp4= +github.com/go-openapi/loads v0.23.2/go.mod h1:IEVw1GfRt/P2Pplkelxzj9BYFajiWOtY2nHZNj4UnWY= +github.com/go-openapi/spec v0.22.1 h1:beZMa5AVQzRspNjvhe5aG1/XyBSMeX1eEOs7dMoXh/k= +github.com/go-openapi/spec v0.22.1/go.mod h1:c7aeIQT175dVowfp7FeCvXXnjN/MrpaONStibD2WtDA= +github.com/go-openapi/strfmt v0.25.0 h1:7R0RX7mbKLa9EYCTHRcCuIPcaqlyQiWNPTXwClK0saQ= +github.com/go-openapi/strfmt v0.25.0/go.mod h1:nNXct7OzbwrMY9+5tLX4I21pzcmE6ccMGXl3jFdPfn8= github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0= github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs= github.com/go-openapi/swag/fileutils v0.25.1 h1:rSRXapjQequt7kqalKXdcpIegIShhTPXx7yw0kek2uU= @@ -43,8 +41,12 @@ github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3 github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8= github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk= github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg= -github.com/go-openapi/validate v0.25.0 h1:JD9eGX81hDTjoY3WOzh6WqxVBVl7xjsLnvDo1GL5WPU= -github.com/go-openapi/validate v0.25.0/go.mod h1:SUY7vKrN5FiwK6LyvSwKjDfLNirSfWwHNgxd2l29Mmw= +github.com/go-openapi/testify/enable/yaml/v2 v2.0.2 h1:0+Y41Pz1NkbTHz8NngxTuAXxEodtNSI1WG1c/m5Akw4= +github.com/go-openapi/testify/enable/yaml/v2 v2.0.2/go.mod h1:kme83333GCtJQHXQ8UKX3IBZu6z8T5Dvy5+CW3NLUUg= +github.com/go-openapi/testify/v2 v2.0.2 h1:X999g3jeLcoY8qctY/c/Z8iBHTbwLz7R2WXd6Ub6wls= +github.com/go-openapi/testify/v2 v2.0.2/go.mod h1:HCPmvFFnheKK2BuwSA0TbbdxJ3I16pjwMkYkP4Ywn54= +github.com/go-openapi/validate v0.25.1 h1:sSACUI6Jcnbo5IWqbYHgjibrhhmt3vR6lCzKZnmAgBw= +github.com/go-openapi/validate v0.25.1/go.mod h1:RMVyVFYte0gbSTaZ0N4KmTn6u/kClvAFp+mAVfS/DQc= github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= @@ -63,8 +65,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw= -go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= +go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss= +go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= @@ -81,14 +83,14 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= -golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= -golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= -golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= -golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4= +golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210= +golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= +golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ= +golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k= +golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/go.work.sum b/go.work.sum index a60668a..b0c2c9a 100644 --- a/go.work.sum +++ b/go.work.sum @@ -43,15 +43,18 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= +golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= @@ -70,6 +73,7 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA= +golang.org/x/term v0.36.0/go.mod h1:Qu394IJq6V6dCBRgwqshf3mPF85AqzYEzofzRdZkWss= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -83,6 +87,7 @@ golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw= golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/headers_test.go b/headers_test.go index 3793b8f..9d5ccb2 100644 --- a/headers_test.go +++ b/headers_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/go-openapi/errors" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestParseContentType(t *testing.T) { @@ -41,7 +41,7 @@ func TestParseContentType(t *testing.T) { require.NoError(t, err, "input: %q, err: %v", v.hdr, err) } else { require.Error(t, err, "input: %q", v.hdr) - assert.IsTypef(t, &errors.ParseError{}, err, "input: %q", v.hdr) //nolint: testifylint // ErrorAs doesn't work and ErrorIs doesn't fit + assert.IsTypef(t, &errors.ParseError{}, err, "input: %q", v.hdr) assert.Equal(t, v.err.Error(), err.Error(), "input: %q", v.hdr) } assert.Equal(t, v.mt, ct, "input: %q", v.hdr) diff --git a/internal/testing/data_test.go b/internal/testing/data_test.go index b83fa98..4ffbebd 100644 --- a/internal/testing/data_test.go +++ b/internal/testing/data_test.go @@ -6,7 +6,7 @@ package testing import ( "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func TestInvalidJSON(t *testing.T) { diff --git a/internal/testing/petstore/api.go b/internal/testing/petstore/api.go index 449eb6a..1aea388 100644 --- a/internal/testing/petstore/api.go +++ b/internal/testing/petstore/api.go @@ -17,7 +17,7 @@ import ( "github.com/go-openapi/runtime/middleware/untyped" "github.com/go-openapi/runtime/security" "github.com/go-openapi/runtime/yamlpc" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) const ( diff --git a/internal/testing/petstore/api_test.go b/internal/testing/petstore/api_test.go index 6bfd15b..f256bdc 100644 --- a/internal/testing/petstore/api_test.go +++ b/internal/testing/petstore/api_test.go @@ -6,7 +6,7 @@ package petstore import ( "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func TestAPI(t *testing.T) { diff --git a/internal/testing/simplepetstore/api_test.go b/internal/testing/simplepetstore/api_test.go index fbaf595..aa3bb89 100644 --- a/internal/testing/simplepetstore/api_test.go +++ b/internal/testing/simplepetstore/api_test.go @@ -11,8 +11,8 @@ import ( "testing" "github.com/go-openapi/runtime" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestSimplePetstoreSpec(t *testing.T) { diff --git a/json_test.go b/json_test.go index 6fc35e2..5e4ee0f 100644 --- a/json_test.go +++ b/json_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) var consProdJSON = `{"name":"Somebody","id":1}` diff --git a/logger/logger_test.go b/logger/logger_test.go index d0ba024..33983c4 100644 --- a/logger/logger_test.go +++ b/logger/logger_test.go @@ -6,7 +6,7 @@ package logger import ( "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func TestLogger(t *testing.T) { diff --git a/middleware/body_test.go b/middleware/body_test.go index 6d88bc0..88c9778 100644 --- a/middleware/body_test.go +++ b/middleware/body_test.go @@ -12,8 +12,8 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/internal/testing/petstore" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) type eofReader struct { diff --git a/middleware/context_test.go b/middleware/context_test.go index 230c871..71919ed 100644 --- a/middleware/context_test.go +++ b/middleware/context_test.go @@ -18,8 +18,8 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/internal/testing/petstore" "github.com/go-openapi/runtime/middleware/untyped" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) type stubBindRequester struct { diff --git a/middleware/debug_test.go b/middleware/debug_test.go index e7d1ad4..8c4ceec 100644 --- a/middleware/debug_test.go +++ b/middleware/debug_test.go @@ -13,8 +13,8 @@ import ( "github.com/go-openapi/runtime/internal/testing/petstore" "github.com/go-openapi/runtime/logger" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) type customLogger struct { diff --git a/middleware/denco/router_test.go b/middleware/denco/router_test.go index 3ac5d56..0a13c6f 100644 --- a/middleware/denco/router_test.go +++ b/middleware/denco/router_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/go-openapi/runtime/middleware/denco" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func routes() []denco.Record { diff --git a/middleware/denco/server_test.go b/middleware/denco/server_test.go index 5fd32b1..0e00418 100644 --- a/middleware/denco/server_test.go +++ b/middleware/denco/server_test.go @@ -12,8 +12,8 @@ import ( "testing" "github.com/go-openapi/runtime/middleware/denco" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func testHandlerFunc(w http.ResponseWriter, r *http.Request, params denco.Params) { diff --git a/middleware/header/header_test.go b/middleware/header/header_test.go index ed090cc..f39bed9 100644 --- a/middleware/header/header_test.go +++ b/middleware/header/header_test.go @@ -7,7 +7,7 @@ import ( "net/http" "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func TestHeader(t *testing.T) { diff --git a/middleware/not_implemented_test.go b/middleware/not_implemented_test.go index 94a8fb6..462845d 100644 --- a/middleware/not_implemented_test.go +++ b/middleware/not_implemented_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/go-openapi/runtime" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func TestErrorResponder(t *testing.T) { diff --git a/middleware/operation_test.go b/middleware/operation_test.go index 698b1df..42be412 100644 --- a/middleware/operation_test.go +++ b/middleware/operation_test.go @@ -12,8 +12,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/internal/testing/petstore" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestOperationExecutor(t *testing.T) { diff --git a/middleware/parameter_test.go b/middleware/parameter_test.go index eb2eba1..b1817ca 100644 --- a/middleware/parameter_test.go +++ b/middleware/parameter_test.go @@ -13,8 +13,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/runtime" ) diff --git a/middleware/rapidoc_test.go b/middleware/rapidoc_test.go index 63d3923..5aae11f 100644 --- a/middleware/rapidoc_test.go +++ b/middleware/rapidoc_test.go @@ -10,8 +10,8 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestRapiDocMiddleware(t *testing.T) { diff --git a/middleware/redoc_test.go b/middleware/redoc_test.go index 35c760b..aea0550 100644 --- a/middleware/redoc_test.go +++ b/middleware/redoc_test.go @@ -10,8 +10,8 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestRedocMiddleware(t *testing.T) { diff --git a/middleware/request_test.go b/middleware/request_test.go index b9390da..fb34fe7 100644 --- a/middleware/request_test.go +++ b/middleware/request_test.go @@ -17,8 +17,8 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) const ( diff --git a/middleware/route_authenticator_test.go b/middleware/route_authenticator_test.go index 7183a44..b7396e8 100644 --- a/middleware/route_authenticator_test.go +++ b/middleware/route_authenticator_test.go @@ -9,7 +9,7 @@ import ( "net/http" "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/runtime" ) diff --git a/middleware/route_param_test.go b/middleware/route_param_test.go index 02727c4..390f260 100644 --- a/middleware/route_param_test.go +++ b/middleware/route_param_test.go @@ -6,7 +6,7 @@ package middleware import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" ) func TestRouteParams(t *testing.T) { diff --git a/middleware/router_test.go b/middleware/router_test.go index f98ae43..1be2cdf 100644 --- a/middleware/router_test.go +++ b/middleware/router_test.go @@ -15,8 +15,8 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/runtime/internal/testing/petstore" "github.com/go-openapi/runtime/middleware/untyped" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func terminator(rw http.ResponseWriter, _ *http.Request) { diff --git a/middleware/security_test.go b/middleware/security_test.go index 6dbf026..f2b0e06 100644 --- a/middleware/security_test.go +++ b/middleware/security_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/runtime/internal/testing/petstore" ) diff --git a/middleware/spec_test.go b/middleware/spec_test.go index 324da54..d8fce23 100644 --- a/middleware/spec_test.go +++ b/middleware/spec_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/internal/testing/petstore" @@ -34,7 +34,7 @@ func TestServeSpecMiddleware(t *testing.T) { responseHeaders := recorder.Result().Header responseContentType := responseHeaders.Get("Content-Type") - assert.Equal(t, applicationJSON, responseContentType) //nolint:testifylint + assert.Equal(t, applicationJSON, responseContentType) responseBody := recorder.Body require.NotNil(t, responseBody) diff --git a/middleware/string_conversion_test.go b/middleware/string_conversion_test.go index eda31bf..9d6a584 100644 --- a/middleware/string_conversion_test.go +++ b/middleware/string_conversion_test.go @@ -13,8 +13,8 @@ import ( "github.com/go-openapi/spec" "github.com/go-openapi/strfmt" "github.com/go-openapi/swag/stringutils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) var evaluatesAsTrue = []string{"true", "1", "yes", "ok", "y", "on", "selected", "checked", "t", "enabled"} diff --git a/middleware/swaggerui_oauth2_test.go b/middleware/swaggerui_oauth2_test.go index c3c31f8..c97a619 100644 --- a/middleware/swaggerui_oauth2_test.go +++ b/middleware/swaggerui_oauth2_test.go @@ -10,8 +10,8 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestSwaggerUIOAuth2CallbackMiddleware(t *testing.T) { diff --git a/middleware/swaggerui_test.go b/middleware/swaggerui_test.go index 6bcdddd..3b83f6f 100644 --- a/middleware/swaggerui_test.go +++ b/middleware/swaggerui_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestSwaggerUIMiddleware(t *testing.T) { diff --git a/middleware/ui_options_test.go b/middleware/ui_options_test.go index 686f94f..694a226 100644 --- a/middleware/ui_options_test.go +++ b/middleware/ui_options_test.go @@ -6,7 +6,7 @@ package middleware import ( "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func TestConvertOptions(t *testing.T) { diff --git a/middleware/untyped/api_test.go b/middleware/untyped/api_test.go index 238e746..eda92c0 100644 --- a/middleware/untyped/api_test.go +++ b/middleware/untyped/api_test.go @@ -14,8 +14,8 @@ import ( "github.com/go-openapi/loads" "github.com/go-openapi/runtime" swaggerspec "github.com/go-openapi/spec" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func stubAutenticator() runtime.Authenticator { diff --git a/middleware/untyped_request_test.go b/middleware/untyped_request_test.go index e366d66..f4e2842 100644 --- a/middleware/untyped_request_test.go +++ b/middleware/untyped_request_test.go @@ -18,8 +18,8 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestUntypedFormPost(t *testing.T) { diff --git a/middleware/validation_test.go b/middleware/validation_test.go index 01bda84..8066b4b 100644 --- a/middleware/validation_test.go +++ b/middleware/validation_test.go @@ -14,8 +14,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/internal/testing/petstore" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func newTestValidation(ctx *Context, next http.Handler) http.Handler { @@ -160,7 +160,7 @@ func TestValidateContentType(t *testing.T) { require.NoError(t, err, "input: %q", v.hdr) } else { require.Error(t, err, "input: %q", v.hdr) - assert.IsTypef(t, &errors.Validation{}, err, "input: %q", v.hdr) //nolint: testifylint // ErrorAs doesn't work and ErrorIs doesn't fit + assert.IsTypef(t, &errors.Validation{}, err, "input: %q", v.hdr) require.EqualErrorf(t, err, v.err.Error(), "input: %q", v.hdr) assert.EqualValues(t, http.StatusUnsupportedMediaType, err.(*errors.Validation).Code()) } diff --git a/request_test.go b/request_test.go index 1e35831..a2f9c8e 100644 --- a/request_test.go +++ b/request_test.go @@ -13,9 +13,9 @@ import ( "strings" "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" - "github.com/stretchr/testify/assert" + "github.com/go-openapi/testify/v2/assert" ) type eofReader struct{} @@ -165,8 +165,8 @@ func TestJSONRequest(t *testing.T) { req, err := JSONRequest(http.MethodGet, "/swagger.json", nil) require.NoError(t, err) assert.Equal(t, http.MethodGet, req.Method) - assert.Equal(t, JSONMime, req.Header.Get(HeaderContentType)) //nolint:testifylint - assert.Equal(t, JSONMime, req.Header.Get(HeaderAccept)) //nolint:testifylint + assert.Equal(t, JSONMime, req.Header.Get(HeaderContentType)) + assert.Equal(t, JSONMime, req.Header.Get(HeaderAccept)) req, err = JSONRequest(http.MethodGet, "%2", nil) require.Error(t, err) diff --git a/security/apikey_auth_test.go b/security/apikey_auth_test.go index cf216f1..eeb03d7 100644 --- a/security/apikey_auth_test.go +++ b/security/apikey_auth_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/go-openapi/errors" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) const ( diff --git a/security/authorizer_test.go b/security/authorizer_test.go index 0b68b5c..3d7507a 100644 --- a/security/authorizer_test.go +++ b/security/authorizer_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) func TestAuthorized(t *testing.T) { diff --git a/security/basic_auth_test.go b/security/basic_auth_test.go index b2ad1b4..7510439 100644 --- a/security/basic_auth_test.go +++ b/security/basic_auth_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/go-openapi/errors" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) type secTestKey uint8 diff --git a/security/bearer_auth_test.go b/security/bearer_auth_test.go index 4fe4c20..5e2db6a 100644 --- a/security/bearer_auth_test.go +++ b/security/bearer_auth_test.go @@ -15,8 +15,8 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) const ( diff --git a/text_test.go b/text_test.go index fef2041..90401dd 100644 --- a/text_test.go +++ b/text_test.go @@ -10,8 +10,8 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) var consProdText = `The quick brown fox jumped over the lazy dog.` diff --git a/values_test.go b/values_test.go index 2a4269c..41da662 100644 --- a/values_test.go +++ b/values_test.go @@ -6,7 +6,7 @@ package runtime import ( "testing" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/require" ) func TestGetOK(t *testing.T) { diff --git a/xml_test.go b/xml_test.go index 44e4c0e..97a6f2b 100644 --- a/xml_test.go +++ b/xml_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) var consProdXML = `Somebody1` diff --git a/yamlpc/yaml_test.go b/yamlpc/yaml_test.go index ac795fb..6c5e325 100644 --- a/yamlpc/yaml_test.go +++ b/yamlpc/yaml_test.go @@ -9,8 +9,9 @@ import ( "net/http/httptest" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + _ "github.com/go-openapi/testify/enable/yaml/v2" + "github.com/go-openapi/testify/v2/assert" + "github.com/go-openapi/testify/v2/require" ) var consProdYAML = "name: Somebody\nid: 1\n"