Skip to content

Commit

Permalink
deps: upgrade kratos version to v2.7.1 (#3043)
Browse files Browse the repository at this point in the history
  • Loading branch information
@shenqidebaozi
shenqidebaozi authored Oct 23, 2023
1 parent fb926d4 commit 6cdd818
Show file tree
Hide file tree
Showing 31 changed files with 73 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v3
with:
version: latest
version: v1.54.2
working-directory: ${{ matrix.workdir }}
skip-pkg-cache: true
2 changes: 1 addition & 1 deletion cmd/kratos/version.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main

// release is the current kratos tool version.
const release = "v2.7.0"
const release = "v2.7.1"
2 changes: 1 addition & 1 deletion cmd/protoc-gen-go-errors/version.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main

// release is the current protoc-gen-go-errors version.
const release = "v2.7.0"
const release = "v2.7.1"
2 changes: 1 addition & 1 deletion cmd/protoc-gen-go-http/version.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package main

// release is the current protoc-gen-go-http version.
const release = "v2.7.0"
const release = "v2.7.1"
2 changes: 1 addition & 1 deletion contrib/config/apollo/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.19

require (
github.com/apolloconfig/agollo/v4 v4.3.1
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
)

require (
Expand Down
2 changes: 1 addition & 1 deletion contrib/config/consul/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/consul/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/hashicorp/consul/api v1.20.0
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/config/etcd/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/etcd/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
go.etcd.io/etcd/client/v3 v3.5.8
google.golang.org/grpc v1.57.0
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/config/kubernetes/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/kubernetes/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
k8s.io/api v0.26.3
k8s.io/apimachinery v0.26.3
k8s.io/client-go v0.26.3
Expand Down
2 changes: 1 addition & 1 deletion contrib/config/nacos/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/nacos/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/nacos-group/nacos-sdk-go v1.0.9
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/config/polaris/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/config/polaris/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/polarismesh/polaris-go v1.1.0
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/encoding/msgpack/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/encoding/msgpack/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/vmihailenco/msgpack/v5 v5.3.5
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/log/aliyun/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.19

require (
github.com/aliyun/aliyun-log-go-sdk v0.1.44
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
google.golang.org/protobuf v1.31.0
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/log/fluent/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.19

require (
github.com/fluent/fluent-logger-golang v1.9.0
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
)

require (
Expand Down
2 changes: 1 addition & 1 deletion contrib/log/logrus/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/log/logrus/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/sirupsen/logrus v1.8.1
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/log/tencent/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/log/tencent/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/tencentcloud/tencentcloud-cls-sdk-go v1.0.2
google.golang.org/protobuf v1.31.0
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/log/zap/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/log/zap/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
go.uber.org/zap v1.24.0
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/log/zerolog/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/log/zerolog/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/rs/zerolog v1.30.0
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/metrics/datadog/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.19

require (
github.com/DataDog/datadog-go v4.8.3+incompatible
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
)

require (
Expand Down
2 changes: 1 addition & 1 deletion contrib/metrics/prometheus/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/metrics/prometheus/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/prometheus/client_golang v1.15.1
github.com/prometheus/common v0.44.0
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/opensergo/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/opensergo/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/opensergo/opensergo-go v0.0.0-20220331070310-e5b01fee4d1c
golang.org/x/net v0.11.0
google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529
Expand Down
2 changes: 1 addition & 1 deletion contrib/polaris/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.19

require (
github.com/go-kratos/aegis v0.2.0
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/google/uuid v1.3.0
github.com/polarismesh/polaris-go v1.3.0
google.golang.org/protobuf v1.31.0
Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/consul/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/consul/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/hashicorp/consul/api v1.20.0
)

Expand Down
6 changes: 3 additions & 3 deletions contrib/registry/discovery/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module github.com/go-kratos/kratos/contrib/registry/discovery/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-resty/resty/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/go-resty/resty/v2 v2.10.0
github.com/pkg/errors v0.9.1
)

require golang.org/x/net v0.11.0 // indirect
require golang.org/x/net v0.17.0 // indirect

replace github.com/go-kratos/kratos/v2 => ../../../
48 changes: 41 additions & 7 deletions contrib/registry/discovery/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,46 @@
github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
github.com/go-resty/resty/v2 v2.10.0 h1:Qla4W/+TMmv0fOeeRqzEpXPLfTUnR5HZ1+lGs+CkiCo=
github.com/go-resty/resty/v2 v2.10.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
2 changes: 1 addition & 1 deletion contrib/registry/etcd/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/etcd/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
go.etcd.io/etcd/client/v3 v3.5.8
google.golang.org/grpc v1.56.1
)
Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/eureka/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ module github.com/go-kratos/kratos/contrib/registry/eureka/v2

go 1.19

require github.com/go-kratos/kratos/v2 v2.7.0
require github.com/go-kratos/kratos/v2 v2.7.1

replace github.com/go-kratos/kratos/v2 => ../../../
2 changes: 1 addition & 1 deletion contrib/registry/kubernetes/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/kubernetes/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/json-iterator/go v1.1.12
k8s.io/api v0.24.3
k8s.io/apimachinery v0.24.3
Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/nacos/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/nacos/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/nacos-group/nacos-sdk-go v1.0.9
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/polaris/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/polaris/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/polarismesh/polaris-go v1.3.0
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/registry/zookeeper/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/go-kratos/kratos/contrib/registry/zookeeper/v2
go 1.19

require (
github.com/go-kratos/kratos/v2 v2.7.0
github.com/go-kratos/kratos/v2 v2.7.1
github.com/go-zookeeper/zk v1.0.3
golang.org/x/sync v0.3.0
)
Expand Down
2 changes: 1 addition & 1 deletion version.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kratos

// Release is the current kratos version.
const Release = "v2.7.0"
const Release = "v2.7.1"

0 comments on commit 6cdd818

Please sign in to comment.