Add configuration options for HTTP Basic Authentication

This patch adds two fields, `Username` and `Password`, to the client configuration,
allowing to set a common set of credentials for the client.

Related: #31, #32
Closes: #32
(cherry picked from commit ec8c147)

Author: karmi

doc.go

@@ -15,6 +15,8 @@ To configure the client, pass a Config object to the NewClient function:
 		    "http://localhost:9200",
 		    "http://localhost:9201",
 		  },
+		  Username: "foo",
+		  Password: "bar",
 		  Transport: &http.Transport{
 		    MaxIdleConnsPerHost:   10,
 		    ResponseHeaderTimeout: time.Second,

elasticsearch.go

@@ -19,7 +19,10 @@ const (
 // Config represents the client configuration.
 //
 type Config struct {
-	Addresses []string          // A list of Elasticsearch nodes to use.
+	Addresses []string // A list of Elasticsearch nodes to use.
+	Username  string   // Username for HTTP Basic Authentication.
+	Password  string   // Password for HTTP Basic Authentication.
+
 	Transport http.RoundTripper // The HTTP transport object.
 }
 
@@ -70,9 +73,15 @@ func NewClient(cfg Config) (*Client, error) {
 		urls = append(urls, u)
 	}
 
-	tran := estransport.New(estransport.Config{URLs: urls, Transport: cfg.Transport})
+	tp := estransport.New(estransport.Config{
+		URLs:     urls,
+		Username: cfg.Username,
+		Password: cfg.Password,
+
+		Transport: cfg.Transport,
+	})
 
-	return &Client{Transport: tran, API: esapi.New(tran)}, nil
+	return &Client{Transport: tp, API: esapi.New(tp)}, nil
 }
 
 // Perform delegates to Transport to execute a request and return a response.

elasticsearch_example_test.go

@@ -37,12 +37,14 @@ func ExampleNewClient() {
 		Addresses: []string{
 			"http://localhost:9200",
 		},
+		Username: "foo",
+		Password: "bar",
 		Transport: &http.Transport{
 			MaxIdleConnsPerHost:   10,
 			ResponseHeaderTimeout: time.Second,
 			DialContext:           (&net.Dialer{Timeout: time.Second}).DialContext,
 			TLSClientConfig: &tls.Config{
-				MinVersion:         tls.VersionTLS11,
+				MinVersion: tls.VersionTLS11,
 			},
 		},
 	}

estransport/estransport.go

@@ -16,14 +16,20 @@ type Interface interface {
 // Config represents the configuration of HTTP client.
 //
 type Config struct {
-	URLs      []*url.URL
+	URLs     []*url.URL
+	Username string
+	Password string
+
 	Transport http.RoundTripper
 }
 
 // Client represents the HTTP client.
 //
 type Client struct {
-	urls      []*url.URL
+	urls     []*url.URL
+	username string
+	password string
+
 	transport http.RoundTripper
 	selector  Selector
 }
@@ -39,7 +45,10 @@ func New(cfg Config) *Client {
 	}
 
 	return &Client{
-		urls:      cfg.URLs,
+		urls:     cfg.URLs,
+		username: cfg.Username,
+		password: cfg.Password,
+
 		transport: cfg.Transport,
 		selector:  NewRoundRobinSelector(cfg.URLs...),
 	}
@@ -89,6 +98,13 @@ func (c *Client) setBasicAuth(u *url.URL, req *http.Request) *http.Request {
 	if u.User != nil {
 		password, _ := u.User.Password()
 		req.SetBasicAuth(u.User.Username(), password)
+		return req
 	}
+
+	if c.username != "" && c.password != "" {
+		req.SetBasicAuth(c.username, c.password)
+		return req
+	}
+
 	return req
 }

estransport/estransport_internal_test.go

@@ -91,7 +91,7 @@ func TestTransportPerform(t *testing.T) {
 		}
 	})
 
-	t.Run("Sets HTTP Basic Auth", func(t *testing.T) {
+	t.Run("Sets HTTP Basic Auth from URL", func(t *testing.T) {
 		u, _ := url.Parse("https://foo:bar@example.com")
 		tp := New(Config{URLs: []*url.URL{u}})
 
@@ -108,6 +108,23 @@ func TestTransportPerform(t *testing.T) {
 		}
 	})
 
+	t.Run("Sets HTTP Basic Auth from configuration", func(t *testing.T) {
+		u, _ := url.Parse("http://example.com")
+		tp := New(Config{URLs: []*url.URL{u}, Username: "foo", Password: "bar"})
+
+		req, _ := http.NewRequest("GET", "/", nil)
+		tp.setBasicAuth(u, req)
+
+		username, password, ok := req.BasicAuth()
+		if !ok {
+			t.Errorf("Expected the request to have Basic Auth set")
+		}
+
+		if username != "foo" || password != "bar" {
+			t.Errorf("Unexpected values for username and password: %s:%s", username, password)
+		}
+	})
+
 	t.Run("Error No URL", func(t *testing.T) {
 		tp := New(Config{
 			URLs: []*url.URL{},