fix some get config bug

nacos-group · Dec 13, 2023 · 97c9c22 · 97c9c22
1 parent 5449978
commit 97c9c22
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/clients/config_client/config_client.go b/clients/config_client/config_client.go
@@ -258,8 +258,8 @@ func (client *ConfigClient) getConfigInner(param vo.ConfigParam) (content, encry
 	if response != nil && response.Response != nil && !response.IsSuccess() {
 		return response.Content, response.EncryptedDataKey, errors.New(response.GetMessage())
 	}
-	param.EncryptedDataKey = response.EncryptedDataKey
-	param.Content = response.Content
+	encryptedDataKey = response.EncryptedDataKey
+	content = response.Content
 	return content, encryptedDataKey, nil
 }
 

diff --git a/clients/config_client/config_client_test.go b/clients/config_client/config_client_test.go
@@ -67,7 +67,7 @@ func (m *MockConfigProxy) queryConfig(dataId, group, tenant string, timeout uint
 	if IsLimited(cacheKey) {
 		return nil, errors.New("request is limited")
 	}
-	return &rpc_response.ConfigQueryResponse{Content: "hello world"}, nil
+	return &rpc_response.ConfigQueryResponse{Content: "hello world", Response: &rpc_response.Response{Success: true}}, nil
 }
 func (m *MockConfigProxy) searchConfigProxy(param vo.SearchConfigParam, tenant, accessKey, secretKey string) (*model.ConfigPage, error) {
 	return &model.ConfigPage{TotalCount: 1}, nil
@@ -94,7 +94,7 @@ func Test_GetConfig(t *testing.T) {
 
 	content, err := client.GetConfig(vo.ConfigParam{
 		DataId: localConfigTest.DataId,
-		Group:  "group"})
+		Group:  localConfigTest.Group})
 
 	assert.Nil(t, err)
 	assert.Equal(t, "hello world", content)

diff --git a/vo/config_param_test.go b/vo/config_param_test.go
@@ -23,18 +23,10 @@ import (
 
 func TestConfigParamDeepCopy(t *testing.T) {
 	param := &ConfigParam{
-		DataId:           "dataId",
-		Group:            "",
-		Content:          "common content",
-		Tag:              "",
-		AppName:          "",
-		BetaIps:          "",
-		CasMd5:           "",
-		Type:             "",
-		SrcUser:          "",
-		EncryptedDataKey: "",
-		KmsKeyId:         "",
-		UsageType:        RequestType,
+		DataId:    "dataId",
+		Group:     "",
+		Content:   "common content",
+		UsageType: RequestType,
 		OnChange: func(namespace, group, dataId, data string) {
 			//do nothing
 		},
@@ -43,5 +35,6 @@ func TestConfigParamDeepCopy(t *testing.T) {
 
 	assert.Equal(t, param.DataId, paramDeepCopied.DataId)
 	assert.Equal(t, param.Content, paramDeepCopied.Content)
+	assert.NotEqual(t, param.OnChange, paramDeepCopied.OnChange)
 	assert.NotEqual(t, &param, &paramDeepCopied)
 }