Version bumps

chrissearle · chrissearle · commit 13efe0452b46 · 2024-11-20T09:21:40.000+01:00
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -14,10 +14,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 21
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '21'
+          java-version: '22'
           distribution: 'temurin'
 
       - name: Build
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jre
+FROM eclipse-temurin:22-jre
 
 RUN mkdir -p /opt/app
 COPY build/libs/history.jar /opt/app
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ application {
 }
 
 kotlin {
-    jvmToolchain(21)
+    jvmToolchain(22)
 }
 
 repositories {
diff --git a/docker-compose-deploy.yml b/docker-compose-deploy.yml
@@ -10,7 +10,7 @@ services:
       - discovery.type=single-node
       - xpack.security.http.ssl.enabled=false
       - xpack.license.self_generated.type=trial
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0
     mem_limit: 1gb
     networks:
       - history
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -9,4 +9,4 @@ services:
       - discovery.type=single-node
       - xpack.security.http.ssl.enabled=false
       - xpack.license.self_generated.type=trial
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.15.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -10,9 +10,9 @@
     "postinstall": "nuxt prepare"
   },
   "dependencies": {
-    "@nuxt/icon": "^1.5.6",
+    "@nuxt/icon": "^1.8.1",
     "@nuxt/scripts": "^0.9.5",
-    "nuxt": "^3.13.0",
+    "nuxt": "^3.14.1592",
     "vue": "latest",
     "vue-router": "latest",
     "vuetify-nuxt-module": "^0.18.3"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,15 +1,15 @@
 
 [versions]
-ktor-version = "2.3.12"
-kotlin-version = "2.0.20"
-logback-version = "1.5.8"
-prometheus-version = "1.13.5"
+ktor-version = "3.0.1"
+kotlin-version = "2.0.21"
+logback-version = "1.5.12"
+prometheus-version = "1.14.1"
 gradle_versions_filter_version = "0.1.16"
 detekt_version = "1.23.7"
-kotlinter_version = "4.4.1"
+kotlinter_version = "4.5.0"
 kotlin_logging_version = "7.0.0"
 arrow_version = "1.2.4"
-search_client_version = "2.2.2"
+search_client_version = "2.3.1"
 kotlinx_serialization_version = "1.7.3"
 node_version = "7.1.0"
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/kotlin/no/java/conf/plugins/Monitoring.kt b/src/main/kotlin/no/java/conf/plugins/Monitoring.kt
@@ -7,7 +7,7 @@ import io.ktor.server.application.install
 import io.ktor.server.metrics.micrometer.MicrometerMetrics
 import io.ktor.server.plugins.callid.CallId
 import io.ktor.server.plugins.callid.callIdMdc
-import io.ktor.server.plugins.callloging.CallLogging
+import io.ktor.server.plugins.calllogging.CallLogging
 import io.ktor.server.request.path
 import io.ktor.server.response.respond
 import io.ktor.server.routing.get
diff --git a/src/main/kotlin/no/java/conf/plugins/Respond.kt b/src/main/kotlin/no/java/conf/plugins/Respond.kt
@@ -2,24 +2,22 @@ package no.java.conf.plugins
 
 import arrow.core.Either
 import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.ApplicationCall
-import io.ktor.server.application.call
 import io.ktor.server.response.respond
 import io.ktor.server.response.respondRedirect
-import io.ktor.util.pipeline.PipelineContext
+import io.ktor.server.routing.RoutingContext
 import no.java.conf.model.ApiError
 
-context(PipelineContext<Unit, ApplicationCall>)
+context(RoutingContext)
 suspend inline fun <reified A : Any> Either<ApiError, A>.respond(status: HttpStatusCode = HttpStatusCode.OK) =
     when (this) {
         is Either.Left -> respond(value)
         is Either.Right -> call.respond(status, value)
     }
 
-suspend fun PipelineContext<Unit, ApplicationCall>.respond(error: ApiError) =
+suspend fun RoutingContext.respond(error: ApiError) =
     call.respond(error.statusCode, error.messageMap())
 
-context(PipelineContext<Unit, ApplicationCall>)
+context(RoutingContext)
 suspend inline fun <reified A : Any> Either<ApiError, A>.respondRedirect(url: String) =
     when (this) {
         is Either.Left -> respond(value)
diff --git a/src/main/kotlin/no/java/conf/plugins/Security.kt b/src/main/kotlin/no/java/conf/plugins/Security.kt
@@ -1,32 +1,7 @@
 package no.java.conf.plugins
 
 import io.ktor.server.application.Application
-import io.ktor.server.application.call
-import io.ktor.server.application.install
-import io.ktor.server.response.respondText
-import io.ktor.server.routing.get
-import io.ktor.server.routing.routing
-import io.ktor.server.sessions.Sessions
-import io.ktor.server.sessions.cookie
-import io.ktor.server.sessions.get
-import io.ktor.server.sessions.sessions
-import io.ktor.server.sessions.set
 
 fun Application.configureSecurity() {
-    data class MySession(
-        val count: Int = 0,
-    )
 
-    install(Sessions) {
-        cookie<MySession>("MY_SESSION") {
-            cookie.extensions["SameSite"] = "lax"
-        }
-    }
-    routing {
-        get("/session/increment") {
-            val session = call.sessions.get<MySession>() ?: MySession()
-            call.sessions.set(session.copy(count = session.count + 1))
-            call.respondText("Counter is ${session.count}. Refresh to increment.")
-        }
-    }
 }
diff --git a/src/main/kotlin/no/java/conf/service/SearchService.kt b/src/main/kotlin/no/java/conf/service/SearchService.kt
@@ -67,11 +67,17 @@ class SearchService(
     private var readyState = State.NEW
 
     suspend fun setup() {
+        logger.debug { "Setting up SearchService" }
+
         if (readyState != State.NEW) {
+            logger.debug { "Incorrect search state - was $readyState" }
+
             return
         }
 
         if (!skipIndex) {
+            logger.debug { "Creating index" }
+
             client.deleteIndex(INDEX_NAME, ignoreUnavailable = true)
 
             client.createIndex(INDEX_NAME) {
@@ -98,15 +104,23 @@ class SearchService(
             }
         }
 
+        logger.debug { "State -> Mapped" }
+
         readyState = State.MAPPED
     }
 
     suspend fun ingest(sessions: List<Session>) {
+        logger.debug { "Ingesting" }
+
         if (readyState != State.MAPPED) {
+            logger.debug { "Incorrect search state - was $readyState" }
+
             return
         }
 
         if (!skipIndex) {
+            logger.debug { "Bulk" }
+
             val itemCallBack =
                 object : BulkItemCallBack {
                     override fun bulkRequestFailed(
@@ -151,6 +165,8 @@ class SearchService(
             logger.info { "Indexing skipped" }
         }
 
+        logger.debug { "State -> Indexed" }
+
         readyState = State.INDEXED
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM eclipse-temurin:21-jre`
	`1`	`+FROM eclipse-temurin:22-jre`
`2`	`2`
`3`	`3`	`RUN mkdir -p /opt/app`
`4`	`4`	`COPY build/libs/history.jar /opt/app`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ application {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`kotlin {`
`18`		`- jvmToolchain(21)`
	`18`	`+ jvmToolchain(22)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`repositories {`