Fikset merge conflicts

.github/workflows/app.person-organisasjon-tilgang-service.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       working-directory: "apps/person-organisasjon-tilgang-service"
       deploy-tag: "#deploy-person-organisasjon-tilgang-service"
-      deploy-tag-test: "#deploy-test-person-organisasjon-tilgang-service"
     permissions:
       contents: read
       id-token: write

.github/workflows/db.dolly-backend.yml

@@ -0,0 +1,21 @@
+name: db-dolly-backend
+
+on:
+  push:
+    paths:
+      - "apps/dolly-db/db.dolly-backend.yml"
+      - "apps/dolly-db/src/**"
+      - ".github/workflows/db.dolly-backend.yml"
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/dolly-db"
+      nais-manifest: "db.dolly-backend.yml"
+      deploy-tag: "#db-dolly-backend"
+      sonar-enabled: false
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

.github/workflows/db.organisasjon-forvalter.yml

@@ -0,0 +1,20 @@
+name: db-organisasjon-forvalter
+
+on:
+  push:
+    paths:
+      - "apps/dolly-db/db.organisasjon.forvalter.yml"
+      - ".github/workflows/db.organisasjon-forvalter.yml"
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/dolly-db"
+      nais-manifest: "db.organisasjon-forvalter.yml"
+      deploy-tag: "#db-organisasjon-forvalter"
+      sonar-enabled: false
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

.github/workflows/db.pdl-forvalter.yml

@@ -0,0 +1,20 @@
+name: db-pdl-forvalter
+
+on:
+  push:
+    paths:
+      - "apps/dolly-db/db.pdl-forvalter.yml"
+      - ".github/workflows/db.pdl-forvalter.yml"
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/dolly-db"
+      nais-manifest: "db.pdl-forvalter.yml"
+      deploy-tag: "#db-pdl-forvalter"
+      sonar-enabled: false
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit

.github/workflows/proxy.aareg-proxy.yml

@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/aareg-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-aareg"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.aareg-synt-services-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/aareg-synt-services-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-aareg-synt-services"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.arbeidsplassencv-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "proxies/arbeidsplassencv-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-arbeidsplassencv"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.arena-forvalteren-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/arena-forvalteren-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-arena-forvalteren"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.batch-adeo-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/batch-adeo-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-batch-adeo"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.brregstub-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/brregstub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-brregstub"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.ereg-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/ereg-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-ereg"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.histark-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/histark-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-histark"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.inntektstub-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inntektstub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-inntektstub"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.inst-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inst-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-inst"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.kontoregister-person-proxy.yml

@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/kontoregister-person-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-kontoregister-person"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.krrstub-proxy.yml

@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/krrstub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-krrstub"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.medl-proxy.yml

@@ -19,7 +19,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/medl-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-medl"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.norg2-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/norg2-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-norg2"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.pensjon-testdata-facade-proxy.yml

@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/pensjon-testdata-facade-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-pensjon"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.saf-proxy.yml

@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/saf-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-saf"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.sigrunstub-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/sigrunstub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-sigrunstub"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.skjermingsregister-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/skjermingsregister-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-skjermingsregister"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.synthdata-meldekort-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "proxies/synthdata-meldekort-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-synthdata-meldekort"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.udistub-proxy.yml

@@ -17,7 +17,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/udistub-proxy"
-      deploy-tag: "#deploy-proxy"
+      deploy-tag: "#deploy-proxy-udistub"
     permissions:
       contents: read
       id-token: write

README.md

@@ -81,19 +81,19 @@ Eller kjør:
 ```
 
 ## Virtuelt miljø 
-Kjør kommandoen: 
-
+Kjør kommandoen:
+```aiexclude
+> JWK=$(cat ./mocks/jwk.json) docker compose up --build
 ```
-JWK=$(cat ./mocks/jwk.json) docker compose up --build
+Evt. i PowerShell:
+```aiexclude
+> $env:JWK=(Get-Content -Path ./mocks/jwk.json -Raw) ; docker compose up --build
 ```
-
-Deretter kan itegrasjonstester kjøres med kommandoen: 
-
+Deretter kan itegrasjonstester kjøres med kommandoen:
 ```
-./gradlew iTest
+> ./gradlew iTest
 ```
-
-NB: Dette vil kun fungere hvis appen støtter itegrasjonstester.
+NB: Dette vil kun fungere hvis appen støtter integrasjonstester.
 
 
 ## Kode generert av GitHub Copilot

apps/adresse-service/build.gradle

@@ -10,14 +10,15 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'no.nav.testnav.libs:security-core'
-    implementation 'no.nav.testnav.libs:servlet-core'
-    implementation 'no.nav.testnav.libs:servlet-security'
-    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation "no.nav.testnav.libs:security-core"
+    implementation "no.nav.testnav.libs:servlet-core"
+    implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:data-transfer-objects"
+    implementation "no.nav.testnav.libs:vault"
 
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation "org.springframework.boot:spring-boot-starter-security"
+    implementation "org.springframework.boot:spring-boot-starter-web"
+    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
 
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
     implementation "org.aspectj:aspectjweaver:$versions.jweaver"

apps/adresse-service/config.yml

@@ -21,6 +21,13 @@ spec:
     path: /internal/isAlive
     periodSeconds: 30
     initialDelay: 30
+  observability:
+    logging:
+      destinations:
+        - id: elastic
+    autoInstrumentation:
+      enabled: true
+      runtime: java
   readiness:
     path: /internal/isReady
     initialDelay: 30