更新测试用例

goes.go

@@ -34,7 +34,7 @@ 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, ""}
+	return &Client{host, port, http.DefaultClient, "", "", ""}
 }
 
 // WithHTTPClient sets the http.Client to be used with the connection. Returns the original client.
@@ -585,6 +585,11 @@ 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)
 }
 
@@ -596,6 +601,10 @@ 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,14 +5,13 @@
 package goes
 
 import (
+	. "gopkg.in/check.v1"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
 	"testing"
 	"time"
-
-	. "github.com/go-check/check"
 )
 
 var (
@@ -41,7 +40,7 @@ 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{ESHost, ESPort, http.DefaultClient, "", "", ""})
 }
 
 func (s *GoesTestSuite) TestWithHTTPClient(c *C) {
@@ -54,7 +53,7 @@ func (s *GoesTestSuite) TestWithHTTPClient(c *C) {
 	}
 	conn := NewClient(ESHost, ESPort).WithHTTPClient(cl)
 
-	c.Assert(conn, DeepEquals, &Client{ESHost, ESPort, cl, ""})
+	c.Assert(conn, DeepEquals, &Client{ESHost, ESPort, 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,6 +43,12 @@ 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

@@ -23,6 +23,12 @@ 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