Finish v4.2.0

Author: zouyx

component/remote/async.go

@@ -59,12 +59,13 @@ func (*asyncApolloConfig) GetNotifyURLSuffix(notifications string, config config
 }
 
 func (*asyncApolloConfig) GetSyncURI(config config.AppConfig, namespaceName string) string {
-	return fmt.Sprintf("configs/%s/%s/%s?releaseKey=%s&ip=%s",
+	return fmt.Sprintf("configs/%s/%s/%s?releaseKey=%s&ip=%s&label=%s",
 		url.QueryEscape(config.AppID),
 		url.QueryEscape(config.Cluster),
 		url.QueryEscape(namespaceName),
 		url.QueryEscape(config.GetCurrentApolloConfig().GetReleaseKey(namespaceName)),
-		utils.GetInternal())
+		utils.GetInternal(),
+		url.QueryEscape(config.Label))
 }
 
 func (a *asyncApolloConfig) Sync(appConfigFunc func() config.AppConfig) []*config.ApolloConfig {

component/remote/async_test.go

@@ -46,21 +46,37 @@ func init() {
 }
 
 const configResponseStr = `{
-  "appId": "100004458",
-  "cluster": "default",
-  "namespaceName": "application",
-  "configurations": {
-    "key1":"value1",
-    "key2":"value2"
-  },
-  "releaseKey": "20170430092936-dee2d58e74515ff3"
+	"appId": "100004458",
+	"cluster": "default",
+	"namespaceName": "application",
+	"configurations": {
+	  "key1":"value1",
+	  "key2":"value2"
+	},
+	"releaseKey": "20170430092936-dee2d58e74515ff3"
+}`
+
+const grayConfigResponseStr = `{
+	"appId": "100004458",
+	"cluster": "default",
+	"namespaceName": "application",
+	"configurations": {
+	  "key1":"gray_value1",
+	  "key2":"gray_value2"
+	},
+	"releaseKey": "20170430092936-dee2d58e74515ff3"
 }`
 
 const configFilesResponseStr = `{
     "key1":"value1",
     "key2":"value2"
 }`
 
+const grayConfigFilesResponseStr = `{
+    "key1":"gray_value1",
+    "key2":"gray_value2"
+}`
+
 const configAbc1ResponseStr = `{
   "appId": "100004458",
   "cluster": "default",
@@ -77,6 +93,13 @@ const tworesponseStr = `[{"namespaceName":"application","notificationId":%d},{"n
 
 func onlyNormalConfigResponse(rw http.ResponseWriter, req *http.Request) {
 	rw.WriteHeader(http.StatusOK)
+
+	label, ok := req.URL.Query()["label"]
+	if ok && len(label) > 0 && label[0] == grayLabel {
+		fmt.Fprintf(rw, grayConfigResponseStr)
+		return
+	}
+
 	fmt.Fprintf(rw, configResponseStr)
 }
 
@@ -192,6 +215,23 @@ func TestApolloConfig_SyncTwoOk(t *testing.T) {
 	Assert(t, appConfig.GetNotificationsMap().GetNotify("abc1"), Equal(int64(3)))
 }
 
+func TestApolloConfig_GraySync(t *testing.T) {
+	server := initMockNotifyAndConfigServer()
+	appConfig := initNotifications()
+	appConfig.IP = server.URL
+	appConfig.Label = grayLabel
+	apolloConfigs := asyncApollo.Sync(func() config.AppConfig {
+		return *appConfig
+	})
+	//err keep nil
+	Assert(t, apolloConfigs, NotNilVal())
+	Assert(t, len(apolloConfigs), Equal(1))
+
+	apolloConfig := apolloConfigs[0]
+	Assert(t, "gray_value1", Equal(apolloConfig.Configurations["key1"]))
+	Assert(t, "gray_value2", Equal(apolloConfig.Configurations["key2"]))
+}
+
 func TestApolloConfig_SyncABC1Error(t *testing.T) {
 	server := initMockNotifyAndConfigServerWithTwoErrResponse()
 	appConfig := initNotifications()

component/remote/sync.go

@@ -47,11 +47,12 @@ func (*syncApolloConfig) GetNotifyURLSuffix(notifications string, config config.
 }
 
 func (*syncApolloConfig) GetSyncURI(config config.AppConfig, namespaceName string) string {
-	return fmt.Sprintf("configfiles/json/%s/%s/%s?&ip=%s",
+	return fmt.Sprintf("configfiles/json/%s/%s/%s?&ip=%s&label=%s",
 		url.QueryEscape(config.AppID),
 		url.QueryEscape(config.Cluster),
 		url.QueryEscape(namespaceName),
-		utils.GetInternal())
+		utils.GetInternal(),
+		url.QueryEscape(config.Label))
 }
 
 func (*syncApolloConfig) CallBack(namespace string) http.CallBack {

component/remote/sync_test.go

@@ -37,6 +37,7 @@ import (
 )
 
 var (
+	grayLabel         = "gray"
 	normalConfigCount = 1
 	syncApollo        *syncApolloConfig
 )
@@ -60,6 +61,14 @@ func runNormalConfigResponse() *httptest.Server {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		normalConfigCount++
 		if normalConfigCount%2 == 0 {
+			label, ok := r.URL.Query()["label"]
+			if ok && len(label) > 0 && label[0] == grayLabel {
+				w.WriteHeader(http.StatusOK)
+				w.Write([]byte(grayConfigFilesResponseStr))
+
+				return
+			}
+
 			w.WriteHeader(http.StatusOK)
 			w.Write([]byte(configFilesResponseStr))
 		} else {
@@ -153,3 +162,24 @@ func TestAutoSyncConfigServicesError(t *testing.T) {
 
 	Assert(t, len(apolloConfigs), Equal(0))
 }
+
+func TestClientLabelConfigService(t *testing.T) {
+	server := runNormalConfigResponse()
+	newAppConfig := initNotifications()
+	newAppConfig.IP = server.URL
+	newAppConfig.Label = grayLabel
+
+	apolloConfigs := syncApollo.Sync(func() config.AppConfig {
+		return *newAppConfig
+	})
+
+	Assert(t, apolloConfigs, NotNilVal())
+	Assert(t, len(apolloConfigs), Equal(1))
+
+	apolloConfig := apolloConfigs[0]
+	newAppConfig.GetCurrentApolloConfig().Set(newAppConfig.NamespaceName, &apolloConfig.ApolloConnConfig)
+	c := newAppConfig.GetCurrentApolloConfig().Get()[newAppConfig.NamespaceName]
+	Assert(t, "application", Equal(c.NamespaceName))
+	Assert(t, "gray_value1", Equal(apolloConfig.Configurations["key1"]))
+	Assert(t, "gray_value2", Equal(apolloConfig.Configurations["key2"]))
+}

env/config/config.go

@@ -48,6 +48,7 @@ type AppConfig struct {
 	IsBackupConfig    bool   `default:"true" json:"isBackupConfig"`
 	BackupConfigPath  string `json:"backupConfigPath"`
 	Secret            string `json:"secret"`
+	Label             string `json:"label"`
 	SyncServerTimeout int    `json:"syncServerTimeout"`
 	// MustStart 可用于控制第一次同步必须成功
 	MustStart               bool `default:"false"`

protocol/http/request.go

@@ -62,6 +62,7 @@ var (
 func getDefaultTransport(insecureSkipVerify bool) *http.Transport {
 	once.Do(func() {
 		defaultTransport = &http.Transport{
+			Proxy:               http.ProxyFromEnvironment,
 			MaxIdleConns:        defaultMaxConnsPerHost,
 			MaxIdleConnsPerHost: defaultMaxConnsPerHost,
 			DialContext: (&net.Dialer{