Allow username:password to be included with host

goes.go

@@ -34,7 +34,15 @@ func (err *SearchError) Error() string {
 // This function is pretty useless for now but might be useful in a near future
 // if wee need more features like connection pooling or load balancing.
 func NewClient(host string, port string) *Client {
-	return &Client{host, port, http.DefaultClient, "", "", ""}
+	if !strings.HasPrefix(host, "http://") && !strings.HasPrefix(host, "https://") {
+		host = "http://" + host
+	}
+	host = host + ":" + port
+	u, err := url.Parse(host)
+	if err != nil {
+		panic(err)
+	}
+	return &Client{u, http.DefaultClient, ""}
 }
 
 // WithHTTPClient sets the http.Client to be used with the connection. Returns the original client.
@@ -574,8 +582,9 @@ func (c *Client) AliasExists(alias string) (bool, error) {
 }
 
 func (c *Client) replaceHost(req *http.Request) {
-	req.URL.Scheme = "http"
-	req.URL.Host = fmt.Sprintf("%s:%s", c.Host, c.Port)
+	req.URL.User = c.Host.User
+	req.URL.Scheme = c.Host.Scheme
+	req.URL.Host = c.Host.Host
 }
 
 // DoRaw Does the provided requeset and returns the raw bytes and the status code of the response
@@ -585,11 +594,6 @@ func (c *Client) DoRaw(r Requester) ([]byte, uint64, error) {
 		return nil, 0, err
 	}
 	c.replaceHost(req)
-
-	if c.AuthUsername != "" {
-		req.SetBasicAuth(c.AuthUsername, c.AuthPassword)
-	}
-
 	return c.doRequest(req)
 }
 
@@ -601,10 +605,6 @@ func (c *Client) Do(r Requester) (*Response, error) {
 	}
 	c.replaceHost(req)
 
-	if c.AuthUsername != "" {
-		req.SetBasicAuth(c.AuthUsername, c.AuthPassword)
-	}
-
 	body, statusCode, err := c.doRequest(req)
 	esResp := &Response{Status: statusCode}
 

goes_test.go

@@ -5,13 +5,14 @@
 package goes
 
 import (
-	. "gopkg.in/check.v1"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
 	"testing"
 	"time"
+
+	. "github.com/go-check/check"
 )
 
 var (
@@ -40,7 +41,12 @@ func (s *GoesTestSuite) SetUpTest(c *C) {
 
 func (s *GoesTestSuite) TestNewClient(c *C) {
 	conn := NewClient(ESHost, ESPort)
-	c.Assert(conn, DeepEquals, &Client{ESHost, ESPort, http.DefaultClient, "", "", ""})
+	c.Assert(conn, DeepEquals, &Client{&url.URL{Scheme: "http", Host: ESHost + ":" + ESPort}, http.DefaultClient, ""})
+}
+
+func (s *GoesTestSuite) TestNewClientWithAuth(c *C) {
+	conn := NewClient("foo:bar@"+ESHost, ESPort)
+	c.Assert(conn, DeepEquals, &Client{&url.URL{Scheme: "http", User: url.UserPassword("foo", "bar"), Host: ESHost + ":" + ESPort}, http.DefaultClient, ""})
 }
 
 func (s *GoesTestSuite) TestWithHTTPClient(c *C) {
@@ -53,7 +59,8 @@ func (s *GoesTestSuite) TestWithHTTPClient(c *C) {
 	}
 	conn := NewClient(ESHost, ESPort).WithHTTPClient(cl)
 
-	c.Assert(conn, DeepEquals, &Client{ESHost, ESPort, cl, "", "", ""})
+	c.Assert(conn.Host, DeepEquals, &url.URL{Scheme: "http", Host: ESHost + ":" + ESPort})
+	c.Assert(conn.Client, DeepEquals, cl)
 	c.Assert(conn.Client.Transport.(*http.Transport).DisableCompression, Equals, true)
 	c.Assert(conn.Client.Transport.(*http.Transport).ResponseHeaderTimeout, Equals, 1*time.Second)
 }

request.go

@@ -43,12 +43,6 @@ type Request struct {
 
 	// Used for the id field when indexing a document
 	ID string
-
-	// Auth username
-	AuthUsername string
-
-	// Auth password
-	AuthPassword string
 }
 
 // URL builds a URL for a Request

structs.go

@@ -7,15 +7,13 @@ package goes
 import (
 	"encoding/json"
 	"net/http"
+	"net/url"
 )
 
 // Client represents a connection to elasticsearch
 type Client struct {
 	// The host to connect to
-	Host string
-
-	// The port to use
-	Port string
+	Host *url.URL
 
 	// Client is the http client used to make requests, allowing settings things
 	// such as timeouts etc
@@ -23,12 +21,6 @@ type Client struct {
 
 	// Detected version of ES
 	version string
-
-	// user name for http basic auth
-	AuthUsername string `json:"username"`
-
-	// pass word  for http basic auth
-	AuthPassword string `json:"password"`
 }
 
 // Response holds an elasticsearch response