Legger til integrasjonstest baseklasse med med postgresSql testcontainer og embedded kafka.

pom.xml

@@ -48,6 +48,8 @@
         <zonky-postgresql.version>13.4.0</zonky-postgresql.version>
         <mockk.version>1.13.8</mockk.version>
         <jsonassert.version>1.5.1</jsonassert.version>
+        <testcontainers.version>1.19.3</testcontainers.version>
+        <springmockk.version>4.0.2</springmockk.version>
 
         <!-- pdf -->
         <openhtmltopdf.version>1.0.10</openhtmltopdf.version>
@@ -69,9 +71,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.zonky.test.postgres</groupId>
-                <artifactId>embedded-postgres-binaries-bom</artifactId>
-                <version>${zonky-postgresql.version}</version>
+                <groupId>org.testcontainers</groupId>
+                <artifactId>testcontainers-bom</artifactId>
+                <version>${testcontainers.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -99,6 +101,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jdbc</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
@@ -218,9 +224,9 @@
 
         <!-- Testing & Mocks -->
         <dependency>
-            <groupId>io.mockk</groupId>
-            <artifactId>mockk-jvm</artifactId>
-            <version>${mockk.version}</version>
+            <groupId>com.ninja-squad</groupId>
+            <artifactId>springmockk</artifactId>
+            <version>${springmockk.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -235,9 +241,17 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.zonky.test</groupId>
-            <artifactId>embedded-postgres</artifactId>
-            <version>${embedded-postgres.version}</version>
+            <groupId>no.nav.security</groupId>
+            <artifactId>token-validation-spring-test</artifactId>
+            <version>${token-support.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/kotlin/no/nav/k9punsj/K9PunsjApplication.kt

@@ -4,23 +4,19 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies
 import com.fasterxml.jackson.databind.SerializationFeature
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import de.huxhorn.sulky.ulid.ULID
-import no.nav.k9punsj.configuration.DbConfiguration
-import no.nav.k9punsj.configuration.hikariConfig
 import no.nav.k9punsj.utils.UlidDeserializer
 import org.springframework.boot.Banner
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration
 import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
 import org.springframework.boot.runApplication
 import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory
 import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory
 import org.springframework.context.annotation.Bean
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder
 import org.springframework.scheduling.annotation.EnableScheduling
-import javax.sql.DataSource
 
 @EnableScheduling
-@SpringBootApplication(exclude = [ErrorMvcAutoConfiguration::class, FlywayAutoConfiguration::class])
+@SpringBootApplication(exclude = [ErrorMvcAutoConfiguration::class])
 class K9PunsjApplication {
 
     @Bean
@@ -37,12 +33,6 @@ class K9PunsjApplication {
     fun reactiveWebServerFactory(): ReactiveWebServerFactory {
         return NettyReactiveWebServerFactory()
     }
-
-    @Bean
-    @StandardProfil
-    fun databaseInitializer(dbConfiguration: DbConfiguration): DataSource {
-        return hikariConfig(dbConfiguration)
-    }
 }
 
 fun main(args: Array<String>) {

src/main/kotlin/no/nav/k9punsj/kafka/KafkaHendelseProducer.kt

@@ -1,13 +1,11 @@
 package no.nav.k9punsj.kafka
 
-import no.nav.k9punsj.IkkeTestProfil
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.kafka.core.KafkaTemplate
 import org.springframework.stereotype.Component
 
 @Component
-@IkkeTestProfil
 class KafkaHendelseProducer(
     private val kafkaTemplate: KafkaTemplate<String, String>
 ) : HendelseProducer {

src/main/kotlin/no/nav/k9punsj/tilgangskontroll/AuthenticationHandler.kt

@@ -19,7 +19,7 @@ import org.springframework.web.reactive.function.server.ServerResponse
 import org.springframework.web.reactive.function.server.buildAndAwait
 
 @Service
-internal class AuthenticationHandler(
+class AuthenticationHandler(
     multiIssuerProperties: MultiIssuerProperties
 ) {
 

src/main/resources/application.yml

@@ -1,3 +1,9 @@
+spring:
+  flyway:
+    enabled: true
+    baselineOnMigrate: true
+    clean-on-validation-error: true
+
 management:
   health:
     diskspace:
@@ -74,11 +80,6 @@ no.nav:
           accepted_audience: ${APP_NAISSTS_aud}
           proxyUrl:
 
-  db:
-    url: ${DEFAULTDS_URL}
-    username: ${DEFAULTDS_USERNAME}
-    password: ${DEFAULTDS_PASSWORD}
-    vault_mountpath: ${DEFAULTDS_VAULT_MOUNTPATH}
   abac:
     system_user: ${SYSTEMBRUKER_USERNAME}
     system_user_password: ${SYSTEMBRUKER_PASSWORD}