refactor remote source API

README.md

@@ -27,9 +27,9 @@ and you can use archaius API to get its value
 
 Here is the precedence list:
 
-0: remote source - use [config client](https://github.com/go-chassis/go-chassis-config) to pull remote config server data into local
+0: remote source - pull remote config server data into local
 
-1: Memory source - after process start, you can set key value in runtime.
+1: Memory source - after init, you can set key value in runtime.
 
 2: Command Line source - read the command lines arguments, while starting the process.
 
@@ -107,33 +107,32 @@ v := archaius.GetString("/etc/component/xxx.txt", "")
 ```
 
 ### Enable remote source
-import a config client implementation
+Before you enable a remote source, you must install a implementation first
 ```go
-import _ "github.com/go-chassis/go-archaius/source/remote/configcenter"
+archaius.InstallRemoteSource("config_center", remote.NewConfigCenterSource)
 ```
-set config client to init config center source
+set remote info to init remote source
 ```go
-	ci := archaius.RemoteInfo{
+	ri := archaius.RemoteInfo{
 	//input your remote source config
 	}
 	//create config client 
-	cc,_:=remote.NewClient("config_center",ccclient.Options{
+	cc,_:=remote.NewClient("config-center",ccclient.Options{
     		ServerURI:"the address of config server endpoint",
     	})
 	//manage local and remote key value at same time
 	err = archaius.Init(
 		archaius.WithRequiredFiles([]string{filename1}),
 		archaius.WithOptionalFiles([]string{filename2}),
-		archaius.WithRemoteSource(ci, cc),
+		archaius.WithRemoteSource("config-center", ri),
 	)
 ```
 
 Supported distributed configuration management service:
 
 | name       | import                                         |description    |
 |----------|----------|:-------------:|
-|config_center      |github.com/go-chassis/go-chassis-config/configcenter |huawei cloud CSE config center https://www.huaweicloud.com/product/cse.html |
-|servicecomb-kie    |github.com/apache/servicecomb-kie/client/adaptor     |apache servicecomb-kie https://github.com/apache/servicecomb-kie |
+|config center      |github.com/go-chassis/go-archaius/configcenter |huawei cloud CSE config center https://www.huaweicloud.com/product/cse.html |
 
 ### Example: Manage local configurations 
 Complete [example](https://github.com/go-chassis/go-archaius/tree/master/examples/file)

archaius.go

@@ -4,17 +4,16 @@ package archaius
 
 import (
 	"errors"
-	"github.com/go-chassis/go-archaius/cast"
 	"os"
 	"strings"
 
+	"github.com/go-chassis/go-archaius/cast"
 	"github.com/go-chassis/go-archaius/event"
 	"github.com/go-chassis/go-archaius/source"
 	"github.com/go-chassis/go-archaius/source/cli"
 	"github.com/go-chassis/go-archaius/source/env"
 	"github.com/go-chassis/go-archaius/source/file"
 	"github.com/go-chassis/go-archaius/source/mem"
-	"github.com/go-chassis/go-archaius/source/remote"
 	"github.com/go-mesh/openlogging"
 )
 
@@ -76,8 +75,8 @@ func Init(opts ...Option) error {
 		return err
 	}
 
-	if o.RemoteInfo != nil {
-		if err = EnableRemoteSource(o.RemoteInfo, o.ConfigClient); err != nil {
+	if o.RemoteSource != "" {
+		if err = EnableRemoteSource(o.RemoteSource, o.RemoteInfo); err != nil {
 			return err
 		}
 	}
@@ -124,7 +123,7 @@ func CustomInit(sources ...source.ConfigSource) error {
 //EnableRemoteSource create a remote source singleton
 //A config center source pull remote config server key values into local memory
 //so that you can use GetXXX to get value easily
-func EnableRemoteSource(ci *RemoteInfo, cc remote.Client) error {
+func EnableRemoteSource(remoteSource string, ci *RemoteInfo) error {
 	if ci == nil {
 		return errors.New("RemoteInfo can not be empty")
 	}
@@ -133,28 +132,15 @@ func EnableRemoteSource(ci *RemoteInfo, cc remote.Client) error {
 		return nil
 	}
 
-	var err error
-	if cc == nil {
-		opts := remote.Options{
-			ServerURI:     ci.URL,
-			TenantName:    ci.TenantName,
-			EnableSSL:     ci.EnableSSL,
-			TLSConfig:     ci.TLSConfig,
-			RefreshPort:   ci.RefreshPort,
-			AutoDiscovery: ci.AutoDiscovery,
-			Labels:        ci.DefaultDimension,
-		}
-		cc, err = remote.NewClient(ci.ClientType, opts)
-		if err != nil {
-			return err
-		}
+	f, ok := newFuncMap[remoteSource]
+	if !ok {
+		return errors.New("don not support remote source: " + remoteSource)
 	}
-	configCenterSource := remote.NewConfigCenterSource(cc, ci.RefreshMode,
-		ci.RefreshInterval)
-	err = manager.AddSource(configCenterSource)
+	s, err := f(ci)
 	if err != nil {
 		return err
 	}
+	err = manager.AddSource(s)
 	configServerRunning = true
 	return nil
 }

archaius_test.go

@@ -145,17 +145,12 @@ metadata:
 
 }
 func TestInitConfigCenter(t *testing.T) {
-	err := archaius.EnableRemoteSource(&archaius.RemoteInfo{}, nil)
-	assert.Error(t, err)
-	err = archaius.EnableRemoteSource(&archaius.RemoteInfo{
-		ClientType: "fake",
-	}, nil)
+	err := archaius.EnableRemoteSource("fake", nil)
 	assert.Error(t, err)
 }
 func TestClean(t *testing.T) {
 	err := archaius.Clean()
 	assert.NoError(t, err)
 	s := archaius.Get("age")
 	assert.Equal(t, nil, s)
-
 }

options.go

@@ -2,7 +2,6 @@ package archaius
 
 import (
 	"crypto/tls"
-	"github.com/go-chassis/go-archaius/source/remote"
 	"github.com/go-chassis/go-archaius/source/util"
 )
 
@@ -41,7 +40,7 @@ type Options struct {
 	OptionalFiles []string
 	FileHandler   util.FileHandler
 	RemoteInfo    *RemoteInfo
-	ConfigClient  remote.Client
+	RemoteSource  string
 	UseCLISource  bool
 	UseENVSource  bool
 	UseMemSource  bool
@@ -72,14 +71,11 @@ func WithDefaultFileHandler(handler util.FileHandler) Option {
 	}
 }
 
-//WithRemoteSource accept the information for initiating a config center source,
-//RemoteInfo is required if you want to use config center source
-//client is optional,if client is nil, archaius will create one based on RemoteInfo
-//config client will be injected into config source as a client to interact with a config server
-func WithRemoteSource(ri *RemoteInfo, c remote.Client) Option {
+//WithRemoteSource accept the information for initiating a remote source
+func WithRemoteSource(provider string, ri *RemoteInfo) Option {
 	return func(options *Options) {
 		options.RemoteInfo = ri
-		options.ConfigClient = c
+		options.RemoteSource = provider
 	}
 }
 

remote.go

@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package archaius
+
+import "github.com/go-chassis/go-archaius/source"
+
+var newFuncMap = make(map[string]NewRemoteSource)
+
+//NewRemoteSource create a new remote source
+type NewRemoteSource func(info *RemoteInfo) (source.ConfigSource, error)
+
+//InstallRemoteSource allow user customize remote source
+func InstallRemoteSource(source string, remoteSource NewRemoteSource) {
+	newFuncMap[source] = remoteSource
+}

remote_test.go

@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package archaius_test
+
+import (
+	"github.com/go-chassis/go-archaius"
+	"github.com/go-chassis/go-archaius/source/remote"
+	"testing"
+)
+
+func TestInstallRemoteSource(t *testing.T) {
+	archaius.InstallRemoteSource("config_center", remote.NewConfigCenterSource)
+}

source/remote/remote.go

@@ -19,6 +19,7 @@ package remote
 
 import (
 	"errors"
+	"github.com/go-chassis/go-archaius"
 	"reflect"
 	"sync"
 	"time"
@@ -58,14 +59,28 @@ type Source struct {
 }
 
 //NewConfigCenterSource initializes all components of configuration center
-func NewConfigCenterSource(cc Client, refreshMode, refreshInterval int) source.ConfigSource {
+func NewConfigCenterSource(ci *archaius.RemoteInfo) (source.ConfigSource, error) {
+	opts := Options{
+		ServerURI:     ci.URL,
+		TenantName:    ci.TenantName,
+		EnableSSL:     ci.EnableSSL,
+		TLSConfig:     ci.TLSConfig,
+		RefreshPort:   ci.RefreshPort,
+		AutoDiscovery: ci.AutoDiscovery,
+		Labels:        ci.DefaultDimension,
+	}
+	cc, err := NewClient(ci.ClientType, opts)
+	if err != nil {
+		openlogging.Error(err.Error())
+		return nil, err
+	}
 	s := new(Source)
 	s.dimensions = []map[string]string{cc.Options().Labels}
 	s.priority = configCenterSourcePriority
 	s.cc = cc
-	s.RefreshMode = refreshMode
-	s.RefreshInterval = time.Second * time.Duration(refreshInterval)
-	return s
+	s.RefreshMode = ci.RefreshMode
+	s.RefreshInterval = time.Second * time.Duration(ci.RefreshInterval)
+	return s, nil
 }
 
 //GetConfigurations pull config from remote and start refresh configs interval
@@ -257,3 +272,6 @@ func (rs *Source) Set(key string, value interface{}) error {
 func (rs *Source) Delete(key string) error {
 	return nil
 }
+func init() {
+	archaius.InstallRemoteSource("config-center", NewConfigCenterSource)
+}