Skip to content

Commit 8ef173e

Browse files
LaurenceLiZhixinMulavarjustxueweicjphahaEnableAsync
authored
merge 3.0 to ensure samples runnable (#1414)
* fix: change register event chan to unbundent chan (#1330) * fix: #1323 delete zk registry when set defualt consumer/provider config (#1324) * Ftr: Generic invocation supports Generalizer (#1315) * generic filter * sync * feat: get java name from POJO * todo: unittests for generic filter * unittests for generic filter * map generalizer * adjust import block * generic service filter is ready for generalizer * add unittests for GenericServiceFilter * ReferenceConfig supports new format of generic key * go fmt * fix license * fix license * fix bugs encountering in integrated tests * go fmt * fix serialization bugs * ftr: generic invocation supports protobuf-json * go fmt * go fmt * disable protobuf-json * go fmt * update comments * fix logging level (#1341) * Ftr: add lumberjack log config (#1335) * add lumberjack & union test * fix go fmt error,modify go.sum file * Ftr: add json generalizer (#1343) * Ftr: add json generalizer Fix: go fmt * Fix: hessian pojo * fix: restart ci * Fix: imports format * style(*): format imports with dubbogo/tools/imports-formatter (#1346) * fix Fixed the problem that the timeout period of the original method level does not take effect (#1336) * fix Fixed the problem that the timeout period of the original method level does not take effect * fix Fixed the problem that the timeout period of the original method level does not take effect Co-authored-by: 董振兴 <[email protected]> * fix:#1143 Feature/reduce etcd registry conn; wait group modify (#1297) * modify map use in nacos service_discovery * fix map double write bug * modify etcd registry restart mechanism * add sync.once for HandleClientRestart * modify the logic when add() or done() of wait group in zk,etcd and k8s registry * modify the logic when add() or done() of wait group in zk,etcd and k8s registry * add handleClientRestart func * add handleClientRestart func * go fmt * fix: update linter Co-authored-by: yexiaobo <[email protected]> Co-authored-by: LaurenceLiZhixin <[email protected]> * ftr: triple multi params support (#1344) * ftr: triple multi params support * fix: import * fix: fix ci and gomod * fix: fmt * fix: add develop back to branch * fix: remove unused getty import * fix: mock zk registry (#1351) * 优化Nacos下的ServiceName的命名风格 (#1352) Co-authored-by: Changeden <[email protected]> * remove zk test (#1357) * Use class name as the default reference name (#1339) * build(deps): bump actions/cache from v2.1.4 to v2.1.5 Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/cache/releases) - [Commits](actions/cache@v2.1.4...1a9e213) Signed-off-by: dependabot[bot] <[email protected]> * improve etcd version and change create to put (#1203) * Remove RPC Service * use type assertion before reflect * modify comment * modify comment of BaseMetadataService * add the type alias of interface{} * modify RPCService Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xin.Zh <[email protected]> Co-authored-by: AlexStocks <[email protected]> Co-authored-by: randy <[email protected]> * Feat/upgrade getty (#1345) * feat(getty): upgrade getty version to 1.4.4 * feat(getty): delete outdated getty params * delete time.Sleep in unit test * upgrade getty version to 1.4.5 * style(getty): format package getty imports Co-authored-by: dongjianhui03 <[email protected]> * support multi pb (#1361) * 修复当getty的tcp read/write timeout小于1s时panic的问题 * TCP Read/Write最小值提取为全局变量，优化parseTimeDurationByRange逻辑 * logo (#1382) * Change the key of a mock EchoFilter (#1381) * build(deps): bump actions/cache from v2.1.4 to v2.1.5 Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/cache/releases) - [Commits](actions/cache@v2.1.4...1a9e213) Signed-off-by: dependabot[bot] <[email protected]> * improve etcd version and change create to put (#1203) * change the mock filter key Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xin.Zh <[email protected]> Co-authored-by: AlexStocks <[email protected]> Co-authored-by: randy <[email protected]> * Change the key of a mock EchoFilter (#1381) * build(deps): bump actions/cache from v2.1.4 to v2.1.5 Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/cache/releases) - [Commits](actions/cache@v2.1.4...1a9e213) Signed-off-by: dependabot[bot] <[email protected]> * improve etcd version and change create to put (#1203) * change the mock filter key Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xin.Zh <[email protected]> Co-authored-by: AlexStocks <[email protected]> Co-authored-by: randy <[email protected]> * fix: nacos service disc error log bug (#1390) * 优化代码逻辑 * fix:registry timeout not pars (#1392) * fix:registry timeout not pars * up:fmt * up:统一超时时间key * fix:修改测试顺序问题 * up:fmt * change dependabot target branch * build(deps): bump github.com/fsnotify/fsnotify from 1.4.9 to 1.5.0 (#1400) * build(deps): bump actions/cache from v2.1.4 to v2.1.5 Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/cache/releases) - [Commits](actions/cache@v2.1.4...1a9e213) Signed-off-by: dependabot[bot] <[email protected]> * improve etcd version and change create to put (#1203) * build(deps): bump github.com/dubbogo/gost from 1.11.14 to 1.11.16 (#1387) Bumps [github.com/dubbogo/gost](https://github.com/dubbogo/gost) from 1.11.14 to 1.11.16. - [Release notes](https://github.com/dubbogo/gost/releases) - [Commits](dubbogo/gost@v1.11.14...v1.11.16) --- updated-dependencies: - dependency-name: github.com/dubbogo/gost dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump google.golang.org/protobuf from 1.26.0 to 1.27.1 (#1386) Bumps [google.golang.org/protobuf](https://github.com/protocolbuffers/protobuf-go) from 1.26.0 to 1.27.1. - [Release notes](https://github.com/protocolbuffers/protobuf-go/releases) - [Changelog](https://github.com/protocolbuffers/protobuf-go/blob/master/release.bash) - [Commits](protocolbuffers/protobuf-go@v1.26.0...v1.27.1) --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.0-alpha.0 to 3.5.0 (#1383) Bumps [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) from 3.5.0-alpha.0 to 3.5.0. - [Release notes](https://github.com/etcd-io/etcd/releases) - [Changelog](https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.5.md) - [Commits](etcd-io/etcd@v3.5.0-alpha.0...v3.5.0) --- updated-dependencies: - dependency-name: go.etcd.io/etcd/client/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump github.com/fsnotify/fsnotify from 1.4.9 to 1.5.0 Bumps [github.com/fsnotify/fsnotify](https://github.com/fsnotify/fsnotify) from 1.4.9 to 1.5.0. - [Release notes](https://github.com/fsnotify/fsnotify/releases) - [Changelog](https://github.com/fsnotify/fsnotify/blob/master/CHANGELOG.md) - [Commits](fsnotify/fsnotify@v1.4.9...v1.5.0) --- updated-dependencies: - dependency-name: github.com/fsnotify/fsnotify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xin.Zh <[email protected]> Co-authored-by: AlexStocks <[email protected]> Co-authored-by: randy <[email protected]> * build(deps): bump github.com/emicklei/go-restful/v3 from 3.4.0 to 3.5.2 (#1403) Bumps [github.com/emicklei/go-restful/v3](https://github.com/emicklei/go-restful) from 3.4.0 to 3.5.2. - [Release notes](https://github.com/emicklei/go-restful/releases) - [Changelog](https://github.com/emicklei/go-restful/blob/v3/CHANGES.md) - [Commits](emicklei/go-restful@v3.4.0...v3.5.2) --- updated-dependencies: - dependency-name: github.com/emicklei/go-restful/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 更新TCP读写超时最小值命名;不再使用范围比较; * del protoc-gen-dubbo3 & protoc-gen-dubbo (#1313) Co-authored-by: Mulavar <[email protected]> Co-authored-by: XavierNiu <[email protected]> Co-authored-by: 氕氘氚 <[email protected]> Co-authored-by: EnableAsync <[email protected]> Co-authored-by: XX <[email protected]> Co-authored-by: 董振兴 <[email protected]> Co-authored-by: WilliamLeaves <[email protected]> Co-authored-by: yexiaobo <[email protected]> Co-authored-by: ChangedenChan <[email protected]> Co-authored-by: Changeden <[email protected]> Co-authored-by: YuDong Tang <[email protected]> Co-authored-by: alchemy-lee <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Xin.Zh <[email protected]> Co-authored-by: AlexStocks <[email protected]> Co-authored-by: randy <[email protected]> Co-authored-by: dongjianhui03 <[email protected]> Co-authored-by: gaoxinge <[email protected]> Co-authored-by: wangxw666 <[email protected]> Co-authored-by: zhaoyunxing <[email protected]> Co-authored-by: Joe Zou <[email protected]>
1 parent 1bfface commit 8ef173e

File tree

245 files changed

+3909
-3871
lines changed

Some content is hidden

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

245 files changed

+3909
-3871
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- Thanks for sending a pull request!
2-
Read https://github.com/apache/dubbo-go/blob/master/contributing.md before commit pull request.
2+
Read https://github.com/apache/dubbo-go/blob/master/CONTRIBUTING.md before commit pull request.
33
-->
44

55
**What this PR does**:

‎.github/dependabot.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ updates:
99
directory: "/" # Location of package manifests
1010
schedule:
1111
interval: "weekly"
12-
target-branch: "develop"
12+
target-branch: "3.0"
1313

1414
- package-ecosystem: "github-actions"
1515
# Workflow files stored in the
1616
# default location of `.github/workflows`
1717
directory: "/"
1818
schedule:
1919
interval: "weekly"
20-
target-branch: "develop"
20+
target-branch: "3.0"

‎.github/workflows/github-actions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
push:
5-
branches: [master, develop]
5+
branches: [master, develop, "1.5", "3.0"]
66
pull_request:
77
branches: "*"
88

@@ -59,7 +59,7 @@ jobs:
5959
# diff -u <(echo -n) <(gofmt -d -s .)
6060
6161
- name: Install go ci lint
62-
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.27.0
62+
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.41.1
6363

6464
- name: Run Linter
6565
run: golangci-lint run --timeout=10m -v

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*.so
66
*.dylib
77
*.jar
8+
*.log
89

910
# Test binary, build with `go test -c`
1011
*.test

‎README.md

+5
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@ If you are using [apache/dubbo-go](https://github.com/apache/dubbo-go) and think
151151
<img width="222px" src="https://gw.alicdn.com/tfs/TB1HPATMrrpK1RjSZTEXXcWAVXa-260-74.png">
152152
</a>
153153
</td>
154+
<td align="center" valign="middle">
155+
<a href="https://www.autohome.com.cn" target="_blank">
156+
<img width="222px" src="https://avatars.githubusercontent.com/u/18279051?s=200&v=4">
157+
</a>
158+
</td>
154159
</tr>
155160
<tr></tr>
156161
</tbody>

‎README_CN.md

+5
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,11 @@ go get dubbo.apache.org/dubbo-go/v3
150150
<img width="222px" src="https://gw.alicdn.com/tfs/TB1HPATMrrpK1RjSZTEXXcWAVXa-260-74.png">
151151
</a>
152152
</td>
153+
<td align="center" valign="middle">
154+
<a href="https://www.autohome.com.cn" target="_blank">
155+
<img width="222px" src="https://avatars.githubusercontent.com/u/18279051?s=200&v=4">
156+
</a>
157+
</td>
153158
</tr>
154159
<tr></tr>
155160
</tbody>

‎cluster/cluster_impl/available_cluster_invoker_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
import (
2828
"github.com/golang/mock/gomock"
29+
2930
"github.com/stretchr/testify/assert"
3031
)
3132

‎cluster/cluster_impl/base_cluster_invoker.go

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package cluster_impl
1919

2020
import (
2121
perrors "github.com/pkg/errors"
22+
2223
"go.uber.org/atomic"
2324
)
2425

‎cluster/cluster_impl/broadcast_cluster_invoker_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
import (
2828
"github.com/golang/mock/gomock"
29+
2930
"github.com/stretchr/testify/assert"
3031
)
3132

‎cluster/cluster_impl/failback_cluster_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ import (
2727

2828
import (
2929
"github.com/golang/mock/gomock"
30+
3031
perrors "github.com/pkg/errors"
32+
3133
"github.com/stretchr/testify/assert"
3234
)
3335

‎cluster/cluster_impl/failfast_cluster_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ import (
2525

2626
import (
2727
"github.com/golang/mock/gomock"
28+
2829
perrors "github.com/pkg/errors"
30+
2931
"github.com/stretchr/testify/assert"
3032
)
3133

‎cluster/cluster_impl/failover_cluster_test.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
import (
2828
perrors "github.com/pkg/errors"
29+
2930
"github.com/stretchr/testify/assert"
3031
)
3132

@@ -40,10 +41,6 @@ import (
4041
"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
4142
)
4243

43-
// ///////////////////////////
44-
// mock invoker
45-
// ///////////////////////////
46-
4744
// nolint
4845
type MockInvoker struct {
4946
url *common.URL

‎cluster/cluster_impl/failsafe_cluster_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ import (
2525

2626
import (
2727
"github.com/golang/mock/gomock"
28+
2829
perrors "github.com/pkg/errors"
30+
2931
"github.com/stretchr/testify/assert"
3032
)
3133

‎cluster/cluster_impl/forking_cluster_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828

2929
import (
3030
"github.com/golang/mock/gomock"
31+
3132
"github.com/stretchr/testify/assert"
3233
)
3334

‎cluster/cluster_impl/zone_aware_cluster_invoker_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525

2626
import (
2727
"github.com/golang/mock/gomock"
28+
2829
"github.com/stretchr/testify/assert"
2930
)
3031

‎cluster/router/chain/chain.go

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
import (
2626
perrors "github.com/pkg/errors"
27+
2728
"go.uber.org/atomic"
2829
)
2930

‎cluster/router/v3router/judger/attachment_match_judger_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"testing"
2322
)
2423

@@ -27,6 +26,7 @@ import (
2726
)
2827

2928
import (
29+
"dubbo.apache.org/dubbo-go/v3/config"
3030
"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
3131
)
3232

‎cluster/router/v3router/judger/bool_match_judger_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"testing"
2322
)
2423

2524
import (
2625
"github.com/stretchr/testify/assert"
2726
)
2827

28+
import (
29+
"dubbo.apache.org/dubbo-go/v3/config"
30+
)
31+
2932
func TestBoolMatchJudger(t *testing.T) {
3033
assert.True(t, newBoolMatchJudger(&config.BoolMatch{
3134
Exact: true,

‎cluster/router/v3router/judger/double_match_judger_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"testing"
2322
)
2423

2524
import (
2625
"github.com/stretchr/testify/assert"
2726
)
2827

28+
import (
29+
"dubbo.apache.org/dubbo-go/v3/config"
30+
)
31+
2932
func TestDoubleMatchJudger(t *testing.T) {
3033
assert.True(t, newDoubleMatchJudger(&config.DoubleMatch{
3134
Exact: 3.14159,

‎cluster/router/v3router/judger/double_range_match_judger_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"testing"
2322
)
2423

2524
import (
2625
"github.com/stretchr/testify/assert"
2726
)
2827

28+
import (
29+
"dubbo.apache.org/dubbo-go/v3/config"
30+
)
31+
2932
func TestDoubleRangeMatchJudger(t *testing.T) {
3033
assert.True(t, newDoubleRangeMatchJudger(&config.DoubleRangeMatch{
3134
Start: 1.0,

‎cluster/router/v3router/judger/list_double_match_judger_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"testing"
2322
)
2423

2524
import (
2625
"github.com/stretchr/testify/assert"
2726
)
2827

28+
import (
29+
"dubbo.apache.org/dubbo-go/v3/config"
30+
)
31+
2932
func TestListDoubleMatchJudger_Judge(t *testing.T) {
3033
assert.True(t, newListDoubleMatchJudger(&config.ListDoubleMatch{
3134
Oneof: []*config.DoubleMatch{

‎cluster/router/v3router/judger/list_string_match_judger_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"testing"
2322
)
2423

2524
import (
2625
"github.com/stretchr/testify/assert"
2726
)
2827

28+
import (
29+
"dubbo.apache.org/dubbo-go/v3/config"
30+
)
31+
2932
func TestListStringMatchJudger(t *testing.T) {
3033
assert.True(t, newListStringMatchJudger(&config.ListStringMatch{
3134
Oneof: []*config.StringMatch{{Exact: "abd"}},

‎cluster/router/v3router/judger/method_match_judger_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"reflect"
2322
"testing"
2423
)
@@ -28,6 +27,7 @@ import (
2827
)
2928

3029
import (
30+
"dubbo.apache.org/dubbo-go/v3/config"
3131
"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
3232
)
3333

‎cluster/router/v3router/judger/string_match_judger.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,14 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"regexp"
2322
"strings"
2423
)
2524

25+
import (
26+
"dubbo.apache.org/dubbo-go/v3/config"
27+
)
28+
2629
// nolint
2730
type StringMatchJudger struct {
2831
config.StringMatch

‎cluster/router/v3router/judger/string_match_judger_test.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
package judger
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"testing"
2322
)
2423

2524
import (
2625
"github.com/stretchr/testify/assert"
2726
)
2827

28+
import (
29+
"dubbo.apache.org/dubbo-go/v3/config"
30+
)
31+
2932
func TestNewStringMatchJudger(t *testing.T) {
3033
assert.True(t, NewStringMatchJudger(&config.StringMatch{
3134
Exact: "abc",

‎cluster/router/v3router/k8s_api/listener_handler_impl.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@
1818
package k8s_api
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
metav "k8s.io/apimachinery/pkg/apis/meta/v1"
2322
"k8s.io/apimachinery/pkg/runtime"
2423
"k8s.io/apimachinery/pkg/watch"
24+
2525
"k8s.io/client-go/kubernetes/scheme"
26+
2627
"k8s.io/client-go/rest"
2728
)
2829

2930
import (
3031
"dubbo.apache.org/dubbo-go/v3/cluster/router/v3router/k8s_crd"
32+
"dubbo.apache.org/dubbo-go/v3/config"
3133
"dubbo.apache.org/dubbo-go/v3/config_center"
3234
"dubbo.apache.org/dubbo-go/v3/remoting"
3335
)

‎cluster/router/v3router/k8s_crd/client.go

+3
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ import (
2929
"k8s.io/apimachinery/pkg/runtime/serializer"
3030
"k8s.io/apimachinery/pkg/util/wait"
3131
"k8s.io/apimachinery/pkg/watch"
32+
3233
"k8s.io/client-go/kubernetes/scheme"
34+
3335
"k8s.io/client-go/rest"
36+
3437
"k8s.io/client-go/tools/cache"
3538
)
3639

‎cluster/router/v3router/k8s_crd/listener_handler.go

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/apimachinery/pkg/runtime"
2323
"k8s.io/apimachinery/pkg/watch"
24+
2425
"k8s.io/client-go/rest"
2526
)
2627

‎cluster/router/v3router/router_chain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package v3router
1919

2020
import (
21-
"dubbo.apache.org/dubbo-go/v3/config"
2221
"encoding/json"
2322
"io"
2423
"strings"
@@ -33,6 +32,7 @@ import (
3332
"dubbo.apache.org/dubbo-go/v3/cluster/router/v3router/k8s_api"
3433
"dubbo.apache.org/dubbo-go/v3/common"
3534
"dubbo.apache.org/dubbo-go/v3/common/logger"
35+
"dubbo.apache.org/dubbo-go/v3/config"
3636
"dubbo.apache.org/dubbo-go/v3/config_center"
3737
"dubbo.apache.org/dubbo-go/v3/protocol"
3838
"dubbo.apache.org/dubbo-go/v3/remoting"

0 commit comments

Comments
 (0)