You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/12/11 09:26:20 UTC
[dubbo-go] branch 1.5 updated: support nacos ContextPath (#1655)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch 1.5
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/1.5 by this push:
new 9b86b2d support nacos ContextPath (#1655)
9b86b2d is described below
commit 9b86b2da99a5a520ee4e4f54f3a2b1ab9f6a23d2
Author: binbin.zhang <bb...@163.com>
AuthorDate: Sat Dec 11 17:26:11 2021 +0800
support nacos ContextPath (#1655)
---
remoting/nacos/builder.go | 13 ++++++++--
remoting/nacos/builder_test.go | 58 +++++++++++++++++++++++++++---------------
2 files changed, 49 insertions(+), 22 deletions(-)
diff --git a/remoting/nacos/builder.go b/remoting/nacos/builder.go
index f0681b7..53f4286 100644
--- a/remoting/nacos/builder.go
+++ b/remoting/nacos/builder.go
@@ -64,8 +64,17 @@ func GetNacosConfig(url *common.URL) ([]nacosConstant.ServerConfig, nacosConstan
return []nacosConstant.ServerConfig{}, nacosConstant.ClientConfig{},
perrors.WithMessagef(err, "split [%s] ", addr)
}
- port, _ := strconv.Atoi(portStr)
- serverConfigs = append(serverConfigs, nacosConstant.ServerConfig{IpAddr: ip, Port: uint64(port)})
+ portContextPath := strings.Split(portStr, constant.PATH_SEPARATOR)
+ port, err := strconv.Atoi(portContextPath[0])
+ if err != nil {
+ return []nacosConstant.ServerConfig{}, nacosConstant.ClientConfig{},
+ perrors.WithMessagef(err, "port [%s] ", portContextPath[0])
+ }
+ var contextPath string
+ if len(portContextPath) > 1 {
+ contextPath = constant.PATH_SEPARATOR + strings.Join(portContextPath[1:], constant.PATH_SEPARATOR)
+ }
+ serverConfigs = append(serverConfigs, nacosConstant.ServerConfig{IpAddr: ip, Port: uint64(port), ContextPath: contextPath})
}
timeout := url.GetParamDuration(constant.CONFIG_TIMEOUT_KEY, constant.DEFAULT_REG_TIMEOUT)
diff --git a/remoting/nacos/builder_test.go b/remoting/nacos/builder_test.go
index 66892e0..d809d09 100644
--- a/remoting/nacos/builder_test.go
+++ b/remoting/nacos/builder_test.go
@@ -34,26 +34,44 @@ import (
)
func TestNewNacosClient(t *testing.T) {
- rc := &config.RemoteConfig{}
- rc.Protocol = "nacos"
- rc.Username = "nacos"
- client, err := NewNacosClient(rc)
-
- // address is nil
- assert.Nil(t, client)
- assert.NotNil(t, err)
-
- rc.Address = "console.nacos.io:80:123"
- client, err = NewNacosClient(rc)
- // invalid address
- assert.Nil(t, client)
- assert.NotNil(t, err)
-
- rc.Address = "console.nacos.io:80"
- rc.TimeoutStr = "10s"
- client, err = NewNacosClient(rc)
- assert.NotNil(t, client)
- assert.Nil(t, err)
+ t.Run("AddressIsNil", func(t *testing.T) {
+ rc := &config.RemoteConfig{}
+ rc.Protocol = "nacos"
+ rc.Username = "nacos"
+ client, err := NewNacosClient(rc)
+
+ // address is nil
+ assert.Nil(t, client)
+ assert.NotNil(t, err)
+ })
+
+ t.Run("InvalidAddress", func(t *testing.T) {
+ rc := &config.RemoteConfig{}
+ rc.Address = "console.nacos.io:80:123"
+ client, err := NewNacosClient(rc)
+ // invalid address
+ assert.Nil(t, client)
+ assert.NotNil(t, err)
+ })
+
+ t.Run("Normal", func(t *testing.T) {
+ rc := &config.RemoteConfig{}
+ rc.Address = "console.nacos.io:80"
+ rc.Protocol = "nacos"
+ rc.TimeoutStr = "10s"
+ client, err := NewNacosClient(rc)
+ assert.NotNil(t, client)
+ assert.Nil(t, err)
+ })
+
+ t.Run("NormalHasContextPath", func(t *testing.T) {
+ rc := &config.RemoteConfig{}
+ rc.Address = "console.nacos.io:80/nacos"
+ rc.Protocol = "nacos"
+ client, err := NewNacosClient(rc)
+ assert.NotNil(t, client)
+ assert.Nil(t, err)
+ })
}
func TestGetNacosConfig(t *testing.T) {