[fix] 兼容没有带任何scheme的地址配置,默认http://

Author: liuxingwang

agollo.go

@@ -78,7 +78,8 @@ func New(configServerURL, appID string, opts ...Option) (Agollo, error) {
 		errorsCh: make(chan *LongPollerError),
 		opts:     newOptions(opts...),
 	}
-	a.opts.ConfigServerURL = configServerURL
+
+	a.opts.ConfigServerURL = normalizeURL(configServerURL)
 	a.opts.AppID = appID
 
 	return a.preload()

apollo_client.go

@@ -107,6 +107,7 @@ func NewApolloClient(opts ...ApolloClientOption) ApolloClient {
 }
 
 func (c *apolloClient) Notifications(configServerURL, appID, cluster string, notifications []Notification) (status int, result []Notification, err error) {
+	configServerURL = normalizeURL(configServerURL)
 	url := fmt.Sprintf("%s/notifications/v2?appId=%s&cluster=%s&notifications=%s",
 		configServerURL,
 		url.QueryEscape(appID),
@@ -139,6 +140,7 @@ func (c *apolloClient) GetConfigsFromNonCache(configServerURL, appID, cluster, n
 		opt(&options)
 	}
 
+	configServerURL = normalizeURL(configServerURL)
 	url := fmt.Sprintf("%s/configs/%s/%s/%s?releaseKey=%s&ip=%s",
 		configServerURL,
 		url.QueryEscape(appID),
@@ -169,6 +171,7 @@ func (c *apolloClient) GetConfigsFromNonCache(configServerURL, appID, cluster, n
 }
 
 func (c *apolloClient) GetConfigsFromCache(configServerURL, appID, cluster, namespace string) (config Configurations, err error) {
+	configServerURL = normalizeURL(configServerURL)
 	url := fmt.Sprintf("%s/configfiles/json/%s/%s/%s?ip=%s",
 		configServerURL,
 		url.QueryEscape(appID),

util.go

@@ -1,5 +1,7 @@
 package agollo
 
+import "strings"
+
 func stringInSlice(a string, list []string) bool {
 	for _, b := range list {
 		if b == a {
@@ -8,3 +10,11 @@ func stringInSlice(a string, list []string) bool {
 	}
 	return false
 }
+
+func normalizeURL(url string) string {
+	if !strings.HasPrefix(url, "http://") && !strings.HasPrefix(url, "https://") {
+		url = "http://" + url
+	}
+
+	return strings.TrimSuffix(url, "/")
+}

util_test.go

@@ -0,0 +1,32 @@
+package agollo
+
+import "testing"
+
+func TestNormalizeURL(t *testing.T) {
+	tests := []struct {
+		url      string
+		expected string
+	}{
+		{
+			"localhost",
+			"http://localhost",
+		},
+		{
+			"http://localhost",
+			"http://localhost",
+		},
+		{
+			"https://localhost",
+			"https://localhost",
+		},
+	}
+
+	for i, test := range tests {
+		t.Logf("run test (%v): %v", i, test.url)
+
+		actual := normalizeURL(test.url)
+		if actual != test.expected {
+			t.Errorf("  should be equal (expected=%v, actual=%v)", test.expected, actual)
+		}
+	}
+}