update elastic dep, upgrade es_client

topfreegames · Jun 17, 2016 · 9b1e87f · 9b1e87f
1 parent ed19148
commit 9b1e87f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/es/es_client.go b/es/es_client.go
@@ -2,10 +2,12 @@ package es
 
 import (
 	"fmt"
+	"net/http"
 	"os"
 	"strings"
 	"sync"
 
+	"github.com/aws/aws-sdk-go/aws/defaults"
 	"github.com/spf13/viper"
 	"github.com/topfreegames/mqttbot/logger"
 	"gopkg.in/topfreegames/elastic.v2"
@@ -34,7 +36,12 @@ func setConfigurationDefaults() {
 
 func configureESClient() {
 	logger.Logger.Debug(fmt.Sprintf("Connecting to elasticsearch @ %s", viper.GetString("elasticsearch.host")))
+	credentials := defaults.CredChain(defaults.Config(), defaults.Handlers())
+	awsSigningRoundTripper := elastic.NewAWSSigningRoundTripper(nil, "us-east-1", credentials)
+	esHttpClient := &http.Client{Transport: awsSigningRoundTripper}
+
 	client, err := elastic.NewClient(
+		elastic.SetHttpClient(esHttpClient),
 		elastic.SetURL(viper.GetString("elasticsearch.host")),
 		elastic.SetSniff(viper.GetBool("elasticsearch.sniff")),
 	)

diff --git a/glide.lock b/glide.lock
diff --git a/vendor/github.com/valyala/fasthttp b/vendor/github.com/valyala/fasthttp
diff --git a/vendor/gopkg.in/topfreegames/elastic.v2 b/vendor/gopkg.in/topfreegames/elastic.v2