This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 23cb11a80 update nacos v1 (#2142)
23cb11a80 is described below
commit 23cb11a80e49ee649b18c3ea8bb6c6c88b638863
Author: binbin.zhang <[email protected]>
AuthorDate: Mon Nov 28 09:11:07 2022 +0800
update nacos v1 (#2142)
Co-authored-by: binbin <[email protected]>
---
config_center/nacos/impl.go | 4 ++--
config_center/nacos/impl_test.go | 4 ++--
config_center/nacos/listener.go | 4 ++--
go.mod | 4 ++--
go.sum | 8 +++++---
metadata/report/nacos/report.go | 2 +-
metadata/report/nacos/report_test.go | 4 ++--
registry/nacos/listener.go | 25 ++++++++++++++++++++-----
registry/nacos/registry.go | 2 +-
registry/nacos/registry_test.go | 4 ++--
registry/nacos/service_discovery.go | 6 +++---
registry/nacos/service_discovery_test.go | 4 ++--
registry/zookeeper/service_discovery_test.go | 4 ++--
remoting/nacos/builder.go | 2 +-
remoting/nacos/builder_test.go | 2 +-
15 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/config_center/nacos/impl.go b/config_center/nacos/impl.go
index f2151855e..1a4ffa8bb 100644
--- a/config_center/nacos/impl.go
+++ b/config_center/nacos/impl.go
@@ -27,8 +27,8 @@ import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
"github.com/dubbogo/gost/log/logger"
- constant2 "github.com/nacos-group/nacos-sdk-go/v2/common/constant"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ constant2 "github.com/nacos-group/nacos-sdk-go/common/constant"
+ "github.com/nacos-group/nacos-sdk-go/vo"
perrors "github.com/pkg/errors"
)
diff --git a/config_center/nacos/impl_test.go b/config_center/nacos/impl_test.go
index b2de57044..e3a542d16 100644
--- a/config_center/nacos/impl_test.go
+++ b/config_center/nacos/impl_test.go
@@ -29,8 +29,8 @@ import (
"github.com/golang/mock/gomock"
- "github.com/nacos-group/nacos-sdk-go/v2/model"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/model"
+ "github.com/nacos-group/nacos-sdk-go/vo"
)
import (
diff --git a/config_center/nacos/listener.go b/config_center/nacos/listener.go
index defcafe5b..ab335db64 100644
--- a/config_center/nacos/listener.go
+++ b/config_center/nacos/listener.go
@@ -24,8 +24,8 @@ import (
import (
"github.com/dubbogo/gost/log/logger"
- constant2 "github.com/nacos-group/nacos-sdk-go/v2/common/constant"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ constant2 "github.com/nacos-group/nacos-sdk-go/common/constant"
+ "github.com/nacos-group/nacos-sdk-go/vo"
)
import (
diff --git a/go.mod b/go.mod
index b732545c4..aa9a5df08 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1
github.com/creasty/defaults v1.5.2
github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5
- github.com/dubbogo/gost v1.13.1
+ github.com/dubbogo/gost v1.13.2
github.com/dubbogo/grpc-go v1.42.10
github.com/dubbogo/triple v1.2.1
github.com/emicklei/go-restful/v3 v3.10.1
@@ -36,7 +36,7 @@ require (
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/mapstructure v1.5.0
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
- github.com/nacos-group/nacos-sdk-go/v2 v2.1.2
+ github.com/nacos-group/nacos-sdk-go v1.1.3
github.com/natefinch/lumberjack v2.0.0+incompatible
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
github.com/opentracing/opentracing-go v1.2.0
diff --git a/go.sum b/go.sum
index 2c9e5efb1..e976e895f 100644
--- a/go.sum
+++ b/go.sum
@@ -176,8 +176,9 @@ github.com/dubbogo/go-zookeeper
v1.0.4-0.20211212162352-f9d2183d89d5/go.mod h1:f
github.com/dubbogo/gost v1.9.0/go.mod
h1:pPTjVyoJan3aPxBPNUX0ADkXjPibLo+/Ib0/fADXSG8=
github.com/dubbogo/gost v1.11.18/go.mod
h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI=
github.com/dubbogo/gost v1.12.6-0.20220824084206-300e27e9e524/go.mod
h1:0YHTGJtjHiYlWtVEkZnyrvhr7rR+23GczNaJrgc2v38=
-github.com/dubbogo/gost v1.13.1 h1:71EJIwV6ev0CxWqWPwcDcHhzEq1Q5pUmCkLcLCBaqvM=
github.com/dubbogo/gost v1.13.1/go.mod
h1:9HMXBv+WBMRWhF3SklpqDjkS/01AKWm2SrVdz/A0xJI=
+github.com/dubbogo/gost v1.13.2 h1:z4dczJ5KYu9CAbHWevzTVI/7a7vGQ1vECfmzKHacov0=
+github.com/dubbogo/gost v1.13.2/go.mod
h1:2vbZ7bo4PgR7stX1He5XBvQgP6wx4A7q7IFHZU3hVmE=
github.com/dubbogo/grpc-go v1.42.9/go.mod
h1:F1T9hnUvYGW4JLK1QNriavpOkhusU677ovPzLkk6zHM=
github.com/dubbogo/grpc-go v1.42.10
h1:CoyCdtqKJEar/3rPa6peZbDqYZ/mVsCqAxB6TfTSkhQ=
github.com/dubbogo/grpc-go v1.42.10/go.mod
h1:JMkPt1mIHL96GAFeYsMoMjew6f1ROKycikGzZQH1s5U=
@@ -232,6 +233,7 @@ github.com/ghodss/yaml v1.0.0/go.mod
h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME
github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod
h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
github.com/go-co-op/gocron v1.9.0
h1:+V+DDenw3ryB7B+tK1bAIC5p0ruw4oX9IqAsdRnGIf0=
github.com/go-co-op/gocron v1.9.0/go.mod
h1:DbJm9kdgr1sEvWpHCA7dFFs/PGHPMil9/97EXCRPr4k=
+github.com/go-errors/errors v1.0.1
h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
github.com/go-errors/errors v1.0.1/go.mod
h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod
h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod
h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -579,9 +581,9 @@ github.com/mschoch/smat v0.2.0
h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
github.com/mschoch/smat v0.2.0/go.mod
h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod
h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod
h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nacos-group/nacos-sdk-go v1.0.8
h1:8pEm05Cdav9sQgJSv5kyvlgfz0SzFUUGI3pWX6SiSnM=
github.com/nacos-group/nacos-sdk-go v1.0.8/go.mod
h1:hlAPn3UdzlxIlSILAyOXKxjFSvDJ9oLzTJ9hLAK1KzA=
-github.com/nacos-group/nacos-sdk-go/v2 v2.1.2
h1:A8GV6j0rw80I6tTKSav/pTpEgNECYXeFvZCsiLBWGnQ=
+github.com/nacos-group/nacos-sdk-go v1.1.3
h1:xNlSC9li2A11ifTA8HCqgM6NRImGUJA4X+gGK5muJuQ=
+github.com/nacos-group/nacos-sdk-go v1.1.3/go.mod
h1:cBv9wy5iObs7khOqov1ERFQrCuTR4ILpgaiaVMxEmGI=
github.com/nacos-group/nacos-sdk-go/v2 v2.1.2/go.mod
h1:ys/1adWeKXXzbNWfRNbaFlX/t6HVLWdpsNDvmoWTw0g=
github.com/natefinch/lumberjack v2.0.0+incompatible
h1:4QJd3OLAMgj7ph+yZTuX13Ld4UpgHp07nNdFX7mqFfM=
github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod
h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=
diff --git a/metadata/report/nacos/report.go b/metadata/report/nacos/report.go
index 874967b2a..655b57704 100644
--- a/metadata/report/nacos/report.go
+++ b/metadata/report/nacos/report.go
@@ -28,7 +28,7 @@ import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
"github.com/dubbogo/gost/log/logger"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/vo"
perrors "github.com/pkg/errors"
)
diff --git a/metadata/report/nacos/report_test.go
b/metadata/report/nacos/report_test.go
index 759a45661..cd6e0f51d 100644
--- a/metadata/report/nacos/report_test.go
+++ b/metadata/report/nacos/report_test.go
@@ -29,8 +29,8 @@ import (
"github.com/golang/mock/gomock"
- "github.com/nacos-group/nacos-sdk-go/v2/model"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/model"
+ "github.com/nacos-group/nacos-sdk-go/vo"
)
import (
diff --git a/registry/nacos/listener.go b/registry/nacos/listener.go
index a8e8f9655..230630e7d 100644
--- a/registry/nacos/listener.go
+++ b/registry/nacos/listener.go
@@ -30,8 +30,8 @@ import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
"github.com/dubbogo/gost/log/logger"
- "github.com/nacos-group/nacos-sdk-go/v2/model"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/model"
+ "github.com/nacos-group/nacos-sdk-go/vo"
perrors "github.com/pkg/errors"
)
@@ -48,7 +48,7 @@ var (
listenerCache sync.Map
)
-type callback func(services []model.Instance, err error)
+type callback func(services []model.SubscribeService, err error)
type nacosListener struct {
namingClient *nacosClient.NacosNamingClient
@@ -75,6 +75,21 @@ func NewNacosListener(url, regURL *common.URL, namingClient
*nacosClient.NacosNa
return listener, err
}
+func generateInstance(ss model.SubscribeService) model.Instance {
+ return model.Instance{
+ InstanceId: ss.InstanceId,
+ Ip: ss.Ip,
+ Port: ss.Port,
+ ServiceName: ss.ServiceName,
+ Valid: ss.Valid,
+ Enable: ss.Enable,
+ Weight: ss.Weight,
+ Metadata: ss.Metadata,
+ ClusterName: ss.ClusterName,
+ Healthy: ss.Healthy,
+ }
+}
+
func generateUrl(instance model.Instance) *common.URL {
if instance.Metadata == nil {
logger.Errorf("nacos instance metadata is empty,instance:%+v",
instance)
@@ -108,7 +123,7 @@ func generateUrl(instance model.Instance) *common.URL {
}
// Callback will be invoked when got subscribed events.
-func (nl *nacosListener) Callback(services []model.Instance, err error) {
+func (nl *nacosListener) Callback(services []model.SubscribeService, err
error) {
if err != nil {
logger.Errorf("nacos subscribe callback error:%s ,
subscribe:%+v ", err.Error(), nl.subscribeParam)
return
@@ -127,7 +142,7 @@ func (nl *nacosListener) Callback(services
[]model.Instance, err error) {
continue
}
host := services[i].Ip + ":" +
strconv.Itoa(int(services[i].Port))
- instance := services[i]
+ instance := generateInstance(services[i])
newInstanceMap[host] = instance
if old, ok := nl.instanceMap[host]; !ok && instance.Healthy {
// instance does not exist in cache, add it to cache
diff --git a/registry/nacos/registry.go b/registry/nacos/registry.go
index 5ee70107e..46da4bc66 100644
--- a/registry/nacos/registry.go
+++ b/registry/nacos/registry.go
@@ -28,7 +28,7 @@ import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
"github.com/dubbogo/gost/log/logger"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/vo"
perrors "github.com/pkg/errors"
)
diff --git a/registry/nacos/registry_test.go b/registry/nacos/registry_test.go
index cde18ebf6..df1331ded 100644
--- a/registry/nacos/registry_test.go
+++ b/registry/nacos/registry_test.go
@@ -29,8 +29,8 @@ import (
"github.com/golang/mock/gomock"
- "github.com/nacos-group/nacos-sdk-go/v2/model"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/model"
+ "github.com/nacos-group/nacos-sdk-go/vo"
)
import (
diff --git a/registry/nacos/service_discovery.go
b/registry/nacos/service_discovery.go
index 7f2f2cae3..313bb014d 100644
--- a/registry/nacos/service_discovery.go
+++ b/registry/nacos/service_discovery.go
@@ -28,8 +28,8 @@ import (
gxpage "github.com/dubbogo/gost/hash/page"
"github.com/dubbogo/gost/log/logger"
- "github.com/nacos-group/nacos-sdk-go/v2/model"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/model"
+ "github.com/nacos-group/nacos-sdk-go/vo"
perrors "github.com/pkg/errors"
)
@@ -246,7 +246,7 @@ func (n *nacosServiceDiscovery) AddListener(listener
registry.ServiceInstancesCh
err := n.namingClient.Client().Subscribe(&vo.SubscribeParam{
ServiceName: serviceName,
GroupName: n.group,
- SubscribeCallback: func(services []model.Instance, err
error) {
+ SubscribeCallback: func(services
[]model.SubscribeService, err error) {
if err != nil {
logger.Errorf("Could not handle the
subscribe notification because the err is not nil."+
" service name: %s, err: %v",
serviceName, err)
diff --git a/registry/nacos/service_discovery_test.go
b/registry/nacos/service_discovery_test.go
index f48f84492..7eb18a626 100644
--- a/registry/nacos/service_discovery_test.go
+++ b/registry/nacos/service_discovery_test.go
@@ -27,8 +27,8 @@ import (
import (
gxset "github.com/dubbogo/gost/container/set"
- "github.com/nacos-group/nacos-sdk-go/v2/model"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/model"
+ "github.com/nacos-group/nacos-sdk-go/vo"
perrors "github.com/pkg/errors"
diff --git a/registry/zookeeper/service_discovery_test.go
b/registry/zookeeper/service_discovery_test.go
index 00868b3c8..20e2e4659 100644
--- a/registry/zookeeper/service_discovery_test.go
+++ b/registry/zookeeper/service_discovery_test.go
@@ -24,8 +24,8 @@ import (
)
import (
- "github.com/nacos-group/nacos-sdk-go/v2/model"
- "github.com/nacos-group/nacos-sdk-go/v2/vo"
+ "github.com/nacos-group/nacos-sdk-go/model"
+ "github.com/nacos-group/nacos-sdk-go/vo"
"github.com/stretchr/testify/assert"
)
diff --git a/remoting/nacos/builder.go b/remoting/nacos/builder.go
index ff199227c..bc8ebccbd 100644
--- a/remoting/nacos/builder.go
+++ b/remoting/nacos/builder.go
@@ -28,7 +28,7 @@ import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
"github.com/dubbogo/gost/log/logger"
- nacosConstant "github.com/nacos-group/nacos-sdk-go/v2/common/constant"
+ nacosConstant "github.com/nacos-group/nacos-sdk-go/common/constant"
perrors "github.com/pkg/errors"
)
diff --git a/remoting/nacos/builder_test.go b/remoting/nacos/builder_test.go
index 54e058fd9..93f8568a8 100644
--- a/remoting/nacos/builder_test.go
+++ b/remoting/nacos/builder_test.go
@@ -29,7 +29,7 @@ import (
nacosClient "github.com/dubbogo/gost/database/kv/nacos"
- nacosConstant "github.com/nacos-group/nacos-sdk-go/v2common/constant"
+ nacosConstant "github.com/nacos-group/nacos-sdk-gocommon/constant"
"github.com/stretchr/testify/assert"
)
