Merge pull request #182 from hmrc/lajw/DLS-9829/Upgrade-Bootstrap

DLS-9829  Upgrade Bootstrap

Author: LAJW

app/uk/gov/hmrc/helptosaveapi/auth/Auth.scala

@@ -23,16 +23,15 @@ import uk.gov.hmrc.auth.core.retrieve.Retrieval
 import uk.gov.hmrc.helptosaveapi.util.Logging
 import uk.gov.hmrc.play.bootstrap.backend.controller.BackendController
 
-import scala.concurrent.Future
-import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.{ExecutionContext, Future}
 
 trait Auth extends AuthorisedFunctions { this: BackendController with Logging =>
 
   val authProviders: AuthProviders = AuthProviders(GovernmentGateway, PrivilegedApplication)
 
   type HtsAction[A] = Request[AnyContent] => A => Future[Result]
 
-  def authorised[A](retrievals: Retrieval[A])(action: HtsAction[A]): Action[AnyContent] =
+  def authorised[A](retrievals: Retrieval[A])(action: HtsAction[A])(implicit ec: ExecutionContext): Action[AnyContent] =
     Action.async { implicit request =>
       authorised(authProviders)
         .retrieve(retrievals) { action(request) }

app/uk/gov/hmrc/helptosaveapi/controllers/HelpToSaveController.scala

@@ -98,7 +98,7 @@ class HelpToSaveController @Inject() (
               )
               helpToSaveApiService.createAccountUserRestricted(request, retrievedDetails).map(handleResult)
           }
-        }(request)
+        }(ec)(request)
 
       case Left(e) =>
         logger.warn(s"Received create account request with unsupported credentials provider type: $e")
@@ -115,7 +115,7 @@ class HelpToSaveController @Inject() (
           case Right(UserRestricted) =>
             authorised(v2Nino) { _ =>
               _.fold[Future[Result]](Forbidden)(getEligibility(_, correlationId))
-            }(request)
+            }(ec)(request)
 
           case Right(PrivilegedAccess) =>
             logger.warn(
@@ -158,7 +158,7 @@ class HelpToSaveController @Inject() (
                   Forbidden
                 }
               }
-            }(request)
+            }(ec)(request)
 
           case Right(PrivilegedAccess) =>
             getEligibility(urlNino, correlationId)

conf/application.conf

@@ -21,23 +21,6 @@ appName=help-to-save-api
 
 play.filters.enabled += "play.filters.headers.SecurityHeadersFilter"
 
-# An ApplicationLoader that uses Guice to bootstrap the application.
-play.application.loader = "uk.gov.hmrc.play.bootstrap.ApplicationLoader"
-
-# Primary entry point for all HTTP requests on Play applications
-play.http.requestHandler = "uk.gov.hmrc.play.bootstrap.http.RequestHandler"
-
-# Provides an implementation of AuditConnector. Use `uk.gov.hmrc.play.bootstrap.AuditModule` or create your own.
-# An audit connector must be provided.
-play.modules.enabled += "uk.gov.hmrc.play.audit.AuditModule"
-
-# Provides an implementation of MetricsFilter. Use `uk.gov.hmrc.play.graphite.GraphiteMetricsModule` or create your own.
-# A metric filter must be provided
-play.modules.enabled += "uk.gov.hmrc.play.bootstrap.graphite.GraphiteMetricsModule"
-
-# Provides an implementation and configures all filters required by a Platform frontend microservice.
-play.modules.enabled += "uk.gov.hmrc.play.bootstrap.backend.BackendModule"
-
 play.modules.enabled += "uk.gov.hmrc.play.bootstrap.AuthModule"
 
 play.modules.enabled += "uk.gov.hmrc.play.bootstrap.HttpClientModule"
@@ -97,38 +80,13 @@ controllers {
 # evolutionplugin=disabled
 
 # Metrics plugin settings - graphite reporting is configured on a per env basis
-metrics {
-    name = ${appName}
-    rateUnit = SECONDS
-    durationUnit = SECONDS
-    showSamples = true
-    jvm = true
-    enabled = true
-}
-
+metrics.enabled = true
 
 # Microservice specific config
 
-auditing {
-    enabled=true
-    consumer {
-        baseUri {
-            host = localhost
-            port = 8100
-        }
-    }
-}
+auditing.enabled = true
 
 microservice {
-    metrics {
-        graphite {
-            host = graphite
-            port = 2003
-            prefix = play.${appName}.
-            enabled = false
-        }
-    }
-
     services {
 
         auth {

project/AppDependencies.scala

@@ -4,7 +4,7 @@ import sbt.*
 object AppDependencies {
 
   val hmrc = "uk.gov.hmrc"
-  val hmrcBootstrapVersion = "5.25.0"
+  val hmrcBootstrapVersion = "7.23.0"
 
   val compile: Seq[ModuleID] = Seq(
     ws,

project/plugins.sbt

@@ -8,7 +8,7 @@ addSbtPlugin("uk.gov.hmrc" %% "sbt-auto-build" % "3.20.0")
 
 addSbtPlugin("uk.gov.hmrc" %% "sbt-distributables" % "2.2.0")
 
-addSbtPlugin("com.typesafe.play" %% "sbt-plugin" % "2.8.15")
+addSbtPlugin("com.typesafe.play" %% "sbt-plugin" % "2.8.20")
 
 addSbtPlugin("org.scoverage" %% "sbt-scoverage" % "2.0.8")
 

test/uk/gov/hmrc/helptosaveapi/services/HelpToSaveApiServiceSpec.scala

@@ -19,7 +19,6 @@ package uk.gov.hmrc.helptosaveapi.services
 import cats.data.Validated._
 import cats.data.{NonEmptyList, ValidatedNel}
 import org.mockito.ArgumentMatchersSugar.*
-import org.scalatest.BeforeAndAfterEach
 import play.api.libs.json._
 import play.api.mvc.{AnyContent, AnyContentAsEmpty, AnyContentAsJson, Request}
 import play.api.test.FakeRequest

test/uk/gov/hmrc/helptosaveapi/util/TestSupport.scala

@@ -17,10 +17,8 @@
 package uk.gov.hmrc.helptosaveapi.util
 
 import akka.stream.Materializer
-import com.codahale.metrics.{Counter, Timer}
 import com.typesafe.config.ConfigFactory
 import controllers.Assets
-import org.mockito.ArgumentMatchersSugar.*
 import org.mockito.IdiomaticMockito
 import play.api.http.HttpErrorHandler
 import play.api.inject.guice.GuiceApplicationBuilder

test/uk/gov/hmrc/helptosaveapi/validators/APIHttpHeaderValidatorSpec.scala

@@ -22,7 +22,6 @@ import play.api.http.{ContentTypes, HeaderNames}
 import play.api.mvc._
 import play.api.test.FakeRequest
 import uk.gov.hmrc.helptosaveapi.util.TestSupport
-import play.api.data.validation._
 
 class APIHttpHeaderValidatorSpec extends TestSupport {