Skip to content

Legger inn fp-inntektsmelding backend. #1443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2024
Merged

Legger inn fp-inntektsmelding backend. #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lokal-utvikling/setup-lokal-utvikling.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ settPorterSomSkalErstattes () {
replace_port_array=("8080")
with_port_array=("8050")
;;
fpinntektsmelding)
replace_port_array=("8080")
with_port_array=("8040")
;;
*)
replace_port_array=("")
with_port_array=("")
Expand Down
131 changes: 91 additions & 40 deletions resources/pipeline/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
container_name: audit.nais
mem_limit: 16mb
ports:
- 127.0.0.1:6514:6514
- "127.0.0.1:6514:6514"
oracle:
image: $ORACLE_IMAGE
container_name: oracle
Expand Down Expand Up @@ -48,7 +48,7 @@ services:
volumes:
- ./postgres-init:/docker-entrypoint-initdb.d/
ports:
- 127.0.0.1:5432:5432
- "127.0.0.1:5432:5432"
healthcheck:
test: [ "CMD-SHELL", "while ! /usr/bin/pg_isready -U admin -t 1; do sleep 1; done" ]
interval: 2s
Expand Down Expand Up @@ -78,13 +78,13 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8060:8060
- 127.0.0.1:8063:8063
- 127.0.0.1:8636:8636
- 127.0.0.1:9093:9093
- 127.0.0.1:9092:9092
- 127.0.0.1:1337:1337
- 127.0.0.1:8389:8389
- "127.0.0.1:8060:8060"
- "127.0.0.1:8063:8063"
- "127.0.0.1:8636:8636"
- "127.0.0.1:9093:9093"
- "127.0.0.1:9092:9092"
- "127.0.0.1:1337:1337"
- "127.0.0.1:8389:8389"
healthcheck:
test: ["CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8060/rest/isReady"]
interval: 5s
Expand Down Expand Up @@ -113,7 +113,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8050:8080
- "127.0.0.1:8050:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fptilgang/internal/health/isReady" ]
interval: 5s
Expand All @@ -135,7 +135,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8015:8080
- "127.0.0.1:8015:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpabakus/internal/health/isReady" ]
interval: 5s
Expand All @@ -159,7 +159,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8016:8080
- "127.0.0.1:8016:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpkalkulus/internal/health/isReady" ]
interval: 5s
Expand Down Expand Up @@ -188,7 +188,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8080:8080
- "127.0.0.1:8080:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpsak/internal/health/isReady" ]
interval: 10s
Expand Down Expand Up @@ -253,7 +253,7 @@ services:
env_file:
- *common-properties
ports:
- 127.0.0.1:9090:9090
- "127.0.0.1:9090:9090"
depends_on:
wonderwall-fpfrontend:
condition: service_started
Expand All @@ -278,7 +278,7 @@ services:
--session.refresh=true
--log-level=debug
ports:
- 127.0.0.1:9000:9000
- "127.0.0.1:9000:9000"
env_file:
- *common-properties
fpfordel:
Expand All @@ -295,7 +295,7 @@ services:
- *sertifikat-volum
- ./tokenx:/tokenx
ports:
- 127.0.0.1:8090:8080
- "127.0.0.1:8090:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpfordel/internal/health/isReady" ]
interval: 15s
Expand Down Expand Up @@ -326,7 +326,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8010:8080
- "127.0.0.1:8010:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpformidling/internal/health/isReady" ]
interval: 5s
Expand All @@ -349,7 +349,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8291:8080
- "127.0.0.1:8291:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/actuator/info" ]
interval: 5s
Expand All @@ -366,7 +366,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8070:8080
- "127.0.0.1:8070:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpoppdrag/internal/health/isReady" ]
interval: 5s
Expand Down Expand Up @@ -400,7 +400,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8030:8080
- "127.0.0.1:8030:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fptilbake/internal/health/isReady" ]
interval: 5s
Expand All @@ -426,7 +426,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8075:8080
- "127.0.0.1:8075:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fprisk/internal/health/isReady" ]
interval: 5s
Expand All @@ -448,7 +448,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8065:8080
- "127.0.0.1:8065:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/fpabonnent/internal/health/isReady" ]
interval: 5s
Expand All @@ -474,7 +474,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8071:8080
- "127.0.0.1:8071:8080"
healthcheck:
test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8080/fplos/internal/health/isReady"]
interval: 5s
Expand Down Expand Up @@ -514,7 +514,7 @@ services:
volumes:
- *sertifikat-volum
ports:
- 127.0.0.1:8889:8080
- "127.0.0.1:8889:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/internal/health/isReady" ]
interval: 15s
Expand Down Expand Up @@ -558,7 +558,7 @@ services:
- *sertifikat-volum
- ./tokenx:/tokenx
ports:
- 127.0.0.1:9001:9001
- "127.0.0.1:9001:9001"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:9001/api/actuator" ]
interval: 5s
Expand All @@ -567,6 +567,46 @@ services:
depends_on:
- vtp
- fpfordel
fpinntektsmelding:
<<: *default-konfigurasjon
image: $FPINNTEKTSMELDING_IMAGE
container_name: fpinntektsmelding
mem_limit: 512mb
environment:
FPDOKGEN_URL: http://fpdokgen:8080
ARBEIDSGIVER_NOTIFIKASJON_URL: http://fager-api:8080/api/graphql
ARBEIDSGIVER_NOTIFIKASJON_SCOPES: api://vtp.teamforeldrepenger.vtp/.default
ALTINN_URL: http://vtp:8060/rest/altinn-rettigheter-proxy/ekstern/altinn/api/serviceowner/reportees
env_file:
- *common-properties
- fpinntektsmelding_datasource.env
volumes:
- *sertifikat-volum
ports:
- "127.0.0.1:8040:8080"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:8080/internal/health/isReady" ]
interval: 15s
timeout: 10s
retries: 10
depends_on:
postgres:
condition: service_healthy
vtp:
condition: service_healthy
fager-api:
condition: service_healthy

fager-api:
image: ghcr.io/navikt/arbeidsgiver-notifikasjon-produsent-api/fake-produsent-api:latest
ports:
- "127.0.0.1:8072:8080"
environment:
ALWAYS_SUCCESSFUL_RESPONSE: true
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost:8072/rest/isReady" ]
interval: 30s
timeout: 5s

## SELVBETJENING SPESIFIKK
foreldrepengesoknad-api:
Expand All @@ -586,7 +626,7 @@ services:
- *sertifikat-volum
- ./tokenx:/tokenx
ports:
- 127.0.0.1:9002:9002
- "127.0.0.1:9002:9002"
healthcheck:
test: [ "CMD", "wget", "--no-verbose","--tries=1", "--spider", "http://localhost:9002/internal/actuator" ]
interval: 5s
Expand All @@ -601,7 +641,7 @@ services:
image: $FORELDREPENGEOVERSIKT_IMAGE
container_name: foreldrepengeoversikt
ports:
- 127.0.0.1:9066:9066
- "127.0.0.1:9066:9066"
env_file:
- *common-properties
environment:
Expand All @@ -614,7 +654,7 @@ services:
image: $FORELDREPENGESOKNAD_IMAGE
container_name: foreldrepengesoknad
ports:
- 127.0.0.1:9067:9067
- "127.0.0.1:9067:9067"
env_file:
- *common-properties
environment:
Expand All @@ -628,7 +668,7 @@ services:
image: $SVANGERSKAPSPENGESOKNAD_IMAGE
container_name: svangerskapspengesoknad
ports:
- 127.0.0.1:9068:9068
- "127.0.0.1:9068:9068"
env_file:
- *common-properties
environment:
Expand All @@ -642,7 +682,7 @@ services:
image: $ENGANGSSTONAD_IMAGE
container_name: engangsstonad
ports:
- 127.0.0.1:9069:9069
- "127.0.0.1:9069:9069"
env_file:
- *common-properties
environment:
Expand Down Expand Up @@ -733,15 +773,27 @@ services:
{
"path": "/api",
"scopes": "api://vtp.teamforeldrepenger.fpoversikt/swagger",
"url": "http://fpoversikt:8889",
"url": "http://fpoversikt:8080",
"name": "fp-oversikt"
},
{
"path": "/fpabakus/ekstern/api",
"scopes": "api://vtp.teamforeldrepenger.fpabakus/swagger",
"url": "http://fpabakus:8080",
"name": "fp-abakus ekstern API"
},
{
"path": "/fpinntektsmelding/forvaltning/api",
"scopes": "api://vtp.teamforeldrepenger.fpinntektsmelding/swagger",
"url": "http://fpinntektsmelding:8080",
"name": "fp-inntektsmelding"
}
]
}
env_file:
- *common-properties
ports:
- 127.0.0.1:9190:9190
- "127.0.0.1:9190:9190"
depends_on:
fpswagger-wonderwall:
condition: service_started
Expand All @@ -757,18 +809,17 @@ services:
--auto-login=true
--log-level=debug
ports:
- 127.0.0.1:9200:9200
- "127.0.0.1:9200:9200"
env_file:
- *common-properties
depends_on:
fpsak:
condition: service_started

redis:
image: redis:7
container_name: redis
ports:
- 127.0.0.1:6379:6379
- "127.0.0.1:6379:6379"
wonderwall-selvbetjening-sso-server:
<<: *default-konfigurasjon
image: ghcr.io/nais/wonderwall:latest
Expand All @@ -788,7 +839,7 @@ services:
--auto-login=true
--log-level=debug
ports:
- 127.0.0.1:9111:9111
- "127.0.0.1:9111:9111"
env_file:
- *common-properties
depends_on:
Expand All @@ -812,7 +863,7 @@ services:
--ingress=http://localhost:9100
--upstream-host=foreldrepengeoversikt:9066
ports:
- 127.0.0.1:9100:9100
- "127.0.0.1:9100:9100"
env_file:
- *common-properties
depends_on:
Expand All @@ -837,7 +888,7 @@ services:
--bind-address=0.0.0.0:9101
--upstream-host=foreldrepengesoknad:9067
ports:
- 127.0.0.1:9101:9101
- "127.0.0.1:9101:9101"
env_file:
- *common-properties
depends_on:
Expand All @@ -862,7 +913,7 @@ services:
--bind-address=0.0.0.0:9102
--upstream-host=svangerskapspengesoknad:9068
ports:
- 127.0.0.1:9102:9102
- "127.0.0.1:9102:9102"
env_file:
- *common-properties
depends_on:
Expand All @@ -887,7 +938,7 @@ services:
--bind-address=0.0.0.0:9103
--upstream-host=engangsstonad:9069
ports:
- 127.0.0.1:9103:9103
- "127.0.0.1:9103:9103"
env_file:
- *common-properties
depends_on:
Expand Down
6 changes: 0 additions & 6 deletions resources/pipeline/fpinfohistorikk_datasource.env
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions resources/pipeline/fpinntektsmelding_datasource.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
APP_NAME=fpinntektsmelding
NAIS_APP_NAME=fpinntektsmelding

DB_JDBC_URL=jdbc:postgresql://postgres:5432/fpinntektsmelding?reWriteBatchedInserts=true
DB_USERNAME=fpinntektsmelding
DB_PASSWORD=fpinntektsmelding
Loading