Merge branch 'release/0.18.1'

Author: nshumoogum

service/initialise.go

@@ -15,9 +15,10 @@ import (
 
 // ExternalServiceList holds the initialiser and initialisation state of external services.
 type ExternalServiceList struct {
-	HealthCheck bool
-	Init        Initialiser
-	MongoDB     bool
+	AuthorisationMiddleware bool
+	HealthCheck             bool
+	Init                    Initialiser
+	MongoDB                 bool
 }
 
 // NewServiceList creates a new service list with the provided initialiser
@@ -91,5 +92,6 @@ func (e *Init) DoGetAuthorisationMiddleware(ctx context.Context, authorisationCo
 
 // GetAuthorisationMiddleware creates a new instance of authorisation.Middlware
 func (e *ExternalServiceList) GetAuthorisationMiddleware(ctx context.Context, authorisationConfig *authorisation.Config) (authorisation.Middleware, error) {
+	e.AuthorisationMiddleware = true
 	return e.Init.DoGetAuthorisationMiddleware(ctx, authorisationConfig)
 }

service/service.go

@@ -16,13 +16,13 @@ import (
 
 // Service contains all the configs, server and clients to run the dp-topic-api API
 type Service struct {
-	Config      *config.Config
-	Server      HTTPServer
-	Router      *mux.Router
-	api         *api.API
-	ServiceList *ExternalServiceList
-	HealthCheck HealthChecker
-	MongoDB     PermissionsStore
+	Config                  *config.Config
+	Server                  HTTPServer
+	Router                  *mux.Router
+	api                     *api.API
+	ServiceList             *ExternalServiceList
+	HealthCheck             HealthChecker
+	MongoDB                 PermissionsStore
 	AuthorisationMiddleware authorisation.Middleware
 }
 
@@ -78,13 +78,13 @@ func Run(ctx context.Context, cfg *config.Config, serviceList *ExternalServiceLi
 	}()
 
 	return &Service{
-		Config:      cfg,
-		Router:      r,
-		api:         a,
-		HealthCheck: hc,
-		ServiceList: serviceList,
-		Server:      s,
-		MongoDB:     mongoDB,
+		Config:                  cfg,
+		Router:                  r,
+		api:                     a,
+		HealthCheck:             hc,
+		ServiceList:             serviceList,
+		Server:                  s,
+		MongoDB:                 mongoDB,
 		AuthorisationMiddleware: authorisationMiddleware,
 	}, nil
 }
@@ -119,9 +119,11 @@ func (svc *Service) Close(ctx context.Context) error {
 			}
 		}
 
-		if err := svc.AuthorisationMiddleware.Close(ctx); err != nil {
-			log.Error(ctx, "failed to close authorisation middleware", err)
-			hasShutdownError = true
+		if svc.ServiceList.AuthorisationMiddleware {
+			if err := svc.AuthorisationMiddleware.Close(ctx); err != nil {
+				log.Error(ctx, "failed to close authorisation middleware", err)
+				hasShutdownError = true
+			}
 		}
 	}()
 

service/service_test.go

@@ -101,9 +101,9 @@ func TestRun(t *testing.T) {
 
 		Convey("Given that initialising mongoDB returns an error", func() {
 			initMock := &mock.InitialiserMock{
-				DoGetHTTPServerFunc:  funcDoGetHTTPServerNil,
-				DoGetMongoDBFunc:     funcDoGetMongoDbErr,
-				DoGetHealthCheckFunc: funcDoGetHealthcheckOk,
+				DoGetHTTPServerFunc:              funcDoGetHTTPServerNil,
+				DoGetMongoDBFunc:                 funcDoGetMongoDbErr,
+				DoGetHealthCheckFunc:             funcDoGetHealthcheckOk,
 				DoGetAuthorisationMiddlewareFunc: funcDoGetAuthorisationMiddleware,
 			}
 			svcErrors := make(chan error, 1)
@@ -121,9 +121,9 @@ func TestRun(t *testing.T) {
 
 			// setup (run before each `Convey` at this scope / indentation):
 			initMock := &mock.InitialiserMock{
-				DoGetHTTPServerFunc:  funcDoGetHTTPServerNil,
-				DoGetHealthCheckFunc: funcDoGetHealthcheckErr,
-				DoGetMongoDBFunc:     funcDoGetMongoDbOk,
+				DoGetHTTPServerFunc:              funcDoGetHTTPServerNil,
+				DoGetHealthCheckFunc:             funcDoGetHealthcheckErr,
+				DoGetMongoDBFunc:                 funcDoGetMongoDbOk,
 				DoGetAuthorisationMiddlewareFunc: funcDoGetAuthorisationMiddleware,
 			}
 			svcErrors := make(chan error, 1)
@@ -145,9 +145,9 @@ func TestRun(t *testing.T) {
 
 			// setup (run before each `Convey` at this scope / indentation):
 			initMock := &mock.InitialiserMock{
-				DoGetHTTPServerFunc:  funcDoGetHTTPServer,
-				DoGetHealthCheckFunc: funcDoGetHealthcheckOk,
-				DoGetMongoDBFunc:     funcDoGetMongoDbOk,
+				DoGetHTTPServerFunc:              funcDoGetHTTPServer,
+				DoGetHealthCheckFunc:             funcDoGetHealthcheckOk,
+				DoGetMongoDBFunc:                 funcDoGetMongoDbOk,
 				DoGetAuthorisationMiddlewareFunc: funcDoGetAuthorisationMiddleware,
 			}
 			svcErrors := make(chan error, 1)
@@ -193,7 +193,7 @@ func TestRun(t *testing.T) {
 				DoGetHealthCheckFunc: func(cfg *config.Config, buildTime string, gitCommit string, version string) (service.HealthChecker, error) {
 					return hcMockAddFail, nil
 				},
-				DoGetMongoDBFunc: funcDoGetMongoDbOk,
+				DoGetMongoDBFunc:                 funcDoGetMongoDbOk,
 				DoGetAuthorisationMiddlewareFunc: funcDoGetAuthorisationMiddleware,
 				// ADD CODE: add the checkers that you want to register here
 			}
@@ -217,9 +217,9 @@ func TestRun(t *testing.T) {
 
 			// setup (run before each `Convey` at this scope / indentation):
 			initMock := &mock.InitialiserMock{
-				DoGetHealthCheckFunc: funcDoGetHealthcheckOk,
-				DoGetHTTPServerFunc:  funcDoGetFailingHTTPServer,
-				DoGetMongoDBFunc:     funcDoGetMongoDbOk,
+				DoGetHealthCheckFunc:             funcDoGetHealthcheckOk,
+				DoGetHTTPServerFunc:              funcDoGetFailingHTTPServer,
+				DoGetMongoDBFunc:                 funcDoGetMongoDbOk,
 				DoGetAuthorisationMiddlewareFunc: funcDoGetAuthorisationMiddleware,
 			}
 			svcErrors := make(chan error, 1)