Skip to content

Commit a4be5b6

Browse files
grokifygrokify
committed
dep: getkin/kin-openapi: update to v0.65.0, post v0.61.0
1 parent ddd6890 commit a4be5b6

Some content is hidden

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

41 files changed

+143
-132
lines changed

‎cmd/oas3validate/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"os"
77
"strings"
88

9-
oas3 "github.com/getkin/kin-openapi/openapi3"
109
"github.com/grokify/gocharts/data/histogram"
1110
"github.com/grokify/simplego/fmt/fmtutil"
1211
"github.com/grokify/simplego/net/urlutil"
@@ -27,7 +26,7 @@ func main() {
2726
log.Fatal(err)
2827
}
2928

30-
spec := &oas3.Swagger{}
29+
spec := &openapi3.Spec{}
3130

3231
if urlutil.IsHttp(opts.SpecFileOAS3, true, true) {
3332
spec, err = openapi3.ReadURL(opts.SpecFileOAS3)

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ go 1.16
44

55
require (
66
github.com/buaazp/fasthttprouter v0.1.1
7-
github.com/getkin/kin-openapi v0.60.0
7+
github.com/getkin/kin-openapi v0.65.0
88
github.com/ghodss/yaml v1.0.0
99
github.com/grokify/gocharts v1.9.0
1010
github.com/grokify/simplego v0.26.10
1111
github.com/jessevdk/go-flags v1.5.0
1212
github.com/pkg/errors v0.9.1
13-
github.com/rs/zerolog v1.22.0
14-
github.com/valyala/fasthttp v1.26.0
13+
github.com/rs/zerolog v1.23.0
14+
github.com/valyala/fasthttp v1.27.0
1515
github.com/valyala/quicktemplate v1.6.3
1616
gopkg.in/yaml.v2 v2.4.0
1717
)

‎go.sum

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
8484
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
8585
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
8686
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
87+
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
8788
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
8889
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
8990
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -109,8 +110,8 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a
109110
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
110111
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
111112
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
112-
github.com/getkin/kin-openapi v0.60.0 h1:wnTPS0Vrq4CmlmLCACY/bQXduBThkZOb5OLQfBW5FiM=
113-
github.com/getkin/kin-openapi v0.60.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
113+
github.com/getkin/kin-openapi v0.65.0 h1:Gq8Z5gzgczdThvR9aoJE9Cfcys4zOaCA6YxsiQQXIB8=
114+
github.com/getkin/kin-openapi v0.65.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
114115
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
115116
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
116117
github.com/go-errors/errors v1.1.1/go.mod h1:psDX2osz5VnTOnFWbDeWwS7yejl+uV3FEWEp4lssFEs=
@@ -127,6 +128,7 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh
127128
github.com/go-pg/pg v8.0.7+incompatible/go.mod h1:a2oXow+aFOrvwcKs3eIA0lNFmMilrxK2sOkB5NWe0vA=
128129
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
129130
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
131+
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
130132
github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
131133
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
132134
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
@@ -399,8 +401,9 @@ github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
399401
github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
400402
github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
401403
github.com/rs/zerolog v1.21.0/go.mod h1:ZPhntP/xmq1nnND05hhpAh2QMhSsA4UN3MGZ6O2J3hM=
402-
github.com/rs/zerolog v1.22.0 h1:XrVUjV4K+izZpKXZHlPrYQiDtmdGiCylnT4i43AAWxg=
403404
github.com/rs/zerolog v1.22.0/go.mod h1:ZPhntP/xmq1nnND05hhpAh2QMhSsA4UN3MGZ6O2J3hM=
405+
github.com/rs/zerolog v1.23.0 h1:UskrK+saS9P9Y789yNNulYKdARjPZuS35B8gJF2x60g=
406+
github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo=
404407
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
405408
github.com/rustyoz/Mtransform v0.0.0-20190224104252-60c8c35a3681/go.mod h1:LoYQicvJKiYtg51aHi/pslb7cyYUevSnMuB5IlkjuF0=
406409
github.com/rustyoz/genericlexer v0.0.0-20190224115003-eb82fd2987bd/go.mod h1:m65JtsVg785EjQvQylesseVucezoQZqJozlPAfjXmbE=
@@ -449,8 +452,9 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw
449452
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
450453
github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA=
451454
github.com/valyala/fasthttp v1.24.0/go.mod h1:0mw2RjXGOzxf4NL2jni3gUQ7LfjjUSiG5sskOUUSEpU=
452-
github.com/valyala/fasthttp v1.26.0 h1:k5Tooi31zPG/g8yS6o2RffRO2C9B9Kah9SY8j/S7058=
453455
github.com/valyala/fasthttp v1.26.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA=
456+
github.com/valyala/fasthttp v1.27.0 h1:gDefRDL9aqSiwXV6aRW8aSBPs82y4KizSzHrBLf4NDI=
457+
github.com/valyala/fasthttp v1.27.0/go.mod h1:cmWIqlu99AO/RKcp1HWaViTqc57FswJOfYYdPJBl8BA=
454458
github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc=
455459
github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
456460
github.com/valyala/quicktemplate v1.6.3 h1:O7EuMwuH7Q94U2CXD6sOX8AYHqQqWtmIk690IhmpkKA=

‎openapi2/convert.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@ import (
55
"io/ioutil"
66
"os"
77

8-
oas2 "github.com/getkin/kin-openapi/openapi2"
98
"github.com/getkin/kin-openapi/openapi2conv"
109
"gopkg.in/yaml.v2"
1110
)
1211

13-
func ConvertSpectrumOAS2ToKinOAS2(smSpec *Specification) (*oas2.Swagger, error) {
12+
func ConvertSpectrumOAS2ToKinOAS2(smSpec *Specification) (*Spec, error) {
1413
bytes, err := json.Marshal(smSpec)
1514
if err != nil {
1615
return nil, err
1716
}
18-
var kinSpec oas2.Swagger
17+
var kinSpec Spec
1918
err = json.Unmarshal(bytes, &kinSpec)
2019
return &kinSpec, err
2120
}
@@ -25,7 +24,7 @@ func ConvertOAS2FileToOAS3File(oas2file, oas3file string, perm os.FileMode, pret
2524
if err != nil {
2625
return err
2726
}
28-
oas3, err := openapi2conv.ToV3Swagger(oas2)
27+
oas3, err := openapi2conv.ToV3(oas2)
2928
if err != nil {
3029
return err
3130
}

‎openapi2/openapi2csv/spec-to-csv.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"net/http"
55
"path/filepath"
66

7-
"github.com/getkin/kin-openapi/openapi2"
7+
oas2 "github.com/getkin/kin-openapi/openapi2"
88
"github.com/grokify/gocharts/data/table"
9-
oas2 "github.com/grokify/spectrum/openapi2"
9+
"github.com/grokify/spectrum/openapi2"
1010
)
1111

1212
func TableFromSpecFiles(files []string, includeFilename bool) (*table.Table, error) {
@@ -18,7 +18,7 @@ func TableFromSpecFiles(files []string, includeFilename bool) (*table.Table, err
1818
}
1919
tbl.Columns = append(tbl.Columns, []string{"Path", "Method", "OperationID", "Summary", "Description"}...)
2020
for _, file := range files {
21-
spec, err := oas2.ReadOpenAPI2KinSpecFile(file)
21+
spec, err := openapi2.ReadOpenAPI2KinSpecFile(file)
2222
if err != nil {
2323
return tblp, err
2424
}
@@ -32,15 +32,15 @@ func TableFromSpecFiles(files []string, includeFilename bool) (*table.Table, err
3232
return tblp, nil
3333
}
3434

35-
func TableAddOpenAPI2Spec(tbl *table.Table, spec *openapi2.Swagger, prefix []string) *table.Table {
35+
func TableAddOpenAPI2Spec(tbl *table.Table, spec *openapi2.Spec, prefix []string) *table.Table {
3636
for url, path := range spec.Paths {
3737
tbl = TableAddOpenAPI2Path(tbl, path, append(prefix, url))
3838
}
3939
return tbl
4040
}
4141

4242
// prefix can be `filename`,`path`
43-
func TableAddOpenAPI2Path(tbl *table.Table, path *openapi2.PathItem, prefix []string) *table.Table {
43+
func TableAddOpenAPI2Path(tbl *table.Table, path *oas2.PathItem, prefix []string) *table.Table {
4444
if path.Delete != nil {
4545
tbl.Rows = append(tbl.Rows, pathOpenApi2ToRow(prefix, path.Delete, http.MethodDelete))
4646
}
@@ -65,7 +65,7 @@ func TableAddOpenAPI2Path(tbl *table.Table, path *openapi2.PathItem, prefix []st
6565
return tbl
6666
}
6767

68-
func pathOpenApi2ToRow(prefix []string, op *openapi2.Operation, method string) []string {
68+
func pathOpenApi2ToRow(prefix []string, op *oas2.Operation, method string) []string {
6969
row := prefix
7070
row = append(row, method, op.OperationID, op.Summary, op.Description)
7171
return row

‎openapi2/read.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"regexp"
77
"strings"
88

9-
oas2 "github.com/getkin/kin-openapi/openapi2"
109
"github.com/ghodss/yaml"
1110
)
1211

@@ -42,8 +41,8 @@ func ReadOpenAPI2SpecFileDirect(filename string) (Specification, error) {
4241
return NewSpecificationFromBytes(bytes)
4342
}*/
4443

45-
func ReadOpenAPI2KinSpecFile(filename string) (*oas2.Swagger, error) {
46-
var swag oas2.Swagger
44+
func ReadOpenAPI2KinSpecFile(filename string) (*Spec, error) {
45+
var swag Spec
4746
bytes, err := ioutil.ReadFile(filename)
4847
if err != nil {
4948
return &swag, err

‎openapi2/swagger_specification_v2.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ import (
66
"fmt"
77
"net/http"
88
"strings"
9+
10+
oas2 "github.com/getkin/kin-openapi/openapi2"
911
)
1012

13+
type Spec = oas2.T
14+
1115
// Specification represents a Swagger 2.0 specification.
1216
type Specification struct {
1317
Swagger string `json:"swagger,omitempty"`

‎openapi3/extension_taggroups.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"reflect"
77
"strings"
88

9-
oas3 "github.com/getkin/kin-openapi/openapi3"
109
"github.com/grokify/simplego/type/stringsutil"
1110
)
1211

@@ -45,7 +44,7 @@ func (set *TagGroupSet) GetTagGroupNamesForTagNames(wantTagNames ...string) []st
4544
return stringsutil.SliceCondenseSpace(tagGroupNames, true, true)
4645
}
4746

48-
func (set *TagGroupSet) AddToSpec(spec *oas3.Swagger) error {
47+
func (set *TagGroupSet) AddToSpec(spec *Spec) error {
4948
if len(set.TagGroups) == 0 {
5049
return nil
5150
}
@@ -82,7 +81,7 @@ func (sm *SpecMore) TagsWithoutGroups() ([]string, []string, []string, error) {
8281
}
8382
*/
8483

85-
func TagsWithoutGroups(spec *oas3.Swagger, tagGroupSet TagGroupSet) []string {
84+
func TagsWithoutGroups(spec *Spec, tagGroupSet TagGroupSet) []string {
8685
missing := []string{}
8786
for _, tag := range spec.Tags {
8887
if !tagGroupSet.Exists(tag.Name) {

‎openapi3/merge.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717

1818
var jsonFileRx = regexp.MustCompile(`(?i)\.(json|yaml|yml)\s*$`)
1919

20-
func MergeDirectory(dir string, mergeOpts *MergeOptions) (*oas3.Swagger, int, error) {
20+
func MergeDirectory(dir string, mergeOpts *MergeOptions) (*Spec, int, error) {
2121
var filePaths []string
2222
var err error
2323
if mergeOpts != nil && mergeOpts.FileRx != nil {
@@ -34,15 +34,15 @@ func MergeDirectory(dir string, mergeOpts *MergeOptions) (*oas3.Swagger, int, er
3434
return spec, len(filePaths), err
3535
}
3636

37-
func MergeFiles(filepaths []string, mergeOpts *MergeOptions) (*oas3.Swagger, error) {
37+
func MergeFiles(filepaths []string, mergeOpts *MergeOptions) (*Spec, error) {
3838
sort.Strings(filepaths)
3939
validateEach := false
4040
validateFinal := true
4141
if mergeOpts != nil {
4242
validateEach = mergeOpts.ValidateEach
4343
validateFinal = mergeOpts.ValidateFinal
4444
}
45-
var specMaster *oas3.Swagger
45+
var specMaster *Spec
4646
for i, fpath := range filepaths {
4747
thisSpec, err := ReadFile(fpath, validateEach)
4848
if err != nil {
@@ -63,7 +63,7 @@ func MergeFiles(filepaths []string, mergeOpts *MergeOptions) (*oas3.Swagger, err
6363
if err != nil {
6464
return specMaster, err
6565
}
66-
newSpec, err := oas3.NewSwaggerLoader().LoadSwaggerFromData(bytes)
66+
newSpec, err := oas3.NewLoader().LoadFromData(bytes)
6767
if err != nil {
6868
return newSpec, errors.Wrap(err, "Loader.LoadSwaggerFromData (MergeFiles().ValidateFinal)")
6969
}
@@ -72,7 +72,7 @@ func MergeFiles(filepaths []string, mergeOpts *MergeOptions) (*oas3.Swagger, err
7272
return specMaster, nil
7373
}
7474

75-
func Merge(specMaster, specExtra *oas3.Swagger, specExtraNote string, mergeOpts *MergeOptions) (*oas3.Swagger, error) {
75+
func Merge(specMaster, specExtra *Spec, specExtraNote string, mergeOpts *MergeOptions) (*Spec, error) {
7676
specMaster = MergeTags(specMaster, specExtra)
7777
specMaster, err := MergeParameters(specMaster, specExtra, specExtraNote, mergeOpts)
7878
if err != nil {
@@ -93,7 +93,7 @@ func Merge(specMaster, specExtra *oas3.Swagger, specExtraNote string, mergeOpts
9393
return MergeRequestBodies(specMaster, specExtra, specExtraNote)
9494
}
9595

96-
func MergeTags(specMaster, specExtra *oas3.Swagger) *oas3.Swagger {
96+
func MergeTags(specMaster, specExtra *Spec) *Spec {
9797
tagsMap := map[string]int{}
9898
for _, tag := range specMaster.Tags {
9999
tagsMap[tag.Name] = 1
@@ -110,7 +110,7 @@ func MergeTags(specMaster, specExtra *oas3.Swagger) *oas3.Swagger {
110110
// MergeWithTables performs a spec merge and returns comparison
111111
// tables. This is useful to combine with github.com/grokify/gocharts/data/table
112112
// WriteXLSX() to write out comparison tables for debugging.
113-
func MergeWithTables(spec1, spec2 *oas3.Swagger, specExtraNote string, mergeOpts *MergeOptions) (*oas3.Swagger, []*table.Table, error) {
113+
func MergeWithTables(spec1, spec2 *Spec, specExtraNote string, mergeOpts *MergeOptions) (*Spec, []*table.Table, error) {
114114
tbls := []*table.Table{}
115115
sm1 := SpecMore{Spec: spec1}
116116
sm2 := SpecMore{Spec: spec2}
@@ -141,7 +141,7 @@ func MergeWithTables(spec1, spec2 *oas3.Swagger, specExtraNote string, mergeOpts
141141
return specf, tbls, nil
142142
}
143143

144-
func MergePaths(specMaster, specExtra *oas3.Swagger) (*oas3.Swagger, error) {
144+
func MergePaths(specMaster, specExtra *Spec) (*Spec, error) {
145145
for url, pathItem := range specExtra.Paths {
146146
if pathInfoMaster, ok := specMaster.Paths[url]; !ok || pathInfoMaster == nil {
147147
specMaster.Paths[url] = &oas3.PathItem{}
@@ -213,7 +213,7 @@ func MergePaths(specMaster, specExtra *oas3.Swagger) (*oas3.Swagger, error) {
213213
return specMaster, nil
214214
}
215215

216-
func MergeParameters(specMaster, specExtra *oas3.Swagger, specExtraNote string, mergeOpts *MergeOptions) (*oas3.Swagger, error) {
216+
func MergeParameters(specMaster, specExtra *Spec, specExtraNote string, mergeOpts *MergeOptions) (*Spec, error) {
217217
if specMaster.Components.Parameters == nil {
218218
specMaster.Components.Parameters = map[string]*oas3.ParameterRef{}
219219
}
@@ -244,7 +244,7 @@ func MergeParameters(specMaster, specExtra *oas3.Swagger, specExtraNote string,
244244
return specMaster, nil
245245
}
246246

247-
func MergeResponses(specMaster, specExtra *oas3.Swagger, specExtraNote string, mergeOpts *MergeOptions) (*oas3.Swagger, error) {
247+
func MergeResponses(specMaster, specExtra *Spec, specExtraNote string, mergeOpts *MergeOptions) (*Spec, error) {
248248
if specMaster.Components.Responses == nil {
249249
specMaster.Components.Responses = map[string]*oas3.ResponseRef{}
250250
}
@@ -273,7 +273,7 @@ func MergeResponses(specMaster, specExtra *oas3.Swagger, specExtraNote string, m
273273
return specMaster, nil
274274
}
275275

276-
func MergeSchemas(specMaster, specExtra *oas3.Swagger, specExtraNote string, mergeOpts *MergeOptions) (*oas3.Swagger, error) {
276+
func MergeSchemas(specMaster, specExtra *Spec, specExtraNote string, mergeOpts *MergeOptions) (*Spec, error) {
277277
for schemaName, schemaExtra := range specExtra.Components.Schemas {
278278
if schemaExtra == nil {
279279
continue
@@ -307,7 +307,7 @@ func MergeSchemas(specMaster, specExtra *oas3.Swagger, specExtraNote string, mer
307307
return specMaster, nil
308308
}
309309

310-
func MergeRequestBodies(specMaster, specExtra *oas3.Swagger, specExtraNote string) (*oas3.Swagger, error) {
310+
func MergeRequestBodies(specMaster, specExtra *Spec, specExtraNote string) (*Spec, error) {
311311
for rbName, rbExtra := range specExtra.Components.RequestBodies {
312312
if rbExtra == nil {
313313
continue

‎openapi3/openapi3html/pageparams.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type PageParams struct {
1616
PageTitle string
1717
PageLink string
1818
TableDomID string
19-
Spec *oas3.Swagger
19+
Spec *openapi3.Spec
2020
ColumnSet *table.ColumnSet
2121
OpsFilterFunc func(path, method string, op *oas3.Operation) bool
2222
TableJSON []byte
@@ -31,7 +31,7 @@ func (pp *PageParams) PageLinkHTML() string {
3131
html.EscapeString(pp.PageTitle))
3232
}
3333

34-
func (pp *PageParams) AddSpec(spec *oas3.Swagger) error {
34+
func (pp *PageParams) AddSpec(spec *openapi3.Spec) error {
3535
sm := openapi3.SpecMore{Spec: spec}
3636
tbl, err := sm.OperationsTable(pp.ColumnSet, pp.OpsFilterFunc)
3737
if err != nil {

‎openapi3/openapi3postman2/convert.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
// Converter is the struct that manages the conversion.
2121
type Converter struct {
2222
Configuration Configuration
23-
OpenAPISpec *oas3.Swagger
23+
OpenAPISpec *openapi3.Spec
2424
}
2525

2626
// NewConverter instantiates a new converter.
@@ -67,8 +67,8 @@ func (conv *Converter) MergeConvert(openapiFilepath string, pmanBaseFilepath str
6767

6868
// ConvertFile builds a Postman 2.0 spec using an OpenAPI 3.0 spec.
6969
func (conv *Converter) ConvertFile(openapiFilepath string, pmanSpecFilepath string) error {
70-
oas3Loader := oas3.NewSwaggerLoader()
71-
oas3spec, err := oas3Loader.LoadSwaggerFromFile(openapiFilepath)
70+
oas3Loader := oas3.NewLoader()
71+
oas3spec, err := oas3Loader.LoadFromFile(openapiFilepath)
7272
if err != nil {
7373
return err
7474
}
@@ -85,13 +85,13 @@ func (conv *Converter) ConvertFile(openapiFilepath string, pmanSpecFilepath stri
8585
}
8686

8787
// ConvertSpec creates a Postman 2.0 collection from a configuration and Swagger 2.0 spec
88-
func ConvertSpec(cfg Configuration, oas3spec *oas3.Swagger) (postman2.Collection, error) {
88+
func ConvertSpec(cfg Configuration, oas3spec *openapi3.Spec) (postman2.Collection, error) {
8989
return Merge(cfg, postman2.Collection{}, oas3spec)
9090
}
9191

9292
// Merge creates a Postman 2.0 collection from a configuration, base Postman
9393
// 2.0 collection and Swagger 2.0 spec
94-
func Merge(cfg Configuration, pman postman2.Collection, oas3spec *oas3.Swagger) (postman2.Collection, error) {
94+
func Merge(cfg Configuration, pman postman2.Collection, oas3spec *openapi3.Spec) (postman2.Collection, error) {
9595
if len(pman.Info.Name) == 0 {
9696
pman.Info.Name = strings.TrimSpace(oas3spec.Info.Title)
9797
}
@@ -198,7 +198,7 @@ func postmanAddItemToFolder(pman postman2.Collection, pmItem *postman2.Item, pmF
198198
return pman
199199
}
200200

201-
func Openapi3OperationToPostman2APIItem(cfg Configuration, oas3spec *oas3.Swagger, oasUrl string, method string, operation *oas3.Operation) *postman2.Item {
201+
func Openapi3OperationToPostman2APIItem(cfg Configuration, oas3spec *openapi3.Spec, oasUrl string, method string, operation *oas3.Operation) *postman2.Item {
202202
pmUrl := BuildPostmanURL(cfg, oas3spec, oasUrl, operation)
203203
item := &postman2.Item{
204204
Name: operation.Summary,
@@ -242,7 +242,7 @@ func Openapi3OperationToPostman2APIItem(cfg Configuration, oas3spec *oas3.Swagge
242242
return item
243243
}
244244

245-
func BuildPostmanURL(cfg Configuration, spec *oas3.Swagger, specPath string, operation *oas3.Operation) postman2.URL {
245+
func BuildPostmanURL(cfg Configuration, spec *openapi3.Spec, specPath string, operation *oas3.Operation) postman2.URL {
246246
specMore := openapi3.SpecMore{Spec: spec}
247247
specServerURL := specMore.ServerURL(0)
248248
partsOverrideURL := []string{}

0 commit comments

Comments
 (0)