Fixet merge conflicts

navikt · Apr 4, 2024 · acfaa56 · acfaa56
2 parents adb31ad + 2a4b97c
commit acfaa56
Show file tree

Hide file tree

Showing 298 changed files with 11,253 additions and 18,596 deletions.
diff --git a/.github/workflows/app.ereg-batch-status-service.yml b/.github/workflows/app.ereg-batch-status-service.yml
@@ -14,7 +14,7 @@ jobs:
   workflow:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
-      cluster: "dev-fss"
+      cluster: "dev-gcp"
       working-directory: "apps/ereg-batch-status-service"
       deploy-tag: "#deploy-ereg-batch-status-service"
     permissions:

diff --git a/.github/workflows/app.geografiske-kodeverk-service.yml b/.github/workflows/app.geografiske-kodeverk-service.yml
diff --git a/.github/workflows/app.kodeverk-service.yml b/.github/workflows/app.kodeverk-service.yml
@@ -0,0 +1,22 @@
+name: kodeverk-service
+
+on:
+  push:
+    paths:
+      - libs/security-core
+      - libs/reactive-core
+      - libs/reactive-security
+      - libs/data-transfer-objects
+      - apps/kodeverk-service/**
+      - .github/workflows/app.kodeverk-service.yml
+
+jobs:
+  workflow:
+    uses: ./.github/workflows/common.workflow.backend.yml
+    with:
+      working-directory: "apps/kodeverk-service"
+      deploy-tag: "#deploy-kodeverk-service"
+    permissions:
+      contents: read
+      id-token: write
+    secrets: inherit
diff --git a/.github/workflows/app.team-dolly-lokal-app.yml b/.github/workflows/app.team-dolly-lokal-app.yml
@@ -0,0 +1,21 @@
+name: team-dolly-lokal-app
+
+on:
+  push:
+    paths:
+      - .nais/team-dolly-lokal-app.yml
+      - .github/workflows/app.team-dolly-lokal-app.yml
+
+jobs:
+  deploy:
+    name: Deploy team-dolly-lokal-app
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/team-dolly-lokal-app.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/tests.yml → .github/workflows/integration-tests.yml b/.github/workflows/tests.yml → .github/workflows/integration-tests.yml
@@ -1,4 +1,4 @@
-name: Tests
+name: Integration Tests
 on:
   push:
     branches:

diff --git a/...workflows/proxy.tps-forvalteren-proxy.yml → ...hub/workflows/proxy.modapp-ereg-proxy.yml b/...workflows/proxy.tps-forvalteren-proxy.yml → ...hub/workflows/proxy.modapp-ereg-proxy.yml
@@ -1,19 +1,21 @@
-name: tps-forvalteren-proxy
+name: modapp-ereg-proxy
 
 on:
   push:
     paths:
       - libs/reactive-core
       - libs/reactive-proxy
-      - proxies/tps-forvalteren-proxy/**
-      - .github/workflows/proxy.tps-forvalteren-proxy.yml
+      - libs/reactive-security
+      - libs/security-core
+      - proxies/modapp-ereg-proxy/**
+      - .github/workflows/proxy.modapp-ereg-proxy.yml
 
 jobs:
   workflow:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       cluster: "dev-fss"
-      working-directory: "proxies/tps-forvalteren-proxy"
+      working-directory: "proxies/modapp-ereg-proxy"
       deploy-tag: "#deploy-proxy"
     permissions:
       contents: read

diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.idea/
 *target/
 *.iml
+*.http
 
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 

diff --git a/.nais/team-dolly-lokal-app.yml b/.nais/team-dolly-lokal-app.yml
@@ -0,0 +1,18 @@
+apiVersion: nais.io/v1
+kind: AzureAdApplication
+metadata:
+  labels:
+    team: dolly
+  name: team-dolly-lokal-app
+  namespace: dolly
+spec:
+  allowAllUsers: true
+  logoutUrl: https://localhost:8080/oauth2/logout
+  preAuthorizedApplications:
+    - application: testnav-oversikt-frontend
+      cluster: dev-gcp
+      namespace: dolly
+  replyUrls:
+    - url: http://localhost:8080/login/oauth2/code/aad
+  secretName: azuread-team-dolly-lokal-app
+  tenant: nav.no
diff --git a/apps/adresse-service/src/main/resources/application.yaml b/apps/adresse-service/src/main/resources/application.yaml
@@ -50,4 +50,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml
@@ -43,4 +43,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
@@ -48,4 +48,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml
@@ -46,4 +46,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml
@@ -45,6 +45,8 @@ server:
   servlet:
     encoding:
       charset: UTF-8
+  error:
+    include-message: always
 
 consumers:
   dolly-backend:

diff --git a/apps/brreg-stub/src/main/resources/application.yaml b/apps/brreg-stub/src/main/resources/application.yaml
@@ -29,4 +29,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/bruker-service/src/main/resources/application.yml b/apps/bruker-service/src/main/resources/application.yml
@@ -44,4 +44,6 @@ management:
 server:
   servlet:
     encoding:
-      charset: UTF-8
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/budpro-service/src/main/resources/application.yml b/apps/budpro-service/src/main/resources/application.yml
@@ -37,3 +37,10 @@ consumers:
 app:
   security:
     allow-api: true
+
+server:
+  servlet:
+    encoding:
+      charset: UTF-8
+  error:
+    include-message: always
diff --git a/apps/dolly-backend/README.md b/apps/dolly-backend/README.md
@@ -44,5 +44,6 @@ TESTCONTAINERS_RYUK_DISABLED=true
 For å kjøre lokalt med elastic search:
 
 ```
-docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" --name opensearch-node -d opensearchproject/opensearch:latest
-```
+docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "plugins.security.disabled=true" -e "OPENSEARCH_INITIAL_ADMIN_PASSWORD=YLAgOm}rz#o6#Aq" --name opensearch -d opensearchproject/opensearch:latest
+```
+Legg merke til passord `YLAgOm}rz#o6#Aq` (tilfeldig [generert](https://www.strongpasswordgenerator.org/), men må være "sterkt" ellers vil ikke OpenSearch starte). 
diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
@@ -34,18 +34,19 @@ spec:
     outbound:
       rules:
         - application: testnav-amelding-service
+        - application: testnav-arbeidsforhold-service
         - application: testnav-arbeidsplassencv-proxy
-        - application: testnorge-profil-api-dev
-        - application: testnav-tps-messaging-service
+        - application: testnav-inntektsmelding-service
+        - application: testnav-kodeverk-service
+        - application: testnav-miljoer-service
+        - application: testnav-organisasjon-forvalter
+        - application: testnav-organisasjon-service
+        - application: testnav-pdl-forvalter-dev
+        - application: testnav-person-service
         - application: testnav-sykemelding-api
         - application: testnav-synt-sykemelding-api
-        - application: testnav-person-service
-        - application: testnav-pdl-forvalter-dev
-        - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-forvalter
-        - application: testnav-miljoer-service
-        - application: testnav-inntektsmelding-service
-        - application: testnav-arbeidsforhold-service
+        - application: testnav-tps-messaging-service
+        - application: testnorge-profil-api-dev
       external:
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-brregstub-proxy.dev-fss-pub.nais.io
@@ -61,9 +62,7 @@ spec:
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
-        - host: kodeverk-api.nav.no
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
-        - host: tps-forvalteren-dev-proxy.dev-fss-pub.nais.io
   webproxy: true
   azure:
     application:

diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -41,18 +41,19 @@ spec:
     outbound:
       rules:
         - application: testnav-amelding-service
+        - application: testnav-arbeidsforhold-service
         - application: testnav-arbeidsplassencv-proxy
-        - application: testnav-tps-messaging-service
-        - application: testnorge-profil-api
+        - application: testnav-inntektsmelding-service
+        - application: testnav-kodeverk-service
+        - application: testnav-miljoer-service
+        - application: testnav-organisasjon-forvalter
+        - application: testnav-organisasjon-service
+        - application: testnav-pdl-forvalter
+        - application: testnav-person-service
         - application: testnav-sykemelding-api
         - application: testnav-synt-sykemelding-api
-        - application: testnav-person-service
-        - application: testnav-pdl-forvalter
-        - application: testnav-organisasjon-service
-        - application: testnav-organisasjon-forvalter
-        - application: testnav-miljoer-service
-        - application: testnav-inntektsmelding-service
-        - application: testnav-arbeidsforhold-service
+        - application: testnav-tps-messaging-service
+        - application: testnorge-profil-api
       external:
         - host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
         - host: testnav-brregstub-proxy.dev-fss-pub.nais.io
@@ -63,14 +64,12 @@ spec:
         - host: testnav-inst-proxy.dev-fss-pub.nais.io
         - host: testnav-kontoregister-person-proxy.dev-fss-pub.nais.io
         - host: testnav-krrstub-proxy.dev-fss-pub.nais.io
-        - host: kodeverk-api.nav.no
         - host: testnav-norg2-proxy.dev-fss-pub.nais.io
         - host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
         - host: testnav-pdl-proxy.dev-fss-pub.nais.io
         - host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
         - host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
         - host: testnav-udistub-proxy.dev-fss-pub.nais.io
-        - host: tps-forvalteren-proxy.dev-fss-pub.nais.io
   webproxy: true
   azure:
     application:

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java b/apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java
@@ -10,4 +10,4 @@ public static void main(String[] args) {
 
         SpringApplication.run(DollyBackendApplicationStarter.class, args);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ public static void main(String[] args) { @@
             SpringApplication.run(DollyBackendApplicationStarter.class, args);
         }
-    }
+    }