Skip to content

Commit cfcaefb

Browse files
authored
Merge pull request #283 from terev/upgrade-libopenapi
Upgrade libopenapi
2 parents 1cc6bad + 636710d commit cfcaefb

File tree

9 files changed

+679
-528
lines changed

9 files changed

+679
-528
lines changed

bulk/commands.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package bulk
22

33
import (
4+
"context"
45
"encoding/json"
56
"fmt"
67
"io"
@@ -85,7 +86,7 @@ func newInterpreter(expression, schemaURL string) mexpr.Interpreter {
8586

8687
if err := yaml.Unmarshal(body, &rootNode); err == nil {
8788
if err := low.BuildModel(rootNode.Content[0], &ls); err == nil {
88-
if err := ls.Build(rootNode.Content[0], index.NewSpecIndex(&rootNode)); err == nil {
89+
if err := ls.Build(context.TODO(), rootNode.Content[0], index.NewSpecIndex(&rootNode)); err == nil {
8990
s := base.NewSchema(&ls)
9091
result := openapi.GenExample(s, 0)
9192
if asMap, ok := result.(map[string]any); ok {

go.mod

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/rest-sh/restish
22

3-
go 1.24.0
3+
go 1.24
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.6
@@ -25,14 +25,14 @@ require (
2525
github.com/mattn/go-colorable v0.1.13
2626
github.com/mattn/go-isatty v0.0.16
2727
github.com/mitchellh/mapstructure v1.5.0
28-
github.com/pb33f/libopenapi v0.9.7
28+
github.com/pb33f/libopenapi v0.22.3
2929
github.com/schollz/progressbar/v3 v3.12.2
3030
github.com/shamaton/msgpack/v2 v2.1.1
3131
github.com/spf13/afero v1.9.3
3232
github.com/spf13/cobra v1.6.1
3333
github.com/spf13/pflag v1.0.5
3434
github.com/spf13/viper v1.14.0
35-
github.com/stretchr/testify v1.8.1
35+
github.com/stretchr/testify v1.10.0
3636
github.com/tent/http-link-go v0.0.0-20130702225549-ac974c61c2f9
3737
github.com/zeebo/xxh3 v1.0.2
3838
golang.org/x/exp v0.0.0-20230321023759-10a507213a29
@@ -47,14 +47,15 @@ require (
4747
require (
4848
github.com/aymanbagabas/go-osc52 v1.2.1 // indirect
4949
github.com/aymerick/douceur v0.2.0 // indirect
50+
github.com/bahlo/generic-list-go v0.2.0 // indirect
51+
github.com/buger/jsonparser v1.1.1 // indirect
5052
github.com/davecgh/go-spew v1.1.1 // indirect
5153
github.com/disintegration/imaging v1.6.2 // indirect
5254
github.com/dlclark/regexp2 v1.7.0 // indirect
53-
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
5455
github.com/fsnotify/fsnotify v1.6.0 // indirect
5556
github.com/golang/protobuf v1.5.2 // indirect
5657
github.com/google/btree v1.1.2 // indirect
57-
github.com/gorilla/css v1.0.0 // indirect
58+
github.com/gorilla/css v1.0.1 // indirect
5859
github.com/gosimple/unidecode v1.0.1 // indirect
5960
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
6061
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -63,9 +64,10 @@ require (
6364
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
6465
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
6566
github.com/magiconair/properties v1.8.6 // indirect
67+
github.com/mailru/easyjson v0.7.7 // indirect
6668
github.com/mattn/go-runewidth v0.0.14 // indirect
6769
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
68-
github.com/microcosm-cc/bluemonday v1.0.21 // indirect
70+
github.com/microcosm-cc/bluemonday v1.0.27 // indirect
6971
github.com/miekg/pkcs11 v1.0.3-0.20190429190417-a667d056470f // indirect
7072
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
7173
github.com/muesli/reflow v0.3.0 // indirect
@@ -77,18 +79,18 @@ require (
7779
github.com/pkg/errors v0.9.1 // indirect
7880
github.com/pmezard/go-difflib v1.0.0 // indirect
7981
github.com/rivo/uniseg v0.4.3 // indirect
82+
github.com/speakeasy-api/jsonpath v0.6.2 // indirect
8083
github.com/spf13/cast v1.5.0 // indirect
8184
github.com/spf13/jwalterweatherman v1.1.0 // indirect
8285
github.com/subosito/gotenv v1.4.1 // indirect
8386
github.com/thales-e-security/pool v0.0.2 // indirect
8487
github.com/twpayne/httpcache v1.0.0 // indirect
85-
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
88+
github.com/wk8/go-ordered-map/v2 v2.1.9-0.20240815153524-6ea36470d1bd // indirect
8689
github.com/x448/float16 v0.8.4 // indirect
8790
github.com/yuin/goldmark v1.5.3 // indirect
8891
github.com/yuin/goldmark-emoji v1.0.1 // indirect
8992
golang.org/x/image v0.18.0 // indirect
9093
golang.org/x/net v0.38.0 // indirect
91-
golang.org/x/sync v0.12.0 // indirect
9294
golang.org/x/sys v0.31.0 // indirect
9395
google.golang.org/appengine v1.6.7 // indirect
9496
google.golang.org/protobuf v1.33.0 // indirect

go.sum

Lines changed: 19 additions & 47 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)