pågående initiell utvikling

navikt · Jan 15, 2025 · 082fc7f · 082fc7f
1 parent ab5db14
commit 082fc7f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/config/DatasourceConfig.kt b/src/main/kotlin/no/nav/pensjon/opptjening/filadapter/config/DatasourceConfig.kt
@@ -7,8 +7,8 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Profile
 
-@Configuration
-@Profile("dev-gcp", "prod-gcp")
+// @Configuration
+// @Profile("dev-gcp", "prod-gcp")
 class DatasourceConfig {
 
     @Bean

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -17,4 +17,7 @@ no.nav.security.jwt:
       discoveryurl: ${AZURE_APP_WELL_KNOWN_URL}
       accepted_audience: ${AZURE_APP_CLIENT_ID}
 
+spring.datasource:
+  url: ${DATABASE_JDBC_URL}
+
 POPP_URL: http://localhost:9991/popp/api
diff --git a/src/test/kotlin/no/nav/pensjon/opptjening/filadapter/config/DatasourceConfig.kt b/src/test/kotlin/no/nav/pensjon/opptjening/filadapter/config/DatasourceConfig.kt
@@ -5,7 +5,7 @@ import com.zaxxer.hikari.HikariDataSource
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 
-@Configuration
+// @Configuration
 class DatasourceConfig {
 
     @Bean

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -1,3 +1,9 @@
 POPP_URL: http://localhost:9991/api
 UNLEASH_SERVER_API_URL: http://localhost:9991/api
 UNLEASH_SERVER_API_TOKEN: "bogus"
+
+spring.datasource:
+  driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver
+  url: jdbc:tc:postgresql:17:///test
+  username: test
+  password: test