up:修改配置操作

config_center/nacos/client_test.go

@@ -18,7 +18,6 @@
 package nacos
 
 import (
-	"strings"
 	"testing"
 	"time"
 )
@@ -32,9 +31,10 @@ import (
 )
 
 func TestNewNacosClient(t *testing.T) {
-	server := mockCommonNacosServer()
-	nacosURL := strings.ReplaceAll(server.URL, "http", "registry")
+
+	nacosURL := "registry://127.0.0.1:8848"
 	registryUrl, _ := common.NewURL(nacosURL)
+
 	c := &nacosDynamicConfiguration{
 		url:  registryUrl,
 		done: make(chan struct{}),
@@ -55,9 +55,9 @@ func TestNewNacosClient(t *testing.T) {
 }
 
 func TestSetNacosClient(t *testing.T) {
-	server := mockCommonNacosServer()
-	nacosURL := "registry://" + server.Listener.Addr().String()
+	nacosURL := "registry://127.0.0.1:8848"
 	registryUrl, _ := common.NewURL(nacosURL)
+
 	c := &nacosDynamicConfiguration{
 		url:  registryUrl,
 		done: make(chan struct{}),

config_center/nacos/impl.go

@@ -215,11 +215,7 @@ func (n *nacosDynamicConfiguration) IsAvailable() bool {
 }
 
 func (n *nacosDynamicConfiguration) closeConfigs() {
-	n.cltLock.Lock()
-	client := n.client
-	n.client = nil
-	n.cltLock.Unlock()
 	// Close the old configClient first to close the tmp node
-	client.Close()
+	n.client.Close()
 	logger.Infof("begin to close provider n configClient")
 }

config_center/nacos/impl_test.go

@@ -18,10 +18,6 @@
 package nacos
 
 import (
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"strings"
 	"sync"
 	"testing"
 	"time"
@@ -37,104 +33,46 @@ import (
 	"dubbo.apache.org/dubbo-go/v3/config_center/parser"
 )
 
-// run mock config server
-func runMockConfigServer(configHandler func(http.ResponseWriter, *http.Request),
-	configListenHandler func(http.ResponseWriter, *http.Request)) *httptest.Server {
-	uriHandlerMap := make(map[string]func(http.ResponseWriter, *http.Request))
-
-	uriHandlerMap["/nacos/v1/cs/configs"] = configHandler
-	uriHandlerMap["/nacos/v1/cs/configs/listener"] = configListenHandler
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		uri := r.RequestURI
-		for path, handler := range uriHandlerMap {
-			if uri == path {
-				handler(w, r)
-				break
-			}
-		}
-	}))
-
-	return ts
-}
-
-func mockCommonNacosServer() *httptest.Server {
-	return runMockConfigServer(func(writer http.ResponseWriter, _ *http.Request) {
-		data := "true"
-		fmt.Fprintf(writer, "%s", data)
-	}, func(writer http.ResponseWriter, _ *http.Request) {
-		data := `dubbo.properties%02dubbo%02dubbo.service.com.ikurento.user.UserProvider.cluster=failback`
-		fmt.Fprintf(writer, "%s", data)
-	})
+func getNacosConfig(t *testing.T) config_center.DynamicConfiguration {
+	registryUrl, err := common.NewURL("registry://console.nacos.io:80")
+	assert.Nil(t, err)
+	nacosConfig, err := newNacosDynamicConfiguration(registryUrl)
+	assert.Nil(t, err)
+	return nacosConfig
 }
 
-func initNacosData(t *testing.T) (*nacosDynamicConfiguration, error) {
-	server := mockCommonNacosServer()
-	nacosURL := strings.ReplaceAll(server.URL, "http", "registry")
-	regurl, _ := common.NewURL(nacosURL)
-	factory := &nacosDynamicConfigurationFactory{}
-	nacosConfiguration, err := factory.GetDynamicConfiguration(regurl)
-	assert.NoError(t, err)
-
-	nacosConfiguration.SetParser(&parser.DefaultConfigurationParser{})
-
-	return nacosConfiguration.(*nacosDynamicConfiguration), err
+func TestPublishConfig(t *testing.T) {
+	nacosConfig := getNacosConfig(t)
+	data := `dubbo.protocol.name=dubbo`
+	err := nacosConfig.PublishConfig("dubbo.properties", "dubbo-go", data)
+	assert.Nil(t, err)
 }
 
 func TestGetConfig(t *testing.T) {
-	nacos, err := initNacosData(t)
-	assert.NoError(t, err)
-	configs, err := nacos.GetProperties("dubbo.properties", config_center.WithGroup("dubbo"))
-	assert.Empty(t, configs)
-	assert.NoError(t, err)
-	_, err = nacos.Parser().Parse(configs)
-	assert.NoError(t, err)
-}
+	nacosConfig := getNacosConfig(t)
+	nacosConfig.SetParser(&parser.DefaultConfigurationParser{})
 
-func TestNacosDynamicConfiguration_GetConfigKeysByGroup(t *testing.T) {
-	data := `
-{
-    "PageItems": [
-        {
-            "dataId": "application"
-        }
-    ]
-}
-`
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		_, err := w.Write([]byte(data))
-		assert.Nil(t, err)
-	}))
-
-	nacosURL := strings.ReplaceAll(ts.URL, "http", "registry")
-	regurl, _ := common.NewURL(nacosURL)
-	nacosConfiguration, err := newNacosDynamicConfiguration(regurl)
+	config, err := nacosConfig.GetProperties("dubbo.properties", config_center.WithGroup("dubbo-go"))
+	assert.NotEmpty(t, config)
 	assert.NoError(t, err)
 
-	nacosConfiguration.SetParser(&parser.DefaultConfigurationParser{})
-
-	configs, err := nacosConfiguration.GetConfigKeysByGroup("dubbo")
-	assert.Nil(t, err)
-	assert.Equal(t, 1, configs.Size())
-	assert.True(t, configs.Contains("application"))
+	parse, err := nacosConfig.Parser().Parse(config)
+	assert.NoError(t, err)
+	assert.Equal(t, parse["dubbo.protocol.name"], "dubbo")
 }
 
-func TestNacosDynamicConfigurationPublishConfig(t *testing.T) {
-	nacos, err := initNacosData(t)
-	assert.Nil(t, err)
-	key := "myKey"
-	group := "/custom/a/b"
-	value := "MyValue"
-	err = nacos.PublishConfig(key, group, value)
-	assert.Nil(t, err)
+func TestGetConfigKeysByGroup(t *testing.T) {
+	nacosConfig := getNacosConfig(t)
+	config, err := nacosConfig.GetConfigKeysByGroup("dubbo-go")
+	assert.NoError(t, err)
+	assert.True(t, config.Contains("dubbo.properties"))
 }
 
 func TestAddListener(t *testing.T) {
-	nacos, err := initNacosData(t)
-	assert.NoError(t, err)
+	nacosConfig := getNacosConfig(t)
 	listener := &mockDataListener{}
 	time.Sleep(time.Second * 2)
-	nacos.AddListener("dubbo.properties", listener)
+	nacosConfig.AddListener("dubbo.properties", listener)
 }
 
 func TestRemoveListener(_ *testing.T) {