Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

DDCE-6058 - Removing scopes from API definition #136

Merged
merged 4 commits into from
Sep 17, 2024
Merged

DDCE-6058 - Removing scopes from API definition #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a83fab2
DDCE-6058 - Removing scopes from API definition
mithra-balakrishnan Sep 12, 2024
29e3c69
DDCE-6058 - addressing code review comments
mithra-balakrishnan Sep 12, 2024
b9e6cec
DDCE-6058 - addressing code review comments
mithra-balakrishnan Sep 12, 2024
31f3001
DDCE-6058 - addressing code review comments
mithra-balakrishnan Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/v1/controllers/ApiDocumentationController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
19 changes: 0 additions & 19 deletions conf/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,6 @@
</encoder>
</appender>

<appender name="STDOUT_IGNORE_NETTY" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] rid=[not-available] user=[not-available] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n</pattern>
</encoder>
</appender>

<appender name="ACCESS_LOG_FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/access.log</file>
<encoder>
<pattern>%message%n</pattern>
</encoder>
</appender>

<appender name="CONNECTOR_LOG_FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/connector.log</file>
Expand All @@ -34,13 +22,6 @@
</encoder>
</appender>

<logger name="accesslog" level="OFF" additivity="false">
<appender-ref ref="ACCESS_LOG_FILE" />
</logger>

<logger name="com.ning.http.client.providers.netty" additivity="false">
<appender-ref ref="STDOUT_IGNORE_NETTY" />
</logger>

<logger name="com.google.inject" level="OFF"/>

Expand Down
19 changes: 0 additions & 19 deletions conf/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@
<!--<encoder class="uk.gov.hmrc.play.logging.JsonEncoder"/>-->
</appender>

<appender name="STDOUT_IGNORE_NETTY" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] rid=[not-available] user=[not-available] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n</pattern>
</encoder>
</appender>

<appender name="ACCESS_LOG_FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/access.log</file>
<encoder>
<pattern>%message%n</pattern>
</encoder>
</appender>

<appender name="CONNECTOR_LOG_FILE" class="ch.qos.logback.core.FileAppender">
<file>logs/connector.log</file>
Expand All @@ -40,13 +28,6 @@
</appender>


<logger name="accesslog" level="WARN" additivity="false">
<appender-ref ref="ACCESS_LOG_FILE" />
</logger>

<logger name="com.ning.http.client.providers.netty" level="WARN" additivity="false">
<appender-ref ref="STDOUT_IGNORE_NETTY" />
</logger>

<logger name="com.google.inject" level="WARN"/>

Expand Down
7 changes: 0 additions & 7 deletions it/test/v1/endpoints/ApiDocumentationControllerISpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
7 changes: 0 additions & 7 deletions test/v1/controllers/ApiDocumentationControllerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down