fix dredd

Financial-Times · Oct 19, 2021 · 931f89e · 931f89e
1 parent 397fe7f
commit 931f89e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -27,9 +27,9 @@ jobs:
           command: |
             GOPRIVATE="github.com/Financial-Times"
             git config --global url."https://$GITHUB_USERNAME:$GITHUB_TOKEN@github.com/".insteadOf "https://github.com/"
-            curl -sL https://deb.nodesource.com/setup_11.x | bash -
-            DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs=11.\*
-            npm install -g --unsafe-perm --loglevel warn --user 0 --no-progress dredd@11.2.19
+            curl -sL https://deb.nodesource.com/setup_14.x | bash -
+            DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs=14.\*
+            npm install -g --unsafe-perm --loglevel warn --user 0 --no-progress dredd@14.0.0
             rm -rf /var/lib/apt/lists/*
             GO111MODULE=off go get -u github.com/myitcv/gobin
       - run:
@@ -41,6 +41,7 @@ jobs:
             GOPRIVATE="github.com/Financial-Times"
             git config --global url."https://$GITHUB_USERNAME:$GITHUB_TOKEN@github.com/".insteadOf "https://github.com/"
             go build -mod=readonly -v ./cmd/content-rw-elasticsearch
+            ./content-rw-elasticsearch
       - run:
           name: Dredd API Testing
           command: dredd

diff --git a/cmd/content-rw-elasticsearch/main.go b/cmd/content-rw-elasticsearch/main.go
@@ -181,7 +181,7 @@ func main() {
 		esClient, err := es.NewClient(accessConfig, httpClient, log)
 
 		if err != nil {
-			log.WithError(err).Fatal("failed to create Elasticsearch client")
+			log.WithError(err).Error("failed to create Elasticsearch client")
 		}
 
 		esService.SetClient(esClient)
@@ -202,11 +202,9 @@ func main() {
 			RetryInterval:           time.Minute,
 		})
 
-		if err != nil {
-			log.WithError(err).Fatal("failed to create Kafka consumer")
-		}
-
-		kafkaConsumer.StartListening(handler.HandleMessage)
+		go func() {
+			kafkaConsumer.StartListening(handler.HandleMessage)
+		}()
 
 		healthCheckConfig := kafka.PerseverantConsumerConfig{
 			BrokersConnectionString: *kafkaAddress,

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/Financial-Times/go-fthealth v0.0.0-20180807113633-3d8eb430d5b5
 	github.com/Financial-Times/go-logger/v2 v2.0.1
 	github.com/Financial-Times/kafka v1.2.0
-	github.com/Financial-Times/kafka-client-go v1.1.0-rc1 // indirect
+	github.com/Financial-Times/kafka-client-go v1.1.0-rc2 // indirect
 	github.com/Financial-Times/service-status-go v0.0.0-20160323111542-3f5199736a3d
 	github.com/Financial-Times/transactionid-utils-go v0.2.0
 	github.com/Financial-Times/upp-go-sdk v0.0.7

diff --git a/go.sum b/go.sum
@@ -13,6 +13,8 @@ github.com/Financial-Times/kafka-client-go v1.0.2 h1:+Pf1lYXC72Y/0kuIsF0oSJtZPPL
 github.com/Financial-Times/kafka-client-go v1.0.2/go.mod h1:hqAvNpfFJJFtYcq6ILh2jY9B1pftas861UFKePbYeiM=
 github.com/Financial-Times/kafka-client-go v1.1.0-rc1 h1:UddkfmVWWfynvpBBEBmeIcmJMCuIEk0JGyjIRbuYYF8=
 github.com/Financial-Times/kafka-client-go v1.1.0-rc1/go.mod h1:nfD1QymuqCkF2TmQfyXwdVZXGQbevun3uJeLPhgKpRM=
+github.com/Financial-Times/kafka-client-go v1.1.0-rc2 h1:iNeoxGKG4YOkEy5LrBEvDvlSKeswl5jrwPv6XkeVKBk=
+github.com/Financial-Times/kafka-client-go v1.1.0-rc2/go.mod h1:nfD1QymuqCkF2TmQfyXwdVZXGQbevun3uJeLPhgKpRM=
 github.com/Financial-Times/service-status-go v0.0.0-20160323111542-3f5199736a3d h1:USNBTIof6vWGM49SYrxvC5Y8NqyDL3YuuYmID81ORZQ=
 github.com/Financial-Times/service-status-go v0.0.0-20160323111542-3f5199736a3d/go.mod h1:7zULC9rrq6KxFkpB3Y5zNVaEwrf1g2m3dvXJBPDXyvM=
 github.com/Financial-Times/transactionid-utils-go v0.2.0 h1:YcET5Hd1fUGWWpQSVszYUlAc15ca8tmjRetUuQKRqEQ=