Merge remote-tracking branch 'origin/NINOA-64'

app/config/AppConfig.scala

@@ -19,6 +19,8 @@ package config
 import javax.inject.{Inject, Singleton}
 import play.api.Configuration
 import uk.gov.hmrc.play.bootstrap.config.ServicesConfig
+import v1.config.featureSwitch.Features
+import config.ConfigKeys._
 
 trait AppConfig {
 
@@ -30,18 +32,28 @@ trait AppConfig {
 
   def desContext(): String
 
+  def desStubUrl: String
+
+  def desStubContext: String
+
   def featureSwitch: Option[Configuration]
+
+  def features: Features
 }
 
 @Singleton
-class AppConfigImpl @Inject()(configuration: ServicesConfig, config: Configuration)
+class AppConfigImpl @Inject()(implicit val configuration: ServicesConfig, config: Configuration)
   extends AppConfig {
 
   private val desServicePrefix = "microservice.services.des"
 
   def featureSwitch: Option[Configuration] = config.getOptional[Configuration]("feature-switch")
+
   override lazy val desBaseUrl: String = configuration.baseUrl("des")
   override lazy val desEnvironment: String = configuration.getString(s"$desServicePrefix.env")
   override lazy val desToken: String = configuration.getString(s"$desServicePrefix.token")
   override lazy val desContext: String = configuration.getString(s"$desServicePrefix.context")
+  override lazy val desStubUrl: String = configuration.baseUrl("desStub")
+  override lazy val desStubContext: String = configuration.getString(desStubContextKey)
+  override lazy val features: Features = new Features
 }

app/config/ConfigKeys.scala

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package config
+
+object ConfigKeys {
+  val featureSwitchKey = "feature-switch"
+  val servicesKey = "microservice.services"
+
+  val useDesStubKey = s"$featureSwitchKey.useDesStub"
+  val desStubContextKey = s"$servicesKey.desStub.context"
+}

app/v1/config/featureSwitch/BaseFeature.scala

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package v1.config.featureSwitch
+
+import play.api.Configuration
+
+trait BaseFeature {
+
+  def getConfig(key: String)(implicit config: Configuration): String =
+    sys.props.get(key).fold(config.getString(key).getOrElse(throw new RuntimeException(s"Missing config for key: $key")))(x => x)
+
+}

app/v1/config/featureSwitch/Feature.scala

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2019 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package v1.config.featureSwitch
+
+import play.api.Configuration
+
+class Feature(val key: String)(implicit config: Configuration) extends BaseFeature {
+
+  def apply(value: Boolean): Unit = sys.props += key -> value.toString
+
+  def apply(): Boolean = getConfig(key).toBoolean
+
+}

app/v1/config/featureSwitch/FeatureSwitchModel.scala

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2019 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package v1.config.featureSwitch
+
+import play.api.libs.json.{Format, Json}
+
+case class FeatureSwitchModel(
+                               useDesStub: Boolean
+                             )
+
+object FeatureSwitchModel {
+  implicit val formats: Format[FeatureSwitchModel] = Json.format[FeatureSwitchModel]
+}

app/v1/config/featureSwitch/Features.scala

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2019 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package v1.config.featureSwitch
+
+import javax.inject.{Inject, Singleton}
+import play.api.Configuration
+import config.ConfigKeys.useDesStubKey
+
+@Singleton
+class Features @Inject()(implicit config: Configuration) extends BaseFeature {
+
+  lazy val useDesStub = new Feature(useDesStubKey)
+
+}

app/v1/connectors/DesConnector.scala

@@ -37,7 +37,11 @@ class DesConnector @Inject()(
   def sendRegisterRequest(request: NinoApplication)
                          (implicit hc: HeaderCarrier, ec: ExecutionContext): Future[HttpPostResponse[DesResponseModel]] = {
 
-    val url = s"${appConfig.desBaseUrl()}/${appConfig.desContext()}"
+    val url = if(appConfig.features.useDesStub()) {
+      s"${appConfig.desStubUrl}/${appConfig.desStubContext}"
+    } else {
+      s"${appConfig.desBaseUrl()}/${appConfig.desContext()}"
+    }
 
     http.POST(url, Json.toJson(request))(implicitly, RegisterNinoResponseReads, hc, ec)
   }

app/v1/testOnly/controllers/FeatureSwitchController.scala

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2019 HM Revenue & Customs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package v1.testOnly.controllers
+
+import config.AppConfig
+import javax.inject.Inject
+import play.api.Logger
+import play.api.libs.json.Json
+import play.api.mvc.{Action, AnyContent, ControllerComponents, Result}
+import uk.gov.hmrc.play.bootstrap.controller.BackendController
+import v1.config.featureSwitch.FeatureSwitchModel
+
+class FeatureSwitchController @Inject()(
+                                         appConfig: AppConfig,
+                                         cc: ControllerComponents
+                                       ) extends BackendController(cc) {
+
+  lazy val update: Action[AnyContent] = Action { implicit request =>
+    request.body.asJson match {
+      case Some(jsonBody) => jsonBody.asOpt[FeatureSwitchModel] match {
+        case Some(model) =>
+          appConfig.features.useDesStub(model.useDesStub)
+          result
+        case None =>
+          Logger.warn("[FeatureSwitchController][update] Unable to parse json as FeatureSwitchModel")
+          result
+      }
+      case None =>
+        Logger.warn("[FeatureSwitchController][update] Unable to validate body as JSON")
+        result
+    }
+  }
+
+  def result: Result = {
+    Ok(Json.toJson(FeatureSwitchModel(
+      appConfig.features.useDesStub()
+    )))
+  }
+
+}

build.sbt

@@ -34,3 +34,4 @@ lazy val microservice = Project(appName, file("."))
   .settings(resolvers += Resolver.jcenterRepo)
   .settings(CodeCoverageSettings.settings: _*)
   .settings(scalaVersion := "2.11.12")
+  .settings(resourceDirectory in IntegrationTest := (baseDirectory apply { baseDir: File => baseDir / "it/resources" }).value)

conf/application.conf

@@ -149,13 +149,21 @@ microservice {
       port = 9791
       token = some-token
       env = local
-      context = desEndpoint
+      context = desContext
+    }
+
+    desStub {
+      host = localhost
+      port = 9751
+      context = register
     }
 
   }
 }
 
 feature-switch {
+  useDesStub = true
+
   version-1 {
     enabled = true
   }

conf/testOnly.routes

@@ -10,4 +10,5 @@
 # Failing to follow this rule may result in test routes deployed in production.
 
 # Add all the application routes to the prod.routes file
-->         /                          prod.Routes
+->          /                               prod.Routes
+POST        /test-only/featureSwitch        @v1.testOnly.controllers.FeatureSwitchController.update

it/resources/application.conf

@@ -0,0 +1 @@
+application.router = testOnly.Routes

it/support/IntegrationBaseSpec.scala

@@ -42,6 +42,7 @@ trait IntegrationBaseSpec extends WordSpecLike
   def servicesConfig: Map[String, String] = Map(
     "microservice.services.des.host" -> mockHost,
     "microservice.services.des.port" -> mockPort,
+    "microservice.services.desStub.port" -> mockPort,
     "microservice.services.auth.host" -> mockHost,
     "microservice.services.auth.port" -> mockPort,
     "auditing.consumer.baseUri.port" -> mockPort