INC-1064: update to DPS Gradle Plugin v5 which includes Spring Boot v3 and AWS SDK v2 #407

neilmendum · 2023-04-05T15:18:40Z

https://dsdmoj.atlassian.net/browse/INC-1064

…nd AWS SDK v2

…s we're now using SqsAsyncClient It was added with ministryofjustice/hmpps-spring-boot-sqs#122

neilmendum · 2023-04-05T15:19:32Z

...main/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/config/ResourceServerConfiguration.kt

@@ -10,7 +10,7 @@ import org.springframework.security.web.server.SecurityWebFilterChain

 @Configuration
 @EnableWebFluxSecurity
-@EnableReactiveMethodSecurity
+@EnableReactiveMethodSecurity(useAuthorizationManager = false)


See spring-projects/spring-security#12821

neilmendum · 2023-04-05T15:21:45Z

applicationinsights.json

@@ -6,6 +6,9 @@
    "service.version": "${BUILD_NUMBER}"
  },
  "instrumentation": {
+    "springScheduling": {


See https://dsdmoj.atlassian.net/browse/SDIT-367

microsoft/ApplicationInsights-Java#2870 (comment) – can’t tell if this is still required to throttle app insights logging?

Good spot! Removed with be9b7a0

neilmendum · 2023-04-05T15:22:22Z

build.gradle.kts

@@ -17,14 +17,19 @@ configurations {
  testImplementation { exclude(group = "org.junit.vintage") }
 }

+repositories {


This was added by https://github.com/ministryofjustice/hmpps-tech-docs/blob/99fff7d837644d573652c7c6f3a3ea78be654eeb/scripts/upgrade-spring-boot-3.bash#L17-L20

neilmendum · 2023-04-05T15:34:03Z

src/test/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/resource/IepLevelResourceTest.kt

@@ -768,7 +768,7 @@ class IepLevelResourceTest : IncentiveLevelResourceTestBase() {
          }""",
        )
        .exchange()
-        .expectErrorResponse(HttpStatus.BAD_REQUEST, "Invalid parameters: `iepLevel` must have length of at most 6")
+        .expectErrorResponse(HttpStatus.BAD_REQUEST, "Parameter conversion failure: 400 BAD_REQUEST \"Failed to read HTTP message\"")


This is a funny one - putting a debug break point on HmppsIncentivesApiExceptionHandlerhandleServerWebInputException the e.cause is

org.springframework.core.codec.DecodingException: JSON decoding error: Cannot construct instance of `uk.gov.justice.digital.hmpps.incentivesapi.dto.SyncPostRequest`, problem: Invalid parameters: `iepLevel` must have length of at most 6

I'm not entirely sure why it now drops into there, rather than handleParameterValidationException which it previously used to do, perhaps because a change to jakarta.validation.ValidationException 🤔 Do folks think it's worth investigating further?

i would like to look into it. we should either assert that the "cause" still has the right message, or (if not too tough) make the right exception bubble up

Agreed - raised https://dsdmoj.atlassian.net/browse/INC-1199

neilmendum · 2023-04-05T16:24:15Z

...kotlin/uk/gov/justice/digital/hmpps/incentivesapi/config/ApplicationInsightsConfiguration.kt

 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration

 /**
- * Application insights now controlled by the spring-boot-starter dependency.  However when the key is not specified
- * we don't get a telemetry bean and application won't start.  Therefore need this backup configuration.
+ * TelemetryClient gets altered at runtime by the java agent and so is a no-op otherwise


This was updated with https://github.com/ministryofjustice/hmpps-tech-docs/blob/99fff7d837644d573652c7c6f3a3ea78be654eeb/scripts/upgrade-spring-boot-3.bash#L73-L75

neilmendum · 2023-04-06T09:19:18Z

build.gradle.kts

 dependencies {
  implementation("org.springframework.boot:spring-boot-starter-webflux")
  implementation("org.springframework.boot:spring-boot-starter-data-r2dbc")
  implementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server")
  implementation("org.springframework.boot:spring-boot-starter-security")
  implementation("org.springframework.boot:spring-boot-starter-oauth2-client")

-  implementation("uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:1.2.0")
+  implementation("uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:2.0.0-beta-14")


Upgrading this as it's compatible with Spring Boot v3 - see https://github.com/ministryofjustice/hmpps-spring-boot-sqs/blob/spring-boot-3/release-notes/2.0.0.md

neilmendum · 2023-04-06T11:12:02Z

...lin/uk/gov/justice/digital/hmpps/incentivesapi/integration/IncentiveLevelResourceTestBase.kt

 import uk.gov.justice.digital.hmpps.incentivesapi.jpa.IncentiveLevel
 import uk.gov.justice.digital.hmpps.incentivesapi.jpa.PrisonIncentiveLevel
 import uk.gov.justice.digital.hmpps.incentivesapi.jpa.repository.IncentiveLevelRepository
 import uk.gov.justice.digital.hmpps.incentivesapi.jpa.repository.PrisonIncentiveLevelRepository
 import uk.gov.justice.digital.hmpps.incentivesapi.service.AuditEvent
 import uk.gov.justice.digital.hmpps.incentivesapi.service.HMPPSDomainEvent
 import uk.gov.justice.digital.hmpps.incentivesapi.service.HMPPSMessage
+import uk.gov.justice.hmpps.sqs.countMessagesOnQueue


This was added with ministryofjustice/hmpps-spring-boot-sqs#122 so removed our function AmazonSQS.getApproxQueueSize

neilmendum · 2023-04-06T11:12:49Z

...test/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/integration/SqsIntegrationTestBase.kt

 import uk.gov.justice.digital.hmpps.incentivesapi.integration.LocalStackContainer.setLocalStackProperties
 import uk.gov.justice.hmpps.sqs.HmppsQueue
 import uk.gov.justice.hmpps.sqs.HmppsQueueService
 import uk.gov.justice.hmpps.sqs.HmppsSqsProperties
 import uk.gov.justice.hmpps.sqs.MissingQueueException
 import uk.gov.justice.hmpps.sqs.MissingTopicException
+import uk.gov.justice.hmpps.sqs.countMessagesOnQueue


This was added with ministryofjustice/hmpps-spring-boot-sqs#122 so removed our function getNumberOfMessagesCurrentlyOnQueue

neilmendum · 2023-04-06T11:37:43Z

...ain/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/service/PrisonOffenderEventListener.kt

@@ -16,7 +16,7 @@ class PrisonOffenderEventListener(
    val log: Logger = LoggerFactory.getLogger(this::class.java)
  }

-  @JmsListener(destination = "incentives", containerFactory = "hmppsQueueContainerFactoryProxy")
+  @SqsListener("incentives", factory = "hmppsQueueContainerFactoryProxy")


I spotted ministryofjustice/hmpps-prisoner-to-nomis-update#164 - which we could also include if folks think it would be helpful?

not a bad idea. maybe we can do that in a separate pr as there are probs other methods that would benefit with span annotations

Good shout - raised https://dsdmoj.atlassian.net/browse/INC-1198

ushkarev · 2023-04-06T11:46:44Z

applicationinsights.json

@@ -6,6 +6,9 @@
    "service.version": "${BUILD_NUMBER}"
  },
  "instrumentation": {
+    "springScheduling": {


microsoft/ApplicationInsights-Java#2870 (comment) – can’t tell if this is still required to throttle app insights logging?

ushkarev · 2023-04-06T11:49:47Z

src/main/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/config/OpenApiConfiguration.kt

@@ -13,7 +13,7 @@ import io.swagger.v3.oas.models.security.Scopes
 import io.swagger.v3.oas.models.security.SecurityRequirement
 import io.swagger.v3.oas.models.security.SecurityScheme
 import io.swagger.v3.oas.models.servers.Server
-import org.springdoc.core.customizers.OpenApiCustomiser
+import org.springdoc.core.customizers.OpenApiCustomizer


ushkarev · 2023-04-06T11:54:33Z

...ain/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/service/PrisonOffenderEventListener.kt

@@ -16,7 +16,7 @@ class PrisonOffenderEventListener(
    val log: Logger = LoggerFactory.getLogger(this::class.java)
  }

-  @JmsListener(destination = "incentives", containerFactory = "hmppsQueueContainerFactoryProxy")
+  @SqsListener("incentives", factory = "hmppsQueueContainerFactoryProxy")


not a bad idea. maybe we can do that in a separate pr as there are probs other methods that would benefit with span annotations

ushkarev · 2023-04-06T11:55:22Z

src/test/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/helper/JwtAuthHelper.kt

@@ -59,7 +59,7 @@ class JwtAuthHelper {
          .setSubject(subject)
          .addClaims(it.toMap())
          .setExpiration(Date(System.currentTimeMillis() + expiryTime.toMillis()))
-          .signWith(SignatureAlgorithm.RS256, keyPair.private)
+          .signWith(keyPair.private, SignatureAlgorithm.RS256)


ushkarev · 2023-04-06T12:02:07Z

src/test/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/resource/IepLevelResourceTest.kt

@@ -768,7 +768,7 @@ class IepLevelResourceTest : IncentiveLevelResourceTestBase() {
          }""",
        )
        .exchange()
-        .expectErrorResponse(HttpStatus.BAD_REQUEST, "Invalid parameters: `iepLevel` must have length of at most 6")
+        .expectErrorResponse(HttpStatus.BAD_REQUEST, "Parameter conversion failure: 400 BAD_REQUEST \"Failed to read HTTP message\"")


i would like to look into it. we should either assert that the "cause" still has the right message, or (if not too tough) make the right exception bubble up

ushkarev · 2023-04-06T12:04:53Z

...t/kotlin/uk/gov/justice/digital/hmpps/incentivesapi/resource/IncentiveReviewsResourceTest.kt

@@ -134,7 +134,7 @@ class IncentiveReviewsResourceTest : IncentiveLevelResourceTestBase() {
        .uri("/incentives-reviews/prison/MDI/location/MDI-1/level/STD?sort=PRISON")
        .headers(setAuthorisation(roles = listOf("ROLE_INCENTIVES")))
        .exchange()
-        .expectErrorResponse(HttpStatus.BAD_REQUEST, "No enum constant")
+        .expectErrorResponse(HttpStatus.BAD_REQUEST, "Parameter conversion failure: 400 BAD_REQUEST \"Type mismatch.\"")


if "No enum constant" doesn't appear anywhere including the "cause", then this seems reasonable. though i'd only search for "Type mismatch".

related to https://github.com/ministryofjustice/hmpps-incentives-api/pull/407/files#r1159704464

ushkarev

happy to approve, but i would like to re-evaluate that exception testing to see if it can assert for the right message. or you can if you have an idea how to :)

See https://mojdt.slack.com/archives/C012FNNQ4A3/p1677234268902449?thread_ts=1677233333.667589&cid=C012FNNQ4A3

neilmendum · 2023-04-06T13:02:46Z

...lin/uk/gov/justice/digital/hmpps/incentivesapi/integration/IncentiveLevelResourceTestBase.kt

    assertThat(queueSize).isEqualTo(0)
  }

  protected fun assertDomainEventSent(eventType: String): HMPPSDomainEvent {
    val sqsClient = incentivesQueue.sqsClient
-    val queueSize = sqsClient.getApproxQueueSize(testDomainEventQueueUrl!!)
-    assertThat(queueSize).isEqualTo(1)
+    await untilCallTo { sqsClient.countMessagesOnQueue(testDomainEventQueueUrl!!).get() } matches { it == 1 }


Added this, and other awaits, because was finding tests were consistently failing

Assumed it was because we're now using software.amazon.awssdk.services.sqs.SqsAsyncClient (via uk.gov.justice.service.hmpps:hmpps-sqs-spring-boot-starter:2.0.0-beta-14) whereas previously we were using the synchronous class com.amazonaws.services.sqs.AmazonSQS

neilmendum added 2 commits April 5, 2023 16:17

INC-1064: update to DPS Gradle Plugin which includes Spring Boot v3 a…

09fbba7

…nd AWS SDK v2

INC-1064: fix for OpenApiDocsTest

bbc1766

neilmendum changed the title ~~INC-1064: update to DPS Gradle Plugin 5 which includes Spring Boot v3 and AWS SDK v2~~ INC-1064: update to DPS Gradle Plugin v5 which includes Spring Boot v3 and AWS SDK v2 Apr 6, 2023

neilmendum added 3 commits April 6, 2023 11:28

INC-1064: tweak test methods which make GetQueueAttributesRequest

7e89347

INC-1064: use hmpps-spring-boot-sqs count helper method; add awaits a…

35116d8

…s we're now using SqsAsyncClient It was added with ministryofjustice/hmpps-spring-boot-sqs#122

INC-1064: tweak awaits

40dcce0

neilmendum commented Apr 6, 2023

View reviewed changes

Merge branch 'main' into spring-3

dd40859

neilmendum marked this pull request as ready for review April 6, 2023 11:43

neilmendum requested a review from a team as a code owner April 6, 2023 11:43

ushkarev reviewed Apr 6, 2023

View reviewed changes

ushkarev previously approved these changes Apr 6, 2023

View reviewed changes

neilmendum added 2 commits April 6, 2023 13:38

INC-1064: remove no longer required AppInsights tweak

be9b7a0

Merge remote-tracking branch 'origin/spring-3' into spring-3

d0cd279

neilmendum dismissed ushkarev’s stale review via d0cd279 April 6, 2023 12:38

INC-1064: update logback config

2950877

See https://mojdt.slack.com/archives/C012FNNQ4A3/p1677234268902449?thread_ts=1677233333.667589&cid=C012FNNQ4A3

ushkarev approved these changes Apr 6, 2023

View reviewed changes

neilmendum merged commit 53e5b48 into main Apr 6, 2023

neilmendum deleted the spring-3 branch April 6, 2023 12:55

neilmendum commented Apr 6, 2023

View reviewed changes

neilmendum mentioned this pull request Apr 6, 2023

Update plugin uk.gov.justice.hmpps.gradle-spring-boot to v5 #347

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

INC-1064: update to DPS Gradle Plugin v5 which includes Spring Boot v3 and AWS SDK v2 #407

INC-1064: update to DPS Gradle Plugin v5 which includes Spring Boot v3 and AWS SDK v2 #407

neilmendum commented Apr 5, 2023

neilmendum Apr 5, 2023

neilmendum Apr 5, 2023

ushkarev Apr 6, 2023

neilmendum Apr 6, 2023

neilmendum Apr 5, 2023

neilmendum Apr 5, 2023

ushkarev Apr 6, 2023

neilmendum Apr 6, 2023

neilmendum Apr 5, 2023

neilmendum Apr 6, 2023

neilmendum Apr 6, 2023

neilmendum Apr 6, 2023

neilmendum Apr 6, 2023

ushkarev Apr 6, 2023

neilmendum Apr 6, 2023

ushkarev Apr 6, 2023

ushkarev Apr 6, 2023

ushkarev Apr 6, 2023

ushkarev Apr 6, 2023

ushkarev Apr 6, 2023

ushkarev Apr 6, 2023

ushkarev left a comment

neilmendum Apr 6, 2023

INC-1064: update to DPS Gradle Plugin v5 which includes Spring Boot v3 and AWS SDK v2 #407

INC-1064: update to DPS Gradle Plugin v5 which includes Spring Boot v3 and AWS SDK v2 #407

Conversation

neilmendum commented Apr 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ushkarev left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment