fix: modify Options function

kitex-contrib · Jan 15, 2024 · ff3ae91 · ff3ae91
1 parent d1952cc
commit ff3ae91
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/client/suite.go b/client/suite.go
@@ -19,6 +19,7 @@ import (
 	"github.com/kitex-contrib/config-file/filewatcher"
 	"github.com/kitex-contrib/config-file/monitor"
 	"github.com/kitex-contrib/config-file/parser"
+
 )
 
 type FileConfigClientSuite struct {
@@ -42,6 +43,7 @@ func NewSuite(service, key string, watcher filewatcher.FileWatcher) *FileConfigC
 // Options return a list client.Option
 func (s *FileConfigClientSuite) Options() []kitexclient.Option {
 	s.watcher.SetManager(&parser.ClientFileManager{})
+	s.watcher.SetParser(&parser.Parser{})
 
 	opts := make([]kitexclient.Option, 0, 7)
 	opts = append(opts, WithRetryPolicy(s.watcher)...)

diff --git a/monitor/monitor.go b/monitor/monitor.go
@@ -22,6 +22,7 @@ import (
 	"github.com/cloudwego/kitex/pkg/klog"
 	"github.com/kitex-contrib/config-file/filewatcher"
 	"github.com/kitex-contrib/config-file/parser"
+
 )
 
 type ConfigMonitor interface {
@@ -33,6 +34,7 @@ type ConfigMonitor interface {
 	Stop()
 	SetManager(manager parser.ConfigManager)
 	SetParser(parser parser.ConfigParser)
+	ConfigParse(kind parser.ConfigType, data []byte, config interface{}) error
 	RegisterCallback(callback func()) int64
 	DeregisterCallback(uniqueID int64)
 }
@@ -112,6 +114,11 @@ func (c *configMonitor) SetParser(parser parser.ConfigParser) {
 	c.parser = parser
 }
 
+// ConfigParse call configMonitor.parser.Decode()
+func (c *configMonitor) ConfigParse(kind parser.ConfigType, data []byte, config interface{}) error {
+	return c.parser.Decode(kind, data, config)
+}
+
 // RegisterCallback add callback function, it will be called when file changed, return key for deregister
 func (c *configMonitor) RegisterCallback(callback func()) int64 {
 	c.lock.Lock()

diff --git a/monitor/monitor_test.go b/monitor/monitor_test.go
@@ -70,6 +70,15 @@ func TestSetParser(t *testing.T) {
 		t.Errorf("NewConfigMonitor() error = %v", err)
 	}
 	cm.SetParser(&parser.Parser{})
+
+	// use json format test ConfigParse
+	kind := parser.JSON
+	jsonData := []byte(`{"key": "value"}`)
+	var config struct{}
+	err = cm.ConfigParse(kind, jsonData, &config)
+	if err != nil {
+		t.Errorf("ConfigParse() error = %v", err)
+	}
 }
 
 func TestRegisterCallback(t *testing.T) {

diff --git a/server/suite.go b/server/suite.go
@@ -19,6 +19,7 @@ import (
 	"github.com/kitex-contrib/config-file/filewatcher"
 	"github.com/kitex-contrib/config-file/monitor"
 	"github.com/kitex-contrib/config-file/parser"
+
 )
 
 type FileConfigServerSuite struct {
@@ -40,6 +41,7 @@ func NewSuite(key string, watcher filewatcher.FileWatcher) *FileConfigServerSuit
 // Options return a list client.Option
 func (s *FileConfigServerSuite) Options() []kitexserver.Option {
 	s.watcher.SetManager(&parser.ServerFileManager{})
+	s.watcher.SetParser(&parser.Parser{})
 
 	opts := make([]kitexserver.Option, 0, 1)
 	opts = append(opts, WithLimiter(s.watcher))