From 0324568f60a3eb7e5bf8c9cc86662a301127f3a1 Mon Sep 17 00:00:00 2001
From: Joe Zou <yixian.zou@gmail.com>
Date: Fri, 1 Nov 2019 18:56:41 +0800
Subject: [PATCH] update apollo
---
config/base_config_test.go | 15 +++++++++++++++
config_center/apollo/impl.go | 32 +++++++++++++++-----------------
2 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/config/base_config_test.go b/config/base_config_test.go
index 6dc3749e5..9452c9e61 100644
--- a/config/base_config_test.go
+++ b/config/base_config_test.go
@@ -29,6 +29,7 @@ import (
"github.com/apache/dubbo-go/common/config"
"github.com/apache/dubbo-go/common/extension"
"github.com/apache/dubbo-go/config_center"
+ _ "github.com/apache/dubbo-go/config_center/apollo"
)
func Test_refresh(t *testing.T) {
@@ -490,6 +491,20 @@ func Test_startConfigCenter(t *testing.T) {
assert.Equal(t, "ikurento.com", v)
}
+func Test_startApolloConfigCenter(t *testing.T) {
+ c := &BaseConfig{ConfigCenterConfig: &ConfigCenterConfig{
+ Protocol: "apollo",
+ Address: "106.12.25.204:8080",
+ Group: "mockDubbo",
+ ConfigFile: "mockDubbo.properties",
+ }}
+ err := c.startConfigCenter(context.Background())
+ assert.NoError(t, err)
+ b, v := config.GetEnvInstance().Configuration().Back().Value.(*config.InmemoryConfiguration).GetProperty("dubbo.application.organization")
+ assert.True(t, b)
+ assert.Equal(t, "ikurento.com", v)
+}
+
func Test_initializeStruct(t *testing.T) {
consumerConfig := &ConsumerConfig{}
tp := reflect.TypeOf(ConsumerConfig{})
diff --git a/config_center/apollo/impl.go b/config_center/apollo/impl.go
index dde30a7e3..57ada6f08 100644
--- a/config_center/apollo/impl.go
+++ b/config_center/apollo/impl.go
@@ -18,6 +18,8 @@ limitations under the License.
package apollo
import (
+ "fmt"
+ "github.com/go-errors/errors"
"os"
"strconv"
"strings"
@@ -37,6 +39,7 @@ const (
apolloAddrKey = "apollo.meta"
apolloClusterKey = "apollo.cluster"
apolloProtocolPrefix = "http://"
+ apolloConfigFormat = "%s.%s"
)
type apolloDynamicConfiguration struct {
@@ -68,7 +71,7 @@ func newApolloDynamicConfiguration(url *common.URL) (*apolloDynamicConfiguration
readyConfig := &agollo.AppConfig{
AppId: appId,
Cluster: configCluster,
- NamespaceName: namespace,
+ NamespaceName: getNamespaceName(namespace,agollo.YML),
Ip: configAddr,
}
@@ -76,9 +79,7 @@ func newApolloDynamicConfiguration(url *common.URL) (*apolloDynamicConfiguration
return readyConfig, nil
})
- agollo.Start()
-
- return c, nil
+ return c, agollo.Start()
}
type apolloChangeListener struct {
@@ -142,6 +143,10 @@ func (c *apolloDynamicConfiguration) RemoveListener(key string, listener config_
}
}
+func getNamespaceName(namespace string,configFileFormat agollo.ConfigFileFormat ) string{
+ return fmt.Sprintf(apolloConfigFormat, namespace, configFileFormat)
+}
+
func (c *apolloDynamicConfiguration) GetConfig(key string, opts ...config_center.Option) (string, error) {
k := &config_center.Options{}
for _, opt := range opts {
@@ -149,20 +154,13 @@ func (c *apolloDynamicConfiguration) GetConfig(key string, opts ...config_center
}
group := k.Group
if len(group) != 0 && c.url.GetParam(constant.CONFIG_GROUP_KEY, config_center.DEFAULT_GROUP) != group {
- readyConfig := &agollo.AppConfig{
- AppId: c.appConf.AppId,
- Cluster: c.appConf.Cluster,
- NamespaceName: "application",
- Ip: c.appConf.Ip,
+ namespace := c.url.GetParam(constant.CONFIG_GROUP_KEY, config_center.DEFAULT_GROUP)
+ fileNamespace := getNamespaceName(namespace, agollo.Properties)
+ config := agollo.GetConfig(fileNamespace)
+ if config==nil{
+ return "",errors.New(fmt.Sprintf("nothiing in namespace:%s ",fileNamespace))
}
-
- agollo.InitCustomConfig(func() (*agollo.AppConfig, error) {
- return readyConfig, nil
- })
-
- agollo.Start()
- //Config config = ConfigService.getAppConfig();
- //return config.getProperty(key, null);
+ return config.GetContent(),nil
}
return agollo.GetStringValue(key, ""), nil
}
--
GitLab