Skip to content

Commit 6860428

Browse files
yozelyozel
committed
Migrate to libopenapi
1 parent 4ceb1d5 commit 6860428

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1592
-1274
lines changed

‎cmd/oapi-codegen/oapi-codegen.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -265,17 +265,16 @@ func main() {
265265
fmt.Print(string(buf))
266266
return
267267
}
268-
269-
swagger, err := util.LoadSwaggerWithCircularReferenceCount(flag.Arg(0), opts.Compatibility.CircularReferenceLimit)
270-
if err != nil {
271-
errExit("error loading swagger spec in %s\n: %s", flag.Arg(0), err)
272-
}
273-
274268
if len(noVCSVersionOverride) > 0 {
275269
opts.Configuration.NoVCSVersionOverride = &noVCSVersionOverride
276270
}
277271

278-
code, err := codegen.Generate(swagger, opts.Configuration)
272+
modelv3, err := util.LoadOpenAPI(flag.Arg(0))
273+
if err != nil {
274+
errExit(err.Error())
275+
}
276+
277+
code, err := codegen.Generate(modelv3, opts.Configuration)
279278
if err != nil {
280279
errExit("error generating code: %s\n", err)
281280
}

‎cmd/oapi-codegen/oapi-codegen_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ func TestLoader(t *testing.T) {
1515

1616
for _, v := range paths {
1717

18-
swagger, err := util.LoadSwagger(v)
18+
swagger, err := util.LoadOpenAPI(v)
1919
if err != nil {
2020
t.Error(err)
2121
}
22-
if swagger == nil || swagger.Info == nil || swagger.Info.Version == "" {
22+
if swagger == nil || swagger.Model.Info == nil || swagger.Model.Info.Version == "" {
2323
t.Error("missing data")
2424
}
2525
}

‎examples/authenticated-api/echo/api/api.gen.go

Lines changed: 12 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/go.mod

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/deepmap/oapi-codegen/v2/examples
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.21.0
46

57
replace github.com/deepmap/oapi-codegen/v2 => ../
68

@@ -34,11 +36,14 @@ require (
3436
github.com/andybalholm/brotli v1.0.5 // indirect
3537
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
3638
github.com/aymerick/douceur v0.2.0 // indirect
39+
github.com/bahlo/generic-list-go v0.2.0 // indirect
40+
github.com/buger/jsonparser v1.1.1 // indirect
3741
github.com/bytedance/sonic v1.10.0-rc3 // indirect
3842
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
3943
github.com/chenzhuoyu/iasm v0.9.0 // indirect
4044
github.com/davecgh/go-spew v1.1.1 // indirect
4145
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
46+
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
4247
github.com/fatih/structs v1.1.0 // indirect
4348
github.com/flosch/pongo2/v4 v4.0.2 // indirect
4449
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
@@ -81,6 +86,7 @@ require (
8186
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8287
github.com/modern-go/reflect2 v1.0.2 // indirect
8388
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
89+
github.com/pb33f/libopenapi v0.14.0 // indirect
8490
github.com/pelletier/go-toml/v2 v2.0.9 // indirect
8591
github.com/perimeterx/marshmallow v1.1.5 // indirect
8692
github.com/pkg/errors v0.9.1 // indirect
@@ -100,11 +106,15 @@ require (
100106
github.com/valyala/tcplisten v1.0.0 // indirect
101107
github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
102108
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
109+
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
110+
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
103111
github.com/yosssi/ace v0.0.5 // indirect
104112
golang.org/x/arch v0.4.0 // indirect
105113
golang.org/x/crypto v0.14.0 // indirect
114+
golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect
106115
golang.org/x/mod v0.12.0 // indirect
107116
golang.org/x/net v0.17.0 // indirect
117+
golang.org/x/sync v0.3.0 // indirect
108118
golang.org/x/sys v0.13.0 // indirect
109119
golang.org/x/text v0.14.0 // indirect
110120
golang.org/x/time v0.3.0 // indirect

0 commit comments

Comments
 (0)
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