Skip to content

Commit

Permalink
merge 3.0 to ensure samples runnable (#1414)
Browse files Browse the repository at this point in the history
* 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: 董振兴 <dongzhenxing@xiaomi.com>

* 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 <yexiaobo@luojilab.com>
Co-authored-by: LaurenceLiZhixin <382673304@qq.com>

* 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 <chenzhiduan@unizone.tech>

* 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] <support@github.com>

* 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 <dragoncharlie@foxmail.com>
Co-authored-by: AlexStocks <alexstocks@foxmail.com>
Co-authored-by: randy <ztelur@gmail.com>

* 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 <dongjianhui03@meituan.com>

* 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] <support@github.com>

* 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 <dragoncharlie@foxmail.com>
Co-authored-by: AlexStocks <alexstocks@foxmail.com>
Co-authored-by: randy <ztelur@gmail.com>

* 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] <support@github.com>

* 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 <dragoncharlie@foxmail.com>
Co-authored-by: AlexStocks <alexstocks@foxmail.com>
Co-authored-by: randy <ztelur@gmail.com>

* 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] <support@github.com>

* 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] <support@github.com>

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] <support@github.com>

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] <support@github.com>

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] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Xin.Zh <dragoncharlie@foxmail.com>
Co-authored-by: AlexStocks <alexstocks@foxmail.com>
Co-authored-by: randy <ztelur@gmail.com>

* 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] <support@github.com>

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 <978007503@qq.com>
Co-authored-by: XavierNiu <a@nxw.name>
Co-authored-by: 氕氘氚 <cjp_ca@163.com>
Co-authored-by: EnableAsync <43645467+EnableAsync@users.noreply.github.com>
Co-authored-by: XX <45752021+Threadalive@users.noreply.github.com>
Co-authored-by: 董振兴 <dongzhenxing@xiaomi.com>
Co-authored-by: WilliamLeaves <williamtheleaves@gmail.com>
Co-authored-by: yexiaobo <yexiaobo@luojilab.com>
Co-authored-by: ChangedenChan <changeden520@gmail.com>
Co-authored-by: Changeden <chenzhiduan@unizone.tech>
Co-authored-by: YuDong Tang <583125614@qq.com>
Co-authored-by: alchemy-lee <2769566951@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Xin.Zh <dragoncharlie@foxmail.com>
Co-authored-by: AlexStocks <alexstocks@foxmail.com>
Co-authored-by: randy <ztelur@gmail.com>
Co-authored-by: dongjianhui03 <dongjianhui03@meituan.com>
Co-authored-by: gaoxinge <xg.gao@tianrang-inc.com>
Co-authored-by: wangxw666 <2484713618@qq.com>
Co-authored-by: zhaoyunxing <2385585770@qq.com>
Co-authored-by: Joe Zou <joezou@apache.org>
  • Loading branch information
22 people authored Aug 26, 2021
1 parent 1bfface commit 8ef173e
Show file tree
Hide file tree
Showing 245 changed files with 3,909 additions and 3,871 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- Thanks for sending a pull request!
Read https://github.com/apache/dubbo-go/blob/master/contributing.md before commit pull request.
Read https://github.com/apache/dubbo-go/blob/master/CONTRIBUTING.md before commit pull request.
-->

**What this PR does**:
Expand Down
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ updates:
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
target-branch: "develop"
target-branch: "3.0"

- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "weekly"
target-branch: "develop"
target-branch: "3.0"
4 changes: 2 additions & 2 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
push:
branches: [master, develop]
branches: [master, develop, "1.5", "3.0"]
pull_request:
branches: "*"

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

- name: Run Linter
run: golangci-lint run --timeout=10m -v
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*.so
*.dylib
*.jar
*.log

# Test binary, build with `go test -c`
*.test
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,11 @@ If you are using [apache/dubbo-go](https://github.com/apache/dubbo-go) and think
<img width="222px" src="https://gw.alicdn.com/tfs/TB1HPATMrrpK1RjSZTEXXcWAVXa-260-74.png">
</a>
</td>
<td align="center" valign="middle">
<a href="https://www.autohome.com.cn" target="_blank">
<img width="222px" src="https://avatars.githubusercontent.com/u/18279051?s=200&v=4">
</a>
</td>
</tr>
<tr></tr>
</tbody>
Expand Down
5 changes: 5 additions & 0 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ go get dubbo.apache.org/dubbo-go/v3
<img width="222px" src="https://gw.alicdn.com/tfs/TB1HPATMrrpK1RjSZTEXXcWAVXa-260-74.png">
</a>
</td>
<td align="center" valign="middle">
<a href="https://www.autohome.com.cn" target="_blank">
<img width="222px" src="https://avatars.githubusercontent.com/u/18279051?s=200&v=4">
</a>
</td>
</tr>
<tr></tr>
</tbody>
Expand Down
1 change: 1 addition & 0 deletions cluster/cluster_impl/available_cluster_invoker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

import (
"github.com/golang/mock/gomock"

"github.com/stretchr/testify/assert"
)

Expand Down
1 change: 1 addition & 0 deletions cluster/cluster_impl/base_cluster_invoker.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package cluster_impl

import (
perrors "github.com/pkg/errors"

"go.uber.org/atomic"
)

Expand Down
1 change: 1 addition & 0 deletions cluster/cluster_impl/broadcast_cluster_invoker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

import (
"github.com/golang/mock/gomock"

"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 2 additions & 0 deletions cluster/cluster_impl/failback_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ import (

import (
"github.com/golang/mock/gomock"

perrors "github.com/pkg/errors"

"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 2 additions & 0 deletions cluster/cluster_impl/failfast_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (

import (
"github.com/golang/mock/gomock"

perrors "github.com/pkg/errors"

"github.com/stretchr/testify/assert"
)

Expand Down
5 changes: 1 addition & 4 deletions cluster/cluster_impl/failover_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (

import (
perrors "github.com/pkg/errors"

"github.com/stretchr/testify/assert"
)

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

// ///////////////////////////
// mock invoker
// ///////////////////////////

// nolint
type MockInvoker struct {
url *common.URL
Expand Down
2 changes: 2 additions & 0 deletions cluster/cluster_impl/failsafe_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (

import (
"github.com/golang/mock/gomock"

perrors "github.com/pkg/errors"

"github.com/stretchr/testify/assert"
)

Expand Down
1 change: 1 addition & 0 deletions cluster/cluster_impl/forking_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (

import (
"github.com/golang/mock/gomock"

"github.com/stretchr/testify/assert"
)

Expand Down
1 change: 1 addition & 0 deletions cluster/cluster_impl/zone_aware_cluster_invoker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

import (
"github.com/golang/mock/gomock"

"github.com/stretchr/testify/assert"
)

Expand Down
1 change: 1 addition & 0 deletions cluster/router/chain/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

import (
perrors "github.com/pkg/errors"

"go.uber.org/atomic"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"testing"
)

Expand All @@ -27,6 +26,7 @@ import (
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
)

Expand Down
5 changes: 4 additions & 1 deletion cluster/router/v3router/judger/bool_match_judger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"testing"
)

import (
"github.com/stretchr/testify/assert"
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
)

func TestBoolMatchJudger(t *testing.T) {
assert.True(t, newBoolMatchJudger(&config.BoolMatch{
Exact: true,
Expand Down
5 changes: 4 additions & 1 deletion cluster/router/v3router/judger/double_match_judger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"testing"
)

import (
"github.com/stretchr/testify/assert"
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
)

func TestDoubleMatchJudger(t *testing.T) {
assert.True(t, newDoubleMatchJudger(&config.DoubleMatch{
Exact: 3.14159,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"testing"
)

import (
"github.com/stretchr/testify/assert"
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
)

func TestDoubleRangeMatchJudger(t *testing.T) {
assert.True(t, newDoubleRangeMatchJudger(&config.DoubleRangeMatch{
Start: 1.0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"testing"
)

import (
"github.com/stretchr/testify/assert"
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
)

func TestListDoubleMatchJudger_Judge(t *testing.T) {
assert.True(t, newListDoubleMatchJudger(&config.ListDoubleMatch{
Oneof: []*config.DoubleMatch{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"testing"
)

import (
"github.com/stretchr/testify/assert"
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
)

func TestListStringMatchJudger(t *testing.T) {
assert.True(t, newListStringMatchJudger(&config.ListStringMatch{
Oneof: []*config.StringMatch{{Exact: "abd"}},
Expand Down
2 changes: 1 addition & 1 deletion cluster/router/v3router/judger/method_match_judger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"reflect"
"testing"
)
Expand All @@ -28,6 +27,7 @@ import (
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
)

Expand Down
5 changes: 4 additions & 1 deletion cluster/router/v3router/judger/string_match_judger.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"regexp"
"strings"
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
)

// nolint
type StringMatchJudger struct {
config.StringMatch
Expand Down
5 changes: 4 additions & 1 deletion cluster/router/v3router/judger/string_match_judger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@
package judger

import (
"dubbo.apache.org/dubbo-go/v3/config"
"testing"
)

import (
"github.com/stretchr/testify/assert"
)

import (
"dubbo.apache.org/dubbo-go/v3/config"
)

func TestNewStringMatchJudger(t *testing.T) {
assert.True(t, NewStringMatchJudger(&config.StringMatch{
Exact: "abc",
Expand Down
4 changes: 3 additions & 1 deletion cluster/router/v3router/k8s_api/listener_handler_impl.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,18 @@
package k8s_api

import (
"dubbo.apache.org/dubbo-go/v3/config"
metav "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"

"k8s.io/client-go/kubernetes/scheme"

"k8s.io/client-go/rest"
)

import (
"dubbo.apache.org/dubbo-go/v3/cluster/router/v3router/k8s_crd"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/config_center"
"dubbo.apache.org/dubbo-go/v3/remoting"
)
Expand Down
3 changes: 3 additions & 0 deletions cluster/router/v3router/k8s_crd/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch"

"k8s.io/client-go/kubernetes/scheme"

"k8s.io/client-go/rest"

"k8s.io/client-go/tools/cache"
)

Expand Down
1 change: 1 addition & 0 deletions cluster/router/v3router/k8s_crd/listener_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"

"k8s.io/client-go/rest"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster/router/v3router/router_chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package v3router

import (
"dubbo.apache.org/dubbo-go/v3/config"
"encoding/json"
"io"
"strings"
Expand All @@ -33,6 +32,7 @@ import (
"dubbo.apache.org/dubbo-go/v3/cluster/router/v3router/k8s_api"
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/config_center"
"dubbo.apache.org/dubbo-go/v3/protocol"
"dubbo.apache.org/dubbo-go/v3/remoting"
Expand Down
Loading

0 comments on commit 8ef173e

Please sign in to comment.