Lagt til timout i byggsteg i alle workflows, justert noen dependency-…

…navn
navikt · Oct 30, 2024 · 094d38d · 094d38d
1 parent cc0e20a
commit 094d38d
Show file tree

Hide file tree

Showing 16 changed files with 40 additions and 27 deletions.
diff --git a/.github/workflows/api-start-stopp.yaml b/.github/workflows/api-start-stopp.yaml
@@ -21,11 +21,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/bekreftelse-api.yaml b/.github/workflows/bekreftelse-api.yaml
@@ -22,11 +22,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/bekreftelse-min-side-varsler.yaml b/.github/workflows/bekreftelse-min-side-varsler.yaml
@@ -21,11 +21,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/bekreftelse-tjeneste.yaml b/.github/workflows/bekreftelse-tjeneste.yaml
@@ -22,11 +22,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/bekreftelse-utgang.yaml b/.github/workflows/bekreftelse-utgang.yaml
@@ -22,11 +22,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/hendelselogg-backup.yaml b/.github/workflows/hendelselogg-backup.yaml
@@ -21,11 +21,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/hendelseprosessor.yaml b/.github/workflows/hendelseprosessor.yaml
@@ -21,11 +21,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/kafka-key-generator.yaml b/.github/workflows/kafka-key-generator.yaml
@@ -21,11 +21,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/utgang-formidlingsgruppe-deploy.yaml b/.github/workflows/utgang-formidlingsgruppe-deploy.yaml
@@ -21,11 +21,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/.github/workflows/utgang-pdl-deploy.yaml b/.github/workflows/utgang-pdl-deploy.yaml
@@ -21,11 +21,12 @@ env:
 jobs:
   build:
     name: Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: read
       id-token: write
       packages: write
-    runs-on: ubuntu-latest
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
     steps:

diff --git a/apps/api-start-stopp-perioder/build.gradle.kts b/apps/api-start-stopp-perioder/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     implementation(libs.nav.common.tokenClient)
     implementation(libs.nav.common.auditLog)
     implementation(libs.nav.common.log)
-    implementation(libs.poao.tilgangClient)
+    implementation(libs.nav.poao.tilgangClient)
     implementation(libs.logbackClassic)
     implementation(libs.logstashLogbackEncoder)
     implementation(libs.kafka.clients)

diff --git a/apps/bekreftelse-api/build.gradle.kts b/apps/bekreftelse-api/build.gradle.kts
@@ -42,7 +42,7 @@ dependencies {
     implementation(libs.nav.security.tokenValidationKtorV2)
 
     // Authorization
-    implementation(libs.poao.tilgangClient)
+    implementation(libs.nav.poao.tilgangClient)
 
     // Documentation
     implementation(libs.ktor.server.openapi)

diff --git a/domain/bekreftelse-paavegneav-avro-schema/build.gradle.kts b/domain/bekreftelse-paavegneav-avro-schema/build.gradle.kts
@@ -10,8 +10,8 @@ val schema by configurations.creating {
 }
 
 dependencies {
-    schema(libs.paw.schema.bekreftelse.paavegneav)
-    implementation(libs.paw.schema.bekreftelse.paavegneav)
+    schema(libs.nav.paw.schema.bekreftelse.paavegneav)
+    implementation(libs.nav.paw.schema.bekreftelse.paavegneav)
     api(libs.avro.core)
 }
 

diff --git a/domain/bekreftelsesmelding-avro-schema/build.gradle.kts b/domain/bekreftelsesmelding-avro-schema/build.gradle.kts
@@ -10,8 +10,8 @@ val schema by configurations.creating {
 }
 
 dependencies {
-    schema(libs.paw.schema.bekreftelsesmelding)
-    implementation(libs.paw.schema.bekreftelsesmelding)
+    schema(libs.nav.paw.schema.bekreftelsesmelding)
+    implementation(libs.nav.paw.schema.bekreftelsesmelding)
     api(libs.avro.core)
 }
 

diff --git a/domain/main-avro-schema/build.gradle.kts b/domain/main-avro-schema/build.gradle.kts
@@ -10,8 +10,8 @@ val schema by configurations.creating {
 }
 
 dependencies {
-    schema(libs.paw.schema.main)
-    api(libs.paw.schema.main)
+    schema(libs.nav.paw.schema.main)
+    api(libs.nav.paw.schema.main)
     api(libs.avro.core)
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,6 +1,8 @@
 [versions]
 noNavSecurityVersion = "5.0.5"
+noNavSecurityMockOauth2ServerVersion = "2.1.5"
 noNavCommonVersion = "3.2024.05.23_05.46-2b29fa343e8e"
+navPoaoTilgangClientVersion = "2024.04.29_13.59-a0ddddd36ac9"
 arbeidssokerregisteretVersion = "1.9348086045.48-1"
 bekreftelseSchemaVersion = "24.10.28.13-1"
 arrowVersion = "1.2.4"
@@ -66,7 +68,6 @@ opentelemetry-ktor = { group = "io.opentelemetry.instrumentation", name = "opent
 opentelemetry-annotations = { group = "io.opentelemetry.instrumentation", name = "opentelemetry-instrumentation-annotations", version.ref = "otelInstrumentationVersion" }
 micrometerCore = { group = "io.micrometer", name = "micrometer-core", version.ref = "micrometerVersion" }
 micrometer-registryPrometheus = { group = "io.micrometer", name = "micrometer-registry-prometheus", version.ref = "micrometerVersion" }
-paw-schema-main = { group = "no.nav.paw.arbeidssokerregisteret.api", name = "main-avro-schema", version.ref = "arbeidssokerregisteretVersion" }
 kafka-clients = { group = "org.apache.kafka", name = "kafka-clients", version.ref = "orgApacheKafkaVersion" }
 kafka-streams-core = { group = "org.apache.kafka", name = "kafka-streams", version.ref = "orgApacheKafkaVersion" }
 kafka-streams-test = { group = "org.apache.kafka", name = "kafka-streams-test-utils", version.ref = "orgApacheKafkaVersion" }
@@ -76,11 +77,6 @@ avro-kafkaStreamsSerde = { group = "io.confluent", name = "kafka-streams-avro-se
 jackson-datatypeJsr310 = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jsr310", version.ref = "comFasterxmlJacksonVersion" }
 jackson-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "comFasterxmlJacksonVersion" }
 jackson-core = { group = "com.fasterxml.jackson.core", name = "jackson-core", version.ref = "comFasterxmlJacksonVersion" }
-nav-common-tokenClient = { group = "no.nav.common", name = "token-client", version.ref = "noNavCommonVersion" }
-nav-common-log = { group = "no.nav.common", name = "log", version.ref = "noNavCommonVersion" }
-nav-common-auditLog = { group = "no.nav.common", name = "audit-log", version.ref = "noNavCommonVersion" }
-nav-security-tokenValidationKtorV2 = { group = "no.nav.security", name = "token-validation-ktor-v2", version.ref = "noNavSecurityVersion" }
-nav-security-tokenClientCore = { group = "no.nav.security", name = "token-client-core", version.ref = "noNavSecurityVersion" }
 graphql-client = { group = "com.expediagroup", name = "graphql-kotlin-client", version.ref = "graphqlClientVersion" }
 graphql-ktor-client = { group = "com.expediagroup", name = "graphql-kotlin-ktor-client", version.ref = "graphqlClientVersion" }
 hoplite-core = { group = "com.sksamuel.hoplite", name = "hoplite-core", version.ref = "comSksamuelHopliteVersion" }
@@ -102,9 +98,16 @@ database-postgres-driver = { group = "org.postgresql", name = "postgresql", vers
 database-flyway-core = { group = "org.flywaydb", name = "flyway-core", version.ref = "flywayVersion" }
 database-flyway-postgres = { group = "org.flywaydb", name = "flyway-database-postgresql", version.ref = "flywayVersion" }
 database-hikari-connectionPool = { group = "com.zaxxer", name = "HikariCP", version.ref = "hikariVersion" }
-poao-tilgangClient = { group = "no.nav.poao-tilgang", name = "client", version = "2024.04.29_13.59-a0ddddd36ac9" }
-paw-schema-bekreftelse-paavegneav = { group = "no.nav.paw.arbeidssokerregisteret.api", name = "bekreftelse-paavegneav-schema", version.ref = "bekreftelseSchemaVersion" }
-paw-schema-bekreftelsesmelding = { group = "no.nav.paw.arbeidssokerregisteret.api", name = "bekreftelsesmelding-schema", version.ref = "bekreftelseSchemaVersion" }
+nav-common-tokenClient = { group = "no.nav.common", name = "token-client", version.ref = "noNavCommonVersion" }
+nav-common-log = { group = "no.nav.common", name = "log", version.ref = "noNavCommonVersion" }
+nav-common-auditLog = { group = "no.nav.common", name = "audit-log", version.ref = "noNavCommonVersion" }
+nav-security-tokenClientCore = { group = "no.nav.security", name = "token-client-core", version.ref = "noNavSecurityVersion" }
+nav-security-tokenValidationKtorV2 = { group = "no.nav.security", name = "token-validation-ktor-v2", version.ref = "noNavSecurityVersion" }
+nav-security-mockOauth2Server = { group = "no.nav.security", name = "mock-oauth2-server", version.ref = "noNavSecurityMockOauth2ServerVersion" }
+nav-poao-tilgangClient = { group = "no.nav.poao-tilgang", name = "client", version.ref = "navPoaoTilgangClientVersion" }
+nav-paw-schema-main = { group = "no.nav.paw.arbeidssokerregisteret.api", name = "main-avro-schema", version.ref = "arbeidssokerregisteretVersion" }
+nav-paw-schema-bekreftelse-paavegneav = { group = "no.nav.paw.arbeidssokerregisteret.api", name = "bekreftelse-paavegneav-schema", version.ref = "bekreftelseSchemaVersion" }
+nav-paw-schema-bekreftelsesmelding = { group = "no.nav.paw.arbeidssokerregisteret.api", name = "bekreftelsesmelding-schema", version.ref = "bekreftelseSchemaVersion" }
 
 [bundles]
 ktorServerWithNettyAndMicrometer = ["ktor-server-core", "ktor-server-coreJvm", "ktor-server-netty", "ktor-server-metricsMicrometer"]