配置优化

Author: coder2z

go.mod

@@ -4,16 +4,22 @@ go 1.16
 
 require (
 	github.com/davecgh/go-spew v1.1.1
+	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/go-playground/locales v0.13.0
 	github.com/go-playground/universal-translator v0.17.0
 	github.com/go-playground/validator/v10 v10.4.1
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/json-iterator/go v1.1.10
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/modern-go/reflect2 v1.0.1
+	github.com/pelletier/go-toml v1.2.0
+	github.com/philchia/agollo/v4 v4.1.4
 	github.com/pkg/errors v0.8.1
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.1.3
-	go.uber.org/zap v1.10.0
+	go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547
+	go.uber.org/zap v1.14.1
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
+	sigs.k8s.io/yaml v1.3.0 // indirect
 )

go.sum

@@ -1,6 +1,7 @@
 package xcfg
 
 import (
+	"github.com/pelletier/go-toml"
 	"io"
 
 	"github.com/davecgh/go-spew/spew"
@@ -16,6 +17,8 @@ type DataSource interface {
 // Unmarshaler ...
 type Unmarshaler func([]byte, interface{}) error
 
+var DefaultConfigUnmarshaler = toml.Unmarshal
+
 var defaultConfiguration = New()
 
 // OnChange 注册change回调函数
@@ -30,7 +33,18 @@ func LoadFromDataSource(ds DataSource, unmarshaler Unmarshaler) error {
 	return defaultConfiguration.LoadFromDataSource(ds, unmarshaler)
 }
 
-// Load loads configuration from provided provider with default defaultConfiguration.
+// LoadFromConfigAddr load configuration from configAddr
+// eg:apollo://ip:port?appId=XXX&cluster=XXX&namespaceName=XXX&key=XXX&accesskeySecret=XXX&insecureSkipVerify=XXX&cacheDir=XXX
+//		etcd://ip:port?username=XXX&password=XXX&key=key
+func LoadFromConfigAddr(configAddr string) error {
+	source, err := NewDataSource(configAddr)
+	if err != nil {
+		return err
+	}
+	return LoadFromDataSource(source, DefaultConfigUnmarshaler)
+}
+
+// LoadFromReader Load loads configuration from provided provider with default defaultConfiguration.
 func LoadFromReader(r io.Reader, unmarshaler Unmarshaler) error {
 	return defaultConfiguration.LoadFromReader(r, unmarshaler)
 }

xcfg/api.go

@@ -0,0 +1,61 @@
+package apollo
+
+import (
+	"github.com/coder2z/g-saber/xcfg"
+	"github.com/philchia/agollo/v4"
+)
+
+type apolloDataSource struct {
+	client      agollo.Client
+	namespace   string
+	propertyKey string
+	changed     chan struct{}
+}
+
+// NewDataSource creates an apolloDataSource
+func NewDataSource(conf *agollo.Conf, namespace string, key string, watch bool) xcfg.DataSource {
+	client := agollo.NewClient(conf, agollo.WithLogger(&agolloLogger{}))
+	ap := &apolloDataSource{
+		client:      client,
+		namespace:   namespace,
+		propertyKey: key,
+		changed:     make(chan struct{}, 1),
+	}
+	_ = ap.client.Start()
+	if watch {
+		ap.client.OnUpdate(
+			func(event *agollo.ChangeEvent) {
+				ap.changed <- struct{}{}
+			})
+	}
+	return ap
+}
+
+// ReadConfig reads xcfg content from apollo
+func (ap *apolloDataSource) ReadConfig() ([]byte, error) {
+	value := ap.client.GetString(ap.propertyKey, agollo.WithNamespace(ap.namespace))
+	return []byte(value), nil
+}
+
+// IsConfigChanged returns a chanel for notification when the xcfg changed
+func (ap *apolloDataSource) IsConfigChanged() <-chan struct{} {
+	return ap.changed
+}
+
+// Close stops watching the xcfg changed
+func (ap *apolloDataSource) Close() error {
+	_ = ap.client.Stop()
+	close(ap.changed)
+	return nil
+}
+
+type agolloLogger struct {
+}
+
+// Infof ...
+func (l *agolloLogger) Infof(format string, args ...interface{}) {
+}
+
+// Errorf ...
+func (l *agolloLogger) Errorf(format string, args ...interface{}) {
+}

xcfg/apollo/apollo.go

@@ -0,0 +1,46 @@
+package apollo
+
+import (
+	"github.com/coder2z/g-saber/xcfg"
+	"github.com/philchia/agollo/v4"
+	"github.com/spf13/cast"
+	"net/url"
+)
+
+func init() {
+	xcfg.Register(new(apollo))
+}
+
+// DataSourceApollo defines apollo scheme
+const DataSourceApollo = "apollo"
+
+type apollo struct{}
+
+func (e apollo) Register() (string, xcfg.DataSourceCreatorFunc) {
+	return DataSourceApollo, func(addr string) xcfg.DataSource {
+		var watch bool
+		if addr == "" {
+			return nil
+		}
+		// configAddr is a string in this format:
+		// apollo://ip:port?appId=XXX&cluster=XXX&namespaceName=XXX&key=XXX&accesskeySecret=XXX&insecureSkipVerify=XXX&cacheDir=XXX&watch=true
+		urlObj, err := url.Parse(addr)
+		if err != nil {
+			return nil
+		}
+		watch = cast.ToBool(urlObj.Query().Get("watch"))
+		apolloConf := agollo.Conf{
+			AppID:              urlObj.Query().Get("appId"),
+			Cluster:            urlObj.Query().Get("cluster"),
+			NameSpaceNames:     []string{urlObj.Query().Get("namespaceName")},
+			MetaAddr:           urlObj.Host,
+			InsecureSkipVerify: cast.ToBool(urlObj.Query().Get("insecureSkipVerify")),
+			AccesskeySecret:    urlObj.Query().Get("accesskeySecret"),
+			CacheDir:           ".",
+		}
+		if urlObj.Query().Get("cacheDir") != "" {
+			apolloConf.CacheDir = urlObj.Query().Get("cacheDir")
+		}
+		return NewDataSource(&apolloConf, urlObj.Query().Get("namespaceName"), urlObj.Query().Get("key"), watch)
+	}
+}

xcfg/apollo/register.go

@@ -3,7 +3,8 @@ package xcfg
 import (
 	"errors"
 	"fmt"
-	xcast2 "github.com/coder2z/g-saber/xtransform/xcast"
+	"github.com/coder2z/g-saber/xstring"
+	"github.com/coder2z/g-saber/xtransform/xcast"
 	"io"
 	"io/ioutil"
 	"reflect"
@@ -94,13 +95,15 @@ func (c *Configuration) LoadFromDataSource(ds DataSource, unmarshaler Unmarshale
 // Load ...
 func (c *Configuration) Load(content []byte, unmarshaler Unmarshaler) error {
 	configuration := make(map[string]interface{})
-	if err := unmarshaler(content, &configuration); err != nil {
+	// 替换里面的环境变量 ....
+	envContent := xstring.ExpandEnv(xcast.ToString(content))
+	if err := unmarshaler([]byte(envContent), &configuration); err != nil {
 		return err
 	}
 	return c.apply(configuration)
 }
 
-// Load loads configuration from provided data source.
+// LoadFromReader loads configuration from provided data source.
 func (c *Configuration) LoadFromReader(reader io.Reader, unmarshaler Unmarshaler) error {
 	content, err := ioutil.ReadAll(reader)
 	if err != nil {
@@ -189,7 +192,7 @@ func GetString(key string) string {
 
 // GetString returns the value associated with the key as a string.
 func (c *Configuration) GetString(key string) string {
-	return xcast2.ToString(c.Get(key))
+	return xcast.ToString(c.Get(key))
 }
 
 // GetBool returns the value associated with the key as a boolean with default defaultConfiguration.
@@ -199,7 +202,7 @@ func GetBool(key string) bool {
 
 // GetBool returns the value associated with the key as a boolean.
 func (c *Configuration) GetBool(key string) bool {
-	return xcast2.ToBool(c.Get(key))
+	return xcast.ToBool(c.Get(key))
 }
 
 // GetInt returns the value associated with the key as an integer with default defaultConfiguration.
@@ -209,7 +212,7 @@ func GetInt(key string) int {
 
 // GetInt returns the value associated with the key as an integer.
 func (c *Configuration) GetInt(key string) int {
-	return xcast2.ToInt(c.Get(key))
+	return xcast.ToInt(c.Get(key))
 }
 
 // GetInt64 returns the value associated with the key as an integer with default defaultConfiguration.
@@ -219,7 +222,7 @@ func GetInt64(key string) int64 {
 
 // GetInt64 returns the value associated with the key as an integer.
 func (c *Configuration) GetInt64(key string) int64 {
-	return xcast2.ToInt64(c.Get(key))
+	return xcast.ToInt64(c.Get(key))
 }
 
 // GetFloat64 returns the value associated with the key as a float64 with default defaultConfiguration.
@@ -229,7 +232,7 @@ func GetFloat64(key string) float64 {
 
 // GetFloat64 returns the value associated with the key as a float64.
 func (c *Configuration) GetFloat64(key string) float64 {
-	return xcast2.ToFloat64(c.Get(key))
+	return xcast.ToFloat64(c.Get(key))
 }
 
 // GetTime returns the value associated with the key as time with default defaultConfiguration.
@@ -239,7 +242,7 @@ func GetTime(key string) time.Time {
 
 // GetTime returns the value associated with the key as time.
 func (c *Configuration) GetTime(key string) time.Time {
-	return xcast2.ToTime(c.Get(key))
+	return xcast.ToTime(c.Get(key))
 }
 
 // GetDuration returns the value associated with the key as a duration with default defaultConfiguration.
@@ -249,7 +252,7 @@ func GetDuration(key string) time.Duration {
 
 // GetDuration returns the value associated with the key as a duration.
 func (c *Configuration) GetDuration(key string) time.Duration {
-	return xcast2.ToDuration(c.Get(key))
+	return xcast.ToDuration(c.Get(key))
 }
 
 // GetStringSlice returns the value associated with the key as a slice of strings with default defaultConfiguration.
@@ -259,7 +262,7 @@ func GetStringSlice(key string) []string {
 
 // GetStringSlice returns the value associated with the key as a slice of strings.
 func (c *Configuration) GetStringSlice(key string) []string {
-	return xcast2.ToStringSlice(c.Get(key))
+	return xcast.ToStringSlice(c.Get(key))
 }
 
 // GetSlice returns the value associated with the key as a slice of strings with default defaultConfiguration.
@@ -269,7 +272,7 @@ func GetSlice(key string) []interface{} {
 
 // GetSlice returns the value associated with the key as a slice of strings.
 func (c *Configuration) GetSlice(key string) []interface{} {
-	return xcast2.ToSlice(c.Get(key))
+	return xcast.ToSlice(c.Get(key))
 }
 
 // GetStringMap returns the value associated with the key as a map of interfaces with default defaultConfiguration.
@@ -279,7 +282,7 @@ func GetStringMap(key string) map[string]interface{} {
 
 // GetStringMap returns the value associated with the key as a map of interfaces.
 func (c *Configuration) GetStringMap(key string) map[string]interface{} {
-	return xcast2.ToStringMap(c.Get(key))
+	return xcast.ToStringMap(c.Get(key))
 }
 
 // GetStringMapString returns the value associated with the key as a map of strings with default defaultConfiguration.
@@ -289,12 +292,12 @@ func GetStringMapString(key string) map[string]string {
 
 // GetStringMapString returns the value associated with the key as a map of strings.
 func (c *Configuration) GetStringMapString(key string) map[string]string {
-	return xcast2.ToStringMapString(c.Get(key))
+	return xcast.ToStringMapString(c.Get(key))
 }
 
 // GetSliceStringMap returns the value associated with the slice of maps.
 func (c *Configuration) GetSliceStringMap(key string) []map[string]interface{} {
-	return xcast2.ToSliceStringMap(c.Get(key))
+	return xcast.ToSliceStringMap(c.Get(key))
 }
 
 // GetStringMapStringSlice returns the value associated with the key as a map to a slice of strings with default defaultConfiguration.
@@ -304,7 +307,7 @@ func GetStringMapStringSlice(key string) map[string][]string {
 
 // GetStringMapStringSlice returns the value associated with the key as a map to a slice of strings.
 func (c *Configuration) GetStringMapStringSlice(key string) map[string][]string {
-	return xcast2.ToStringMapStringSlice(c.Get(key))
+	return xcast.ToStringMapStringSlice(c.Get(key))
 }
 
 // UnmarshalWithExpect unmarshal key, returns expect if failed
@@ -380,7 +383,7 @@ func lookup(prefix string, target map[string]interface{}, data map[string]interf
 		if prefix == "" {
 			pp = k
 		}
-		if dd, err := xcast2.ToStringMapE(v); err == nil {
+		if dd, err := xcast.ToStringMapE(v); err == nil {
 			lookup(pp, dd, data, sep)
 		} else {
 			data[pp] = v