Merge branch 'release/0.5.0'

Makefile

@@ -3,9 +3,11 @@ BINPATH ?= build
 BUILD_TIME=$(shell date +%s)
 GIT_COMMIT=$(shell git rev-parse HEAD)
 VERSION ?= $(shell git tag --points-at HEAD | grep ^v | head -n 1)
-
 LDFLAGS = -ldflags "-X main.BuildTime=$(BUILD_TIME) -X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)"
 
+export GRAPH_DRIVER_TYPE?=neo4j
+export GRAPH_ADDR?=bolt://localhost:7687
+
 .PHONY: all
 all: audit test build
 
@@ -20,7 +22,7 @@ build:
 .PHONY: debug
 debug:
 	go build -tags 'debug' $(LDFLAGS) -o $(BINPATH)/dp-observation-api
-	GRAPH_DRIVER_TYPE="neo4j" GRAPH_ADDR="bolt://localhost:7687" HUMAN_LOG=1 DEBUG=1 $(BINPATH)/dp-observation-api
+	HUMAN_LOG=1 DEBUG=1 $(BINPATH)/dp-observation-api
 
 .PHONY: test
 test:

api/api.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/ONSdigital/dp-authorisation/auth"
-	dpHTTP "github.com/ONSdigital/dp-net/http"
+	"github.com/ONSdigital/dp-net/request"
 	"github.com/ONSdigital/dp-observation-api/config"
 	"github.com/ONSdigital/log.go/log"
 	"github.com/gorilla/mux"
@@ -42,13 +42,13 @@ func Setup(ctx context.Context, r *mux.Router, cfg *config.Config, graphDB IGrap
 
 func (api *API) checkIfAuthorised(r *http.Request, logData log.Data) (authorised bool) {
 
-	callerIdentity := dpHTTP.Caller(r.Context())
+	callerIdentity := request.Caller(r.Context())
 	if callerIdentity != "" {
 		logData["caller_identity"] = callerIdentity
 		authorised = true
 	}
 
-	userIdentity := dpHTTP.User(r.Context())
+	userIdentity := request.User(r.Context())
 	if userIdentity != "" {
 		logData["user_identity"] = userIdentity
 		authorised = true

api/api_test.go

@@ -2,14 +2,14 @@ package api_test
 
 import (
 	"context"
+	"github.com/ONSdigital/dp-net/request"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"sync"
 	"testing"
 
 	"github.com/ONSdigital/dp-authorisation/auth"
-	dpHTTP "github.com/ONSdigital/dp-net/http"
 	"github.com/ONSdigital/dp-observation-api/api"
 	"github.com/ONSdigital/dp-observation-api/api/mock"
 	errs "github.com/ONSdigital/dp-observation-api/apierrors"
@@ -22,7 +22,7 @@ import (
 const testServiceAuthToken = "testServiceAuthToken"
 const testUserAuthToken = "testUserAuthToken"
 
-var ctx = context.WithValue(context.Background(), dpHTTP.FlorenceIdentityKey, testUserAuthToken)
+var ctx = context.WithValue(context.Background(), request.FlorenceIdentityKey, testUserAuthToken)
 
 var (
 	mu          sync.Mutex

api/interfaces.go

@@ -19,6 +19,7 @@ import (
 type IGraph interface {
 	driver.Driver
 	StreamCSVRows(ctx context.Context, instanceID, filterID string, filters *observation.DimensionFilters, limit *int) (observation.StreamRowReader, error)
+	ErrorChan() chan error
 }
 
 // IDatasetClient represents the required methods from the Dataset Client required by Observation API