Merge pull request #5 from OSGP/feature/FDP-94-actuator

FDP-94: Actuator fix
OSGP · Nov 22, 2023 · 29bd978 · 29bd978
2 parents a645dd5 + cd36f45
commit 29bd978
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/application/build.gradle.kts b/application/build.gradle.kts
@@ -27,6 +27,9 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-engine")
     testImplementation("org.junit.jupiter:junit-jupiter-params")
     testImplementation("org.mockito:mockito-junit-jupiter")
+
+    // Generate test and integration test reports
+    jacocoAggregation(project(":application"))
 }
 
 tasks.withType<org.springframework.boot.gradle.tasks.bundling.BootBuildImage> {

diff --git a/...ation/src/main/java/org/gxf/soapbridge/application/configuration/SoapEndpointMapping.java b/...ation/src/main/java/org/gxf/soapbridge/application/configuration/SoapEndpointMapping.java
@@ -20,6 +20,11 @@ public SoapEndpointMapping(final SoapEndpoint soapEndpoint) {
 
   @Override
   protected Object getHandlerInternal(@NotNull final HttpServletRequest request) {
-    return soapEndpoint;
+    if (request.getServletPath().startsWith("/actuator")) {
+      // Let Spring handle this routing
+      return null;
+    } else {
+      return soapEndpoint;
+    }
   }
 }
diff --git a/application/src/main/kotlin/org/gxf/soapbridge/configuration/SecurityConfiguration.kt b/application/src/main/kotlin/org/gxf/soapbridge/configuration/SecurityConfiguration.kt
@@ -18,6 +18,7 @@ class SecurityConfiguration {
     fun filterChain(http: HttpSecurity): SecurityFilterChain =
         http.authorizeHttpRequests {
             it
+                .requestMatchers("/actuator/**").permitAll()
                 .anyRequest().authenticated()
         }.x509 {
             it

diff --git a/application/src/main/resources/application-dev.yml b/application/src/main/resources/application-dev.yml
@@ -3,7 +3,6 @@ logging:
     org:
       gxf:
         soapbridge: DEBUG
-
 spring:
   kafka:
     bootstrap-servers: localhost:9092
@@ -46,3 +45,14 @@ soap:
     port: 443
     protocol: https
   time-out: 45
+
+management:
+  server:
+    port: 8888
+  #    ssl:
+  #      enabled: false
+  #      client-auth: none
+  endpoints:
+    web:
+      exposure:
+        include: health