From 2f0ff757704b82d2d506434bae93bf19ef602f72 Mon Sep 17 00:00:00 2001 From: Jamie Tanna Date: Tue, 4 Jun 2024 07:00:58 +0100 Subject: [PATCH 1/4] chore(deps): update middleware dependencies Post-release, and pre-release for this project. --- examples/authenticated-api/stdhttp/go.mod | 2 +- examples/authenticated-api/stdhttp/go.sum | 4 +- examples/go.mod | 51 +++++----- examples/go.sum | 119 ++++++++++------------ examples/petstore-expanded/stdhttp/go.mod | 2 +- examples/petstore-expanded/stdhttp/go.sum | 4 +- 6 files changed, 85 insertions(+), 97 deletions(-) diff --git a/examples/authenticated-api/stdhttp/go.mod b/examples/authenticated-api/stdhttp/go.mod index e69d56960..7bda47d1d 100644 --- a/examples/authenticated-api/stdhttp/go.mod +++ b/examples/authenticated-api/stdhttp/go.mod @@ -8,7 +8,7 @@ require ( github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/lestrrat-go/jwx v1.2.29 - github.com/oapi-codegen/nethttp-middleware v1.0.1 + github.com/oapi-codegen/nethttp-middleware v1.0.2 github.com/oapi-codegen/testutil v1.1.0 github.com/stretchr/testify v1.9.0 ) diff --git a/examples/authenticated-api/stdhttp/go.sum b/examples/authenticated-api/stdhttp/go.sum index eb6d313d5..fdbaa70c6 100644 --- a/examples/authenticated-api/stdhttp/go.sum +++ b/examples/authenticated-api/stdhttp/go.sum @@ -41,8 +41,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/oapi-codegen/nethttp-middleware v1.0.1 h1:ZWvwfnMU0eloHX1VEJmQscQm3741t0vCm0eSIie1NIo= -github.com/oapi-codegen/nethttp-middleware v1.0.1/go.mod h1:P7xtAvpoqNB+5obR9qRCeefH7YlXWSK3KgPs/9WB8tE= +github.com/oapi-codegen/nethttp-middleware v1.0.2 h1:A5tfAcKJhWIbIPnlQH+l/DtfVE1i5TFgPlQAiW+l1vQ= +github.com/oapi-codegen/nethttp-middleware v1.0.2/go.mod h1:DfDalonSO+eRQ3RTb8kYoWZByCCPFRxm9WKq1UbY0E4= github.com/oapi-codegen/testutil v1.1.0 h1:EufqpNg43acR3qzr3ObhXmWg3Sl2kwtRnUN5GYY4d5g= github.com/oapi-codegen/testutil v1.1.0/go.mod h1:ttCaYbHvJtHuiyeBF0tPIX+4uhEPTeizXKx28okijLw= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= diff --git a/examples/go.mod b/examples/go.mod index 965fd8969..d78684b03 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -7,19 +7,19 @@ replace github.com/deepmap/oapi-codegen/v2 => ../ require ( github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 - github.com/gin-gonic/gin v1.9.1 + github.com/gin-gonic/gin v1.10.0 github.com/go-chi/chi/v5 v5.0.10 - github.com/gofiber/fiber/v2 v2.49.1 - github.com/google/uuid v1.4.0 + github.com/gofiber/fiber/v2 v2.52.4 + github.com/google/uuid v1.5.0 github.com/gorilla/mux v1.8.1 github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9 - github.com/labstack/echo/v4 v4.11.3 + github.com/labstack/echo/v4 v4.12.0 github.com/lestrrat-go/jwx v1.2.26 - github.com/oapi-codegen/echo-middleware v1.0.1 - github.com/oapi-codegen/fiber-middleware v1.0.1 - github.com/oapi-codegen/gin-middleware v1.0.1 - github.com/oapi-codegen/iris-middleware v1.0.4 - github.com/oapi-codegen/nethttp-middleware v1.0.1 + github.com/oapi-codegen/echo-middleware v1.0.2 + github.com/oapi-codegen/fiber-middleware v1.0.2 + github.com/oapi-codegen/gin-middleware v1.0.2 + github.com/oapi-codegen/iris-middleware v1.0.5 + github.com/oapi-codegen/nethttp-middleware v1.0.2 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.0.0 github.com/stretchr/testify v1.9.0 @@ -35,20 +35,21 @@ require ( github.com/andybalholm/brotli v1.0.5 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/aymerick/douceur v0.2.0 // indirect - github.com/bytedance/sonic v1.10.0-rc3 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect - github.com/chenzhuoyu/iasm v0.9.0 // indirect + github.com/bytedance/sonic v1.11.6 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/flosch/pongo2/v4 v4.0.2 // indirect - github.com/gabriel-vasile/mimetype v1.4.2 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-openapi/jsonpointer v0.20.2 // indirect github.com/go-openapi/swag v0.22.8 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.14.1 // indirect + github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/snappy v0.0.4 // indirect @@ -63,10 +64,10 @@ require ( github.com/kataras/pio v0.0.12 // indirect github.com/kataras/sitemap v0.0.6 // indirect github.com/kataras/tunnel v0.0.4 // indirect - github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid/v2 v2.2.5 // indirect - github.com/labstack/gommon v0.4.0 // indirect - github.com/leodido/go-urn v1.2.4 // indirect + github.com/klauspost/compress v1.17.0 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/labstack/gommon v0.4.2 // indirect + github.com/leodido/go-urn v1.4.0 // indirect github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect github.com/lestrrat-go/blackmagic v1.0.1 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect @@ -75,13 +76,13 @@ require ( github.com/mailgun/raymond/v2 v2.0.48 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/microcosm-cc/bluemonday v1.0.25 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect - github.com/pelletier/go-toml/v2 v2.0.9 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/perimeterx/marshmallow v1.1.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -92,23 +93,23 @@ require ( github.com/tdewolff/minify/v2 v2.12.9 // indirect github.com/tdewolff/parse/v2 v2.6.8 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.2.11 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.49.0 // indirect + github.com/valyala/fasthttp v1.51.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect github.com/valyala/tcplisten v1.0.0 // indirect github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/yosssi/ace v0.0.5 // indirect - golang.org/x/arch v0.4.0 // indirect + golang.org/x/arch v0.8.0 // indirect golang.org/x/crypto v0.23.0 // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.25.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect - golang.org/x/time v0.3.0 // indirect + golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.21.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/examples/go.sum b/examples/go.sum index 046f1c0f4..692f5ab55 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -19,16 +19,14 @@ github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= -github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= -github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= -github.com/bytedance/sonic v1.10.0-rc3 h1:uNSnscRapXTwUgTyOF0GVljYD08p9X/Lbr9MweSV3V0= -github.com/bytedance/sonic v1.10.0-rc3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= -github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= -github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA= -github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo= -github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog= +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= +github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= 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= @@ -40,14 +38,14 @@ github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw= github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8= -github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= -github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/getkin/kin-openapi v0.124.0 h1:VSFNMB9C9rTKBnQ/fpyDU8ytMTr4dWI9QovSKj9kz/M= github.com/getkin/kin-openapi v0.124.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= -github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q= @@ -59,27 +57,25 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k= -github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= +github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/gofiber/fiber/v2 v2.49.1 h1:0W2DRWevSirc8pJl4o8r8QejDR8TV6ZUCawHxwbIdOk= -github.com/gofiber/fiber/v2 v2.49.1/go.mod h1:nPUeEBUeeYGgwbDm59Gp7vS8MDyScL6ezr/Np9A13WU= +github.com/gofiber/fiber/v2 v2.52.4 h1:P+T+4iK7VaqUsq2PALYEfBBo6bJZ4q3FP8cZ84EggTM= +github.com/gofiber/fiber/v2 v2.52.4/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12 h1:uK3X/2mt4tbSGoHvbLBHUny7CKiuwUip3MArtukol4E= github.com/gomarkdown/markdown v0.0.0-20230716120725-531d2d74bc12/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= -github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= @@ -108,22 +104,22 @@ github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4= github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA= github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= +github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= 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/labstack/echo/v4 v4.11.3 h1:Upyu3olaqSHkCjs1EJJwQ3WId8b8b1hxbogyommKktM= -github.com/labstack/echo/v4 v4.11.3/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws= -github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8= -github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= -github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= +github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= +github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= +github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= github.com/lestrrat-go/backoff/v2 v2.0.8 h1:oNb5E5isby2kiro9AgdHLv5N5tint1AnDVVf2E2un5A= github.com/lestrrat-go/backoff/v2 v2.0.8/go.mod h1:rHP/q/r9aT27n24JQLa7JhSQZCKBBOiM/uP402WwN8Y= github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80= @@ -141,13 +137,11 @@ github.com/mailgun/raymond/v2 v2.0.48 h1:5dmlB680ZkFG2RN/0lvTAghrSxIESeu9/2aeDqA github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/microcosm-cc/bluemonday v1.0.25 h1:4NEwSfiJ+Wva0VxN5B8OwMicaJvD8r9tlJWm9rtloEg= @@ -161,22 +155,22 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/oapi-codegen/echo-middleware v1.0.1 h1:edYGScq1phCcuDoz9AqA9eHX+tEI1LNL5PL1lkkQh1k= -github.com/oapi-codegen/echo-middleware v1.0.1/go.mod h1:DBQKRn+D/vfXOFbaX5GRwFttoJY64JH6yu+pdt7wU3o= -github.com/oapi-codegen/fiber-middleware v1.0.1 h1:DZQA+tEsqEMox4pPmc6SJXvDriiWSxc3QiA4UuMwGq4= -github.com/oapi-codegen/fiber-middleware v1.0.1/go.mod h1:UUVrHLPT4Zv7S2U2TCGLXpTx6mfMb613UI+Z6F8S5Vk= -github.com/oapi-codegen/gin-middleware v1.0.1 h1:903hkcyMcM/h6ooHS7t/2ad973BY0xvsRNP0EN1B65g= -github.com/oapi-codegen/gin-middleware v1.0.1/go.mod h1:JDMxGX/rErQs2VV0XAVo1sD6sA0EVUMvFSPhgOLt9mE= -github.com/oapi-codegen/iris-middleware v1.0.4 h1:+Eoqqbc90qCeBz3Zlzf1xb5xn+wfwQihndHlvU/4Meo= -github.com/oapi-codegen/iris-middleware v1.0.4/go.mod h1:D1IAqYMgm5QKbD9R+y0j8m+xUtiPLMG92iY+oos/NXc= -github.com/oapi-codegen/nethttp-middleware v1.0.1 h1:ZWvwfnMU0eloHX1VEJmQscQm3741t0vCm0eSIie1NIo= -github.com/oapi-codegen/nethttp-middleware v1.0.1/go.mod h1:P7xtAvpoqNB+5obR9qRCeefH7YlXWSK3KgPs/9WB8tE= +github.com/oapi-codegen/echo-middleware v1.0.2 h1:oNBqiE7jd/9bfGNk/bpbX2nqWrtPc+LL4Boya8Wl81U= +github.com/oapi-codegen/echo-middleware v1.0.2/go.mod h1:5J6MFcGqrpWLXpbKGZtRPZViLIHyyyUHlkqg6dT2R4E= +github.com/oapi-codegen/fiber-middleware v1.0.2 h1:f4KPdjyRTYh2GyAv9wsDP+Q9akOND17wuMSbmMwDkJI= +github.com/oapi-codegen/fiber-middleware v1.0.2/go.mod h1:+lGj+802Ajp/+fQG9d8t1SuYP8r7lnOc6wnOwwRArYg= +github.com/oapi-codegen/gin-middleware v1.0.2 h1:/H99UzvHQAUxXK8pzdcGAZgjCVeXdFDAUUWaJT0k0eI= +github.com/oapi-codegen/gin-middleware v1.0.2/go.mod h1:2HJDQjH8jzK2/k/VKcWl+/T41H7ai2bKa6dN3AA2GpA= +github.com/oapi-codegen/iris-middleware v1.0.5 h1:eO33pCvapaf1Xa0esEP0PYcdqPZSeq1eze4mamhT5hU= +github.com/oapi-codegen/iris-middleware v1.0.5/go.mod h1:/ysgvbjWyhfDAouIeUOjzIv+zsXfaIXlAQrsOU9/Kyo= +github.com/oapi-codegen/nethttp-middleware v1.0.2 h1:A5tfAcKJhWIbIPnlQH+l/DtfVE1i5TFgPlQAiW+l1vQ= +github.com/oapi-codegen/nethttp-middleware v1.0.2/go.mod h1:DfDalonSO+eRQ3RTb8kYoWZByCCPFRxm9WKq1UbY0E4= github.com/oapi-codegen/runtime v1.1.0 h1:rJpoNUawn5XTvekgfkvSZr0RqEnoYpFkyvrzfWeFKWM= github.com/oapi-codegen/runtime v1.1.0/go.mod h1:BeSfBkWWWnAnGdyS+S/GnlbmHKzf8/hwkvelJZDeKA8= github.com/oapi-codegen/testutil v1.0.0 h1:1GI2IiMMLh2vDHr1OkNacaYU/VaApKdcmfgl4aeXAa8= github.com/oapi-codegen/testutil v1.0.0/go.mod h1:ttCaYbHvJtHuiyeBF0tPIX+4uhEPTeizXKx28okijLw= -github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0= -github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s= github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -199,6 +193,7 @@ github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKk github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -206,7 +201,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= @@ -218,13 +212,12 @@ github.com/tdewolff/test v1.0.9 h1:SswqJCmeN4B+9gEAi/5uqT0qpi1y2/2O47V/1hhGZT0= github.com/tdewolff/test v1.0.9/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= -github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.49.0 h1:9FdvCpmxB74LH4dPb7IJ1cOSsluR07XG3I1txXWwJpE= -github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1SqA= +github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= @@ -244,8 +237,8 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3Ifn github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= -golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc= -golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= +golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -281,10 +274,7 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -305,8 +295,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -317,11 +307,9 @@ golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= @@ -330,7 +318,6 @@ gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= 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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/examples/petstore-expanded/stdhttp/go.mod b/examples/petstore-expanded/stdhttp/go.mod index 9c5eb2d36..edd0c7d62 100644 --- a/examples/petstore-expanded/stdhttp/go.mod +++ b/examples/petstore-expanded/stdhttp/go.mod @@ -7,7 +7,7 @@ replace github.com/deepmap/oapi-codegen/v2 => ../../../ require ( github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 - github.com/oapi-codegen/nethttp-middleware v1.0.1 + github.com/oapi-codegen/nethttp-middleware v1.0.2 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.0.0 github.com/stretchr/testify v1.9.0 diff --git a/examples/petstore-expanded/stdhttp/go.sum b/examples/petstore-expanded/stdhttp/go.sum index c1caf5ece..c5e5169f4 100644 --- a/examples/petstore-expanded/stdhttp/go.sum +++ b/examples/petstore-expanded/stdhttp/go.sum @@ -30,8 +30,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/oapi-codegen/nethttp-middleware v1.0.1 h1:ZWvwfnMU0eloHX1VEJmQscQm3741t0vCm0eSIie1NIo= -github.com/oapi-codegen/nethttp-middleware v1.0.1/go.mod h1:P7xtAvpoqNB+5obR9qRCeefH7YlXWSK3KgPs/9WB8tE= +github.com/oapi-codegen/nethttp-middleware v1.0.2 h1:A5tfAcKJhWIbIPnlQH+l/DtfVE1i5TFgPlQAiW+l1vQ= +github.com/oapi-codegen/nethttp-middleware v1.0.2/go.mod h1:DfDalonSO+eRQ3RTb8kYoWZByCCPFRxm9WKq1UbY0E4= github.com/oapi-codegen/runtime v1.1.0 h1:rJpoNUawn5XTvekgfkvSZr0RqEnoYpFkyvrzfWeFKWM= github.com/oapi-codegen/runtime v1.1.0/go.mod h1:BeSfBkWWWnAnGdyS+S/GnlbmHKzf8/hwkvelJZDeKA8= github.com/oapi-codegen/testutil v1.0.0 h1:1GI2IiMMLh2vDHr1OkNacaYU/VaApKdcmfgl4aeXAa8= From c734650e2a627cc19a899e038fa7564d693dcae8 Mon Sep 17 00:00:00 2001 From: Marcin Romaszewicz Date: Wed, 5 Jun 2024 11:39:14 +0200 Subject: [PATCH 2/4] Rename module post-move (#1643) * Rename module post-move * Regenerate boilerplate * Make tidy * Add CODEOWNERS --- .github/CODEOWNERS | 1 + README.md | 48 +++++++++---------- cmd/oapi-codegen/oapi-codegen.go | 4 +- cmd/oapi-codegen/oapi-codegen_test.go | 2 +- .../anyof-allof-oneof/anyofallofoneof.gen.go | 2 +- examples/anyof-allof-oneof/generate.go | 2 +- .../authenticated-api/echo/api/api.gen.go | 2 +- examples/authenticated-api/echo/api/doc.go | 2 +- examples/authenticated-api/echo/main.go | 4 +- .../authenticated-api/echo/server/fake_jws.go | 5 +- .../authenticated-api/echo/server/server.go | 2 +- .../echo/server/server_test.go | 4 +- .../authenticated-api/stdhttp/api/api.gen.go | 2 +- examples/authenticated-api/stdhttp/api/doc.go | 2 +- examples/authenticated-api/stdhttp/go.mod | 6 +-- examples/authenticated-api/stdhttp/main.go | 4 +- .../stdhttp/server/fake_jws.go | 5 +- .../stdhttp/server/server.go | 2 +- .../stdhttp/server/server_test.go | 2 +- .../authenticated-api/stdhttp/tools/tools.go | 2 +- examples/client/client.gen.go | 2 +- examples/client/generate.go | 2 +- .../custom-client-type.gen.go | 2 +- examples/custom-client-type/doc.go | 2 +- examples/extensions/xdeprecatedreason/gen.go | 2 +- .../extensions/xdeprecatedreason/generate.go | 2 +- examples/extensions/xenumnames/gen.go | 2 +- examples/extensions/xenumnames/generate.go | 2 +- examples/extensions/xgojsonignore/gen.go | 2 +- examples/extensions/xgojsonignore/generate.go | 2 +- examples/extensions/xgoname/gen.go | 2 +- examples/extensions/xgoname/generate.go | 2 +- examples/extensions/xgotype/gen.go | 2 +- examples/extensions/xgotype/generate.go | 2 +- examples/extensions/xgotypename/gen.go | 2 +- examples/extensions/xgotypename/generate.go | 2 +- .../xgotypeskipoptionalpointer/gen.go | 2 +- .../xgotypeskipoptionalpointer/generate.go | 2 +- .../extensions/xoapicodegenextratags/gen.go | 2 +- .../xoapicodegenextratags/generate.go | 2 +- examples/extensions/xomitempty/gen.go | 2 +- examples/extensions/xomitempty/generate.go | 2 +- examples/extensions/xorder/gen.go | 2 +- examples/extensions/xorder/generate.go | 2 +- examples/go.mod | 6 +-- examples/import-mapping/admin/cfg.yaml | 2 +- examples/import-mapping/admin/generate.go | 2 +- examples/import-mapping/admin/server.gen.go | 4 +- examples/import-mapping/common/generate.go | 2 +- examples/import-mapping/common/types.gen.go | 2 +- examples/minimal-server/chi/api/generate.go | 2 +- examples/minimal-server/chi/api/ping.gen.go | 2 +- examples/minimal-server/chi/main.go | 2 +- examples/minimal-server/echo/api/generate.go | 2 +- examples/minimal-server/echo/api/ping.gen.go | 2 +- examples/minimal-server/echo/main.go | 2 +- examples/minimal-server/fiber/api/generate.go | 2 +- examples/minimal-server/fiber/api/ping.gen.go | 2 +- examples/minimal-server/fiber/main.go | 2 +- examples/minimal-server/gin/api/generate.go | 2 +- examples/minimal-server/gin/api/ping.gen.go | 2 +- examples/minimal-server/gin/main.go | 2 +- .../minimal-server/gorillamux/api/generate.go | 2 +- .../minimal-server/gorillamux/api/ping.gen.go | 2 +- examples/minimal-server/gorillamux/main.go | 2 +- examples/minimal-server/iris/api/generate.go | 2 +- examples/minimal-server/iris/api/ping.gen.go | 2 +- examples/minimal-server/iris/main.go | 2 +- .../minimal-server/nethttp-compatible/main.go | 2 +- .../minimal-server/stdhttp/api/generate.go | 2 +- .../minimal-server/stdhttp/api/ping.gen.go | 2 +- examples/minimal-server/stdhttp/go.mod | 6 +-- examples/minimal-server/stdhttp/main.go | 2 +- .../minimal-server/stdhttp/tools/tools.go | 2 +- .../echo/api/api.gen.go | 2 +- .../no-vcs-version-override/echo/api/doc.go | 2 +- examples/only-models/generate.go | 2 +- examples/only-models/only-models.gen.go | 2 +- .../petstore-expanded/chi/api/petstore.gen.go | 2 +- .../petstore-expanded/chi/api/petstore.go | 2 +- examples/petstore-expanded/chi/petstore.go | 4 +- .../petstore-expanded/chi/petstore_test.go | 4 +- .../echo/api/models/models.gen.go | 2 +- .../echo/api/petstore-server.gen.go | 4 +- .../petstore-expanded/echo/api/petstore.go | 6 +-- .../echo/api/server.cfg.yaml | 2 +- examples/petstore-expanded/echo/petstore.go | 2 +- .../petstore-expanded/echo/petstore_test.go | 6 +-- .../echo/pkg_codegen_petstore_test.go | 6 +-- .../fiber/api/petstore-server.gen.go | 2 +- .../fiber/api/petstore-types.gen.go | 2 +- .../petstore-expanded/fiber/api/petstore.go | 4 +- examples/petstore-expanded/fiber/petstore.go | 2 +- .../petstore-expanded/fiber/petstore_test.go | 2 +- .../gin/api/petstore-server.gen.go | 2 +- .../gin/api/petstore-types.gen.go | 2 +- .../petstore-expanded/gin/api/petstore.go | 4 +- examples/petstore-expanded/gin/petstore.go | 2 +- .../petstore-expanded/gin/petstore_test.go | 2 +- .../gorilla/api/petstore.gen.go | 2 +- .../petstore-expanded/gorilla/api/petstore.go | 2 +- .../petstore-expanded/gorilla/petstore.go | 4 +- .../gorilla/petstore_test.go | 4 +- examples/petstore-expanded/internal/doc.go | 2 +- .../iris/api/petstore-server.gen.go | 2 +- .../iris/api/petstore-types.gen.go | 2 +- .../petstore-expanded/iris/api/petstore.go | 4 +- examples/petstore-expanded/iris/petstore.go | 4 +- .../petstore-expanded/iris/petstore_test.go | 2 +- .../petstore-expanded/petstore-client.gen.go | 2 +- .../stdhttp/api/petstore.gen.go | 2 +- .../petstore-expanded/stdhttp/api/petstore.go | 2 +- examples/petstore-expanded/stdhttp/go.mod | 6 +-- .../petstore-expanded/stdhttp/petstore.go | 2 +- .../stdhttp/petstore_test.go | 2 +- .../petstore-expanded/stdhttp/tools/tools.go | 2 +- .../strict/api/petstore-server.gen.go | 2 +- .../strict/api/petstore-types.gen.go | 2 +- .../petstore-expanded/strict/api/petstore.go | 4 +- examples/petstore-expanded/strict/petstore.go | 4 +- .../petstore-expanded/strict/petstore_test.go | 4 +- examples/tools.go | 2 +- go.mod | 2 +- internal/test/all_of/doc.go | 4 +- internal/test/all_of/v1/openapi.gen.go | 2 +- internal/test/all_of/v2/openapi.gen.go | 2 +- internal/test/any_of/param/doc.go | 2 +- internal/test/any_of/param/param.gen.go | 2 +- internal/test/any_of/param/param_test.go | 2 +- internal/test/client/client.gen.go | 2 +- internal/test/client/client_test.go | 2 +- internal/test/client/doc.go | 2 +- internal/test/components/components.gen.go | 2 +- internal/test/components/doc.go | 2 +- internal/test/extensions/x-order/generate.go | 2 +- internal/test/extensions/x-order/issue.gen.go | 2 +- internal/test/externalref/doc.go | 2 +- .../test/externalref/externalref.cfg.yaml | 6 +-- internal/test/externalref/externalref.gen.go | 8 ++-- internal/test/externalref/imports_test.go | 6 +-- .../test/externalref/packageA/config.yaml | 2 +- internal/test/externalref/packageA/doc.go | 2 +- .../externalref/packageA/externalref.gen.go | 4 +- internal/test/externalref/packageB/doc.go | 2 +- .../externalref/packageB/externalref.gen.go | 2 +- .../test/externalref/petstore/config.yaml | 2 +- internal/test/externalref/petstore/doc.go | 2 +- .../externalref/petstore/externalref.gen.go | 4 +- internal/test/filter/doc.go | 4 +- internal/test/filter/operations/server.gen.go | 2 +- internal/test/filter/tags/server.gen.go | 2 +- internal/test/go.mod | 6 +-- internal/test/issues/issue-1039/client.gen.go | 2 +- .../issue-1039/defaultbehaviour/types.gen.go | 2 +- internal/test/issues/issue-1039/doc.go | 8 ++-- internal/test/issues/issue-1039/server.gen.go | 2 +- internal/test/issues/issue-1039/types.gen.go | 2 +- internal/test/issues/issue-1087/api.gen.go | 4 +- .../test/issues/issue-1087/deps/deps.gen.go | 2 +- internal/test/issues/issue-1087/deps/doc.go | 2 +- internal/test/issues/issue-1087/doc.go | 2 +- .../test/issues/issue-1087/server.config.yaml | 2 +- .../issues/issue-1093/api/child/child.gen.go | 4 +- .../issue-1093/api/parent/parent.gen.go | 2 +- .../test/issues/issue-1093/child.cfg.yaml | 2 +- internal/test/issues/issue-1093/doc.go | 4 +- internal/test/issues/issue-1093/issue_test.go | 4 +- internal/test/issues/issue-1127/api.gen.go | 2 +- internal/test/issues/issue-1127/doc.go | 2 +- internal/test/issues/issue-1168/api.gen.go | 2 +- internal/test/issues/issue-1168/doc.go | 2 +- internal/test/issues/issue-1180/doc.go | 2 +- internal/test/issues/issue-1180/issue.gen.go | 2 +- .../test/issues/issue-1182/pkg1/config.yaml | 2 +- internal/test/issues/issue-1182/pkg1/doc.go | 2 +- .../test/issues/issue-1182/pkg1/pkg1.gen.go | 4 +- internal/test/issues/issue-1182/pkg2/doc.go | 2 +- .../test/issues/issue-1182/pkg2/pkg2.gen.go | 2 +- internal/test/issues/issue-1189/doc.go | 2 +- .../test/issues/issue-1189/issue1189.gen.go | 2 +- internal/test/issues/issue-1208-1209/doc.go | 2 +- .../issue-1208-1209/issue-multi-json.gen.go | 2 +- .../issue-1208-1209/issue-multi-json_test.go | 2 +- .../test/issues/issue-1212/pkg1/config.yaml | 2 +- internal/test/issues/issue-1212/pkg1/doc.go | 2 +- .../test/issues/issue-1212/pkg1/pkg1.gen.go | 4 +- internal/test/issues/issue-1212/pkg2/doc.go | 2 +- .../test/issues/issue-1212/pkg2/pkg2.gen.go | 2 +- internal/test/issues/issue-1219/doc.go | 2 +- internal/test/issues/issue-1219/issue.gen.go | 2 +- internal/test/issues/issue-1219/issue_test.go | 2 +- internal/test/issues/issue-1298/doc.go | 2 +- .../test/issues/issue-1298/issue1298.gen.go | 2 +- .../test/issues/issue-1298/issue1298_test.go | 2 +- .../issue-1378/bionicle/bionicle.gen.go | 4 +- .../issues/issue-1378/bionicle/config.yaml | 2 +- .../issues/issue-1378/bionicle/generate.go | 2 +- .../issues/issue-1378/common/common.gen.go | 2 +- .../test/issues/issue-1378/common/generate.go | 2 +- .../issues/issue-1378/fooservice/config.yaml | 4 +- .../issue-1378/fooservice/fooservice.gen.go | 6 +-- .../issues/issue-1378/fooservice/generate.go | 2 +- internal/test/issues/issue-1397/doc.go | 2 +- .../test/issues/issue-1397/issue1397.gen.go | 2 +- internal/test/issues/issue-312/doc.go | 2 +- internal/test/issues/issue-312/issue.gen.go | 2 +- internal/test/issues/issue-52/doc.go | 2 +- internal/test/issues/issue-52/issue.gen.go | 2 +- internal/test/issues/issue-52/issue_test.go | 2 +- internal/test/issues/issue-579/gen.go | 2 +- internal/test/issues/issue-579/issue.gen.go | 2 +- internal/test/issues/issue-832/generate.go | 2 +- internal/test/issues/issue-832/issue.gen.go | 2 +- internal/test/issues/issue-936/api.gen.go | 2 +- internal/test/issues/issue-936/gen.go | 2 +- .../issues/issue-grab_import_names/doc.go | 2 +- .../issue-grab_import_names/issue.gen.go | 2 +- .../issue-grab_import_names/issue_test.go | 2 +- .../issue-head-digit-of-httpheader/doc.go | 2 +- .../issue.gen.go | 2 +- .../issue-head-digit-of-operation-id/doc.go | 2 +- .../issue.gen.go | 2 +- .../issues/issue-illegal_enum_names/doc.go | 2 +- .../issue-illegal_enum_names/issue.gen.go | 2 +- .../issue-illegal_enum_names/issue_test.go | 2 +- .../config.base.yaml | 2 +- .../issues/issue-removed-external-ref/doc.go | 4 +- .../gen/spec_base/issue.gen.go | 4 +- .../gen/spec_ext/issue.gen.go | 2 +- internal/test/issues/issue1469/doc.go | 2 +- internal/test/issues/issue1469/main.gen.go | 2 +- internal/test/issues/issue193/generate.go | 2 +- internal/test/issues/issue193/issue.gen.go | 2 +- .../disabletypealiases/generate.go | 2 +- .../disabletypealiases/types.gen.go | 2 +- .../to-camel-case-with-digits/generate.go | 2 +- .../name_normalizer.gen.go | 2 +- .../generate.go | 2 +- .../name_normalizer.gen.go | 2 +- .../name-normalizer/to-camel-case/generate.go | 2 +- .../to-camel-case/name_normalizer.gen.go | 2 +- .../name-normalizer/unset/generate.go | 2 +- .../unset/name_normalizer.gen.go | 2 +- internal/test/parameters/doc.go | 2 +- internal/test/parameters/parameters.gen.go | 2 +- internal/test/schemas/doc.go | 2 +- internal/test/schemas/schemas.gen.go | 2 +- internal/test/server/doc.go | 2 +- internal/test/server/server.gen.go | 2 +- internal/test/strict-server/chi/server.gen.go | 2 +- internal/test/strict-server/chi/server.go | 4 +- internal/test/strict-server/chi/types.gen.go | 2 +- .../test/strict-server/client/client.gen.go | 2 +- internal/test/strict-server/client/client.go | 2 +- .../test/strict-server/echo/server.gen.go | 2 +- internal/test/strict-server/echo/server.go | 4 +- internal/test/strict-server/echo/types.gen.go | 2 +- .../test/strict-server/fiber/server.gen.go | 2 +- internal/test/strict-server/fiber/server.go | 4 +- .../test/strict-server/fiber/types.gen.go | 2 +- internal/test/strict-server/gin/server.gen.go | 2 +- internal/test/strict-server/gin/server.go | 4 +- internal/test/strict-server/gin/types.gen.go | 2 +- .../test/strict-server/gorilla/server.gen.go | 2 +- internal/test/strict-server/gorilla/server.go | 4 +- .../test/strict-server/gorilla/types.gen.go | 2 +- .../test/strict-server/iris/server.gen.go | 2 +- internal/test/strict-server/iris/server.go | 4 +- internal/test/strict-server/iris/types.gen.go | 2 +- internal/test/strict-server/stdhttp/go.mod | 10 ++-- .../test/strict-server/stdhttp/server.gen.go | 2 +- internal/test/strict-server/stdhttp/server.go | 4 +- .../strict-server/stdhttp/std_strict_test.go | 2 +- .../test/strict-server/stdhttp/tools/tools.go | 2 +- .../test/strict-server/stdhttp/types.gen.go | 2 +- internal/test/strict-server/strict_test.go | 12 ++--- pkg/codegen/codegen.go | 2 +- pkg/codegen/codegen_test.go | 6 +-- pkg/codegen/operations.go | 2 +- pkg/codegen/template_helpers.go | 2 +- 280 files changed, 384 insertions(+), 381 deletions(-) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..be8851996 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @oapi-codegen/maintainers diff --git a/README.md b/README.md index f7b14883b..d055c3752 100644 --- a/README.md +++ b/README.md @@ -27,20 +27,20 @@ This would give you a `tools/tools.go`: package main import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) ``` Then, each invocation of `oapi-codegen` would be used like so: ```go -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml ``` Alternatively, you can install it as a binary with: ```sh -$ go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@latest +$ go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest $ oapi-codegen -version ``` @@ -64,9 +64,9 @@ To do so, you can run: ```sh # pin to the latest version on the default branch -$ go get github.com/deepmap/oapi-codegen/v2@master +$ go get github.com/oapi-codegen/oapi-codegen/v2@master # alternatively, to a commit hash i.e. https://github.com/deepmap/oapi-codegen/commit/71e916c59688a6379b5774dfe5904ec222b9a537 -$ go get github.com/deepmap/oapi-codegen/v2@71e916c59688a6379b5774dfe5904ec222b9a537 +$ go get github.com/oapi-codegen/oapi-codegen/v2@71e916c59688a6379b5774dfe5904ec222b9a537 ``` This will then make a change such as: @@ -77,15 +77,15 @@ index 44f29a4..436a780 100644 --- go.mod +++ go.mod @@ -2,21 +2,20 @@ --require github.com/deepmap/oapi-codegen/v2 v2.1.0 -+require github.com/deepmap/oapi-codegen/v2 v2.1.1-0.20240331212514-80f0b978ef16 +-require github.com/oapi-codegen/oapi-codegen/v2 v2.1.0 ++require github.com/oapi-codegen/oapi-codegen/v2 v2.1.1-0.20240331212514-80f0b978ef16 ``` ## Usage `oapi-codegen` is largely configured using a YAML configuration file, to simplify the number of flags that users need to remember, and to make reading the `go:generate` command less daunting. -For full details of what is supported, it's worth checking out [the GoDoc for `codegen.Configuration`](https://pkg.go.dev/github.com/deepmap/oapi-codegen/v2/pkg/codegen#Configuration). +For full details of what is supported, it's worth checking out [the GoDoc for `codegen.Configuration`](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#Configuration). We also have [a JSON Schema](configuration-schema.json) that can be used by IDEs/editors with the Language Server Protocol (LSP) to perform intelligent suggestions, i.e.: @@ -99,7 +99,7 @@ package: api Although we strive to retain backwards compatibility - as a project that's using a stable API per SemVer - there are sometimes opportunities we must take to fix a bug that could cause a breaking change for [people relying upon the behaviour](https://xkcd.com/1172/). -In this case, we will expose a [compatibility option](https://pkg.go.dev/github.com/deepmap/oapi-codegen/v2/pkg/codegen#CompatibilityOptions) to restore old behaviour. +In this case, we will expose a [compatibility option](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#CompatibilityOptions) to restore old behaviour. ## Features @@ -679,7 +679,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/stdhttp/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp/api" ) func main() { @@ -816,7 +816,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/chi/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/chi/api" "github.com/go-chi/chi/v5" ) @@ -943,7 +943,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gorillamux/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api" "github.com/gorilla/mux" ) @@ -1074,7 +1074,7 @@ Now we've got our implementation, we can then write the following code to wire i import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/echo/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/echo/api" "github.com/labstack/echo/v4" ) @@ -1191,7 +1191,7 @@ Now we've got our implementation, we can then write the following code to wire i import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/fiber/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/fiber/api" "github.com/gofiber/fiber/v2" ) @@ -1306,7 +1306,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gin/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gin/api" "github.com/gin-gonic/gin" ) @@ -1430,7 +1430,7 @@ Now we've got our implementation, we can then write the following code to wire i import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/iris/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/iris/api" "github.com/kataras/iris/v12" ) @@ -1565,7 +1565,7 @@ And a `generate.go`: ```go package client -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml ``` This would then generate: @@ -1641,7 +1641,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/client" + "github.com/oapi-codegen/oapi-codegen/v2/examples/client" ) func TestClient_canCall() { @@ -1764,7 +1764,7 @@ And a `generate.go`: ```go package onlymodels -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml ``` This would then generate: @@ -1903,7 +1903,7 @@ output-options: skip-prune: true import-mapping: # for a given file/URL that is $ref'd, point `oapi-codegen` to the Go package that this spec is generated into, to perform Go package imports - ../common/api.yaml: github.com/deepmap/oapi-codegen/v2/examples/import-mapping/common + ../common/api.yaml: github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common ``` This will then generate the following code: @@ -1913,7 +1913,7 @@ package admin import ( // ... - externalRef0 "github.com/deepmap/oapi-codegen/v2/examples/import-mapping/common" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common" ) // User defines model for User. @@ -2873,7 +2873,7 @@ import ( "fmt" "log" - "github.com/deepmap/oapi-codegen/v2/pkg/securityprovider" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider" ) func main() { @@ -2895,7 +2895,7 @@ func main() { } ``` -Notice that we're using a pre-built provider from the [`pkg/securityprovider` package](https://pkg.go.dev/github.com/deepmap/oapi-codegen/v2/pkg/securityprovider), which has some inbuilt support for other types of authentication, too. +Notice that we're using a pre-built provider from the [`pkg/securityprovider` package](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider), which has some inbuilt support for other types of authentication, too. ## Custom code generation @@ -3853,7 +3853,7 @@ output-options: exclude-schemas: [] ``` -Check [the docs](https://pkg.go.dev/github.com/deepmap/oapi-codegen/v2/pkg/codegen#OutputOptions) for more details of usage. +Check [the docs](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#OutputOptions) for more details of usage. ### Should I commit the generated code? diff --git a/cmd/oapi-codegen/oapi-codegen.go b/cmd/oapi-codegen/oapi-codegen.go index f45eb40f5..cba80bf2c 100644 --- a/cmd/oapi-codegen/oapi-codegen.go +++ b/cmd/oapi-codegen/oapi-codegen.go @@ -25,8 +25,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) func errExit(format string, args ...interface{}) { diff --git a/cmd/oapi-codegen/oapi-codegen_test.go b/cmd/oapi-codegen/oapi-codegen_test.go index 689a8e9a0..9d9f06c20 100644 --- a/cmd/oapi-codegen/oapi-codegen_test.go +++ b/cmd/oapi-codegen/oapi-codegen_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) func TestLoader(t *testing.T) { diff --git a/examples/anyof-allof-oneof/anyofallofoneof.gen.go b/examples/anyof-allof-oneof/anyofallofoneof.gen.go index 8259f1557..99b861683 100644 --- a/examples/anyof-allof-oneof/anyofallofoneof.gen.go +++ b/examples/anyof-allof-oneof/anyofallofoneof.gen.go @@ -1,6 +1,6 @@ // Package anyofallofoneof provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package anyofallofoneof import ( diff --git a/examples/anyof-allof-oneof/generate.go b/examples/anyof-allof-oneof/generate.go index b585c8b36..9e993e2b9 100644 --- a/examples/anyof-allof-oneof/generate.go +++ b/examples/anyof-allof-oneof/generate.go @@ -1,3 +1,3 @@ package anyofallofoneof -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/authenticated-api/echo/api/api.gen.go b/examples/authenticated-api/echo/api/api.gen.go index bca4d644d..383ab5dc2 100644 --- a/examples/authenticated-api/echo/api/api.gen.go +++ b/examples/authenticated-api/echo/api/api.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/authenticated-api/echo/api/doc.go b/examples/authenticated-api/echo/api/doc.go index d49f3532e..e6d8f45d9 100644 --- a/examples/authenticated-api/echo/api/doc.go +++ b/examples/authenticated-api/echo/api/doc.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml diff --git a/examples/authenticated-api/echo/main.go b/examples/authenticated-api/echo/main.go index 2d1ace8e2..905f8d8ae 100644 --- a/examples/authenticated-api/echo/main.go +++ b/examples/authenticated-api/echo/main.go @@ -5,10 +5,10 @@ import ( "log" "net" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/server" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/server" ) func main() { diff --git a/examples/authenticated-api/echo/server/fake_jws.go b/examples/authenticated-api/echo/server/fake_jws.go index 46532af66..6eb3067d8 100644 --- a/examples/authenticated-api/echo/server/fake_jws.go +++ b/examples/authenticated-api/echo/server/fake_jws.go @@ -4,16 +4,17 @@ import ( "crypto/ecdsa" "fmt" - "github.com/deepmap/oapi-codegen/v2/pkg/ecdsafile" "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jws" "github.com/lestrrat-go/jwx/jwt" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/ecdsafile" ) // PrivateKey is an ECDSA private key which was generated with the following // command: -// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem +// +// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem // // We are using a hard coded key here in this example, but in real applications, // you would never do this. Your JWT signing key must never be in your application, diff --git a/examples/authenticated-api/echo/server/server.go b/examples/authenticated-api/echo/server/server.go index dedb2cb2c..5346b77e2 100644 --- a/examples/authenticated-api/echo/server/server.go +++ b/examples/authenticated-api/echo/server/server.go @@ -6,10 +6,10 @@ import ( "sort" "sync" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api" "github.com/getkin/kin-openapi/openapi3filter" "github.com/labstack/echo/v4" middleware "github.com/oapi-codegen/echo-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api" ) type server struct { diff --git a/examples/authenticated-api/echo/server/server_test.go b/examples/authenticated-api/echo/server/server_test.go index 22ee03054..5891c7171 100644 --- a/examples/authenticated-api/echo/server/server_test.go +++ b/examples/authenticated-api/echo/server/server_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api" - "github.com/oapi-codegen/testutil" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api" + "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/authenticated-api/stdhttp/api/api.gen.go b/examples/authenticated-api/stdhttp/api/api.gen.go index 01e6e5f25..7b1fa2c48 100644 --- a/examples/authenticated-api/stdhttp/api/api.gen.go +++ b/examples/authenticated-api/stdhttp/api/api.gen.go @@ -2,7 +2,7 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/authenticated-api/stdhttp/api/doc.go b/examples/authenticated-api/stdhttp/api/doc.go index d49f3532e..e6d8f45d9 100644 --- a/examples/authenticated-api/stdhttp/api/doc.go +++ b/examples/authenticated-api/stdhttp/api/doc.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml diff --git a/examples/authenticated-api/stdhttp/go.mod b/examples/authenticated-api/stdhttp/go.mod index 7bda47d1d..fb0f72572 100644 --- a/examples/authenticated-api/stdhttp/go.mod +++ b/examples/authenticated-api/stdhttp/go.mod @@ -1,14 +1,14 @@ -module github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp +module github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp go 1.22 -replace github.com/deepmap/oapi-codegen/v2 => ../../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../ require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/lestrrat-go/jwx v1.2.29 github.com/oapi-codegen/nethttp-middleware v1.0.2 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/oapi-codegen/testutil v1.1.0 github.com/stretchr/testify v1.9.0 ) diff --git a/examples/authenticated-api/stdhttp/main.go b/examples/authenticated-api/stdhttp/main.go index 98dd5cad9..73d330aac 100644 --- a/examples/authenticated-api/stdhttp/main.go +++ b/examples/authenticated-api/stdhttp/main.go @@ -5,8 +5,8 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp/server" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/server" ) func main() { diff --git a/examples/authenticated-api/stdhttp/server/fake_jws.go b/examples/authenticated-api/stdhttp/server/fake_jws.go index 46532af66..6eb3067d8 100644 --- a/examples/authenticated-api/stdhttp/server/fake_jws.go +++ b/examples/authenticated-api/stdhttp/server/fake_jws.go @@ -4,16 +4,17 @@ import ( "crypto/ecdsa" "fmt" - "github.com/deepmap/oapi-codegen/v2/pkg/ecdsafile" "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jws" "github.com/lestrrat-go/jwx/jwt" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/ecdsafile" ) // PrivateKey is an ECDSA private key which was generated with the following // command: -// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem +// +// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem // // We are using a hard coded key here in this example, but in real applications, // you would never do this. Your JWT signing key must never be in your application, diff --git a/examples/authenticated-api/stdhttp/server/server.go b/examples/authenticated-api/stdhttp/server/server.go index 70e11f6cd..ddcabaa73 100644 --- a/examples/authenticated-api/stdhttp/server/server.go +++ b/examples/authenticated-api/stdhttp/server/server.go @@ -8,9 +8,9 @@ import ( "sort" "sync" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" "github.com/getkin/kin-openapi/openapi3filter" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" ) type server struct { diff --git a/examples/authenticated-api/stdhttp/server/server_test.go b/examples/authenticated-api/stdhttp/server/server_test.go index 58075aa21..cfada646d 100644 --- a/examples/authenticated-api/stdhttp/server/server_test.go +++ b/examples/authenticated-api/stdhttp/server/server_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/examples/authenticated-api/stdhttp/tools/tools.go b/examples/authenticated-api/stdhttp/tools/tools.go index 67a500f26..8615cb4c5 100644 --- a/examples/authenticated-api/stdhttp/tools/tools.go +++ b/examples/authenticated-api/stdhttp/tools/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/examples/client/client.gen.go b/examples/client/client.gen.go index 33ed34d75..8ef6b7856 100644 --- a/examples/client/client.gen.go +++ b/examples/client/client.gen.go @@ -1,6 +1,6 @@ // Package client provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package client import ( diff --git a/examples/client/generate.go b/examples/client/generate.go index 3bf610b9e..e9c9a42f8 100644 --- a/examples/client/generate.go +++ b/examples/client/generate.go @@ -1,3 +1,3 @@ package client -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/custom-client-type/custom-client-type.gen.go b/examples/custom-client-type/custom-client-type.gen.go index 79bab485e..6dd2ef019 100644 --- a/examples/custom-client-type/custom-client-type.gen.go +++ b/examples/custom-client-type/custom-client-type.gen.go @@ -1,6 +1,6 @@ // Package customclienttype provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package customclienttype import ( diff --git a/examples/custom-client-type/doc.go b/examples/custom-client-type/doc.go index 540715b92..778f8a210 100644 --- a/examples/custom-client-type/doc.go +++ b/examples/custom-client-type/doc.go @@ -3,4 +3,4 @@ package customclienttype // This is an example of how to add a prefix to the name of the generated Client struct // See https://github.com/deepmap/oapi-codegen/issues/785 for why this might be necessary -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xdeprecatedreason/gen.go b/examples/extensions/xdeprecatedreason/gen.go index 55e2f610c..aa36e0387 100644 --- a/examples/extensions/xdeprecatedreason/gen.go +++ b/examples/extensions/xdeprecatedreason/gen.go @@ -1,6 +1,6 @@ // Package xdeprecatedreason provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xdeprecatedreason // Client defines model for Client. diff --git a/examples/extensions/xdeprecatedreason/generate.go b/examples/extensions/xdeprecatedreason/generate.go index 24fc54ac7..97a610ff3 100644 --- a/examples/extensions/xdeprecatedreason/generate.go +++ b/examples/extensions/xdeprecatedreason/generate.go @@ -1,3 +1,3 @@ package xdeprecatedreason -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xenumnames/gen.go b/examples/extensions/xenumnames/gen.go index 13d68f5e0..73ebfa656 100644 --- a/examples/extensions/xenumnames/gen.go +++ b/examples/extensions/xenumnames/gen.go @@ -1,6 +1,6 @@ // Package xenumnames provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xenumnames // Defines values for ClientType. diff --git a/examples/extensions/xenumnames/generate.go b/examples/extensions/xenumnames/generate.go index 25f29663f..599d6f3f9 100644 --- a/examples/extensions/xenumnames/generate.go +++ b/examples/extensions/xenumnames/generate.go @@ -1,3 +1,3 @@ package xenumnames -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgojsonignore/gen.go b/examples/extensions/xgojsonignore/gen.go index 4d2b1d0c6..17c21373d 100644 --- a/examples/extensions/xgojsonignore/gen.go +++ b/examples/extensions/xgojsonignore/gen.go @@ -1,6 +1,6 @@ // Package xgojsonignore provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgojsonignore // Client defines model for Client. diff --git a/examples/extensions/xgojsonignore/generate.go b/examples/extensions/xgojsonignore/generate.go index 2c5acf839..0d8488e43 100644 --- a/examples/extensions/xgojsonignore/generate.go +++ b/examples/extensions/xgojsonignore/generate.go @@ -1,3 +1,3 @@ package xgojsonignore -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgoname/gen.go b/examples/extensions/xgoname/gen.go index 27566e07e..c7831379a 100644 --- a/examples/extensions/xgoname/gen.go +++ b/examples/extensions/xgoname/gen.go @@ -1,6 +1,6 @@ // Package xgoname provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgoname // Client defines model for Client. diff --git a/examples/extensions/xgoname/generate.go b/examples/extensions/xgoname/generate.go index 3fe1cb0ec..546211419 100644 --- a/examples/extensions/xgoname/generate.go +++ b/examples/extensions/xgoname/generate.go @@ -1,3 +1,3 @@ package xgoname -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgotype/gen.go b/examples/extensions/xgotype/gen.go index 5c50fb5ee..376c1fdbf 100644 --- a/examples/extensions/xgotype/gen.go +++ b/examples/extensions/xgotype/gen.go @@ -1,6 +1,6 @@ // Package xgotype provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgotype import ( diff --git a/examples/extensions/xgotype/generate.go b/examples/extensions/xgotype/generate.go index 134bf7fc0..fc28c53de 100644 --- a/examples/extensions/xgotype/generate.go +++ b/examples/extensions/xgotype/generate.go @@ -1,3 +1,3 @@ package xgotype -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgotypename/gen.go b/examples/extensions/xgotypename/gen.go index da3603758..cc0c9c2bf 100644 --- a/examples/extensions/xgotypename/gen.go +++ b/examples/extensions/xgotypename/gen.go @@ -1,6 +1,6 @@ // Package xgotypename provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgotypename // Client defines model for Client. diff --git a/examples/extensions/xgotypename/generate.go b/examples/extensions/xgotypename/generate.go index 8a47607d4..787661180 100644 --- a/examples/extensions/xgotypename/generate.go +++ b/examples/extensions/xgotypename/generate.go @@ -1,3 +1,3 @@ package xgotypename -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgotypeskipoptionalpointer/gen.go b/examples/extensions/xgotypeskipoptionalpointer/gen.go index 984d870d9..ddb1df843 100644 --- a/examples/extensions/xgotypeskipoptionalpointer/gen.go +++ b/examples/extensions/xgotypeskipoptionalpointer/gen.go @@ -1,6 +1,6 @@ // Package xgotypeskipoptionalpointer provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgotypeskipoptionalpointer // Client defines model for Client. diff --git a/examples/extensions/xgotypeskipoptionalpointer/generate.go b/examples/extensions/xgotypeskipoptionalpointer/generate.go index ea93abff4..582ec97fd 100644 --- a/examples/extensions/xgotypeskipoptionalpointer/generate.go +++ b/examples/extensions/xgotypeskipoptionalpointer/generate.go @@ -1,3 +1,3 @@ package xgotypeskipoptionalpointer -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xoapicodegenextratags/gen.go b/examples/extensions/xoapicodegenextratags/gen.go index 288674119..25f950e3d 100644 --- a/examples/extensions/xoapicodegenextratags/gen.go +++ b/examples/extensions/xoapicodegenextratags/gen.go @@ -1,6 +1,6 @@ // Package xoapicodegenextratags provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xoapicodegenextratags // Client defines model for Client. diff --git a/examples/extensions/xoapicodegenextratags/generate.go b/examples/extensions/xoapicodegenextratags/generate.go index 0cebd6cd1..6906128b0 100644 --- a/examples/extensions/xoapicodegenextratags/generate.go +++ b/examples/extensions/xoapicodegenextratags/generate.go @@ -1,3 +1,3 @@ package xoapicodegenextratags -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xomitempty/gen.go b/examples/extensions/xomitempty/gen.go index 39c4e773c..a4a06f97e 100644 --- a/examples/extensions/xomitempty/gen.go +++ b/examples/extensions/xomitempty/gen.go @@ -1,6 +1,6 @@ // Package xomitempty provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xomitempty // Client defines model for Client. diff --git a/examples/extensions/xomitempty/generate.go b/examples/extensions/xomitempty/generate.go index ae9a5d016..c6c48c4fe 100644 --- a/examples/extensions/xomitempty/generate.go +++ b/examples/extensions/xomitempty/generate.go @@ -1,3 +1,3 @@ package xomitempty -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xorder/gen.go b/examples/extensions/xorder/gen.go index 6f6065e2c..bb5841d56 100644 --- a/examples/extensions/xorder/gen.go +++ b/examples/extensions/xorder/gen.go @@ -1,6 +1,6 @@ // Package xorder provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xorder // Client defines model for Client. diff --git a/examples/extensions/xorder/generate.go b/examples/extensions/xorder/generate.go index 34a64bf71..9b9d46563 100644 --- a/examples/extensions/xorder/generate.go +++ b/examples/extensions/xorder/generate.go @@ -1,3 +1,3 @@ package xorder -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/go.mod b/examples/go.mod index d78684b03..077872f27 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -1,11 +1,10 @@ -module github.com/deepmap/oapi-codegen/v2/examples +module github.com/oapi-codegen/oapi-codegen/v2/examples go 1.20 -replace github.com/deepmap/oapi-codegen/v2 => ../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../ require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/gin-gonic/gin v1.10.0 github.com/go-chi/chi/v5 v5.0.10 @@ -20,6 +19,7 @@ require ( github.com/oapi-codegen/gin-middleware v1.0.2 github.com/oapi-codegen/iris-middleware v1.0.5 github.com/oapi-codegen/nethttp-middleware v1.0.2 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.0.0 github.com/stretchr/testify v1.9.0 diff --git a/examples/import-mapping/admin/cfg.yaml b/examples/import-mapping/admin/cfg.yaml index 003f174aa..a888e035a 100644 --- a/examples/import-mapping/admin/cfg.yaml +++ b/examples/import-mapping/admin/cfg.yaml @@ -8,4 +8,4 @@ output-options: # to make sure that all types are generated skip-prune: true import-mapping: - ../common/api.yaml: github.com/deepmap/oapi-codegen/v2/examples/import-mapping/common + ../common/api.yaml: github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common diff --git a/examples/import-mapping/admin/generate.go b/examples/import-mapping/admin/generate.go index 893f74c68..0cc4cece1 100644 --- a/examples/import-mapping/admin/generate.go +++ b/examples/import-mapping/admin/generate.go @@ -1,3 +1,3 @@ package admin -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/import-mapping/admin/server.gen.go b/examples/import-mapping/admin/server.gen.go index e70d9667a..66d84690c 100644 --- a/examples/import-mapping/admin/server.gen.go +++ b/examples/import-mapping/admin/server.gen.go @@ -1,14 +1,14 @@ // Package admin provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package admin import ( "fmt" "net/http" - externalRef0 "github.com/deepmap/oapi-codegen/v2/examples/import-mapping/common" "github.com/go-chi/chi/v5" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common" "github.com/oapi-codegen/runtime" openapi_types "github.com/oapi-codegen/runtime/types" ) diff --git a/examples/import-mapping/common/generate.go b/examples/import-mapping/common/generate.go index e74ff35bd..4e7fe60ec 100644 --- a/examples/import-mapping/common/generate.go +++ b/examples/import-mapping/common/generate.go @@ -1,3 +1,3 @@ package common -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/import-mapping/common/types.gen.go b/examples/import-mapping/common/types.gen.go index 28ba244f6..178106064 100644 --- a/examples/import-mapping/common/types.gen.go +++ b/examples/import-mapping/common/types.gen.go @@ -1,6 +1,6 @@ // Package common provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package common // User defines model for User. diff --git a/examples/minimal-server/chi/api/generate.go b/examples/minimal-server/chi/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/chi/api/generate.go +++ b/examples/minimal-server/chi/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/chi/api/ping.gen.go b/examples/minimal-server/chi/api/ping.gen.go index 823173fcc..3f4b5ce29 100644 --- a/examples/minimal-server/chi/api/ping.gen.go +++ b/examples/minimal-server/chi/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/chi/main.go b/examples/minimal-server/chi/main.go index f711001de..56e0a0515 100644 --- a/examples/minimal-server/chi/main.go +++ b/examples/minimal-server/chi/main.go @@ -4,8 +4,8 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/chi/api" "github.com/go-chi/chi/v5" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/chi/api" ) func main() { diff --git a/examples/minimal-server/echo/api/generate.go b/examples/minimal-server/echo/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/echo/api/generate.go +++ b/examples/minimal-server/echo/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/echo/api/ping.gen.go b/examples/minimal-server/echo/api/ping.gen.go index b660981a8..bd78f8f2a 100644 --- a/examples/minimal-server/echo/api/ping.gen.go +++ b/examples/minimal-server/echo/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/echo/main.go b/examples/minimal-server/echo/main.go index f424f015b..ae53667f3 100644 --- a/examples/minimal-server/echo/main.go +++ b/examples/minimal-server/echo/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/echo/api" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/echo/api" ) func main() { diff --git a/examples/minimal-server/fiber/api/generate.go b/examples/minimal-server/fiber/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/fiber/api/generate.go +++ b/examples/minimal-server/fiber/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/fiber/api/ping.gen.go b/examples/minimal-server/fiber/api/ping.gen.go index 78e784bc9..a21e6fa95 100644 --- a/examples/minimal-server/fiber/api/ping.gen.go +++ b/examples/minimal-server/fiber/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/fiber/main.go b/examples/minimal-server/fiber/main.go index 2ca3854cd..88504af7b 100644 --- a/examples/minimal-server/fiber/main.go +++ b/examples/minimal-server/fiber/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/fiber/api" "github.com/gofiber/fiber/v2" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/fiber/api" ) func main() { diff --git a/examples/minimal-server/gin/api/generate.go b/examples/minimal-server/gin/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/gin/api/generate.go +++ b/examples/minimal-server/gin/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/gin/api/ping.gen.go b/examples/minimal-server/gin/api/ping.gen.go index 58852ee51..8e018d4e8 100644 --- a/examples/minimal-server/gin/api/ping.gen.go +++ b/examples/minimal-server/gin/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/gin/main.go b/examples/minimal-server/gin/main.go index ca8d4b040..365932e31 100644 --- a/examples/minimal-server/gin/main.go +++ b/examples/minimal-server/gin/main.go @@ -4,8 +4,8 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gin/api" "github.com/gin-gonic/gin" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gin/api" ) func main() { diff --git a/examples/minimal-server/gorillamux/api/generate.go b/examples/minimal-server/gorillamux/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/gorillamux/api/generate.go +++ b/examples/minimal-server/gorillamux/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/gorillamux/api/ping.gen.go b/examples/minimal-server/gorillamux/api/ping.gen.go index efb430949..f62e3c7f0 100644 --- a/examples/minimal-server/gorillamux/api/ping.gen.go +++ b/examples/minimal-server/gorillamux/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/gorillamux/main.go b/examples/minimal-server/gorillamux/main.go index 2ce286bec..5d7dc87f7 100644 --- a/examples/minimal-server/gorillamux/main.go +++ b/examples/minimal-server/gorillamux/main.go @@ -4,8 +4,8 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gorillamux/api" "github.com/gorilla/mux" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api" ) func main() { diff --git a/examples/minimal-server/iris/api/generate.go b/examples/minimal-server/iris/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/iris/api/generate.go +++ b/examples/minimal-server/iris/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/iris/api/ping.gen.go b/examples/minimal-server/iris/api/ping.gen.go index a5f27a62b..144166eba 100644 --- a/examples/minimal-server/iris/api/ping.gen.go +++ b/examples/minimal-server/iris/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/iris/main.go b/examples/minimal-server/iris/main.go index 62a4c1c64..a163d6f59 100644 --- a/examples/minimal-server/iris/main.go +++ b/examples/minimal-server/iris/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/iris/api" "github.com/kataras/iris/v12" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/iris/api" ) func main() { diff --git a/examples/minimal-server/nethttp-compatible/main.go b/examples/minimal-server/nethttp-compatible/main.go index 6b342a219..784b741cf 100644 --- a/examples/minimal-server/nethttp-compatible/main.go +++ b/examples/minimal-server/nethttp-compatible/main.go @@ -4,7 +4,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gorillamux/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api" ) func main() { diff --git a/examples/minimal-server/stdhttp/api/generate.go b/examples/minimal-server/stdhttp/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/stdhttp/api/generate.go +++ b/examples/minimal-server/stdhttp/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/stdhttp/api/ping.gen.go b/examples/minimal-server/stdhttp/api/ping.gen.go index ae777e3ba..6d11afc6e 100644 --- a/examples/minimal-server/stdhttp/api/ping.gen.go +++ b/examples/minimal-server/stdhttp/api/ping.gen.go @@ -2,7 +2,7 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/stdhttp/go.mod b/examples/minimal-server/stdhttp/go.mod index 07ecb9df5..f2385d10f 100644 --- a/examples/minimal-server/stdhttp/go.mod +++ b/examples/minimal-server/stdhttp/go.mod @@ -1,10 +1,10 @@ -module github.com/deepmap/oapi-codegen/v2/examples/minimal-server/stdhttp +module github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp go 1.22 -replace github.com/deepmap/oapi-codegen/v2 => ../../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../ -require github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 +require github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 require ( github.com/getkin/kin-openapi v0.124.0 // indirect diff --git a/examples/minimal-server/stdhttp/main.go b/examples/minimal-server/stdhttp/main.go index 5f4646261..8ee94ec49 100644 --- a/examples/minimal-server/stdhttp/main.go +++ b/examples/minimal-server/stdhttp/main.go @@ -4,7 +4,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/stdhttp/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp/api" ) func main() { diff --git a/examples/minimal-server/stdhttp/tools/tools.go b/examples/minimal-server/stdhttp/tools/tools.go index 67a500f26..8615cb4c5 100644 --- a/examples/minimal-server/stdhttp/tools/tools.go +++ b/examples/minimal-server/stdhttp/tools/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/examples/no-vcs-version-override/echo/api/api.gen.go b/examples/no-vcs-version-override/echo/api/api.gen.go index 6ce0064e5..e95391fd1 100644 --- a/examples/no-vcs-version-override/echo/api/api.gen.go +++ b/examples/no-vcs-version-override/echo/api/api.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v123.456.789 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v123.456.789 DO NOT EDIT. package api import ( diff --git a/examples/no-vcs-version-override/echo/api/doc.go b/examples/no-vcs-version-override/echo/api/doc.go index 82d3898ce..03f5a0318 100644 --- a/examples/no-vcs-version-override/echo/api/doc.go +++ b/examples/no-vcs-version-override/echo/api/doc.go @@ -1,3 +1,3 @@ package api -//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml +//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml diff --git a/examples/only-models/generate.go b/examples/only-models/generate.go index a94b7f227..91b495725 100644 --- a/examples/only-models/generate.go +++ b/examples/only-models/generate.go @@ -1,3 +1,3 @@ package onlymodels -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/only-models/only-models.gen.go b/examples/only-models/only-models.gen.go index 412e82a10..c8f33c9c8 100644 --- a/examples/only-models/only-models.gen.go +++ b/examples/only-models/only-models.gen.go @@ -1,6 +1,6 @@ // Package onlymodels provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package onlymodels // Client defines model for Client. diff --git a/examples/petstore-expanded/chi/api/petstore.gen.go b/examples/petstore-expanded/chi/api/petstore.gen.go index 5f69e4bfa..89777eba0 100644 --- a/examples/petstore-expanded/chi/api/petstore.gen.go +++ b/examples/petstore-expanded/chi/api/petstore.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/chi/api/petstore.go b/examples/petstore-expanded/chi/api/petstore.go index 888d16f13..6ede559ec 100644 --- a/examples/petstore-expanded/chi/api/petstore.go +++ b/examples/petstore-expanded/chi/api/petstore.go @@ -1,4 +1,4 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/chi/petstore.go b/examples/petstore-expanded/chi/petstore.go index 20b1f5ce8..b525fa576 100644 --- a/examples/petstore-expanded/chi/petstore.go +++ b/examples/petstore-expanded/chi/petstore.go @@ -12,9 +12,9 @@ import ( "net/http" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/chi/api" - middleware "github.com/oapi-codegen/nethttp-middleware" "github.com/go-chi/chi/v5" + middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/chi/api" ) func main() { diff --git a/examples/petstore-expanded/chi/petstore_test.go b/examples/petstore-expanded/chi/petstore_test.go index aa2380e60..e9d7662b4 100644 --- a/examples/petstore-expanded/chi/petstore_test.go +++ b/examples/petstore-expanded/chi/petstore_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/chi/api" + "github.com/go-chi/chi/v5" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/chi/api" "github.com/oapi-codegen/testutil" - "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/petstore-expanded/echo/api/models/models.gen.go b/examples/petstore-expanded/echo/api/models/models.gen.go index 61880b8d6..0945e02ab 100644 --- a/examples/petstore-expanded/echo/api/models/models.gen.go +++ b/examples/petstore-expanded/echo/api/models/models.gen.go @@ -1,6 +1,6 @@ // Package models provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package models // Error defines model for Error. diff --git a/examples/petstore-expanded/echo/api/petstore-server.gen.go b/examples/petstore-expanded/echo/api/petstore-server.gen.go index e92c4a0cc..8767c17a1 100644 --- a/examples/petstore-expanded/echo/api/petstore-server.gen.go +++ b/examples/petstore-expanded/echo/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( @@ -13,9 +13,9 @@ import ( "path" "strings" - . "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" "github.com/getkin/kin-openapi/openapi3" "github.com/labstack/echo/v4" + . "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" "github.com/oapi-codegen/runtime" ) diff --git a/examples/petstore-expanded/echo/api/petstore.go b/examples/petstore-expanded/echo/api/petstore.go index 4c3f412fb..9934fa992 100644 --- a/examples/petstore-expanded/echo/api/petstore.go +++ b/examples/petstore-expanded/echo/api/petstore.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api @@ -22,8 +22,8 @@ import ( "net/http" "sync" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" ) type PetStore struct { diff --git a/examples/petstore-expanded/echo/api/server.cfg.yaml b/examples/petstore-expanded/echo/api/server.cfg.yaml index bb3f813ab..534f4d8f5 100644 --- a/examples/petstore-expanded/echo/api/server.cfg.yaml +++ b/examples/petstore-expanded/echo/api/server.cfg.yaml @@ -2,7 +2,7 @@ package: api output: petstore-server.gen.go additional-imports: - - package: github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models + - package: github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models alias: . generate: echo-server: true diff --git a/examples/petstore-expanded/echo/petstore.go b/examples/petstore-expanded/echo/petstore.go index ea13d7192..5ea025050 100644 --- a/examples/petstore-expanded/echo/petstore.go +++ b/examples/petstore-expanded/echo/petstore.go @@ -11,10 +11,10 @@ import ( "net" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api" "github.com/labstack/echo/v4" echomiddleware "github.com/labstack/echo/v4/middleware" middleware "github.com/oapi-codegen/echo-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api" ) func main() { diff --git a/examples/petstore-expanded/echo/petstore_test.go b/examples/petstore-expanded/echo/petstore_test.go index 062812559..5fc058da9 100644 --- a/examples/petstore-expanded/echo/petstore_test.go +++ b/examples/petstore-expanded/echo/petstore_test.go @@ -19,12 +19,12 @@ import ( "net/http" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" - "github.com/oapi-codegen/testutil" "github.com/labstack/echo/v4" echoMiddleware "github.com/labstack/echo/v4/middleware" middleware "github.com/oapi-codegen/echo-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" + "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go b/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go index a6696c296..de651ec54 100644 --- a/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go +++ b/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go @@ -9,9 +9,9 @@ import ( "net/http/httptest" "testing" - examplePetstoreClient "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded" - examplePetstore "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" + examplePetstoreClient "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded" + examplePetstore "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" "github.com/stretchr/testify/assert" "golang.org/x/lint" ) diff --git a/examples/petstore-expanded/fiber/api/petstore-server.gen.go b/examples/petstore-expanded/fiber/api/petstore-server.gen.go index b3fa4b968..5b01b84a0 100644 --- a/examples/petstore-expanded/fiber/api/petstore-server.gen.go +++ b/examples/petstore-expanded/fiber/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/fiber/api/petstore-types.gen.go b/examples/petstore-expanded/fiber/api/petstore-types.gen.go index 3d8ce1134..0e4954f34 100644 --- a/examples/petstore-expanded/fiber/api/petstore-types.gen.go +++ b/examples/petstore-expanded/fiber/api/petstore-types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Error defines model for Error. diff --git a/examples/petstore-expanded/fiber/api/petstore.go b/examples/petstore-expanded/fiber/api/petstore.go index df03e511e..38eec12d6 100644 --- a/examples/petstore-expanded/fiber/api/petstore.go +++ b/examples/petstore-expanded/fiber/api/petstore.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/fiber/petstore.go b/examples/petstore-expanded/fiber/petstore.go index 7ea71edce..6332ff886 100644 --- a/examples/petstore-expanded/fiber/petstore.go +++ b/examples/petstore-expanded/fiber/petstore.go @@ -13,8 +13,8 @@ import ( "github.com/gofiber/fiber/v2" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/fiber/api" middleware "github.com/oapi-codegen/fiber-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/fiber/api" ) func main() { diff --git a/examples/petstore-expanded/fiber/petstore_test.go b/examples/petstore-expanded/fiber/petstore_test.go index 4de37519c..dac1d58bf 100644 --- a/examples/petstore-expanded/fiber/petstore_test.go +++ b/examples/petstore-expanded/fiber/petstore_test.go @@ -12,7 +12,7 @@ import ( "github.com/gofiber/fiber/v2" "github.com/stretchr/testify/assert" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/fiber/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/fiber/api" ) func doGet(t *testing.T, app *fiber.App, rawURL string) (*http.Response, error) { diff --git a/examples/petstore-expanded/gin/api/petstore-server.gen.go b/examples/petstore-expanded/gin/api/petstore-server.gen.go index f048e0066..02499fcc1 100644 --- a/examples/petstore-expanded/gin/api/petstore-server.gen.go +++ b/examples/petstore-expanded/gin/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/gin/api/petstore-types.gen.go b/examples/petstore-expanded/gin/api/petstore-types.gen.go index 3d8ce1134..0e4954f34 100644 --- a/examples/petstore-expanded/gin/api/petstore-types.gen.go +++ b/examples/petstore-expanded/gin/api/petstore-types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Error defines model for Error. diff --git a/examples/petstore-expanded/gin/api/petstore.go b/examples/petstore-expanded/gin/api/petstore.go index 09c37dba4..094b4ef9e 100644 --- a/examples/petstore-expanded/gin/api/petstore.go +++ b/examples/petstore-expanded/gin/api/petstore.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/gin/petstore.go b/examples/petstore-expanded/gin/petstore.go index 04031e67d..8b0717a4c 100644 --- a/examples/petstore-expanded/gin/petstore.go +++ b/examples/petstore-expanded/gin/petstore.go @@ -14,8 +14,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gin/api" middleware "github.com/oapi-codegen/gin-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gin/api" ) func NewGinPetServer(petStore *api.PetStore, port string) *http.Server { diff --git a/examples/petstore-expanded/gin/petstore_test.go b/examples/petstore-expanded/gin/petstore_test.go index ad9515443..d7a557d1c 100644 --- a/examples/petstore-expanded/gin/petstore_test.go +++ b/examples/petstore-expanded/gin/petstore_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gin/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gin/api" "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" ) diff --git a/examples/petstore-expanded/gorilla/api/petstore.gen.go b/examples/petstore-expanded/gorilla/api/petstore.gen.go index 2f65ea25b..78d2178ea 100644 --- a/examples/petstore-expanded/gorilla/api/petstore.gen.go +++ b/examples/petstore-expanded/gorilla/api/petstore.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/gorilla/api/petstore.go b/examples/petstore-expanded/gorilla/api/petstore.go index 888d16f13..6ede559ec 100644 --- a/examples/petstore-expanded/gorilla/api/petstore.go +++ b/examples/petstore-expanded/gorilla/api/petstore.go @@ -1,4 +1,4 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/gorilla/petstore.go b/examples/petstore-expanded/gorilla/petstore.go index d974efdaa..d1675f1ae 100644 --- a/examples/petstore-expanded/gorilla/petstore.go +++ b/examples/petstore-expanded/gorilla/petstore.go @@ -12,9 +12,9 @@ import ( "net/http" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gorilla/api" - middleware "github.com/oapi-codegen/nethttp-middleware" "github.com/gorilla/mux" + middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gorilla/api" ) func main() { diff --git a/examples/petstore-expanded/gorilla/petstore_test.go b/examples/petstore-expanded/gorilla/petstore_test.go index a63dd536a..a6cfedecd 100644 --- a/examples/petstore-expanded/gorilla/petstore_test.go +++ b/examples/petstore-expanded/gorilla/petstore_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gorilla/api" + "github.com/gorilla/mux" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gorilla/api" "github.com/oapi-codegen/testutil" - "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/petstore-expanded/internal/doc.go b/examples/petstore-expanded/internal/doc.go index bfd040503..b04cac3f8 100644 --- a/examples/petstore-expanded/internal/doc.go +++ b/examples/petstore-expanded/internal/doc.go @@ -17,4 +17,4 @@ package internal // server. The file petstore.gen.go is automatically generated from the schema // Run oapi-codegen to regenerate the petstore boilerplate -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml diff --git a/examples/petstore-expanded/iris/api/petstore-server.gen.go b/examples/petstore-expanded/iris/api/petstore-server.gen.go index 3abf1dac4..a559c238d 100644 --- a/examples/petstore-expanded/iris/api/petstore-server.gen.go +++ b/examples/petstore-expanded/iris/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/iris/api/petstore-types.gen.go b/examples/petstore-expanded/iris/api/petstore-types.gen.go index 3d8ce1134..0e4954f34 100644 --- a/examples/petstore-expanded/iris/api/petstore-types.gen.go +++ b/examples/petstore-expanded/iris/api/petstore-types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Error defines model for Error. diff --git a/examples/petstore-expanded/iris/api/petstore.go b/examples/petstore-expanded/iris/api/petstore.go index ab6491d3d..d1e801801 100644 --- a/examples/petstore-expanded/iris/api/petstore.go +++ b/examples/petstore-expanded/iris/api/petstore.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/iris/petstore.go b/examples/petstore-expanded/iris/petstore.go index feebfcc40..2b2dea37f 100644 --- a/examples/petstore-expanded/iris/petstore.go +++ b/examples/petstore-expanded/iris/petstore.go @@ -11,9 +11,9 @@ import ( "log" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/iris/api" - middleware "github.com/oapi-codegen/iris-middleware" "github.com/kataras/iris/v12" + middleware "github.com/oapi-codegen/iris-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/iris/api" ) func NewIrisPetServer(petStore *api.PetStore, port int) *iris.Application { diff --git a/examples/petstore-expanded/iris/petstore_test.go b/examples/petstore-expanded/iris/petstore_test.go index facb9f222..837a53369 100644 --- a/examples/petstore-expanded/iris/petstore_test.go +++ b/examples/petstore-expanded/iris/petstore_test.go @@ -21,7 +21,7 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/iris/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/iris/api" "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" ) diff --git a/examples/petstore-expanded/petstore-client.gen.go b/examples/petstore-expanded/petstore-client.gen.go index e97ccf6cd..9bd928f49 100644 --- a/examples/petstore-expanded/petstore-client.gen.go +++ b/examples/petstore-expanded/petstore-client.gen.go @@ -1,6 +1,6 @@ // Package petstore provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package petstore import ( diff --git a/examples/petstore-expanded/stdhttp/api/petstore.gen.go b/examples/petstore-expanded/stdhttp/api/petstore.gen.go index 5e15fe2dc..23dd9d463 100644 --- a/examples/petstore-expanded/stdhttp/api/petstore.gen.go +++ b/examples/petstore-expanded/stdhttp/api/petstore.gen.go @@ -2,7 +2,7 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/stdhttp/api/petstore.go b/examples/petstore-expanded/stdhttp/api/petstore.go index f29236d1a..5b9d8606f 100644 --- a/examples/petstore-expanded/stdhttp/api/petstore.go +++ b/examples/petstore-expanded/stdhttp/api/petstore.go @@ -1,6 +1,6 @@ //go:build go1.22 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/stdhttp/go.mod b/examples/petstore-expanded/stdhttp/go.mod index edd0c7d62..a0ff28b6a 100644 --- a/examples/petstore-expanded/stdhttp/go.mod +++ b/examples/petstore-expanded/stdhttp/go.mod @@ -1,13 +1,13 @@ -module github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/stdhttp +module github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp go 1.22 -replace github.com/deepmap/oapi-codegen/v2 => ../../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../ require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/oapi-codegen/nethttp-middleware v1.0.2 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.0.0 github.com/stretchr/testify v1.9.0 diff --git a/examples/petstore-expanded/stdhttp/petstore.go b/examples/petstore-expanded/stdhttp/petstore.go index 03dd84879..68e45cc1d 100644 --- a/examples/petstore-expanded/stdhttp/petstore.go +++ b/examples/petstore-expanded/stdhttp/petstore.go @@ -14,8 +14,8 @@ import ( "net/http" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api" ) func main() { diff --git a/examples/petstore-expanded/stdhttp/petstore_test.go b/examples/petstore-expanded/stdhttp/petstore_test.go index 380f0de35..bf3df022d 100644 --- a/examples/petstore-expanded/stdhttp/petstore_test.go +++ b/examples/petstore-expanded/stdhttp/petstore_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api" "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/examples/petstore-expanded/stdhttp/tools/tools.go b/examples/petstore-expanded/stdhttp/tools/tools.go index 67a500f26..8615cb4c5 100644 --- a/examples/petstore-expanded/stdhttp/tools/tools.go +++ b/examples/petstore-expanded/stdhttp/tools/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/examples/petstore-expanded/strict/api/petstore-server.gen.go b/examples/petstore-expanded/strict/api/petstore-server.gen.go index 34b58e69f..656f40d90 100644 --- a/examples/petstore-expanded/strict/api/petstore-server.gen.go +++ b/examples/petstore-expanded/strict/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/strict/api/petstore-types.gen.go b/examples/petstore-expanded/strict/api/petstore-types.gen.go index 3d8ce1134..0e4954f34 100644 --- a/examples/petstore-expanded/strict/api/petstore-types.gen.go +++ b/examples/petstore-expanded/strict/api/petstore-types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Error defines model for Error. diff --git a/examples/petstore-expanded/strict/api/petstore.go b/examples/petstore-expanded/strict/api/petstore.go index 96ecc6a03..fc5c9fda2 100644 --- a/examples/petstore-expanded/strict/api/petstore.go +++ b/examples/petstore-expanded/strict/api/petstore.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/strict/petstore.go b/examples/petstore-expanded/strict/petstore.go index f0acac4bf..363caf7e1 100644 --- a/examples/petstore-expanded/strict/petstore.go +++ b/examples/petstore-expanded/strict/petstore.go @@ -12,9 +12,9 @@ import ( "net/http" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/strict/api" - middleware "github.com/oapi-codegen/nethttp-middleware" "github.com/go-chi/chi/v5" + middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/strict/api" ) func main() { diff --git a/examples/petstore-expanded/strict/petstore_test.go b/examples/petstore-expanded/strict/petstore_test.go index 848c32e62..208b65ea3 100644 --- a/examples/petstore-expanded/strict/petstore_test.go +++ b/examples/petstore-expanded/strict/petstore_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/strict/api" + "github.com/go-chi/chi/v5" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/strict/api" "github.com/oapi-codegen/testutil" - "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/tools.go b/examples/tools.go index 67a500f26..8615cb4c5 100644 --- a/examples/tools.go +++ b/examples/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/go.mod b/go.mod index 3c21deac7..67fc4261f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/deepmap/oapi-codegen/v2 +module github.com/oapi-codegen/oapi-codegen/v2 go 1.20 diff --git a/internal/test/all_of/doc.go b/internal/test/all_of/doc.go index a3284a6c1..b154cb224 100644 --- a/internal/test/all_of/doc.go +++ b/internal/test/all_of/doc.go @@ -1,4 +1,4 @@ package allof -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config1.yaml openapi.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config2.yaml openapi.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config1.yaml openapi.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config2.yaml openapi.yaml diff --git a/internal/test/all_of/v1/openapi.gen.go b/internal/test/all_of/v1/openapi.gen.go index 0b65e403f..db5fd302c 100644 --- a/internal/test/all_of/v1/openapi.gen.go +++ b/internal/test/all_of/v1/openapi.gen.go @@ -1,6 +1,6 @@ // Package v1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package v1 import ( diff --git a/internal/test/all_of/v2/openapi.gen.go b/internal/test/all_of/v2/openapi.gen.go index f00a14f89..ab430340d 100644 --- a/internal/test/all_of/v2/openapi.gen.go +++ b/internal/test/all_of/v2/openapi.gen.go @@ -1,6 +1,6 @@ // Package v2 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package v2 import ( diff --git a/internal/test/any_of/param/doc.go b/internal/test/any_of/param/doc.go index 71113bd57..657385e03 100644 --- a/internal/test/any_of/param/doc.go +++ b/internal/test/any_of/param/doc.go @@ -1,3 +1,3 @@ package param -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/any_of/param/param.gen.go b/internal/test/any_of/param/param.gen.go index 1d6b42212..3378ae3da 100644 --- a/internal/test/any_of/param/param.gen.go +++ b/internal/test/any_of/param/param.gen.go @@ -1,6 +1,6 @@ // Package param provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package param import ( diff --git a/internal/test/any_of/param/param_test.go b/internal/test/any_of/param/param_test.go index 9ae6edd13..94641b365 100644 --- a/internal/test/any_of/param/param_test.go +++ b/internal/test/any_of/param/param_test.go @@ -3,7 +3,7 @@ package param_test import ( "testing" - "github.com/deepmap/oapi-codegen/v2/internal/test/any_of/param" + "github.com/oapi-codegen/oapi-codegen/v2/internal/test/any_of/param" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/test/client/client.gen.go b/internal/test/client/client.gen.go index 64c0ca227..275c72cf0 100644 --- a/internal/test/client/client.gen.go +++ b/internal/test/client/client.gen.go @@ -1,6 +1,6 @@ // Package client provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package client import ( diff --git a/internal/test/client/client_test.go b/internal/test/client/client_test.go index dd08ae2fb..ef7c5df16 100644 --- a/internal/test/client/client_test.go +++ b/internal/test/client/client_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/securityprovider" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/client/doc.go b/internal/test/client/doc.go index a97d93a6b..930039dad 100644 --- a/internal/test/client/doc.go +++ b/internal/test/client/doc.go @@ -1,3 +1,3 @@ package client -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --package=client --generate=client,types -o client.gen.go client.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=client --generate=client,types -o client.gen.go client.yaml diff --git a/internal/test/components/components.gen.go b/internal/test/components/components.gen.go index 919ca6a43..95257707b 100644 --- a/internal/test/components/components.gen.go +++ b/internal/test/components/components.gen.go @@ -1,6 +1,6 @@ // Package components provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package components import ( diff --git a/internal/test/components/doc.go b/internal/test/components/doc.go index 7d5021bcc..64f995a9c 100644 --- a/internal/test/components/doc.go +++ b/internal/test/components/doc.go @@ -1,3 +1,3 @@ package components -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml components.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml components.yaml diff --git a/internal/test/extensions/x-order/generate.go b/internal/test/extensions/x-order/generate.go index d49bb7970..8970f968a 100644 --- a/internal/test/extensions/x-order/generate.go +++ b/internal/test/extensions/x-order/generate.go @@ -1,3 +1,3 @@ package xorder -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/extensions/x-order/issue.gen.go b/internal/test/extensions/x-order/issue.gen.go index 6934cea8f..9dda2d072 100644 --- a/internal/test/extensions/x-order/issue.gen.go +++ b/internal/test/extensions/x-order/issue.gen.go @@ -1,6 +1,6 @@ // Package xorder provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xorder import ( diff --git a/internal/test/externalref/doc.go b/internal/test/externalref/doc.go index 805be737a..c5aeaa522 100644 --- a/internal/test/externalref/doc.go +++ b/internal/test/externalref/doc.go @@ -1,3 +1,3 @@ package externalref -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=externalref.cfg.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=externalref.cfg.yaml spec.yaml diff --git a/internal/test/externalref/externalref.cfg.yaml b/internal/test/externalref/externalref.cfg.yaml index dfe7b0558..22a76c3ff 100644 --- a/internal/test/externalref/externalref.cfg.yaml +++ b/internal/test/externalref/externalref.cfg.yaml @@ -4,9 +4,9 @@ generate: models: true embedded-spec: true import-mapping: - ./packageA/spec.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageA - ./packageB/spec.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB - https://petstore3.swagger.io/api/v3/openapi.json: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/petstore + ./packageA/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA + ./packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB + https://petstore3.swagger.io/api/v3/openapi.json: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore output: externalref.gen.go output-options: skip-prune: true diff --git a/internal/test/externalref/externalref.gen.go b/internal/test/externalref/externalref.gen.go index 3f132b055..d21bb6813 100644 --- a/internal/test/externalref/externalref.gen.go +++ b/internal/test/externalref/externalref.gen.go @@ -1,6 +1,6 @@ // Package externalref provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package externalref import ( @@ -12,10 +12,10 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageA" - externalRef1 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB" - externalRef2 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/petstore" "github.com/getkin/kin-openapi/openapi3" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA" + externalRef1 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB" + externalRef2 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore" ) // Container defines model for Container. diff --git a/internal/test/externalref/imports_test.go b/internal/test/externalref/imports_test.go index c491edc25..34fd0ec11 100644 --- a/internal/test/externalref/imports_test.go +++ b/internal/test/externalref/imports_test.go @@ -3,9 +3,9 @@ package externalref import ( "testing" - packageA "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageA" - packageB "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB" - petstore "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/petstore" + packageA "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA" + packageB "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB" + petstore "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore" "github.com/stretchr/testify/require" ) diff --git a/internal/test/externalref/packageA/config.yaml b/internal/test/externalref/packageA/config.yaml index 3185cdc7b..6ee1a1369 100644 --- a/internal/test/externalref/packageA/config.yaml +++ b/internal/test/externalref/packageA/config.yaml @@ -6,5 +6,5 @@ generate: output-options: skip-prune: true import-mapping: - ../packageB/spec.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB + ../packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB output: externalref.gen.go diff --git a/internal/test/externalref/packageA/doc.go b/internal/test/externalref/packageA/doc.go index 6d11f4bcf..f05471ffb 100644 --- a/internal/test/externalref/packageA/doc.go +++ b/internal/test/externalref/packageA/doc.go @@ -1,3 +1,3 @@ package packagea -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/externalref/packageA/externalref.gen.go b/internal/test/externalref/packageA/externalref.gen.go index 6f569bfa2..d925df21e 100644 --- a/internal/test/externalref/packageA/externalref.gen.go +++ b/internal/test/externalref/packageA/externalref.gen.go @@ -1,6 +1,6 @@ // Package packagea provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package packagea import ( @@ -12,8 +12,8 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB" "github.com/getkin/kin-openapi/openapi3" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB" ) // ObjectA defines model for ObjectA. diff --git a/internal/test/externalref/packageB/doc.go b/internal/test/externalref/packageB/doc.go index 2aba2cdfb..0dc18f825 100644 --- a/internal/test/externalref/packageB/doc.go +++ b/internal/test/externalref/packageB/doc.go @@ -1,3 +1,3 @@ package packageb -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/externalref/packageB/externalref.gen.go b/internal/test/externalref/packageB/externalref.gen.go index e81242edc..c3f879cfd 100644 --- a/internal/test/externalref/packageB/externalref.gen.go +++ b/internal/test/externalref/packageB/externalref.gen.go @@ -1,6 +1,6 @@ // Package packageb provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package packageb import ( diff --git a/internal/test/externalref/petstore/config.yaml b/internal/test/externalref/petstore/config.yaml index 3185cdc7b..6ee1a1369 100644 --- a/internal/test/externalref/petstore/config.yaml +++ b/internal/test/externalref/petstore/config.yaml @@ -6,5 +6,5 @@ generate: output-options: skip-prune: true import-mapping: - ../packageB/spec.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB + ../packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB output: externalref.gen.go diff --git a/internal/test/externalref/petstore/doc.go b/internal/test/externalref/petstore/doc.go index 6d11f4bcf..f05471ffb 100644 --- a/internal/test/externalref/petstore/doc.go +++ b/internal/test/externalref/petstore/doc.go @@ -1,3 +1,3 @@ package packagea -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/externalref/petstore/externalref.gen.go b/internal/test/externalref/petstore/externalref.gen.go index 24b2cedb3..c1d5d3e10 100644 --- a/internal/test/externalref/petstore/externalref.gen.go +++ b/internal/test/externalref/petstore/externalref.gen.go @@ -1,6 +1,6 @@ // Package packagea provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package packagea import ( @@ -13,8 +13,8 @@ import ( "strings" "time" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB" "github.com/getkin/kin-openapi/openapi3" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB" ) const ( diff --git a/internal/test/filter/doc.go b/internal/test/filter/doc.go index 9b33988d8..a9051b101 100644 --- a/internal/test/filter/doc.go +++ b/internal/test/filter/doc.go @@ -1,4 +1,4 @@ package client -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --package=filtertags --generate=server -o tags/server.gen.go -include-tags included-tag1,included-tag2 server.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --package=filteroperations --generate=server -o operations/server.gen.go -include-operation-ids included-operation1,included-operation2 server.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=filtertags --generate=server -o tags/server.gen.go -include-tags included-tag1,included-tag2 server.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=filteroperations --generate=server -o operations/server.gen.go -include-operation-ids included-operation1,included-operation2 server.yaml diff --git a/internal/test/filter/operations/server.gen.go b/internal/test/filter/operations/server.gen.go index a4db89e6d..49fc69b5e 100644 --- a/internal/test/filter/operations/server.gen.go +++ b/internal/test/filter/operations/server.gen.go @@ -1,6 +1,6 @@ // Package filteroperations provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package filteroperations import ( diff --git a/internal/test/filter/tags/server.gen.go b/internal/test/filter/tags/server.gen.go index f7c993aaf..8137c0f39 100644 --- a/internal/test/filter/tags/server.gen.go +++ b/internal/test/filter/tags/server.gen.go @@ -1,6 +1,6 @@ // Package filtertags provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package filtertags import ( diff --git a/internal/test/go.mod b/internal/test/go.mod index 8b6caf300..f6a61a742 100644 --- a/internal/test/go.mod +++ b/internal/test/go.mod @@ -1,11 +1,10 @@ -module github.com/deepmap/oapi-codegen/v2/internal/test +module github.com/oapi-codegen/oapi-codegen/v2/internal/test go 1.20 -replace github.com/deepmap/oapi-codegen/v2 => ../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../ require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/gin-gonic/gin v1.9.1 github.com/go-chi/chi/v5 v5.0.10 @@ -14,6 +13,7 @@ require ( github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9 github.com/labstack/echo/v4 v4.11.3 github.com/oapi-codegen/nullable v1.0.1 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.0.0 github.com/stretchr/testify v1.9.0 diff --git a/internal/test/issues/issue-1039/client.gen.go b/internal/test/issues/issue-1039/client.gen.go index cf576c717..3114f2986 100644 --- a/internal/test/issues/issue-1039/client.gen.go +++ b/internal/test/issues/issue-1039/client.gen.go @@ -1,6 +1,6 @@ // Package issue1039 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1039 import ( diff --git a/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go b/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go index e16b43613..b148f3783 100644 --- a/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go +++ b/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go @@ -1,6 +1,6 @@ // Package defaultbehaviour provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package defaultbehaviour // PatchRequest A request to patch an existing user object. diff --git a/internal/test/issues/issue-1039/doc.go b/internal/test/issues/issue-1039/doc.go index 4cb14c3fa..2997380aa 100644 --- a/internal/test/issues/issue-1039/doc.go +++ b/internal/test/issues/issue-1039/doc.go @@ -1,6 +1,6 @@ package issue1039 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types-config.yaml spec.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=type-config-defaultbehaviour.yaml spec.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=client-config.yaml spec.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server-config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types-config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=type-config-defaultbehaviour.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=client-config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server-config.yaml spec.yaml diff --git a/internal/test/issues/issue-1039/server.gen.go b/internal/test/issues/issue-1039/server.gen.go index 578c353fe..ac0e22b78 100644 --- a/internal/test/issues/issue-1039/server.gen.go +++ b/internal/test/issues/issue-1039/server.gen.go @@ -1,6 +1,6 @@ // Package issue1039 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1039 import ( diff --git a/internal/test/issues/issue-1039/types.gen.go b/internal/test/issues/issue-1039/types.gen.go index 54c850cb2..9c1191534 100644 --- a/internal/test/issues/issue-1039/types.gen.go +++ b/internal/test/issues/issue-1039/types.gen.go @@ -1,6 +1,6 @@ // Package issue1039 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1039 import ( diff --git a/internal/test/issues/issue-1087/api.gen.go b/internal/test/issues/issue-1087/api.gen.go index 78810652f..99d00fd32 100644 --- a/internal/test/issues/issue-1087/api.gen.go +++ b/internal/test/issues/issue-1087/api.gen.go @@ -1,6 +1,6 @@ // Package issue1087 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1087 import ( @@ -12,8 +12,8 @@ import ( "net/url" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1087/deps" "github.com/go-chi/chi/v5" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1087/deps" ) // Thing defines model for Thing. diff --git a/internal/test/issues/issue-1087/deps/deps.gen.go b/internal/test/issues/issue-1087/deps/deps.gen.go index 91289e99a..8066ab2b5 100644 --- a/internal/test/issues/issue-1087/deps/deps.gen.go +++ b/internal/test/issues/issue-1087/deps/deps.gen.go @@ -1,6 +1,6 @@ // Package deps provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package deps import ( diff --git a/internal/test/issues/issue-1087/deps/doc.go b/internal/test/issues/issue-1087/deps/doc.go index e03a36546..0684d56ca 100644 --- a/internal/test/issues/issue-1087/deps/doc.go +++ b/internal/test/issues/issue-1087/deps/doc.go @@ -1,3 +1,3 @@ package deps -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml my-deps.json +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml my-deps.json diff --git a/internal/test/issues/issue-1087/doc.go b/internal/test/issues/issue-1087/doc.go index 324ca0971..2ad8db520 100644 --- a/internal/test/issues/issue-1087/doc.go +++ b/internal/test/issues/issue-1087/doc.go @@ -1,3 +1,3 @@ package issue1087 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml diff --git a/internal/test/issues/issue-1087/server.config.yaml b/internal/test/issues/issue-1087/server.config.yaml index 76e25dc75..6d795c05d 100644 --- a/internal/test/issues/issue-1087/server.config.yaml +++ b/internal/test/issues/issue-1087/server.config.yaml @@ -8,4 +8,4 @@ generate: embedded-spec: false client: true import-mapping: - ./deps/my-deps.json: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1087/deps + ./deps/my-deps.json: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1087/deps diff --git a/internal/test/issues/issue-1093/api/child/child.gen.go b/internal/test/issues/issue-1093/api/child/child.gen.go index 5de595a8a..a18d256df 100644 --- a/internal/test/issues/issue-1093/api/child/child.gen.go +++ b/internal/test/issues/issue-1093/api/child/child.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( @@ -15,9 +15,9 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent" "github.com/getkin/kin-openapi/openapi3" "github.com/gin-gonic/gin" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent" strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" ) diff --git a/internal/test/issues/issue-1093/api/parent/parent.gen.go b/internal/test/issues/issue-1093/api/parent/parent.gen.go index e59030372..916772b07 100644 --- a/internal/test/issues/issue-1093/api/parent/parent.gen.go +++ b/internal/test/issues/issue-1093/api/parent/parent.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/issues/issue-1093/child.cfg.yaml b/internal/test/issues/issue-1093/child.cfg.yaml index 47ba552f1..4efb750c1 100644 --- a/internal/test/issues/issue-1093/child.cfg.yaml +++ b/internal/test/issues/issue-1093/child.cfg.yaml @@ -7,5 +7,5 @@ generate: strict-server: true models: true import-mapping: - parent.api.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent + parent.api.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent output: api/child/child.gen.go diff --git a/internal/test/issues/issue-1093/doc.go b/internal/test/issues/issue-1093/doc.go index 0487fc8d3..7916b330b 100644 --- a/internal/test/issues/issue-1093/doc.go +++ b/internal/test/issues/issue-1093/doc.go @@ -2,5 +2,5 @@ // See https://github.com/deepmap/oapi-codegen/issues/1093 package issue1093 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config parent.cfg.yaml parent.api.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config child.cfg.yaml child.api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config parent.cfg.yaml parent.api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config child.cfg.yaml child.api.yaml diff --git a/internal/test/issues/issue-1093/issue_test.go b/internal/test/issues/issue-1093/issue_test.go index db7234477..990de8538 100644 --- a/internal/test/issues/issue-1093/issue_test.go +++ b/internal/test/issues/issue-1093/issue_test.go @@ -7,7 +7,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/stretchr/testify/require" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" ) //go:embed child.api.yaml @@ -29,7 +29,7 @@ func TestIssue(t *testing.T) { EmbeddedSpec: true, }, ImportMapping: map[string]string{ - "parent.api.yaml": "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent", + "parent.api.yaml": "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent", }, } diff --git a/internal/test/issues/issue-1127/api.gen.go b/internal/test/issues/issue-1127/api.gen.go index 02e87ebc3..d3fa8e429 100644 --- a/internal/test/issues/issue-1127/api.gen.go +++ b/internal/test/issues/issue-1127/api.gen.go @@ -1,6 +1,6 @@ // Package issue1127 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1127 // Whatever defines model for Whatever. diff --git a/internal/test/issues/issue-1127/doc.go b/internal/test/issues/issue-1127/doc.go index 9f60b28de..d591e52f8 100644 --- a/internal/test/issues/issue-1127/doc.go +++ b/internal/test/issues/issue-1127/doc.go @@ -1,3 +1,3 @@ package issue1127 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml diff --git a/internal/test/issues/issue-1168/api.gen.go b/internal/test/issues/issue-1168/api.gen.go index 1f44dc4b3..d681fbd81 100644 --- a/internal/test/issues/issue-1168/api.gen.go +++ b/internal/test/issues/issue-1168/api.gen.go @@ -1,6 +1,6 @@ // Package issue1168 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1168 import ( diff --git a/internal/test/issues/issue-1168/doc.go b/internal/test/issues/issue-1168/doc.go index 3d2039729..2541e721d 100644 --- a/internal/test/issues/issue-1168/doc.go +++ b/internal/test/issues/issue-1168/doc.go @@ -1,3 +1,3 @@ package issue1168 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml diff --git a/internal/test/issues/issue-1180/doc.go b/internal/test/issues/issue-1180/doc.go index 5b4cdf7de..5fcca2b96 100644 --- a/internal/test/issues/issue-1180/doc.go +++ b/internal/test/issues/issue-1180/doc.go @@ -1,3 +1,3 @@ package issue1180 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml diff --git a/internal/test/issues/issue-1180/issue.gen.go b/internal/test/issues/issue-1180/issue.gen.go index 1b3399abf..cc675b96d 100644 --- a/internal/test/issues/issue-1180/issue.gen.go +++ b/internal/test/issues/issue-1180/issue.gen.go @@ -1,6 +1,6 @@ // Package issue1180 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1180 import ( diff --git a/internal/test/issues/issue-1182/pkg1/config.yaml b/internal/test/issues/issue-1182/pkg1/config.yaml index 05f0fb677..a300242fb 100644 --- a/internal/test/issues/issue-1182/pkg1/config.yaml +++ b/internal/test/issues/issue-1182/pkg1/config.yaml @@ -8,4 +8,4 @@ generate: strict-server: true output: pkg1.gen.go import-mapping: - pkg2.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2 + pkg2.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2 diff --git a/internal/test/issues/issue-1182/pkg1/doc.go b/internal/test/issues/issue-1182/pkg1/doc.go index 060f76260..8b57f0836 100644 --- a/internal/test/issues/issue-1182/pkg1/doc.go +++ b/internal/test/issues/issue-1182/pkg1/doc.go @@ -1,3 +1,3 @@ package pkg1 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml diff --git a/internal/test/issues/issue-1182/pkg1/pkg1.gen.go b/internal/test/issues/issue-1182/pkg1/pkg1.gen.go index ce8632bd7..1f278d359 100644 --- a/internal/test/issues/issue-1182/pkg1/pkg1.gen.go +++ b/internal/test/issues/issue-1182/pkg1/pkg1.gen.go @@ -1,6 +1,6 @@ // Package pkg1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package pkg1 import ( @@ -15,9 +15,9 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2" "github.com/getkin/kin-openapi/openapi3" "github.com/labstack/echo/v4" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2" strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) diff --git a/internal/test/issues/issue-1182/pkg2/doc.go b/internal/test/issues/issue-1182/pkg2/doc.go index fcb267c5c..68cb0b78a 100644 --- a/internal/test/issues/issue-1182/pkg2/doc.go +++ b/internal/test/issues/issue-1182/pkg2/doc.go @@ -1,3 +1,3 @@ package pkg2 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml diff --git a/internal/test/issues/issue-1182/pkg2/pkg2.gen.go b/internal/test/issues/issue-1182/pkg2/pkg2.gen.go index 682bec3c0..51eece40a 100644 --- a/internal/test/issues/issue-1182/pkg2/pkg2.gen.go +++ b/internal/test/issues/issue-1182/pkg2/pkg2.gen.go @@ -1,6 +1,6 @@ // Package pkg2 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package pkg2 import ( diff --git a/internal/test/issues/issue-1189/doc.go b/internal/test/issues/issue-1189/doc.go index c5c647f00..e64506f48 100644 --- a/internal/test/issues/issue-1189/doc.go +++ b/internal/test/issues/issue-1189/doc.go @@ -1,3 +1,3 @@ package param -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1189.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1189.yaml diff --git a/internal/test/issues/issue-1189/issue1189.gen.go b/internal/test/issues/issue-1189/issue1189.gen.go index 16ebff95a..c1a869ad9 100644 --- a/internal/test/issues/issue-1189/issue1189.gen.go +++ b/internal/test/issues/issue-1189/issue1189.gen.go @@ -1,6 +1,6 @@ // Package param provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package param import ( diff --git a/internal/test/issues/issue-1208-1209/doc.go b/internal/test/issues/issue-1208-1209/doc.go index bd18f8322..7384a2ab9 100644 --- a/internal/test/issues/issue-1208-1209/doc.go +++ b/internal/test/issues/issue-1208-1209/doc.go @@ -1,3 +1,3 @@ package multijson -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue-multi-json.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue-multi-json.yaml diff --git a/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go b/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go index dc43f33b6..780d45e6a 100644 --- a/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go +++ b/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go @@ -1,6 +1,6 @@ // Package multijson provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package multijson import ( diff --git a/internal/test/issues/issue-1208-1209/issue-multi-json_test.go b/internal/test/issues/issue-1208-1209/issue-multi-json_test.go index 825a9909e..2c379909e 100644 --- a/internal/test/issues/issue-1208-1209/issue-multi-json_test.go +++ b/internal/test/issues/issue-1208-1209/issue-multi-json_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - multijson "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1208-1209" + multijson "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1208-1209" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/issues/issue-1212/pkg1/config.yaml b/internal/test/issues/issue-1212/pkg1/config.yaml index 8780f76f1..040b8223b 100644 --- a/internal/test/issues/issue-1212/pkg1/config.yaml +++ b/internal/test/issues/issue-1212/pkg1/config.yaml @@ -8,4 +8,4 @@ generate: strict-server: true output: pkg1.gen.go import-mapping: - pkg2.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2 + pkg2.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2 diff --git a/internal/test/issues/issue-1212/pkg1/doc.go b/internal/test/issues/issue-1212/pkg1/doc.go index 060f76260..8b57f0836 100644 --- a/internal/test/issues/issue-1212/pkg1/doc.go +++ b/internal/test/issues/issue-1212/pkg1/doc.go @@ -1,3 +1,3 @@ package pkg1 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml diff --git a/internal/test/issues/issue-1212/pkg1/pkg1.gen.go b/internal/test/issues/issue-1212/pkg1/pkg1.gen.go index 4f0e619c3..bada274bc 100644 --- a/internal/test/issues/issue-1212/pkg1/pkg1.gen.go +++ b/internal/test/issues/issue-1212/pkg1/pkg1.gen.go @@ -1,6 +1,6 @@ // Package pkg1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package pkg1 import ( @@ -17,9 +17,9 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2" "github.com/getkin/kin-openapi/openapi3" "github.com/gin-gonic/gin" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2" strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" ) diff --git a/internal/test/issues/issue-1212/pkg2/doc.go b/internal/test/issues/issue-1212/pkg2/doc.go index fcb267c5c..68cb0b78a 100644 --- a/internal/test/issues/issue-1212/pkg2/doc.go +++ b/internal/test/issues/issue-1212/pkg2/doc.go @@ -1,3 +1,3 @@ package pkg2 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml diff --git a/internal/test/issues/issue-1212/pkg2/pkg2.gen.go b/internal/test/issues/issue-1212/pkg2/pkg2.gen.go index fa8d50fde..5a994ed06 100644 --- a/internal/test/issues/issue-1212/pkg2/pkg2.gen.go +++ b/internal/test/issues/issue-1212/pkg2/pkg2.gen.go @@ -1,6 +1,6 @@ // Package pkg2 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package pkg2 import ( diff --git a/internal/test/issues/issue-1219/doc.go b/internal/test/issues/issue-1219/doc.go index 6976b420b..7e1118e5c 100644 --- a/internal/test/issues/issue-1219/doc.go +++ b/internal/test/issues/issue-1219/doc.go @@ -1,3 +1,3 @@ package issue1219 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml diff --git a/internal/test/issues/issue-1219/issue.gen.go b/internal/test/issues/issue-1219/issue.gen.go index e8df58f14..2beeedc59 100644 --- a/internal/test/issues/issue-1219/issue.gen.go +++ b/internal/test/issues/issue-1219/issue.gen.go @@ -1,6 +1,6 @@ // Package issue1219 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1219 import ( diff --git a/internal/test/issues/issue-1219/issue_test.go b/internal/test/issues/issue-1219/issue_test.go index 489675922..aebd0d1af 100644 --- a/internal/test/issues/issue-1219/issue_test.go +++ b/internal/test/issues/issue-1219/issue_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - issue1219 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1219" + issue1219 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1219" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/issues/issue-1298/doc.go b/internal/test/issues/issue-1298/doc.go index dbae518f0..b5e5ee95c 100644 --- a/internal/test/issues/issue-1298/doc.go +++ b/internal/test/issues/issue-1298/doc.go @@ -1,3 +1,3 @@ package issue1298 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1298.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1298.yaml diff --git a/internal/test/issues/issue-1298/issue1298.gen.go b/internal/test/issues/issue-1298/issue1298.gen.go index 03f8eb392..94734a577 100644 --- a/internal/test/issues/issue-1298/issue1298.gen.go +++ b/internal/test/issues/issue-1298/issue1298.gen.go @@ -1,6 +1,6 @@ // Package issue1298 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1298 import ( diff --git a/internal/test/issues/issue-1298/issue1298_test.go b/internal/test/issues/issue-1298/issue1298_test.go index 62bc46884..0d627f10f 100644 --- a/internal/test/issues/issue-1298/issue1298_test.go +++ b/internal/test/issues/issue-1298/issue1298_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - issue1298 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1298" "github.com/gin-gonic/gin" + issue1298 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1298" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/issues/issue-1378/bionicle/bionicle.gen.go b/internal/test/issues/issue-1378/bionicle/bionicle.gen.go index 4b41f81d0..ec4c1f3b7 100644 --- a/internal/test/issues/issue-1378/bionicle/bionicle.gen.go +++ b/internal/test/issues/issue-1378/bionicle/bionicle.gen.go @@ -1,6 +1,6 @@ // Package bionicle provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package bionicle import ( @@ -15,9 +15,9 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/common" "github.com/getkin/kin-openapi/openapi3" "github.com/gorilla/mux" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common" "github.com/oapi-codegen/runtime" strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp" ) diff --git a/internal/test/issues/issue-1378/bionicle/config.yaml b/internal/test/issues/issue-1378/bionicle/config.yaml index 76ef0870a..4f81605dc 100644 --- a/internal/test/issues/issue-1378/bionicle/config.yaml +++ b/internal/test/issues/issue-1378/bionicle/config.yaml @@ -6,5 +6,5 @@ generate: strict-server: true models: true import-mapping: - common.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/common + common.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common output: bionicle.gen.go diff --git a/internal/test/issues/issue-1378/bionicle/generate.go b/internal/test/issues/issue-1378/bionicle/generate.go index 86c5c1ab0..26b366169 100644 --- a/internal/test/issues/issue-1378/bionicle/generate.go +++ b/internal/test/issues/issue-1378/bionicle/generate.go @@ -1,3 +1,3 @@ package bionicle -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../bionicle.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../bionicle.yaml diff --git a/internal/test/issues/issue-1378/common/common.gen.go b/internal/test/issues/issue-1378/common/common.gen.go index ce5ae4acf..d1747783e 100644 --- a/internal/test/issues/issue-1378/common/common.gen.go +++ b/internal/test/issues/issue-1378/common/common.gen.go @@ -1,6 +1,6 @@ // Package common provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package common import ( diff --git a/internal/test/issues/issue-1378/common/generate.go b/internal/test/issues/issue-1378/common/generate.go index b54279ec4..dbb23b05d 100644 --- a/internal/test/issues/issue-1378/common/generate.go +++ b/internal/test/issues/issue-1378/common/generate.go @@ -1,3 +1,3 @@ package common -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../common.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../common.yaml diff --git a/internal/test/issues/issue-1378/fooservice/config.yaml b/internal/test/issues/issue-1378/fooservice/config.yaml index 993087158..4690bd037 100644 --- a/internal/test/issues/issue-1378/fooservice/config.yaml +++ b/internal/test/issues/issue-1378/fooservice/config.yaml @@ -6,6 +6,6 @@ generate: strict-server: true models: true import-mapping: - common.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/common - bionicle.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle + common.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common + bionicle.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle output: fooservice.gen.go diff --git a/internal/test/issues/issue-1378/fooservice/fooservice.gen.go b/internal/test/issues/issue-1378/fooservice/fooservice.gen.go index 8d2bb1fc7..c74056ac5 100644 --- a/internal/test/issues/issue-1378/fooservice/fooservice.gen.go +++ b/internal/test/issues/issue-1378/fooservice/fooservice.gen.go @@ -1,6 +1,6 @@ // Package fooservice provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package fooservice import ( @@ -15,10 +15,10 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle" - externalRef1 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/common" "github.com/getkin/kin-openapi/openapi3" "github.com/gorilla/mux" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle" + externalRef1 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common" "github.com/oapi-codegen/runtime" strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp" ) diff --git a/internal/test/issues/issue-1378/fooservice/generate.go b/internal/test/issues/issue-1378/fooservice/generate.go index 30826e829..2419719db 100644 --- a/internal/test/issues/issue-1378/fooservice/generate.go +++ b/internal/test/issues/issue-1378/fooservice/generate.go @@ -1,3 +1,3 @@ package fooservice -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../foo-service.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../foo-service.yaml diff --git a/internal/test/issues/issue-1397/doc.go b/internal/test/issues/issue-1397/doc.go index 4dd8581a3..e5964fe29 100644 --- a/internal/test/issues/issue-1397/doc.go +++ b/internal/test/issues/issue-1397/doc.go @@ -1,3 +1,3 @@ package issue1397 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-1397/issue1397.gen.go b/internal/test/issues/issue-1397/issue1397.gen.go index 36c9a7926..2463641eb 100644 --- a/internal/test/issues/issue-1397/issue1397.gen.go +++ b/internal/test/issues/issue-1397/issue1397.gen.go @@ -1,6 +1,6 @@ // Package issue1397 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1397 import ( diff --git a/internal/test/issues/issue-312/doc.go b/internal/test/issues/issue-312/doc.go index 475c1b4c2..768a4595b 100644 --- a/internal/test/issues/issue-312/doc.go +++ b/internal/test/issues/issue-312/doc.go @@ -1,3 +1,3 @@ package issue312 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-312/issue.gen.go b/internal/test/issues/issue-312/issue.gen.go index 690705d21..f0285c071 100644 --- a/internal/test/issues/issue-312/issue.gen.go +++ b/internal/test/issues/issue-312/issue.gen.go @@ -1,6 +1,6 @@ // Package issue312 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue312 import ( diff --git a/internal/test/issues/issue-52/doc.go b/internal/test/issues/issue-52/doc.go index aa9f97725..3d239ebdc 100644 --- a/internal/test/issues/issue-52/doc.go +++ b/internal/test/issues/issue-52/doc.go @@ -1,3 +1,3 @@ package issue52 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-52/issue.gen.go b/internal/test/issues/issue-52/issue.gen.go index 4664ce68c..f024999d6 100644 --- a/internal/test/issues/issue-52/issue.gen.go +++ b/internal/test/issues/issue-52/issue.gen.go @@ -1,6 +1,6 @@ // Package issue52 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue52 import ( diff --git a/internal/test/issues/issue-52/issue_test.go b/internal/test/issues/issue-52/issue_test.go index 09cadd821..0288c2aea 100644 --- a/internal/test/issues/issue-52/issue_test.go +++ b/internal/test/issues/issue-52/issue_test.go @@ -4,8 +4,8 @@ import ( _ "embed" "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" "github.com/getkin/kin-openapi/openapi3" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" "github.com/stretchr/testify/require" ) diff --git a/internal/test/issues/issue-579/gen.go b/internal/test/issues/issue-579/gen.go index c77dc735c..7b198d0cd 100644 --- a/internal/test/issues/issue-579/gen.go +++ b/internal/test/issues/issue-579/gen.go @@ -1,3 +1,3 @@ package issue579 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --package=issue579 --generate=types,skip-prune --alias-types -o issue.gen.go spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=issue579 --generate=types,skip-prune --alias-types -o issue.gen.go spec.yaml diff --git a/internal/test/issues/issue-579/issue.gen.go b/internal/test/issues/issue-579/issue.gen.go index 3bb1dc89f..54326646d 100644 --- a/internal/test/issues/issue-579/issue.gen.go +++ b/internal/test/issues/issue-579/issue.gen.go @@ -1,6 +1,6 @@ // Package issue579 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue579 import ( diff --git a/internal/test/issues/issue-832/generate.go b/internal/test/issues/issue-832/generate.go index 5fdb5aa06..79b06c713 100644 --- a/internal/test/issues/issue-832/generate.go +++ b/internal/test/issues/issue-832/generate.go @@ -1,3 +1,3 @@ package issue_832 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-832/issue.gen.go b/internal/test/issues/issue-832/issue.gen.go index fc7a529f8..0aa74f232 100644 --- a/internal/test/issues/issue-832/issue.gen.go +++ b/internal/test/issues/issue-832/issue.gen.go @@ -1,6 +1,6 @@ // Package issue_832 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue_832 import ( diff --git a/internal/test/issues/issue-936/api.gen.go b/internal/test/issues/issue-936/api.gen.go index 2e94df1e9..6b7c0cf22 100644 --- a/internal/test/issues/issue-936/api.gen.go +++ b/internal/test/issues/issue-936/api.gen.go @@ -1,6 +1,6 @@ // Package issue936 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue936 import ( diff --git a/internal/test/issues/issue-936/gen.go b/internal/test/issues/issue-936/gen.go index a84cbacd2..f1e62f42f 100644 --- a/internal/test/issues/issue-936/gen.go +++ b/internal/test/issues/issue-936/gen.go @@ -1,3 +1,3 @@ package issue936 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml diff --git a/internal/test/issues/issue-grab_import_names/doc.go b/internal/test/issues/issue-grab_import_names/doc.go index ebdbdfc72..e986569fc 100644 --- a/internal/test/issues/issue-grab_import_names/doc.go +++ b/internal/test/issues/issue-grab_import_names/doc.go @@ -1,3 +1,3 @@ package grabimportnames -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-grab_import_names/issue.gen.go b/internal/test/issues/issue-grab_import_names/issue.gen.go index 59924fa3a..52564c0dd 100644 --- a/internal/test/issues/issue-grab_import_names/issue.gen.go +++ b/internal/test/issues/issue-grab_import_names/issue.gen.go @@ -1,6 +1,6 @@ // Package grabimportnames provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package grabimportnames import ( diff --git a/internal/test/issues/issue-grab_import_names/issue_test.go b/internal/test/issues/issue-grab_import_names/issue_test.go index c954d6542..7d299fa22 100644 --- a/internal/test/issues/issue-grab_import_names/issue_test.go +++ b/internal/test/issues/issue-grab_import_names/issue_test.go @@ -3,8 +3,8 @@ package grabimportnames import ( "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" "github.com/getkin/kin-openapi/openapi3" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" "github.com/stretchr/testify/require" ) diff --git a/internal/test/issues/issue-head-digit-of-httpheader/doc.go b/internal/test/issues/issue-head-digit-of-httpheader/doc.go index 69cb64af7..63904053b 100644 --- a/internal/test/issues/issue-head-digit-of-httpheader/doc.go +++ b/internal/test/issues/issue-head-digit-of-httpheader/doc.go @@ -1,3 +1,3 @@ package headdigitofhttpheader -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go b/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go index 14688abb4..6eadcef68 100644 --- a/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go +++ b/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go @@ -1,6 +1,6 @@ // Package headdigitofhttpheader provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package headdigitofhttpheader type N200ResponseHeaders struct { diff --git a/internal/test/issues/issue-head-digit-of-operation-id/doc.go b/internal/test/issues/issue-head-digit-of-operation-id/doc.go index 23999975b..fb08e63e8 100644 --- a/internal/test/issues/issue-head-digit-of-operation-id/doc.go +++ b/internal/test/issues/issue-head-digit-of-operation-id/doc.go @@ -1,3 +1,3 @@ package head_digit_of_operation_id -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go b/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go index 1d2b6b0ac..00c0844af 100644 --- a/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go +++ b/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go @@ -1,4 +1,4 @@ // Package head_digit_of_operation_id provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package head_digit_of_operation_id diff --git a/internal/test/issues/issue-illegal_enum_names/doc.go b/internal/test/issues/issue-illegal_enum_names/doc.go index 6249ddd6a..d8fb076b4 100644 --- a/internal/test/issues/issue-illegal_enum_names/doc.go +++ b/internal/test/issues/issue-illegal_enum_names/doc.go @@ -1,3 +1,3 @@ package illegalenumnames -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-illegal_enum_names/issue.gen.go b/internal/test/issues/issue-illegal_enum_names/issue.gen.go index 395c171cb..a24b19da0 100644 --- a/internal/test/issues/issue-illegal_enum_names/issue.gen.go +++ b/internal/test/issues/issue-illegal_enum_names/issue.gen.go @@ -1,6 +1,6 @@ // Package illegalenumnames provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package illegalenumnames import ( diff --git a/internal/test/issues/issue-illegal_enum_names/issue_test.go b/internal/test/issues/issue-illegal_enum_names/issue_test.go index 2fdfb86ac..3a8b47510 100644 --- a/internal/test/issues/issue-illegal_enum_names/issue_test.go +++ b/internal/test/issues/issue-illegal_enum_names/issue_test.go @@ -6,8 +6,8 @@ import ( "go/token" "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" "github.com/getkin/kin-openapi/openapi3" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" "github.com/stretchr/testify/require" ) diff --git a/internal/test/issues/issue-removed-external-ref/config.base.yaml b/internal/test/issues/issue-removed-external-ref/config.base.yaml index 0fbeb5323..14faed834 100644 --- a/internal/test/issues/issue-removed-external-ref/config.base.yaml +++ b/internal/test/issues/issue-removed-external-ref/config.base.yaml @@ -6,7 +6,7 @@ generate: strict-server: true models: true import-mapping: - spec-ext.yaml: "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext" + spec-ext.yaml: "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext" output: gen/spec_base/issue.gen.go output-options: skip-prune: true diff --git a/internal/test/issues/issue-removed-external-ref/doc.go b/internal/test/issues/issue-removed-external-ref/doc.go index 9f222d4cf..6af4d981f 100644 --- a/internal/test/issues/issue-removed-external-ref/doc.go +++ b/internal/test/issues/issue-removed-external-ref/doc.go @@ -1,4 +1,4 @@ package head_digit_of_httpheader -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.ext.yaml spec-ext.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.base.yaml spec-base.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.ext.yaml spec-ext.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.base.yaml spec-base.yaml diff --git a/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go b/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go index 6b2de3157..627abde1f 100644 --- a/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go +++ b/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go @@ -1,6 +1,6 @@ // Package spec_base provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package spec_base import ( @@ -9,8 +9,8 @@ import ( "fmt" "net/http" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext" "github.com/go-chi/chi/v5" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext" strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp" ) diff --git a/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go b/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go index 42eef1a8b..881f8be12 100644 --- a/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go +++ b/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go @@ -1,6 +1,6 @@ // Package spec_ext provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package spec_ext import ( diff --git a/internal/test/issues/issue1469/doc.go b/internal/test/issues/issue1469/doc.go index 2b9a09d7f..d72f419f6 100644 --- a/internal/test/issues/issue1469/doc.go +++ b/internal/test/issues/issue1469/doc.go @@ -1,3 +1,3 @@ package issue1469 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue1469/main.gen.go b/internal/test/issues/issue1469/main.gen.go index ef60bbb6a..11f87b0c4 100644 --- a/internal/test/issues/issue1469/main.gen.go +++ b/internal/test/issues/issue1469/main.gen.go @@ -1,6 +1,6 @@ // Package issue1469 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1469 import ( diff --git a/internal/test/issues/issue193/generate.go b/internal/test/issues/issue193/generate.go index aa9f97725..3d239ebdc 100644 --- a/internal/test/issues/issue193/generate.go +++ b/internal/test/issues/issue193/generate.go @@ -1,3 +1,3 @@ package issue52 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue193/issue.gen.go b/internal/test/issues/issue193/issue.gen.go index 8c15e23c8..eec8a25df 100644 --- a/internal/test/issues/issue193/issue.gen.go +++ b/internal/test/issues/issue193/issue.gen.go @@ -1,6 +1,6 @@ // Package issue52 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue52 import ( diff --git a/internal/test/outputoptions/disabletypealiases/generate.go b/internal/test/outputoptions/disabletypealiases/generate.go index 8043e48f5..8f0dd5b3e 100644 --- a/internal/test/outputoptions/disabletypealiases/generate.go +++ b/internal/test/outputoptions/disabletypealiases/generate.go @@ -1,3 +1,3 @@ package types -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/outputoptions/disabletypealiases/types.gen.go b/internal/test/outputoptions/disabletypealiases/types.gen.go index 8bb7b1ef5..f2537cfba 100644 --- a/internal/test/outputoptions/disabletypealiases/types.gen.go +++ b/internal/test/outputoptions/disabletypealiases/types.gen.go @@ -1,6 +1,6 @@ // Package types provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package types // Example defines model for example. diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go index 2a2d99595..4b4d2e44e 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go @@ -1,3 +1,3 @@ package tocamelcasewithdigits -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go index 915ba02d8..8c8853d6f 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go @@ -1,6 +1,6 @@ // Package tocamelcasewithdigits provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package tocamelcasewithdigits import ( diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go index 110652605..5f6549131 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go @@ -1,3 +1,3 @@ package tocamelcasewithinitialisms -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go index 718c7df05..fc1286b8a 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go @@ -1,6 +1,6 @@ // Package tocamelcasewithinitialisms provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package tocamelcasewithinitialisms import ( diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go index 5f535284b..a6c179b79 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go @@ -1,3 +1,3 @@ package tocamelcase -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go index afa9c4e4d..449d9e45e 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go @@ -1,6 +1,6 @@ // Package tocamelcase provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package tocamelcase import ( diff --git a/internal/test/outputoptions/name-normalizer/unset/generate.go b/internal/test/outputoptions/name-normalizer/unset/generate.go index 94d3d7bb7..84fac60cb 100644 --- a/internal/test/outputoptions/name-normalizer/unset/generate.go +++ b/internal/test/outputoptions/name-normalizer/unset/generate.go @@ -1,3 +1,3 @@ package unset -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml diff --git a/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go index d6f105dbf..ac6f4c896 100644 --- a/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go +++ b/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go @@ -1,6 +1,6 @@ // Package unset provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package unset import ( diff --git a/internal/test/parameters/doc.go b/internal/test/parameters/doc.go index 25168f610..30d5b502e 100644 --- a/internal/test/parameters/doc.go +++ b/internal/test/parameters/doc.go @@ -1,3 +1,3 @@ package parameters -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml parameters.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml parameters.yaml diff --git a/internal/test/parameters/parameters.gen.go b/internal/test/parameters/parameters.gen.go index 1da8aae1d..630770731 100644 --- a/internal/test/parameters/parameters.gen.go +++ b/internal/test/parameters/parameters.gen.go @@ -1,6 +1,6 @@ // Package parameters provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package parameters import ( diff --git a/internal/test/schemas/doc.go b/internal/test/schemas/doc.go index f743377e5..a4147ee5a 100644 --- a/internal/test/schemas/doc.go +++ b/internal/test/schemas/doc.go @@ -1,3 +1,3 @@ package schemas -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml schemas.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml schemas.yaml diff --git a/internal/test/schemas/schemas.gen.go b/internal/test/schemas/schemas.gen.go index 12c629868..09efa4a01 100644 --- a/internal/test/schemas/schemas.gen.go +++ b/internal/test/schemas/schemas.gen.go @@ -1,6 +1,6 @@ // Package schemas provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package schemas import ( diff --git a/internal/test/server/doc.go b/internal/test/server/doc.go index a766b30b8..f46abed62 100644 --- a/internal/test/server/doc.go +++ b/internal/test/server/doc.go @@ -1,3 +1,3 @@ package server -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../test-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../test-schema.yaml diff --git a/internal/test/server/server.gen.go b/internal/test/server/server.gen.go index 0620e64c8..cfc75b65c 100644 --- a/internal/test/server/server.gen.go +++ b/internal/test/server/server.gen.go @@ -1,6 +1,6 @@ // Package server provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package server import ( diff --git a/internal/test/strict-server/chi/server.gen.go b/internal/test/strict-server/chi/server.gen.go index c0579f98b..5725eb145 100644 --- a/internal/test/strict-server/chi/server.gen.go +++ b/internal/test/strict-server/chi/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/chi/server.go b/internal/test/strict-server/chi/server.go index fe744e250..c135a2a44 100644 --- a/internal/test/strict-server/chi/server.go +++ b/internal/test/strict-server/chi/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/chi/types.gen.go b/internal/test/strict-server/chi/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/chi/types.gen.go +++ b/internal/test/strict-server/chi/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/client/client.gen.go b/internal/test/strict-server/client/client.gen.go index 16e588bd6..e7959520e 100644 --- a/internal/test/strict-server/client/client.gen.go +++ b/internal/test/strict-server/client/client.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/client/client.go b/internal/test/strict-server/client/client.go index 51214137c..5b350a488 100644 --- a/internal/test/strict-server/client/client.go +++ b/internal/test/strict-server/client/client.go @@ -1,3 +1,3 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=client.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=client.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/echo/server.gen.go b/internal/test/strict-server/echo/server.gen.go index 8c5205262..f07dfa5e4 100644 --- a/internal/test/strict-server/echo/server.gen.go +++ b/internal/test/strict-server/echo/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/echo/server.go b/internal/test/strict-server/echo/server.go index fe744e250..c135a2a44 100644 --- a/internal/test/strict-server/echo/server.go +++ b/internal/test/strict-server/echo/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/echo/types.gen.go b/internal/test/strict-server/echo/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/echo/types.gen.go +++ b/internal/test/strict-server/echo/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/fiber/server.gen.go b/internal/test/strict-server/fiber/server.gen.go index d86acc1da..b15d923fd 100644 --- a/internal/test/strict-server/fiber/server.gen.go +++ b/internal/test/strict-server/fiber/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/fiber/server.go b/internal/test/strict-server/fiber/server.go index fe744e250..c135a2a44 100644 --- a/internal/test/strict-server/fiber/server.go +++ b/internal/test/strict-server/fiber/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/fiber/types.gen.go b/internal/test/strict-server/fiber/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/fiber/types.gen.go +++ b/internal/test/strict-server/fiber/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/gin/server.gen.go b/internal/test/strict-server/gin/server.gen.go index 4b58ae0e6..21f9f3276 100644 --- a/internal/test/strict-server/gin/server.gen.go +++ b/internal/test/strict-server/gin/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/gin/server.go b/internal/test/strict-server/gin/server.go index fe744e250..c135a2a44 100644 --- a/internal/test/strict-server/gin/server.go +++ b/internal/test/strict-server/gin/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/gin/types.gen.go b/internal/test/strict-server/gin/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/gin/types.gen.go +++ b/internal/test/strict-server/gin/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/gorilla/server.gen.go b/internal/test/strict-server/gorilla/server.gen.go index 388da5199..07612e98f 100644 --- a/internal/test/strict-server/gorilla/server.gen.go +++ b/internal/test/strict-server/gorilla/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/gorilla/server.go b/internal/test/strict-server/gorilla/server.go index 83eb50339..5c5d7c9e7 100644 --- a/internal/test/strict-server/gorilla/server.go +++ b/internal/test/strict-server/gorilla/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/gorilla/types.gen.go b/internal/test/strict-server/gorilla/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/gorilla/types.gen.go +++ b/internal/test/strict-server/gorilla/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/iris/server.gen.go b/internal/test/strict-server/iris/server.gen.go index 54d6f4982..7f224b3b3 100644 --- a/internal/test/strict-server/iris/server.gen.go +++ b/internal/test/strict-server/iris/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/iris/server.go b/internal/test/strict-server/iris/server.go index f35e2f82b..c0ab4c770 100644 --- a/internal/test/strict-server/iris/server.go +++ b/internal/test/strict-server/iris/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/iris/types.gen.go b/internal/test/strict-server/iris/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/iris/types.gen.go +++ b/internal/test/strict-server/iris/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/stdhttp/go.mod b/internal/test/strict-server/stdhttp/go.mod index 78e8b04cd..61c4982ac 100644 --- a/internal/test/strict-server/stdhttp/go.mod +++ b/internal/test/strict-server/stdhttp/go.mod @@ -1,15 +1,15 @@ -module github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/stdhttp +module github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/stdhttp go 1.22 -replace github.com/deepmap/oapi-codegen/v2 => ../../../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../../ -replace github.com/deepmap/oapi-codegen/v2/internal/test => ../.. +replace github.com/oapi-codegen/oapi-codegen/v2/internal/test => ../.. require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 - github.com/deepmap/oapi-codegen/v2/internal/test v0.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 + github.com/oapi-codegen/oapi-codegen/v2/internal/test v0.0.0-00010101000000-000000000000 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.1.0 github.com/stretchr/testify v1.9.0 diff --git a/internal/test/strict-server/stdhttp/server.gen.go b/internal/test/strict-server/stdhttp/server.gen.go index 2c03a7029..57140ea31 100644 --- a/internal/test/strict-server/stdhttp/server.gen.go +++ b/internal/test/strict-server/stdhttp/server.gen.go @@ -2,7 +2,7 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/stdhttp/server.go b/internal/test/strict-server/stdhttp/server.go index e87ae2ff0..a142a6b81 100644 --- a/internal/test/strict-server/stdhttp/server.go +++ b/internal/test/strict-server/stdhttp/server.go @@ -1,7 +1,7 @@ //go:build go1.22 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/stdhttp/std_strict_test.go b/internal/test/strict-server/stdhttp/std_strict_test.go index 9433ebe13..40d362a54 100644 --- a/internal/test/strict-server/stdhttp/std_strict_test.go +++ b/internal/test/strict-server/stdhttp/std_strict_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" - clientAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/client" + clientAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/client" "github.com/oapi-codegen/runtime" "github.com/oapi-codegen/testutil" ) diff --git a/internal/test/strict-server/stdhttp/tools/tools.go b/internal/test/strict-server/stdhttp/tools/tools.go index 67a500f26..8615cb4c5 100644 --- a/internal/test/strict-server/stdhttp/tools/tools.go +++ b/internal/test/strict-server/stdhttp/tools/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/internal/test/strict-server/stdhttp/types.gen.go b/internal/test/strict-server/stdhttp/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/stdhttp/types.gen.go +++ b/internal/test/strict-server/stdhttp/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/strict_test.go b/internal/test/strict-server/strict_test.go index a1143e89f..0ae094df0 100644 --- a/internal/test/strict-server/strict_test.go +++ b/internal/test/strict-server/strict_test.go @@ -19,12 +19,12 @@ import ( "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" - chiAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/chi" - clientAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/client" - echoAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/echo" - fiberAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/fiber" - ginAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/gin" - irisAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/iris" + chiAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/chi" + clientAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/client" + echoAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/echo" + fiberAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/fiber" + ginAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/gin" + irisAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/iris" "github.com/oapi-codegen/runtime" "github.com/oapi-codegen/testutil" diff --git a/pkg/codegen/codegen.go b/pkg/codegen/codegen.go index e1028ffca..7163998d1 100644 --- a/pkg/codegen/codegen.go +++ b/pkg/codegen/codegen.go @@ -33,7 +33,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" "golang.org/x/tools/imports" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) // Embed the templates directory diff --git a/pkg/codegen/codegen_test.go b/pkg/codegen/codegen_test.go index b4b2dfe14..1d752601b 100644 --- a/pkg/codegen/codegen_test.go +++ b/pkg/codegen/codegen_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) const ( remoteRefFile = `https://raw.githubusercontent.com/deepmap/oapi-codegen/master/examples/petstore-expanded` + `/petstore-expanded.yaml` - remoteRefImport = `github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded` + remoteRefImport = `github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded` ) func TestExampleOpenAPICodeGeneration(t *testing.T) { @@ -198,7 +198,7 @@ func TestRemoteExternalReference(t *testing.T) { assert.Contains(t, code, "package api") // Check import - assert.Contains(t, code, `externalRef0 "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded"`) + assert.Contains(t, code, `externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded"`) // Check generated oneOf structure: assert.Contains(t, code, ` diff --git a/pkg/codegen/operations.go b/pkg/codegen/operations.go index 150e73899..da903810d 100644 --- a/pkg/codegen/operations.go +++ b/pkg/codegen/operations.go @@ -25,7 +25,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) type ParameterDefinition struct { diff --git a/pkg/codegen/template_helpers.go b/pkg/codegen/template_helpers.go index 09ac1146f..62ea244c8 100644 --- a/pkg/codegen/template_helpers.go +++ b/pkg/codegen/template_helpers.go @@ -23,7 +23,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) const ( From 0f67d9a354bc3c5f99a27a88416bc17f1da574a9 Mon Sep 17 00:00:00 2001 From: Marcin Romaszewicz Date: Thu, 6 Jun 2024 17:15:11 +0200 Subject: [PATCH 3/4] Update README (#1646) * Update README Add information about repo move and fix one bad branch ref. * Update README.md Co-authored-by: Jamie Tanna --------- Co-authored-by: Jamie Tanna --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d055c3752..6cb6e2e81 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,12 @@ With `oapi-codegen`, there are a few [Key Design Decisions](#key-design-decision ⚠️ This README may be for the latest development version, which may contain unreleased changes. Please ensure you're looking at the README for the latest release version. +## Action Required: The repository for this project has changed + +As announced in [May 2024](https://github.com/oapi-codegen/oapi-codegen/discussions/1605), we have moved the project from the deepmap organization to our own organization, and you will need to update your import +paths to pull updates past this point. You need to do a recursive search/replace from +`github.com/oapi-codegen/oapi-codegen/v2` to `github.com/oapi-codegen/oapi-codegen/v2`. + ## Install It is recommended to follow [the `tools.go` pattern](https://www.jvt.me/posts/2022/06/15/go-tools-dependency-management/) for managing the dependency of `oapi-codegen` alongside your core application. @@ -64,7 +70,7 @@ To do so, you can run: ```sh # pin to the latest version on the default branch -$ go get github.com/oapi-codegen/oapi-codegen/v2@master +$ go get github.com/oapi-codegen/oapi-codegen/v2@main # alternatively, to a commit hash i.e. https://github.com/deepmap/oapi-codegen/commit/71e916c59688a6379b5774dfe5904ec222b9a537 $ go get github.com/oapi-codegen/oapi-codegen/v2@71e916c59688a6379b5774dfe5904ec222b9a537 ``` From 43365ffa7493eaed3dc4576eeb32d6256f39e38c Mon Sep 17 00:00:00 2001 From: Marcin Romaszewicz Date: Thu, 6 Jun 2024 22:57:09 +0200 Subject: [PATCH 4/4] Update readme with install instrctions (#1652) There are go.mod module name mismatches now that we've moved repos. Mention this in the readme, and inform that v2.3.0 is the first working version in the new location. --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6cb6e2e81..7ef5b8dff 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,15 @@ With `oapi-codegen`, there are a few [Key Design Decisions](#key-design-decision ## Action Required: The repository for this project has changed -As announced in [May 2024](https://github.com/oapi-codegen/oapi-codegen/discussions/1605), we have moved the project from the deepmap organization to our own organization, and you will need to update your import -paths to pull updates past this point. You need to do a recursive search/replace from +As announced in [May 2024](https://github.com/oapi-codegen/oapi-codegen/discussions/1605), +we have moved the project from the deepmap organization to our own organization, and you will need to update your +import paths to pull updates past this point. You need to do a recursive search/replace from `github.com/oapi-codegen/oapi-codegen/v2` to `github.com/oapi-codegen/oapi-codegen/v2`. +`oapi-codegen` moved to its new home with the version tag `v2.3.0`. If you +are installing a version prior to `v2.3.0`, please use `github.com/deepmap/oapi-codegen/v2', +otherwise, use `github.com/oapi-codegen/oapi-codegen/v2` + ## Install It is recommended to follow [the `tools.go` pattern](https://www.jvt.me/posts/2022/06/15/go-tools-dependency-management/) for managing the dependency of `oapi-codegen` alongside your core application. pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy