Oppdatert avhengigheter igjen

Author: naviktthomas

Diff for: .github/workflows/api-start-stopp.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/bekreftelse-api.yaml

@@ -58,7 +58,7 @@ jobs:
           ./gradlew -Pversion=${{ env.VERSION }} -Pimage=${{ env.IMAGE }} :apps:${{ env.MODULE }}:build :apps:${{ env.MODULE }}:jib
           echo "DIGEST=$(cat ./apps/${{ env.MODULE }}/build/jib-image.digest)" >> $GITHUB_ENV
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/bekreftelse-min-side-varsler.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/bekreftelse-tjeneste.yaml

@@ -58,7 +58,7 @@ jobs:
           ./gradlew -Pversion=${{ env.VERSION }} -Pimage=${{ env.IMAGE }} :apps:${{ env.MODULE }}:build :apps:${{ env.MODULE }}:jib
           echo "DIGEST=$(cat ./apps/${{ env.MODULE }}/build/jib-image.digest)" >> $GITHUB_ENV
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/bekreftelse-utgang.yaml

@@ -58,7 +58,7 @@ jobs:
           ./gradlew -Pversion=${{ env.VERSION }} -Pimage=${{ env.IMAGE }} :apps:${{ env.MODULE }}:build :apps:${{ env.MODULE }}:jib
           echo "DIGEST=$(cat ./apps/${{ env.MODULE }}/build/jib-image.digest)" >> $GITHUB_ENV
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         env:
           TRIVY_JAVA_DB_REPOSITORY: "public.ecr.aws/aquasecurity/trivy-java-db:1"
         with:

Diff for: .github/workflows/hendelselogg-backup.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/hendelseprosessor.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/kafka-key-generator.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/kafka-key-maintenance.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/meldekort-adapter.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/tilgangskontroll.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/utgang-formidlingsgruppe-deploy.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: .github/workflows/utgang-pdl-deploy.yaml

@@ -59,7 +59,7 @@ jobs:
         env:
           ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
       - name: Attest and sign image
-        uses: nais/[email protected].9
+        uses: nais/[email protected].11
         with:
           image_ref: ${{ env.IMAGE }}@${{ env.DIGEST }}
 

Diff for: docker/postgres/config/initdb/postgres-init.sql

@@ -1,5 +1,5 @@
 create user pawkafkakeys with password '5up3r_53cr3t_p455w0rd';
-create user bekreftelse_api with password '5up3r_53cr3t_p455w0rd';
+create user bekreftelse_api with password 'Paw1234';
 create user pawkafkakeymaintenance with password '5up3r_53cr3t_p455w0rd';
 create user hendelselogg_backup with password '5up3r_53cr3t_p455w0rd';
 

Diff for: gradle/libs.versions.toml

@@ -13,20 +13,20 @@ orgApacheKafkaVersion = "3.7.2"
 ioConfluentKafkaVersion = "7.8.0"
 orgApacheAvroVersion = "1.12.0"
 comFasterxmlJacksonVersion = "2.18.2"
-kotlinExposedVersion = "0.57.0"
+kotlinExposedVersion = "0.58.0"
 logstashVersion = "8.0"
 logbackVersion = "1.5.16"
 kotestVersion = "5.9.1"
 mockkVersion = "1.13.16"
 testContainersVersion = "1.20.4"
-micrometerVersion = "1.14.2"
+micrometerVersion = "1.14.3"
 otelTargetSdkVersion = "1.46.0"
 otelInstrumentationVersion = "2.11.0"
 coroutinesVersion = "1.9.0"
 postgresDriverVersion = "42.7.4"
 flywayVersion = "11.1.1"
 hikariVersion = "6.2.1"
-kotlinxCoroutinesVersion = "1.9.0"
+kotlinxCoroutinesVersion = "1.10.1"
 kotlinxSerializationJsonVersion = "1.8.0"
 ktorVersion = "3.0.3"
 

Diff for: lib/database/src/main/kotlin/no/nav/paw/database/config/DatabaseConfig.kt

@@ -9,10 +9,12 @@ data class DatabaseConfig(
     val port: Int,
     val username: String,
     val password: String,
-    val name: String,
+    val database: String,
+    val autoCommit: Boolean = true,
     val maximumPoolSize: Int = 3,
     val connectionTimeout: Duration = Duration.ofSeconds(30),
+    val idleTimeout: Duration = Duration.ofMinutes(10),
     val maxLifetime: Duration = Duration.ofMinutes(30)
 ) {
-    val url get() = "jdbc:postgresql://$host:$port/$name?user=$username&password=$password"
+    val url get() = "jdbc:postgresql://$host:$port/$database?user=$username&password=$password"
 }

Diff for: lib/database/src/main/kotlin/no/nav/paw/database/factory/DataSourceFactory.kt

@@ -9,7 +9,9 @@ fun createHikariDataSource(databaseConfig: DatabaseConfig): HikariDataSource =
         HikariConfig().apply {
             jdbcUrl = databaseConfig.url
             maximumPoolSize = databaseConfig.maximumPoolSize
+            isAutoCommit = databaseConfig.autoCommit
             connectionTimeout = databaseConfig.connectionTimeout.toMillis()
+            idleTimeout = databaseConfig.idleTimeout.toMillis()
             maxLifetime = databaseConfig.maxLifetime.toMillis()
         }
     )