Update to elastic search 5

topfreegames · Jun 6, 2017 · 81a7cea · 81a7cea
1 parent 6a337e5
commit 81a7cea
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 39 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8-alpine
+FROM golang:1.8.3-alpine
 
 MAINTAINER TFG Co <backend@tfgco.com>
 

diff --git a/app/histories.go b/app/histories.go
@@ -1,6 +1,7 @@
 package app
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"reflect"
@@ -10,7 +11,7 @@ import (
 	"github.com/labstack/echo"
 	"github.com/topfreegames/mqtt-history/es"
 	"github.com/topfreegames/mqtt-history/logger"
-	"gopkg.in/olivere/elastic.v3"
+	"gopkg.in/olivere/elastic.v5"
 )
 
 // HistoriesHandler is the handler responsible for sending multiples rooms history to the player
@@ -19,7 +20,7 @@ func HistoriesHandler(app *App) func(c echo.Context) error {
 		esclient := es.GetESClient()
 		c.Set("route", "Histories")
 		topicPrefix := c.ParamValues()[0]
-		authorizedTopics := []string{}
+		authorizedTopics := []interface{}{}
 		userID := c.QueryParam("userid")
 		topicsSuffix := strings.Split(c.QueryParam("topics"), ",")
 		topics := make([]string, len(topicsSuffix))
@@ -54,13 +55,13 @@ func HistoriesHandler(app *App) func(c echo.Context) error {
 		if redisResults[0] != nil && len(authorizedTopics) > 0 {
 			boolQuery := elastic.NewBoolQuery()
 			topicBoolQuery := elastic.NewBoolQuery()
-			topicBoolQuery.Should(elastic.NewTermsQuery("topic", authorizedTopics))
+			topicBoolQuery.Should(elastic.NewTermsQuery("topic", authorizedTopics...))
 			boolQuery.Must(topicBoolQuery)
 
 			var searchResults *elastic.SearchResult
 			err = WithSegment("elasticsearch", c, func() error {
 				searchResults, err = esclient.Search().Index("chat").Query(boolQuery).
-					Sort("timestamp", false).From(from).Size(limit).Do()
+					Sort("timestamp", false).From(from).Size(limit).Do(context.TODO())
 				return err
 			})
 

diff --git a/app/histories_test.go b/app/histories_test.go
@@ -7,6 +7,7 @@
 package app_test
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -71,10 +72,10 @@ func TestHistoriesHandler(t *testing.T) {
 					Topic:     topic2,
 				}
 
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 				Expect(err).To(BeNil())
 
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage2).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage2).Do(context.TODO())
 				Expect(err).To(BeNil())
 
 				refreshIndex()
@@ -113,10 +114,10 @@ func TestHistoriesHandler(t *testing.T) {
 					Topic:     topic2,
 				}
 
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 				Expect(err).To(BeNil())
 
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage2).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage2).Do(context.TODO())
 				Expect(err).To(BeNil())
 
 				refreshIndex()
@@ -153,10 +154,10 @@ func TestHistoriesHandler(t *testing.T) {
 					Topic:     topic2,
 				}
 
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 				Expect(err).To(BeNil())
 
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage2).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage2).Do(context.TODO())
 				Expect(err).To(BeNil())
 
 				refreshIndex()

diff --git a/app/history.go b/app/history.go
@@ -1,6 +1,7 @@
 package app
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -14,7 +15,7 @@ import (
 	"github.com/labstack/echo"
 	"github.com/topfreegames/mqtt-history/es"
 	"github.com/topfreegames/mqtt-history/logger"
-	"gopkg.in/olivere/elastic.v3"
+	"gopkg.in/olivere/elastic.v5"
 )
 
 // Message represents a chat message
@@ -58,7 +59,7 @@ func HistoryHandler(app *App) func(c echo.Context) error {
 			var searchResults *elastic.SearchResult
 			err = WithSegment("elasticsearch", c, func() error {
 				searchResults, err = esclient.Search().Index("chat").Query(boolQuery).
-					Sort("timestamp", false).From(from).Size(limit).Do()
+					Sort("timestamp", false).From(from).Size(limit).Do(context.TODO())
 				return err
 			})
 
@@ -145,7 +146,7 @@ func HistorySinceHandler(app *App) func(c echo.Context) error {
 			var searchResults *elastic.SearchResult
 			err = WithSegment("elasticsearch", c, func() error {
 				searchResults, err = esclient.Search().Index("chat").Query(boolQuery).
-					Sort("timestamp", false).From(from).Size(limit).Pretty(true).Do()
+					Sort("timestamp", false).From(from).Size(limit).Pretty(true).Do(context.TODO())
 				return err
 			})
 

diff --git a/app/history_test.go b/app/history_test.go
@@ -8,6 +8,7 @@ package app_test
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -17,7 +18,7 @@ import (
 
 	. "github.com/franela/goblin"
 	. "github.com/onsi/gomega"
-	"github.com/satori/go.uuid"
+	uuid "github.com/satori/go.uuid"
 	. "github.com/topfreegames/mqtt-history/app"
 	"github.com/topfreegames/mqtt-history/es"
 	"github.com/topfreegames/mqtt-history/redisclient"
@@ -70,7 +71,7 @@ func TestHistoryHandler(t *testing.T) {
 					Payload:   "{\"test1\":\"test2\"}",
 					Topic:     topic,
 				}
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 				Expect(err).To(BeNil())
 
 				refreshIndex()
@@ -130,7 +131,7 @@ func TestHistoryHandler(t *testing.T) {
 					Topic:     topic,
 				}
 
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 				Expect(err).To(BeNil())
 
 				refreshIndex()
@@ -186,7 +187,7 @@ func TestHistoryHandler(t *testing.T) {
 					"/historysince/%s?userid=test:test&since=%d",
 					topic, (time.Now().UnixNano() / 1000000000), // now
 				)
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 				Expect(err).To(BeNil())
 
 				// Update indexes
@@ -229,7 +230,7 @@ func TestHistoryHandler(t *testing.T) {
 						Payload:   "{\"test1\":\"test2\"}",
 						Topic:     topic,
 					}
-					_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+					_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 					Expect(err).To(BeNil())
 				}
 
@@ -278,7 +279,7 @@ func TestHistoryHandler(t *testing.T) {
 						Payload:   "{\"test1\":\"test2\"}",
 						Topic:     topic,
 					}
-					_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+					_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 					Expect(err).To(BeNil())
 				}
 
@@ -322,7 +323,7 @@ func TestHistoryHandler(t *testing.T) {
 						Payload:   "{\"test1\":\"test2\"}",
 						Topic:     topic,
 					}
-					_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+					_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 					Expect(err).To(BeNil())
 				}
 
@@ -370,7 +371,7 @@ func TestHistoryHandler(t *testing.T) {
 				Payload:   "{\"test1\":\"test2\"}",
 				Topic:     topic,
 			}
-			_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+			_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 			Expect(err).To(BeNil())
 
 			messageTime = baseTime + 1*second
@@ -379,7 +380,7 @@ func TestHistoryHandler(t *testing.T) {
 				Payload:   "{\"test1\":\"test2\"}",
 				Topic:     fmt.Sprintf("%s/moremore", topic),
 			}
-			_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+			_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 			Expect(err).To(BeNil())
 
 			// Update indexes
@@ -423,7 +424,7 @@ func TestHistoryHandler(t *testing.T) {
 					Payload:   "{\"test1\":\"test2\"}",
 					Topic:     topic,
 				}
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 				Expect(err).To(BeNil())
 			}
 
@@ -471,7 +472,7 @@ func TestHistoryHandler(t *testing.T) {
 					Payload:   "{\"test1\":\"test2\"}",
 					Topic:     topic,
 				}
-				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do()
+				_, err = esclient.Index().Index("chat").Type("message").BodyJson(testMessage).Do(context.TODO())
 				Expect(err).To(BeNil())
 			}
 

diff --git a/config/local.yaml b/config/local.yaml
@@ -5,7 +5,7 @@ elasticsearch:
   host: "http://localhost:9123"
   sniff: false
   indexMappings:
-    chat: '{ "mappings": { "message":{"_ttl": { "enabled": true, "default": "2d" }}}}'
+    chat: '{ "mappings": { "message":{}}}'
 redis:
   host: "localhost"
   port: 4444

diff --git a/config/test.yaml b/config/test.yaml
@@ -5,7 +5,7 @@ elasticsearch:
   host: "http://localhost:9123"
   sniff: false
   indexMappings:
-    chat: '{ "mappings": { "message":{"_ttl": { "enabled": true, "default": "2d" }}}}'
+    chat: '{ "mappings": { "message":{}}}'
 redis:
   host: "localhost"
   port: 4444

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,13 @@ services:
     image: redis:3.2
     command: redis-server
   elasticsearch:
-    image: elasticsearch:2.3.4
+    image: docker.elastic.co/elasticsearch/elasticsearch:5.4.1
+     ports:
+       - "9200:9200"
+     environment:
+       - http.host=0.0.0.0
+       - transport.host=127.0.0.1
+       - xpack.security.enabled=false
   mosquitto:
     image: tfgco/mosquitto_with_auth:0.0.1
     environment:

diff --git a/es/es_client.go b/es/es_client.go
@@ -1,12 +1,13 @@
 package es
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"strings"
 	"sync"
 
-	"gopkg.in/olivere/elastic.v3"
+	"gopkg.in/olivere/elastic.v5"
 
 	"github.com/op/go-logging"
 	"github.com/spf13/viper"
@@ -62,7 +63,7 @@ func configureESClient() {
 
 	indexes := viper.GetStringMapString("elasticsearch.indexMappings")
 	for index, mappings := range indexes {
-		_, err = client.CreateIndex(index).Body(mappings).Do()
+		_, err = client.CreateIndex(index).Body(mappings).Do(context.TODO())
 		if err != nil {
 			if strings.Contains(err.Error(), "index_already_exists_exception") || strings.Contains(err.Error(), "IndexAlreadyExistsException") ||
 				strings.Contains(err.Error(), "already exists as alias") {

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -20,7 +20,8 @@ import:
 - package: github.com/gavv/httpexpect
 - package: github.com/ajg/form
 - package: github.com/valyala/fasthttp
-- package: gopkg.in/olivere/elastic.v3
+- package: gopkg.in/olivere/elastic.v5
+  version: ^5.0.39
 - package: github.com/uber-go/zap
 - package: github.com/uber-go/atomic
 - package: github.com/getsentry/raven-go

diff --git a/test_containers/docker-compose.yml b/test_containers/docker-compose.yml
@@ -21,10 +21,13 @@ services:
     labels:
       - "local.example.description=Mosquitto v1.4.9 MQTT server"
   elasticsearch:
-    image: elasticsearch:2.4
+    image: docker.elastic.co/elasticsearch/elasticsearch:5.4.1
     ports:
       - "9123:9200"
       - "9300:9300"
-    command: "elasticsearch -Des.logger.level=DEBUG"
+    environment:
+       - http.host=0.0.0.0
+       - transport.host=127.0.0.1
+       - xpack.security.enabled=false
 networks:
   mosqnet: