Debugging

Author: geiralund

.github/workflows/dp-inntekt-api-deploy.yaml renamed to .github/workflows/deploy.yaml

@@ -19,13 +19,22 @@ jobs:
           distribution: temurin
           java-version: 17
 
+      - uses: gradle/[email protected]
       - uses: gradle/[email protected]
+        id: build
+        env:
+          DEPENDENCY_GRAPH_INCLUDE_CONFIGURATIONS: compileClasspath|runtimeClasspath
+          ORG_GRADLE_PROJECT_githubUser: x-access-token
+          ORG_GRADLE_PROJECT_githubPassword: ${{ secrets.GITHUB_TOKEN }}
         with:
-          arguments: build
+          dependency-graph: generate-and-submit
+          arguments: --configuration-cache build
+
       - uses: nais/docker-build-push@v0
         name: docker-build-push
         id: docker-build-push
         with:
+          byosbom: dependency-graph-reports/build_and_deploy-build.json
           team: teamdagpenger
           tag: latest
           push_image: true # optional, default true

dp-inntekt-api/src/main/kotlin/no/nav/dagpenger/inntekt/db/Postgres.kt

@@ -17,6 +17,7 @@ fun migrate(config: InntektApiConfig): Int {
                     locations = config.database.flywayLocations,
                 )
             }
+
         else ->
             hikariDataSourceWithVaultIntegration(config, Role.ADMIN).use {
                 migrate(
@@ -59,7 +60,9 @@ fun migrate(
     dataSource: HikariDataSource,
     initSql: String = "",
     locations: List<String> = listOf("db/migration"),
-): Int = Flyway.configure().locations(*locations.toTypedArray()).dataSource(dataSource).initSql(initSql).load().migrate().migrations.size
+): Int =
+    Flyway.configure().validateMigrationNaming(true).locations(*locations.toTypedArray()).dataSource(dataSource)
+        .initSql(initSql).load().migrate().migrations.size
 
 fun clean(dataSource: HikariDataSource) =
     Flyway.configure().cleanDisabled(