From a83fab267a4046772034ca42cb03b5077ac49d98 Mon Sep 17 00:00:00 2001 From: mithra-balakrishnan <177737570+mithra-balakrishnan@users.noreply.github.com> Date: Thu, 12 Sep 2024 08:33:25 +0100 Subject: [PATCH 1/4] DDCE-6058 - Removing scopes from API definition --- app/v1/controllers/ApiDocumentationController.scala | 7 ------- it/test/v1/endpoints/ApiDocumentationControllerISpec.scala | 7 ------- test/v1/controllers/ApiDocumentationControllerSpec.scala | 7 ------- 3 files changed, 21 deletions(-) diff --git a/app/v1/controllers/ApiDocumentationController.scala b/app/v1/controllers/ApiDocumentationController.scala index de2942f..044b04a 100644 --- a/app/v1/controllers/ApiDocumentationController.scala +++ b/app/v1/controllers/ApiDocumentationController.scala @@ -38,13 +38,6 @@ class ApiDocumentationController @Inject() ( val apiDefinition = Json.parse( s""" |{ - | "scopes": [ - | { - | "key": "read:register-nino", - | "name": "Register NINO", - | "description": "Register NINO" - | } - | ], | "api": { | "name": "Register NINO", | "description": "Register NINO information for downstream service", diff --git a/it/test/v1/endpoints/ApiDocumentationControllerISpec.scala b/it/test/v1/endpoints/ApiDocumentationControllerISpec.scala index b3392fb..9725e76 100644 --- a/it/test/v1/endpoints/ApiDocumentationControllerISpec.scala +++ b/it/test/v1/endpoints/ApiDocumentationControllerISpec.scala @@ -54,13 +54,6 @@ class ApiDocumentationControllerISpec extends IntegrationBaseSpec { private val expectedJson: JsValue = Json.parse( """ |{ - | "scopes": [ - | { - | "key": "read:register-nino", - | "name": "Register NINO", - | "description": "Register NINO" - | } - | ], | "api": { | "name": "Register NINO", | "description": "Register NINO information for downstream service", diff --git a/test/v1/controllers/ApiDocumentationControllerSpec.scala b/test/v1/controllers/ApiDocumentationControllerSpec.scala index 9bd10ae..58f7ca3 100644 --- a/test/v1/controllers/ApiDocumentationControllerSpec.scala +++ b/test/v1/controllers/ApiDocumentationControllerSpec.scala @@ -43,13 +43,6 @@ class ApiDocumentationControllerSpec extends ControllerBaseSpec with MockApiDefi private val expectedJson: JsValue = Json.parse( """ |{ - | "scopes": [ - | { - | "key": "read:register-nino", - | "name": "Register NINO", - | "description": "Register NINO" - | } - | ], | "api": { | "name": "Register NINO", | "description": "Register NINO information for downstream service", From 29e3c699c694939f754d1e96a95d0afe9e08490c Mon Sep 17 00:00:00 2001 From: mithra-balakrishnan <177737570+mithra-balakrishnan@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:42:55 +0100 Subject: [PATCH 2/4] DDCE-6058 - addressing code review comments --- conf/logback.xml | 12 ------------ project/plugins.sbt | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/conf/logback.xml b/conf/logback.xml index 7571ee3..6811c33 100644 --- a/conf/logback.xml +++ b/conf/logback.xml @@ -19,18 +19,6 @@ - - - %date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] rid=[not-available] user=[not-available] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n - - - - - logs/access.log - - %message%n - - logs/connector.log diff --git a/project/plugins.sbt b/project/plugins.sbt index 61797d7..c121cac 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,7 +3,7 @@ resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefact Resolver.ivyStylePatterns ) -addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.21.0") +addSbtPlugin("uk.gov.hmrc" % "sbt-auto-build" % "3.22.0") addSbtPlugin("uk.gov.hmrc" % "sbt-distributables" % "2.5.0") addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.2") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11") From b9e6cecb5df070e6c02b8b3a475704c37266417d Mon Sep 17 00:00:00 2001 From: mithra-balakrishnan <177737570+mithra-balakrishnan@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:48:58 +0100 Subject: [PATCH 3/4] DDCE-6058 - addressing code review comments --- conf/logback.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/conf/logback.xml b/conf/logback.xml index 6811c33..151e1ab 100644 --- a/conf/logback.xml +++ b/conf/logback.xml @@ -28,13 +28,6 @@ - - - - - - - From 31f30015c3621c0e35ae4b010f425eb360c9ec23 Mon Sep 17 00:00:00 2001 From: mithra-balakrishnan <177737570+mithra-balakrishnan@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:57:33 +0100 Subject: [PATCH 4/4] DDCE-6058 - addressing code review comments --- conf/logback-test.xml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/conf/logback-test.xml b/conf/logback-test.xml index 8bb2bfd..702a64e 100644 --- a/conf/logback-test.xml +++ b/conf/logback-test.xml @@ -14,18 +14,6 @@ - - - %date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] rid=[not-available] user=[not-available] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n - - - - - logs/access.log - - %message%n - - logs/connector.log @@ -34,13 +22,6 @@ - - - - - - -