Fix integration tests

Financial-Times · Mar 16, 2022 · 6d0517f · 6d0517f
1 parent 1bdeb14
commit 6d0517f
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 41 deletions.
diff --git a/_ft/Dockerfile b/_ft/Dockerfile
@@ -5,5 +5,5 @@ FROM peteclarkft/ersatz:0.0.4
 COPY ./ersatz-fixtures.yml /_ft/ersatz-fixtures.yml
 
 WORKDIR /
-CMD [ "/ersatz" ]
+CMD [ "/ersatz", "--fixtures", "/_ft/ersatz-fixtures.yml", "--port", "9000"  ]
 
diff --git a/_ft/ersatz-fixtures.yml b/_ft/ersatz-fixtures.yml
@@ -3,7 +3,7 @@ fixtures:
   /:
     get:
       status: 200
-  /_cluster/health/:
+  /_cluster/health:
     get:
       body:
         cluster_name: "070529446553:upp-sapi-v1-k8s-dev"

diff --git a/cmd/content-rw-elasticsearch/main.go b/cmd/content-rw-elasticsearch/main.go
@@ -5,13 +5,13 @@ import (
 	"os"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/concept"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/config"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/es"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/health"
-	pkghttp "github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/http"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/mapper"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/message"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/config"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/es"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/health"
+	pkghttp "github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/http"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/mapper"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/message"
 	"github.com/Financial-Times/go-logger/v2"
 	"github.com/Financial-Times/kafka-client-go/v2"
 	cli "github.com/jawher/mow.cli"
@@ -147,7 +147,7 @@ func main() {
 		healthService := health.NewHealthService(messageConsumer, esService, httpClient, concordanceAPIService, *appSystemCode, log)
 
 		serveMux := http.NewServeMux()
-		serveMux = healthService.AttachHTTPEndpoints(serveMux, *appName, config.AppDescription)
+		healthService.AttachHTTPEndpoints(serveMux, *appName, config.AppDescription)
 		pkghttp.StartServer(log, serveMux, *port)
 
 		handler.Stop()

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/Financial-Times/content-rw-elasticsearch/v2
+module github.com/Financial-Times/content-rw-elasticsearch/v7
 
 go 1.17
 
@@ -7,17 +7,18 @@ require (
 	github.com/Financial-Times/go-logger/v2 v2.0.1
 	github.com/Financial-Times/service-status-go v0.0.0-20160323111542-3f5199736a3d
 	github.com/Financial-Times/transactionid-utils-go v0.2.0
+	github.com/davecgh/go-spew v1.1.1
 	github.com/gorilla/mux v1.8.0
 	github.com/jawher/mow.cli v1.0.4
 	github.com/olivere/elastic/v7 v7.0.29
 	github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c
+	github.com/sirupsen/logrus v1.8.1
 	github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9
 	github.com/stretchr/testify v1.7.0
 )
 
 require (
 	github.com/Shopify/sarama v1.30.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/eapache/go-resiliency v1.2.0 // indirect
 	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
@@ -40,7 +41,6 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/schema"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/schema"
 	"github.com/spf13/viper"
 )
 

diff --git a/pkg/es/service.go b/pkg/es/service.go
@@ -8,7 +8,9 @@ import (
 	"reflect"
 	"sync"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/config"
+	"github.com/sirupsen/logrus"
+
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/config"
 
 	"github.com/olivere/elastic/v7"
 )
@@ -43,10 +45,12 @@ func NewService(indexName string) Service {
 }
 
 func (s *ElasticsearchService) GetClusterHealth() (*elastic.ClusterHealthResponse, error) {
+	logrus.Error("if s.ElasticClient == nil {", s.ElasticClient)
 	if s.ElasticClient == nil {
 		return nil, errors.New("client could not be created, please check the application parameters/env variables, and restart the service")
 	}
 
+	logrus.WithField("s.ElasticClient", s.ElasticClient).Errorln("222222222")
 	return s.ElasticClient.ClusterHealth().Do(s.ctx)
 }
 

diff --git a/pkg/health/healthcheck.go b/pkg/health/healthcheck.go
@@ -5,9 +5,11 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/concept"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/es"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/message"
+	"github.com/davecgh/go-spew/spew"
+
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/es"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/message"
 	fthealth "github.com/Financial-Times/go-fthealth/v1_1"
 	"github.com/Financial-Times/go-logger/v2"
 	"github.com/Financial-Times/service-status-go/gtg"
@@ -49,7 +51,7 @@ func NewHealthService(consumer message.Consumer, esHealthService es.HealthStatus
 	return service
 }
 
-func (s *Service) AttachHTTPEndpoints(serveMux *http.ServeMux, appName string, appDescription string) *http.ServeMux {
+func (s *Service) AttachHTTPEndpoints(serveMux *http.ServeMux, appName string, appDescription string) {
 	hc := fthealth.HealthCheck{
 		SystemCode:  s.AppSystemCode,
 		Name:        appName,
@@ -60,8 +62,6 @@ func (s *Service) AttachHTTPEndpoints(serveMux *http.ServeMux, appName string, a
 	serveMux.HandleFunc(pathHealthDetails, s.healthDetails)
 	serveMux.HandleFunc(status.GTGPath, status.NewGoodToGoHandler(s.gtgCheck))
 	serveMux.HandleFunc(status.BuildInfoPath, status.BuildInfoHandler)
-
-	return serveMux
 }
 
 func (s *Service) clusterIsHealthyCheck() fthealth.Check {
@@ -174,12 +174,15 @@ func (s *Service) gtgCheck() gtg.Status {
 
 // HealthDetails returns the response from elasticsearch service /__health endpoint - describing the cluster health
 func (s *Service) healthDetails(writer http.ResponseWriter, req *http.Request) {
+	s.log.Errorln("func (s *Service) healthDetails(writer http.ResponseWriter, req *http.Request) {", spew.Sdump(s.ESHealthService))
 	writer.Header().Set("Content-Type", "application/json")
 	output, err := s.ESHealthService.GetClusterHealth()
 	if err != nil {
+		s.log.WithError(err).Errorln("AAAAAAAA")
 		writer.WriteHeader(http.StatusInternalServerError)
 		return
 	}
+	s.log.WithField("output", *output).Errorln("333333")
 
 	var response []byte
 	response, err = json.Marshal(*output)

diff --git a/pkg/mapper/mapper.go b/pkg/mapper/mapper.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/concept"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/config"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/html"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/schema"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/config"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/html"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/schema"
 	"github.com/Financial-Times/go-logger/v2"
 )
 

diff --git a/pkg/mapper/mapper_test.go b/pkg/mapper/mapper_test.go
@@ -9,10 +9,10 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/concept"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/config"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/schema"
-	tst "github.com/Financial-Times/content-rw-elasticsearch/v2/test"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/config"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/schema"
+	tst "github.com/Financial-Times/content-rw-elasticsearch/v7/test"
 	"github.com/Financial-Times/go-logger/v2"
 )
 

diff --git a/pkg/message/message_handler.go b/pkg/message/message_handler.go
@@ -7,10 +7,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/config"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/es"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/mapper"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/schema"
+	"github.com/davecgh/go-spew/spew"
+
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/config"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/es"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/mapper"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/schema"
 	"github.com/Financial-Times/go-logger/v2"
 	"github.com/Financial-Times/kafka-client-go/v2"
 	transactionid "github.com/Financial-Times/transactionid-utils-go"
@@ -61,10 +63,11 @@ func (h *Handler) Start(baseAPIURL string, accessConfig es.AccessConfig) {
 			ec, err := h.esClient(accessConfig, h.httpClient, h.log)
 			if err != nil {
 				h.log.Error("Could not connect to Elasticsearch")
-				time.Sleep(time.Minute)
+				time.Sleep(time.Second)
 				continue
 			}
 			h.esService.SetClient(ec)
+			h.log.WithField("CLIENT", spew.Sdump(h.esService.(*es.ElasticsearchService).ElasticClient)).Errorln("11111")
 			h.log.Info("Connected to Elasticsearch")
 			// this is a blocking method
 			h.consumer.StartListening(h.handleMessage)

diff --git a/pkg/message/message_handler_test.go b/pkg/message/message_handler_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/concept"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/config"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/es"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/mapper"
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/schema"
-	tst "github.com/Financial-Times/content-rw-elasticsearch/v2/test"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/concept"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/config"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/es"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/mapper"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/schema"
+	tst "github.com/Financial-Times/content-rw-elasticsearch/v7/test"
 	"github.com/Financial-Times/go-logger/v2"
 	"github.com/Financial-Times/kafka-client-go/v2"
 	"github.com/olivere/elastic/v7"

diff --git a/test/helper.go b/test/helper.go
@@ -8,7 +8,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/Financial-Times/content-rw-elasticsearch/v2/pkg/config"
+	"github.com/Financial-Times/content-rw-elasticsearch/v7/pkg/config"
 )
 
 func getResourceFilePath(resourceFilePath string) string {