Skip to content

Commit 2cdf634

Browse files
committed
Merge remote-tracking branch 'origin/release-v2-dev' into feat/support_global_rules
2 parents 64a2fce + 40cda45 commit 2cdf634

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

.pre-commit-config.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
repos:
2+
- repo: local
3+
hooks:
4+
- id: go-mod-tidy
5+
name: go mod tidy
6+
entry: bash -c 'go mod tidy'
7+
language: system
8+
pass_filenames: false
9+
- id: make-lint
10+
name: make lint
11+
entry: bash -c 'make lint'
12+
language: system
13+
pass_filenames: false
14+
- id: make-gofmt
15+
name: make gofmt
16+
entry: bash -c 'make gofmt'
17+
language: system
18+
pass_filenames: false

api/adc/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ type ConsumerElement struct {
9393
type Credential struct {
9494
Metadata `json:",inline" yaml:",inline"`
9595

96-
Config map[string]interface{} `json:"config" yaml:"config"`
97-
Type string `json:"type" yaml:"type"`
96+
Config map[string]any `json:"config" yaml:"config"`
97+
Type string `json:"type" yaml:"type"`
9898
}
9999

100100
type Service struct {
@@ -243,7 +243,7 @@ const (
243243
Server SSLType = "server"
244244
)
245245

246-
type Plugins map[string]interface{}
246+
type Plugins map[string]any
247247

248248
func (p *Plugins) DeepCopyInto(out *Plugins) {
249249
b, _ := json.Marshal(&p)

0 commit comments

Comments
 (0)