Remove the default port when parsing CloudID into address

Closes 81

(cherry picked from commit 0b113bc)

Author: karmi

elasticsearch.go

@@ -193,10 +193,7 @@ func addrsToURLs(addrs []string) ([]*url.URL, error) {
 // See: https://www.elastic.co/guide/en/cloud/current/ec-cloud-id.html
 //
 func addrFromCloudID(input string) (string, error) {
-	var (
-		port   = 9243
-		scheme = "https://"
-	)
+	var scheme = "https://"
 
 	values := strings.Split(input, ":")
 	if len(values) != 2 {
@@ -207,5 +204,5 @@ func addrFromCloudID(input string) (string, error) {
 		return "", err
 	}
 	parts := strings.Split(string(data), "$")
-	return fmt.Sprintf("%s%s.%s:%d", scheme, parts[1], parts[0], port), nil
+	return fmt.Sprintf("%s%s.%s", scheme, parts[1], parts[0]), nil
 }

elasticsearch_internal_test.go

@@ -98,15 +98,16 @@ func TestClientConfiguration(t *testing.T) {
 	})
 
 	t.Run("With CloudID", func(t *testing.T) {
+		// bar.cloud.es.io$abc123$def456
 		c, err := NewClient(Config{CloudID: "foo:YmFyLmNsb3VkLmVzLmlvJGFiYzEyMyRkZWY0NTY="})
 		if err != nil {
 			t.Fatalf("Unexpected error: %s", err)
 		}
 
 		u := c.Transport.(*estransport.Client).URLs()[0].String()
 
-		if u != "https://abc123.bar.cloud.es.io:9243" {
-			t.Errorf("Unexpected URL, want=https://abc123.bar.cloud.es.io:9243, got=%s", u)
+		if u != "https://abc123.bar.cloud.es.io" {
+			t.Errorf("Unexpected URL, want=https://abc123.bar.cloud.es.io, got=%s", u)
 		}
 	})
 
@@ -237,16 +238,30 @@ func TestAddrsToURLs(t *testing.T) {
 
 func TestCloudID(t *testing.T) {
 	t.Run("Parse", func(t *testing.T) {
-		input := "name:" + base64.StdEncoding.EncodeToString([]byte("host$es$kibana"))
-		expected := "https://es.host:9243"
-
-		actual, err := addrFromCloudID(input)
-		if err != nil {
-			t.Errorf("Unexpected error: %s", err)
+		var testdata = []struct {
+			in  string
+			out string
+		}{
+			{
+				in:  "name:" + base64.StdEncoding.EncodeToString([]byte("host$es$kibana")),
+				out: "https://es.host",
+			},
+			{
+				in:  "name:" + base64.StdEncoding.EncodeToString([]byte("host:9243$es$kibana")),
+				out: "https://es.host:9243",
+			},
 		}
-		if actual != expected {
-			t.Errorf("Unexpected output, want=%q, got=%q", expected, actual)
+
+		for _, tt := range testdata {
+			actual, err := addrFromCloudID(tt.in)
+			if err != nil {
+				t.Errorf("Unexpected error: %s", err)
+			}
+			if actual != tt.out {
+				t.Errorf("Unexpected output, want=%q, got=%q", tt.out, actual)
+			}
 		}
+
 	})
 
 	t.Run("Invalid format", func(t *testing.T) {