WIP Spring boot 4 - do not merge

.github/workflows/build_test_package.yml

@@ -31,10 +31,9 @@ jobs:
           java-version: '23'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Build with Gradle
         env:
@@ -94,10 +93,9 @@ jobs:
           java-version: '23'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Run ${{ matrix.service.testPrefix }} controller tests
         env:
@@ -125,10 +123,9 @@ jobs:
           java-version: '23'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Run unit tests
         env:
@@ -174,10 +171,9 @@ jobs:
           java-version: '23'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Run RBAC ${{ matrix.service.packageName }} integration tests
         env:
@@ -221,10 +217,9 @@ jobs:
         run: echo "gitRefName=${GITHUB_REF#refs/*/}" >> "${GITHUB_OUTPUT}"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Build local Container Image for scanning
         run: >

.github/workflows/doc.yml

@@ -29,10 +29,9 @@ jobs:
           java-version: '23'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Generate Markdown documentation
         env:

.github/workflows/lint.yml

@@ -33,10 +33,9 @@ jobs:
         java-version: '23'
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v5
+      uses: gradle/actions/setup-gradle@v6
       with:
-        gradle-version: '8.14'
-        cache-disabled: true
+        gradle-version: '9.4.1'
 
     - name: Check with Spotless
       env:
@@ -61,10 +60,9 @@ jobs:
           java-version: '23'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Check with Detekt
         env:

.github/workflows/openapi.yml

@@ -41,10 +41,9 @@ jobs:
           java-version: '23'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Validate '${{ matrix.project }}' definition
         run: ./gradlew :cosmotech-${{ matrix.project }}:openApiValidate | tee validate.log

.github/workflows/openapi_clients.yml

@@ -44,10 +44,9 @@ jobs:
           java-version: '23'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
 
       - name: Generate Client (${{ matrix.language }})
         env:

.github/workflows/track_dependencies.yml

@@ -17,10 +17,9 @@ jobs:
           distribution: 'temurin'
           java-version: '23'
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v5
+        uses: gradle/actions/setup-gradle@v6
         with:
-          gradle-version: '8.14'
-          cache-disabled: true
+          gradle-version: '9.4.1'
       - name: Track dependencies
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

api/build.gradle.kts

@@ -21,7 +21,9 @@ dependencies {
   implementation(projects.cosmotechRunApi)
   implementation(projects.cosmotechRunnerApi)
   implementation(projects.cosmotechCommonApi)
-  testImplementation("org.springframework.security:spring-security-test")
+  testImplementation("org.springframework.boot:spring-boot-starter-security-test")
+  testImplementation("org.springframework.boot:spring-boot-restdocs")
+  testImplementation("org.springframework.boot:spring-boot-webmvc-test")
   testImplementation("org.springframework.restdocs:spring-restdocs-mockmvc")
 }
 

api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestBase.kt

@@ -17,7 +17,8 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.extension.ExtendWith
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs
+import org.springframework.boot.restdocs.test.autoconfigure.AutoConfigureRestDocs
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc
 import org.springframework.http.HttpHeaders
 import org.springframework.restdocs.RestDocumentationContextProvider
 import org.springframework.restdocs.RestDocumentationExtension
@@ -34,6 +35,7 @@ import org.springframework.web.context.WebApplicationContext
 @EnableWebSecurity
 @ExtendWith(RestDocumentationExtension::class)
 @AutoConfigureRestDocs
+@AutoConfigureMockMvc
 abstract class ControllerTestBase : CsmTestBase() {
 
   @Autowired private lateinit var context: WebApplicationContext
@@ -46,7 +48,6 @@ abstract class ControllerTestBase : CsmTestBase() {
 
   @BeforeEach
   fun beforeEach(restDocumentationContextProvider: RestDocumentationContextProvider) {
-
     rediSearchIndexer.createIndexFor(Organization::class.java)
     rediSearchIndexer.createIndexFor(Workspace::class.java)
     rediSearchIndexer.createIndexFor(Dataset::class.java)

api/src/integrationTest/kotlin/com/cosmotech/api/home/ControllerTestUtils.kt

@@ -36,6 +36,7 @@ import org.springframework.mock.web.MockMultipartFile
 import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder
+import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.multipart
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
@@ -519,3 +520,7 @@ fun MockHttpServletRequestBuilder.withPlatformAdminHeader(): MockHttpServletRequ
 
 fun MockHttpServletRequestBuilder.withOrganizationUserHeader(): MockHttpServletRequestBuilder =
     this.header(ORGANIZATION_USER_EMAIL, ORGANIZATION_USER_API_KEY_VALUE)
+
+fun MockMultipartHttpServletRequestBuilder.withPlatformAdminHeader():
+    MockMultipartHttpServletRequestBuilder =
+    this.header(PLATFORM_ADMIN_EMAIL, PLATFORM_ADMIN_API_KEY_VALUE)

api/src/integrationTest/kotlin/com/cosmotech/api/home/dataset/DatasetControllerTests.kt

@@ -81,7 +81,6 @@ class DatasetControllerTests : ControllerTestBase() {
 
   @BeforeEach
   fun beforeEach() {
-
     val runTemplateRunSizing =
         RunTemplateResourceSizing(
             com.cosmotech.solution.domain.ResourceSizeInfo("1", "2G"),

api/src/integrationTest/kotlin/com/cosmotech/api/home/run/RunControllerTests.kt

@@ -101,7 +101,6 @@ class RunControllerTests : ControllerTestBase() {
 
   @BeforeEach
   fun beforeEach() {
-
     ReflectionTestUtils.setField(runApiService, "containerFactory", containerFactory)
     ReflectionTestUtils.setField(runApiService, "workflowService", workflowService)
     ReflectionTestUtils.setField(runApiService, "eventPublisher", eventPublisher)

api/src/integrationTest/kotlin/com/cosmotech/api/home/runner/RunnerControllerTests.kt

@@ -77,7 +77,6 @@ class RunnerControllerTests : ControllerTestBase() {
 
   @BeforeEach
   fun beforeEach() {
-
     val tags = mutableListOf("tag1", "tag2")
     val description = "this_is_a_description"
     val parameterGroupId = "parameterGroup1"

api/src/integrationTest/resources/application-test.yml

@@ -1,6 +1,6 @@
 management:
   endpoints:
-    enabled-by-default: false
+    access.default: none
 
 spring:
   data:

api/src/main/resources/application.yml

@@ -51,11 +51,7 @@ management:
     port: 8081
 
 server:
-  error:
-    whitelabel:
-      enabled: false
-    include-stacktrace: never
-  undertow:
+  jetty:
     accesslog:
       enabled: true
 
@@ -179,3 +175,7 @@ api:
   swagger-ui:
     base-path: ${server.servlet.context-path}
   version: ${csm.platform.api.version}
+
+spring.web.error.include-stacktrace: never
+
+spring.web.error.whitelabel.enabled: false