Skip to content

Commit 4cabd32

Browse files
BaoyuantopShivam0500incubator4LiteSunmscb402
authored
chore: backport commits to 3.0 (#2780)
* chore: update the year in the NOTICE (#2726) fix: #2724 * fix plugins display in list of routes (#2704) Co-authored-by: litesun <[email protected]> * fix: plugin config page error (#2739) * fix: plugin disable invalid in API /plugin?all=true (#2737) * chore(deps): bump http-cache-semantics from 4.1.0 to 4.1.1 in /web (#2730) * fix: update URL of the online playground (#2760) * chore: update dependency (#2752) * chore: update dependency --------- Co-authored-by: rongxin <[email protected]> * fix: remove route name length limit (#2759) * fix: change regex template to optional in proxy write (#2762) * fix: ssl table expiration time display (#2763) * feat: add search functionality for id, host, and description fields (#2750) Co-authored-by: Anil Durmus <[email protected]> * fix: disable global plugin invalid (#2757) * feat: support ipv6 in upstream nodes (#2766) * fix: upstream nodes metadata miss (#2773) * fix: remove ssl check in redirect https (#2770) --------- Co-authored-by: Shivam0500 <[email protected]> Co-authored-by: incubator4 <[email protected]> Co-authored-by: litesun <[email protected]> Co-authored-by: Joanthan Chen <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JunXu Chen <[email protected]> Co-authored-by: Xin Rong <[email protected]> Co-authored-by: rongxin <[email protected]> Co-authored-by: Anil Baki Durmus <[email protected]> Co-authored-by: Anil Durmus <[email protected]>
1 parent f494919 commit 4cabd32

35 files changed

+630
-115
lines changed

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache APISIX
2-
Copyright 2019-2022 The Apache Software Foundation
2+
Copyright 2019-2023 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Note: Currently the Dashboard does not have complete coverage of Apache APISIX f
4747

4848
## Demo
4949

50-
[Online Playground](http://20.210.250.99:9000/)
50+
[Online Playground](https://apisix-dashboard.apiseven.com/)
5151

5252
```text
5353
Username: admin

api/go.mod

Lines changed: 66 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
module github.com/apisix/manager-api
22

3-
go 1.16
3+
go 1.19
44

55
require (
66
github.com/coreos/go-oidc/v3 v3.3.0
77
github.com/evanphx/json-patch/v5 v5.1.0
88
github.com/getkin/kin-openapi v0.33.0
99
github.com/gin-contrib/gzip v0.0.3
1010
github.com/gin-contrib/static v0.0.0-20200916080430-d45d9a37d28e
11-
github.com/gin-gonic/gin v1.7.0
11+
github.com/gin-gonic/gin v1.9.0
1212
github.com/golang-jwt/jwt v3.2.2+incompatible
1313
github.com/gorilla/sessions v1.2.1
1414
github.com/juliangruber/go-intersect v1.1.0
@@ -19,13 +19,74 @@ require (
1919
github.com/sony/sonyflake v1.0.0
2020
github.com/spf13/cobra v1.6.1
2121
github.com/spf13/viper v1.8.1
22-
github.com/stretchr/testify v1.8.0
23-
github.com/tidwall/gjson v1.6.7
22+
github.com/stretchr/testify v1.8.2
23+
github.com/tidwall/gjson v1.14.4
2424
github.com/xeipuuv/gojsonschema v1.2.0
2525
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da
2626
go.etcd.io/etcd/client/pkg/v3 v3.5.5
2727
go.etcd.io/etcd/client/v3 v3.5.5
2828
go.uber.org/zap v1.17.0
29-
golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f // indirect
3029
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094
3130
)
31+
32+
require (
33+
github.com/bytedance/sonic v1.8.0 // indirect
34+
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
35+
github.com/coreos/go-semver v0.3.0 // indirect
36+
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
37+
github.com/davecgh/go-spew v1.1.1 // indirect
38+
github.com/fsnotify/fsnotify v1.4.9 // indirect
39+
github.com/ghodss/yaml v1.0.0 // indirect
40+
github.com/gin-contrib/sse v0.1.0 // indirect
41+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
42+
github.com/go-openapi/swag v0.19.5 // indirect
43+
github.com/go-playground/locales v0.14.1 // indirect
44+
github.com/go-playground/universal-translator v0.18.1 // indirect
45+
github.com/go-playground/validator/v10 v10.11.2 // indirect
46+
github.com/goccy/go-json v0.10.0 // indirect
47+
github.com/gogo/protobuf v1.3.2 // indirect
48+
github.com/golang/protobuf v1.5.2 // indirect
49+
github.com/gorilla/securecookie v1.1.1 // indirect
50+
github.com/hashicorp/hcl v1.0.0 // indirect
51+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
52+
github.com/json-iterator/go v1.1.12 // indirect
53+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
54+
github.com/leodido/go-urn v1.2.1 // indirect
55+
github.com/magiconair/properties v1.8.5 // indirect
56+
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
57+
github.com/mattn/go-isatty v0.0.17 // indirect
58+
github.com/mitchellh/mapstructure v1.4.1 // indirect
59+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
60+
github.com/modern-go/reflect2 v1.0.2 // indirect
61+
github.com/pelletier/go-toml v1.9.3 // indirect
62+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
63+
github.com/pmezard/go-difflib v1.0.0 // indirect
64+
github.com/spf13/afero v1.6.0 // indirect
65+
github.com/spf13/cast v1.3.1 // indirect
66+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
67+
github.com/spf13/pflag v1.0.5 // indirect
68+
github.com/stretchr/objx v0.5.0 // indirect
69+
github.com/subosito/gotenv v1.2.0 // indirect
70+
github.com/tidwall/match v1.1.1 // indirect
71+
github.com/tidwall/pretty v1.2.0 // indirect
72+
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
73+
github.com/ugorji/go/codec v1.2.9 // indirect
74+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
75+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
76+
go.etcd.io/etcd/api/v3 v3.5.5 // indirect
77+
go.uber.org/atomic v1.7.0 // indirect
78+
go.uber.org/multierr v1.6.0 // indirect
79+
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
80+
golang.org/x/crypto v0.5.0 // indirect
81+
golang.org/x/net v0.7.0 // indirect
82+
golang.org/x/sys v0.5.0 // indirect
83+
golang.org/x/text v0.7.0 // indirect
84+
google.golang.org/appengine v1.6.7 // indirect
85+
google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90 // indirect
86+
google.golang.org/grpc v1.47.0 // indirect
87+
google.golang.org/protobuf v1.28.1 // indirect
88+
gopkg.in/ini.v1 v1.62.0 // indirect
89+
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
90+
gopkg.in/yaml.v2 v2.4.0 // indirect
91+
gopkg.in/yaml.v3 v3.0.1 // indirect
92+
)

0 commit comments

Comments
 (0)