Skip to content

Commit acfaa56

Browse files
betsytraranbetsytraran
committed
Fixet merge conflicts
2 parents adb31ad + 2a4b97c commit acfaa56

File tree

298 files changed

+11253
-18596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+11253
-18596
lines changed

‎.github/workflows/app.ereg-batch-status-service.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
workflow:
1515
uses: ./.github/workflows/common.workflow.backend.yml
1616
with:
17-
cluster: "dev-fss"
17+
cluster: "dev-gcp"
1818
working-directory: "apps/ereg-batch-status-service"
1919
deploy-tag: "#deploy-ereg-batch-status-service"
2020
permissions:

‎.github/workflows/app.geografiske-kodeverk-service.yml

-21
This file was deleted.

‎.github/workflows/app.kodeverk-service.yml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: kodeverk-service
2+
3+
on:
4+
push:
5+
paths:
6+
- libs/security-core
7+
- libs/reactive-core
8+
- libs/reactive-security
9+
- libs/data-transfer-objects
10+
- apps/kodeverk-service/**
11+
- .github/workflows/app.kodeverk-service.yml
12+
13+
jobs:
14+
workflow:
15+
uses: ./.github/workflows/common.workflow.backend.yml
16+
with:
17+
working-directory: "apps/kodeverk-service"
18+
deploy-tag: "#deploy-kodeverk-service"
19+
permissions:
20+
contents: read
21+
id-token: write
22+
secrets: inherit

‎.github/workflows/app.team-dolly-lokal-app.yml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: team-dolly-lokal-app
2+
3+
on:
4+
push:
5+
paths:
6+
- .nais/team-dolly-lokal-app.yml
7+
- .github/workflows/app.team-dolly-lokal-app.yml
8+
9+
jobs:
10+
deploy:
11+
name: Deploy team-dolly-lokal-app
12+
runs-on: ubuntu-latest
13+
permissions:
14+
contents: read
15+
id-token: write
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: nais/deploy/actions/deploy@v2
19+
env:
20+
CLUSTER: dev-gcp
21+
RESOURCE: .nais/team-dolly-lokal-app.yml

‎.github/workflows/build.yml

-35
This file was deleted.

‎.github/workflows/tests.yml ‎.github/workflows/integration-tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Tests
1+
name: Integration Tests
22
on:
33
push:
44
branches:

‎.github/workflows/proxy.tps-forvalteren-proxy.yml ‎.github/workflows/proxy.modapp-ereg-proxy.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
name: tps-forvalteren-proxy
1+
name: modapp-ereg-proxy
22

33
on:
44
push:
55
paths:
66
- libs/reactive-core
77
- libs/reactive-proxy
8-
- proxies/tps-forvalteren-proxy/**
9-
- .github/workflows/proxy.tps-forvalteren-proxy.yml
8+
- libs/reactive-security
9+
- libs/security-core
10+
- proxies/modapp-ereg-proxy/**
11+
- .github/workflows/proxy.modapp-ereg-proxy.yml
1012

1113
jobs:
1214
workflow:
1315
uses: ./.github/workflows/common.workflow.backend.yml
1416
with:
1517
cluster: "dev-fss"
16-
working-directory: "proxies/tps-forvalteren-proxy"
18+
working-directory: "proxies/modapp-ereg-proxy"
1719
deploy-tag: "#deploy-proxy"
1820
permissions:
1921
contents: read

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.idea/
22
*target/
33
*.iml
4+
*.http
45

56
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
67

‎.nais/team-dolly-lokal-app.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
apiVersion: nais.io/v1
2+
kind: AzureAdApplication
3+
metadata:
4+
labels:
5+
team: dolly
6+
name: team-dolly-lokal-app
7+
namespace: dolly
8+
spec:
9+
allowAllUsers: true
10+
logoutUrl: https://localhost:8080/oauth2/logout
11+
preAuthorizedApplications:
12+
- application: testnav-oversikt-frontend
13+
cluster: dev-gcp
14+
namespace: dolly
15+
replyUrls:
16+
- url: http://localhost:8080/login/oauth2/code/aad
17+
secretName: azuread-team-dolly-lokal-app
18+
tenant: nav.no

‎apps/adresse-service/src/main/resources/application.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,6 @@ management:
5050
server:
5151
servlet:
5252
encoding:
53-
charset: UTF-8
53+
charset: UTF-8
54+
error:
55+
include-message: always

‎apps/amelding-service/src/main/resources/application.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,6 @@ management:
4343
server:
4444
servlet:
4545
encoding:
46-
charset: UTF-8
46+
charset: UTF-8
47+
error:
48+
include-message: always

‎apps/app-tilgang-analyse-service/src/main/resources/application.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,6 @@ management:
4848
server:
4949
servlet:
5050
encoding:
51-
charset: UTF-8
51+
charset: UTF-8
52+
error:
53+
include-message: always

‎apps/arbeidsforhold-service/src/main/resources/application.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,6 @@ management:
4646
server:
4747
servlet:
4848
encoding:
49-
charset: UTF-8
49+
charset: UTF-8
50+
error:
51+
include-message: always

‎apps/batch-bestilling-service/src/main/resources/application.yml

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ server:
4545
servlet:
4646
encoding:
4747
charset: UTF-8
48+
error:
49+
include-message: always
4850

4951
consumers:
5052
dolly-backend:

‎apps/brreg-stub/src/main/resources/application.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,6 @@ management:
2929
server:
3030
servlet:
3131
encoding:
32-
charset: UTF-8
32+
charset: UTF-8
33+
error:
34+
include-message: always

‎apps/bruker-service/src/main/resources/application.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,6 @@ management:
4444
server:
4545
servlet:
4646
encoding:
47-
charset: UTF-8
47+
charset: UTF-8
48+
error:
49+
include-message: always

‎apps/budpro-service/src/main/resources/application.yml

+7
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,10 @@ consumers:
3737
app:
3838
security:
3939
allow-api: true
40+
41+
server:
42+
servlet:
43+
encoding:
44+
charset: UTF-8
45+
error:
46+
include-message: always

‎apps/dolly-backend/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ TESTCONTAINERS_RYUK_DISABLED=true
4444
For å kjøre lokalt med elastic search:
4545

4646
```
47-
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
48-
```
47+
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
48+
```
49+
Legg merke til passord `YLAgOm}rz#o6#Aq` (tilfeldig [generert](https://www.strongpasswordgenerator.org/), men må være "sterkt" ellers vil ikke OpenSearch starte).

‎apps/dolly-backend/config.test.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,19 @@ spec:
3434
outbound:
3535
rules:
3636
- application: testnav-amelding-service
37+
- application: testnav-arbeidsforhold-service
3738
- application: testnav-arbeidsplassencv-proxy
38-
- application: testnorge-profil-api-dev
39-
- application: testnav-tps-messaging-service
39+
- application: testnav-inntektsmelding-service
40+
- application: testnav-kodeverk-service
41+
- application: testnav-miljoer-service
42+
- application: testnav-organisasjon-forvalter
43+
- application: testnav-organisasjon-service
44+
- application: testnav-pdl-forvalter-dev
45+
- application: testnav-person-service
4046
- application: testnav-sykemelding-api
4147
- application: testnav-synt-sykemelding-api
42-
- application: testnav-person-service
43-
- application: testnav-pdl-forvalter-dev
44-
- application: testnav-organisasjon-service
45-
- application: testnav-organisasjon-forvalter
46-
- application: testnav-miljoer-service
47-
- application: testnav-inntektsmelding-service
48-
- application: testnav-arbeidsforhold-service
48+
- application: testnav-tps-messaging-service
49+
- application: testnorge-profil-api-dev
4950
external:
5051
- host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
5152
- host: testnav-brregstub-proxy.dev-fss-pub.nais.io
@@ -61,9 +62,7 @@ spec:
6162
- host: testnav-pdl-proxy.dev-fss-pub.nais.io
6263
- host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
6364
- host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
64-
- host: kodeverk-api.nav.no
6565
- host: testnav-udistub-proxy.dev-fss-pub.nais.io
66-
- host: tps-forvalteren-dev-proxy.dev-fss-pub.nais.io
6766
webproxy: true
6867
azure:
6968
application:

‎apps/dolly-backend/config.yml

+10-11
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,19 @@ spec:
4141
outbound:
4242
rules:
4343
- application: testnav-amelding-service
44+
- application: testnav-arbeidsforhold-service
4445
- application: testnav-arbeidsplassencv-proxy
45-
- application: testnav-tps-messaging-service
46-
- application: testnorge-profil-api
46+
- application: testnav-inntektsmelding-service
47+
- application: testnav-kodeverk-service
48+
- application: testnav-miljoer-service
49+
- application: testnav-organisasjon-forvalter
50+
- application: testnav-organisasjon-service
51+
- application: testnav-pdl-forvalter
52+
- application: testnav-person-service
4753
- application: testnav-sykemelding-api
4854
- application: testnav-synt-sykemelding-api
49-
- application: testnav-person-service
50-
- application: testnav-pdl-forvalter
51-
- application: testnav-organisasjon-service
52-
- application: testnav-organisasjon-forvalter
53-
- application: testnav-miljoer-service
54-
- application: testnav-inntektsmelding-service
55-
- application: testnav-arbeidsforhold-service
55+
- application: testnav-tps-messaging-service
56+
- application: testnorge-profil-api
5657
external:
5758
- host: testnav-arena-forvalteren-proxy.dev-fss-pub.nais.io
5859
- host: testnav-brregstub-proxy.dev-fss-pub.nais.io
@@ -63,14 +64,12 @@ spec:
6364
- host: testnav-inst-proxy.dev-fss-pub.nais.io
6465
- host: testnav-kontoregister-person-proxy.dev-fss-pub.nais.io
6566
- host: testnav-krrstub-proxy.dev-fss-pub.nais.io
66-
- host: kodeverk-api.nav.no
6767
- host: testnav-norg2-proxy.dev-fss-pub.nais.io
6868
- host: testnav-pensjon-testdata-facade-proxy.dev-fss-pub.nais.io
6969
- host: testnav-pdl-proxy.dev-fss-pub.nais.io
7070
- host: testnav-sigrunstub-proxy.dev-fss-pub.nais.io
7171
- host: testnav-skjermingsregister-proxy.dev-fss-pub.nais.io
7272
- host: testnav-udistub-proxy.dev-fss-pub.nais.io
73-
- host: tps-forvalteren-proxy.dev-fss-pub.nais.io
7473
webproxy: true
7574
azure:
7675
application:

‎apps/dolly-backend/src/main/java/no/nav/dolly/DollyBackendApplicationStarter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ public static void main(String[] args) {
1010

1111
SpringApplication.run(DollyBackendApplicationStarter.class, args);
1212
}
13-
}
13+
}

0 commit comments

Comments
 (0)