From 1437093c7803ce58e359233020594626cd78922a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristen=20H=C3=A6rum?= Date: Wed, 17 Jan 2024 13:23:58 +0100 Subject: [PATCH] Oppdatert systemkonfigurasjon og refaktorert filnavn (#3373) Oppdatert systemkonfigurasjon og refaktoret filnavn --- .github/workflows/app.adresse-service.yml | 1 + .github/workflows/app.amelding-service.yml | 1 + .../app.app-tilgang-analyse-service.yml | 1 + .../workflows/app.arbeidsforhold-service.yml | 1 + .../app.batch-bestilling-service.yml | 1 + .github/workflows/app.brreg-stub.yml | 1 + .github/workflows/app.bruker-service.yml | 1 + .github/workflows/app.budpro-service.yml | 1 + .github/workflows/app.dolly-backend.yml | 1 + .github/workflows/app.dolly-frontend.yml | 2 ++ .github/workflows/app.dollystatus.yml | 1 + .../app.endringsmelding-frontend.yml | 1 + .../workflows/app.endringsmelding-service.yml | 1 + .../app.ereg-batch-status-service.yml | 1 + .github/workflows/app.faste-data-frontend.yml | 1 + ...erer-arbeidsforhold-populasjon-service.yml | 1 + .../workflows/app.generer-navn-service.yml | 1 + ...enerer-organisasjon-populasjon-service.yml | 1 + .../app.generer-synt-amelding-service.yml | 1 + .../app.geografiske-kodeverk-service.yml | 1 + .../workflows/app.helsepersonell-service.yml | 1 + .../app.inntektsmelding-generator-service.yml | 1 + .../workflows/app.inntektsmelding-service.yml | 1 + .../app.jenkins-batch-status-service.yml | 1 + .../workflows/app.joark-dokument-service.yml | 1 + .github/workflows/app.miljoer-service.yml | 1 + .../app.oppsummeringsdokument-service.yml | 1 + .../app.organisasjon-bestilling-service.yml | 1 + .../app.organisasjon-faste-data-service.yml | 1 + .../workflows/app.organisasjon-forvalter.yml | 1 + .../app.organisasjon-mottak-service.yml | 1 + .../workflows/app.organisasjon-service.yml | 1 + .../app.organisasjon-tilgang-frontend.yml | 1 + .../app.organisasjon-tilgang-service.yml | 1 + .github/workflows/app.orgnummer-service.yml | 1 + .github/workflows/app.oversikt-frontend.yml | 1 + .github/workflows/app.pdl-forvalter.yml | 1 + .github/workflows/app.person-export-api.yml | 27 ------------------- .../app.person-faste-data-service.yml | 1 + ...pp.person-organisasjon-tilgang-service.yml | 1 + .../workflows/app.person-search-service.yml | 1 + .github/workflows/app.person-service.yml | 1 + .github/workflows/app.profil-api.yml | 1 + .github/workflows/app.sykemelding-api.yml | 1 + .../workflows/app.synt-sykemelding-api.yml | 1 + .../app.synt-vedtakshistorikk-service.yml | 1 + .github/workflows/app.testnav-ident-pool.yml | 1 + .../app.testnorge-statisk-data-forvalter.yml | 1 + .github/workflows/app.tilbakemelding-api.yml | 1 + .../workflows/app.tps-messaging-service.yml | 1 + .github/workflows/app.udi-stub.yml | 1 + .github/workflows/app.varslinger-service.yml | 1 + .github/workflows/proxy.aareg-proxy.yml | 1 + .../proxy.aareg-synt-services-proxy.yml | 1 + .../proxy.arbeidsplassencv-proxy.yml | 1 + .../proxy.arena-forvalteren-proxy.yml | 1 + .github/workflows/proxy.batch-adeo-proxy.yml | 1 + .github/workflows/proxy.brregstub-proxy.yml | 1 + .github/workflows/proxy.dokarkiv-proxy.yml | 1 + .github/workflows/proxy.ereg-proxy.yml | 1 + .github/workflows/proxy.histark-proxy.yml | 1 + .github/workflows/proxy.inntektstub-proxy.yml | 1 + .github/workflows/proxy.inst-proxy.yml | 1 + .github/workflows/proxy.kodeverk-proxy.yml | 1 + .../proxy.kontoregister-person-proxy.yml | 1 + .github/workflows/proxy.krrstub-proxy.yml | 1 + .github/workflows/proxy.medl-proxy.yml | 1 + .github/workflows/proxy.norg2-proxy.yml | 1 + .github/workflows/proxy.pdl-proxy.yml | 1 + .../proxy.pensjon-testdata-facade-proxy.yml | 1 + .github/workflows/proxy.saf-proxy.yml | 1 + .github/workflows/proxy.sigrunstub-proxy.yml | 1 + .../proxy.skjermingsregister-proxy.yml | 1 + .../proxy.synthdata-meldekort-proxy.yml | 1 + .../workflows/proxy.tps-forvalteren-proxy.yml | 1 + .github/workflows/proxy.udistub-proxy.yml | 1 + .../src/main/resources/application.yaml | 4 +-- .../resources/application-test.properties | 1 + .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 6 ++--- .../src/test/resources/application-test.yml | 4 ++- .../src/main/resources/application-dev.yml | 2 -- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application-local.yml | 5 +--- .../src/main/resources/application.yml | 4 +-- .../src/main/resources/application.yaml | 4 +-- .../src/test/resources/application-test.yaml | 5 +--- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 5 +--- .../resources/application-test.properties | 1 - .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application-dev.yml | 2 -- .../resources/application-test.properties | 1 - .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application-dev.yml | 5 ---- .../src/main/resources/application.yml | 6 ++--- .../src/test/resources/application-test.yml | 1 + .../src/main/resources/application-dev.yml | 2 -- .../src/main/resources/application.yml | 6 ++--- .../ApplicationContextTest.java | 2 ++ .../provider/KodeverkControllerTest.java | 5 ++-- .../resources/application-test.properties | 1 + .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 1 + .../src/main/resources/application.yml | 6 ++--- .../ApplicationContextTest.java | 2 ++ .../resources/application-test.properties | 2 +- .../src/main/resources/application.yml | 6 ++--- .../ApplicationContextTest.java | 2 ++ .../resources/application-test.properties | 2 +- .../src/main/resources/application.yml | 6 ++--- .../ApplicationContextTest.java | 2 ++ .../resources/application-test.properties | 2 +- .../src/main/resources/application.yml | 6 ++--- .../ApplicationContextTest.java | 2 ++ .../resources/application-test.properties | 1 + .../src/main/resources/application-dev.yml | 2 -- .../src/main/resources/application.yml | 6 ++--- .../ApplicationContextTest.java | 2 ++ .../resources/application-test.properties | 2 +- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application-dev.yml | 2 -- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application-prod.yml | 2 -- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 3 ++- ...asjonMottakServiceApplicationStarter.java} | 4 +-- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 2 +- apps/organisasjon-tilgang-service/config.yml | 4 --- .../src/main/resources/application-local.yml | 9 ++----- .../src/main/resources/application.yml | 6 ++--- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../src/test/resources/bootstrap.yml | 4 --- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 3 --- apps/pdl-forvalter/config.test.yml | 2 ++ apps/pdl-forvalter/config.yml | 2 ++ .../src/main/resources/application-dev.yaml | 11 -------- .../src/main/resources/application-local.yaml | 13 ++------- .../src/main/resources/application-prod.yaml | 11 -------- .../src/main/resources/application.yaml | 12 ++++++++- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../config.test.yml | 4 --- .../config.yml | 6 +---- .../src/main/resources/application-local.yml | 5 ++-- .../main/resources/application-virtual.yml | 14 +++------- .../src/main/resources/application.yml | 6 ++--- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 6 ++--- .../src/test/resources/application-test.yml | 11 +------- .../src/main/resources/application.yml | 6 ++--- .../resources/application-test.properties | 4 +-- .../src/test/resources/bootstrap-test.yml | 4 --- .../src/main/resources/application-dev.yml | 9 ------- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 7 +---- .../src/main/resources/application.yml | 4 +-- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 14 +--------- .../src/test/resources/application-test.yml | 11 +------- .../src/main/resources/application.yaml | 4 +-- .../src/test/resources/application.properties | 4 +-- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 4 ++- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../src/main/resources/application-local.yaml | 2 +- .../src/main/resources/application.yaml | 7 +++-- .../src/test/Resources/application-test.yaml | 8 +++++- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 2 ++ .../src/main/resources/application-local.yml | 2 -- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 3 +-- docs/_config.yml | 1 - docs/applications/avhengighetsanalyse.md | 14 ---------- .../src/main/resources/application-local.yml | 3 --- .../src/main/resources/application.yml | 4 +-- .../src/main/resources/application-local.yaml | 2 +- .../src/main/resources/application.yaml | 4 +-- .../resources/application-test.properties | 1 + .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 6 ++--- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 4 ++- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 4 +-- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 3 +-- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 4 +-- .../instproxy/ApplicationContextTest.java | 2 ++ .../resources/application-test.properties | 1 + .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 3 ++- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 2 +- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 3 +-- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 4 +-- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 4 +-- .../src/main/resources/application-dev.yml | 2 -- .../src/main/resources/application.yml | 4 +-- .../src/test/resources/application-test.yml | 4 ++- .../src/main/resources/application.yml | 4 +-- .../resources/application-test.properties | 5 +--- 249 files changed, 373 insertions(+), 459 deletions(-) delete mode 100644 .github/workflows/app.person-export-api.yml create mode 100644 apps/adresse-service/src/test/resources/application-test.properties delete mode 100644 apps/arbeidsforhold-service/src/main/resources/application-dev.yml delete mode 100644 apps/endringsmelding-frontend/src/test/resources/application-test.properties delete mode 100644 apps/faste-data-frontend/src/test/resources/application-test.properties delete mode 100644 apps/generer-synt-amelding-service/src/main/resources/application-dev.yml create mode 100644 apps/geografiske-kodeverk-service/src/test/resources/application-test.properties create mode 100644 apps/helsepersonell-service/src/test/resources/application-test.properties create mode 100644 apps/joark-dokument-service/src/test/resources/application-test.properties delete mode 100644 apps/miljoer-service/src/main/resources/application-dev.yml rename apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/{OMSApplicationStarter.java => OrganisasjonMottakServiceApplicationStarter.java} (66%) delete mode 100644 apps/orgnummer-service/src/test/resources/bootstrap.yml delete mode 100644 apps/oversikt-frontend/src/test/resources/application-test.properties delete mode 100644 apps/person-service/src/test/resources/bootstrap-test.yml delete mode 100644 docs/applications/avhengighetsanalyse.md create mode 100644 proxies/aareg-proxy/src/test/resources/application-test.properties create mode 100644 proxies/inst-proxy/src/test/resources/application-test.properties diff --git a/.github/workflows/app.adresse-service.yml b/.github/workflows/app.adresse-service.yml index 8acaea880af..6277bd2a767 100644 --- a/.github/workflows/app.adresse-service.yml +++ b/.github/workflows/app.adresse-service.yml @@ -9,6 +9,7 @@ on: - libs/servlet-security - apps/adresse-service/** - .github/workflows/app.adresse-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.amelding-service.yml b/.github/workflows/app.amelding-service.yml index 77017ca6d9f..f113babada8 100644 --- a/.github/workflows/app.amelding-service.yml +++ b/.github/workflows/app.amelding-service.yml @@ -11,6 +11,7 @@ on: - libs/security-core - apps/amelding-service/** - .github/workflows/app.amelding-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.app-tilgang-analyse-service.yml b/.github/workflows/app.app-tilgang-analyse-service.yml index 3c5f17f27fa..0b49750af2b 100644 --- a/.github/workflows/app.app-tilgang-analyse-service.yml +++ b/.github/workflows/app.app-tilgang-analyse-service.yml @@ -8,6 +8,7 @@ on: - libs/reactive-security - apps/app-tilgang-analyse-service/** - .github/workflows/app.app-tilgang-analyse-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.arbeidsforhold-service.yml b/.github/workflows/app.arbeidsforhold-service.yml index 339f7da9e05..38727814c13 100644 --- a/.github/workflows/app.arbeidsforhold-service.yml +++ b/.github/workflows/app.arbeidsforhold-service.yml @@ -11,6 +11,7 @@ on: - libs/servlet-security - apps/arbeidsforhold-service/** - .github/workflows/app.arbeidsforhold-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.batch-bestilling-service.yml b/.github/workflows/app.batch-bestilling-service.yml index acc02fe8548..e58a3567662 100644 --- a/.github/workflows/app.batch-bestilling-service.yml +++ b/.github/workflows/app.batch-bestilling-service.yml @@ -12,6 +12,7 @@ on: - libs/servlet-security - apps/batch-bestilling-service/** - .github/workflows/app.batch-bestilling-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.brreg-stub.yml b/.github/workflows/app.brreg-stub.yml index 7d4a1591b6a..c1ead9d9416 100644 --- a/.github/workflows/app.brreg-stub.yml +++ b/.github/workflows/app.brreg-stub.yml @@ -7,6 +7,7 @@ on: - libs/servlet-core - apps/brreg-stub/** - .github/workflows/app.brreg-stub.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.bruker-service.yml b/.github/workflows/app.bruker-service.yml index 8de7a0b70ad..a31f1382d84 100644 --- a/.github/workflows/app.bruker-service.yml +++ b/.github/workflows/app.bruker-service.yml @@ -10,6 +10,7 @@ on: - libs/security-core - apps/bruker-service/** - .github/workflows/app.bruker-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.budpro-service.yml b/.github/workflows/app.budpro-service.yml index a3311297486..25b20414558 100644 --- a/.github/workflows/app.budpro-service.yml +++ b/.github/workflows/app.budpro-service.yml @@ -12,6 +12,7 @@ on: - libs/servlet-security - apps/budpro-service/** - .github/workflows/app.budpro-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.dolly-backend.yml b/.github/workflows/app.dolly-backend.yml index e8299e69245..c1729b5e588 100644 --- a/.github/workflows/app.dolly-backend.yml +++ b/.github/workflows/app.dolly-backend.yml @@ -12,6 +12,7 @@ on: - libs/servlet-security - apps/dolly-backend/** - .github/workflows/app.dolly-backend.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml index aa95e32abf3..965c12bed8f 100644 --- a/.github/workflows/app.dolly-frontend.yml +++ b/.github/workflows/app.dolly-frontend.yml @@ -13,6 +13,8 @@ on: - libs/security-core - apps/dolly-frontend/** - .github/workflows/app.dolly-frontend.yml + - .github/workflows/common.cypress.yml + - .github/workflows/common.workflow.frontend.yml jobs: diff --git a/.github/workflows/app.dollystatus.yml b/.github/workflows/app.dollystatus.yml index 730f43e2f30..abf0c95ade6 100644 --- a/.github/workflows/app.dollystatus.yml +++ b/.github/workflows/app.dollystatus.yml @@ -5,6 +5,7 @@ on: paths: - apps/dollystatus/** - .github/workflows/app.dollystatus.yml + - .github/workflows/common.workflow.frontend.yml jobs: workflow: diff --git a/.github/workflows/app.endringsmelding-frontend.yml b/.github/workflows/app.endringsmelding-frontend.yml index a05e180e445..252f0654d6c 100644 --- a/.github/workflows/app.endringsmelding-frontend.yml +++ b/.github/workflows/app.endringsmelding-frontend.yml @@ -9,6 +9,7 @@ on: - libs/security-core - apps/endringsmelding-frontend/** - .github/workflows/app.endringsmelding-frontend.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.endringsmelding-service.yml b/.github/workflows/app.endringsmelding-service.yml index e6ecb801a90..dcd6932537a 100644 --- a/.github/workflows/app.endringsmelding-service.yml +++ b/.github/workflows/app.endringsmelding-service.yml @@ -9,6 +9,7 @@ on: - libs/security-core - apps/endringsmelding-service/** - .github/workflows/app.endringsmelding-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.ereg-batch-status-service.yml b/.github/workflows/app.ereg-batch-status-service.yml index a85fa1addd1..3a6ad28a3f5 100644 --- a/.github/workflows/app.ereg-batch-status-service.yml +++ b/.github/workflows/app.ereg-batch-status-service.yml @@ -9,6 +9,7 @@ on: - libs/servlet-security - apps/ereg-batch-status-service/** - .github/workflows/app.ereg-batch-status-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.faste-data-frontend.yml b/.github/workflows/app.faste-data-frontend.yml index 7587b562734..4704db12f01 100644 --- a/.github/workflows/app.faste-data-frontend.yml +++ b/.github/workflows/app.faste-data-frontend.yml @@ -9,6 +9,7 @@ on: - libs/security-core - apps/faste-data-frontend/** - .github/workflows/app.faste-data-frontend.yml + - .github/workflows/common.workflow.frontend.yml jobs: workflow: diff --git a/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml b/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml index ff7aef85a87..7ac32b67a2b 100644 --- a/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml +++ b/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml @@ -10,6 +10,7 @@ on: - libs/servlet-insecure-security - apps/generer-arbeidsforhold-populasjon-service/** - .github/workflows/app.generer-arbeidsforhold-populasjon-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.generer-navn-service.yml b/.github/workflows/app.generer-navn-service.yml index 6053e0beffd..e3b9aede884 100644 --- a/.github/workflows/app.generer-navn-service.yml +++ b/.github/workflows/app.generer-navn-service.yml @@ -11,6 +11,7 @@ on: - libs/testing - apps/generer-navn-service/** - .github/workflows/app.generer-navn-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.generer-organisasjon-populasjon-service.yml b/.github/workflows/app.generer-organisasjon-populasjon-service.yml index 0ef92eaaa2c..39a820fe093 100644 --- a/.github/workflows/app.generer-organisasjon-populasjon-service.yml +++ b/.github/workflows/app.generer-organisasjon-populasjon-service.yml @@ -15,6 +15,7 @@ on: - libs/servlet-security - apps/generer-organisasjon-populasjon-service/** - .github/workflows/app.generer-organisasjon-populasjon-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.generer-synt-amelding-service.yml b/.github/workflows/app.generer-synt-amelding-service.yml index 6f9b0273a65..eef80e6fc0b 100644 --- a/.github/workflows/app.generer-synt-amelding-service.yml +++ b/.github/workflows/app.generer-synt-amelding-service.yml @@ -10,6 +10,7 @@ on: - libs/servlet-security - apps/generer-synt-amelding-service/** - .github/workflows/app.generer-synt-amelding-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.geografiske-kodeverk-service.yml b/.github/workflows/app.geografiske-kodeverk-service.yml index 0dcc356b185..9ab8c50581d 100644 --- a/.github/workflows/app.geografiske-kodeverk-service.yml +++ b/.github/workflows/app.geografiske-kodeverk-service.yml @@ -8,6 +8,7 @@ on: - libs/testing - apps/geografiske-kodeverk-service/** - .github/workflows/app.geografiske-kodeverk-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.helsepersonell-service.yml b/.github/workflows/app.helsepersonell-service.yml index 4f90de43a9b..c6aa23e77e4 100644 --- a/.github/workflows/app.helsepersonell-service.yml +++ b/.github/workflows/app.helsepersonell-service.yml @@ -11,6 +11,7 @@ on: - libs/testing - apps/helsepersonell-service/** - .github/workflows/app.helsepersonell-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.inntektsmelding-generator-service.yml b/.github/workflows/app.inntektsmelding-generator-service.yml index c78500e6eb4..22873dae2fb 100644 --- a/.github/workflows/app.inntektsmelding-generator-service.yml +++ b/.github/workflows/app.inntektsmelding-generator-service.yml @@ -8,6 +8,7 @@ on: - libs/servlet-security - apps/inntektsmelding-generator-service/** - .github/workflows/app.inntektsmelding-generator-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.inntektsmelding-service.yml b/.github/workflows/app.inntektsmelding-service.yml index 837f9221c41..29dd00d67ac 100644 --- a/.github/workflows/app.inntektsmelding-service.yml +++ b/.github/workflows/app.inntektsmelding-service.yml @@ -9,6 +9,7 @@ on: - libs/servlet-security - apps/inntektsmelding-service/** - .github/workflows/app.inntektsmelding-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.jenkins-batch-status-service.yml b/.github/workflows/app.jenkins-batch-status-service.yml index 9987827a628..9f3d4a1d95e 100644 --- a/.github/workflows/app.jenkins-batch-status-service.yml +++ b/.github/workflows/app.jenkins-batch-status-service.yml @@ -11,6 +11,7 @@ on: - libs/servlet-security - apps/jenkins-batch-status-service/** - .github/workflows/app.jenkins-batch-status-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.joark-dokument-service.yml b/.github/workflows/app.joark-dokument-service.yml index f64331dd625..131c7134d4c 100644 --- a/.github/workflows/app.joark-dokument-service.yml +++ b/.github/workflows/app.joark-dokument-service.yml @@ -11,6 +11,7 @@ on: - libs/servlet-security - apps/joark-dokument-service/** - .github/workflows/app.joark-dokument-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.miljoer-service.yml b/.github/workflows/app.miljoer-service.yml index bdd7c42dd71..4a7b0e9c1ef 100644 --- a/.github/workflows/app.miljoer-service.yml +++ b/.github/workflows/app.miljoer-service.yml @@ -10,6 +10,7 @@ on: - libs/servlet-security - apps/miljoer-service/** - .github/workflows/app.miljoer-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.oppsummeringsdokument-service.yml b/.github/workflows/app.oppsummeringsdokument-service.yml index 85cca7f8edf..56a6df77def 100644 --- a/.github/workflows/app.oppsummeringsdokument-service.yml +++ b/.github/workflows/app.oppsummeringsdokument-service.yml @@ -10,6 +10,7 @@ on: - xsd/arbeidsforhold-xsd - apps/oppsummeringsdokument-service/** - .github/workflows/app.oppsummeringsdokument-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.organisasjon-bestilling-service.yml b/.github/workflows/app.organisasjon-bestilling-service.yml index 5d8e2ce8f35..cb6f343e4f3 100644 --- a/.github/workflows/app.organisasjon-bestilling-service.yml +++ b/.github/workflows/app.organisasjon-bestilling-service.yml @@ -11,6 +11,7 @@ on: - libs/servlet-security - apps/organisasjon-bestilling-service/** - .github/workflows/app.organisasjon-bestilling-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.organisasjon-faste-data-service.yml b/.github/workflows/app.organisasjon-faste-data-service.yml index f0e03bf4f8f..f54061c7762 100644 --- a/.github/workflows/app.organisasjon-faste-data-service.yml +++ b/.github/workflows/app.organisasjon-faste-data-service.yml @@ -15,6 +15,7 @@ on: - libs/servlet-security - apps/organisasjon-faste-data-service/** - .github/workflows/app.organisasjon-faste-data-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.organisasjon-forvalter.yml b/.github/workflows/app.organisasjon-forvalter.yml index 72b5f6861c9..ec42e2fde77 100644 --- a/.github/workflows/app.organisasjon-forvalter.yml +++ b/.github/workflows/app.organisasjon-forvalter.yml @@ -15,6 +15,7 @@ on: - libs/testing - apps/organisasjon-forvalter/** - .github/workflows/app.organisasjon-forvalter.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.organisasjon-mottak-service.yml b/.github/workflows/app.organisasjon-mottak-service.yml index 67dca1c75e7..63cdf10e98c 100644 --- a/.github/workflows/app.organisasjon-mottak-service.yml +++ b/.github/workflows/app.organisasjon-mottak-service.yml @@ -14,6 +14,7 @@ on: - libs/servlet-insecure-security - apps/organisasjon-mottak-service/** - .github/workflows/app.organisasjon-mottak-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.organisasjon-service.yml b/.github/workflows/app.organisasjon-service.yml index 6ccf1c20ea5..e9f23af37f4 100644 --- a/.github/workflows/app.organisasjon-service.yml +++ b/.github/workflows/app.organisasjon-service.yml @@ -12,6 +12,7 @@ on: - libs/testing - apps/organisasjon-service/** - .github/workflows/app.organisasjon-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.organisasjon-tilgang-frontend.yml b/.github/workflows/app.organisasjon-tilgang-frontend.yml index 2b415a11c87..ae8957a72db 100644 --- a/.github/workflows/app.organisasjon-tilgang-frontend.yml +++ b/.github/workflows/app.organisasjon-tilgang-frontend.yml @@ -9,6 +9,7 @@ on: - libs/security-core - apps/organisasjon-tilgang-frontend/** - .github/workflows/app.organisasjon-tilgang-frontend.yml + - .github/workflows/common.workflow.frontend.yml jobs: workflow: diff --git a/.github/workflows/app.organisasjon-tilgang-service.yml b/.github/workflows/app.organisasjon-tilgang-service.yml index fabd9193dce..6258e580c8b 100644 --- a/.github/workflows/app.organisasjon-tilgang-service.yml +++ b/.github/workflows/app.organisasjon-tilgang-service.yml @@ -7,6 +7,7 @@ on: - libs/reactive-security - apps/organisasjon-tilgang-service/** - .github/workflows/app.organisasjon-tilgang-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.orgnummer-service.yml b/.github/workflows/app.orgnummer-service.yml index 591148ded99..06cf77b229d 100644 --- a/.github/workflows/app.orgnummer-service.yml +++ b/.github/workflows/app.orgnummer-service.yml @@ -12,6 +12,7 @@ on: - libs/servlet-security - apps/orgnummer-service/** - .github/workflows/app.orgnummer-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.oversikt-frontend.yml b/.github/workflows/app.oversikt-frontend.yml index 6ebf48e69fc..bf5175aee6a 100644 --- a/.github/workflows/app.oversikt-frontend.yml +++ b/.github/workflows/app.oversikt-frontend.yml @@ -9,6 +9,7 @@ on: - libs/security-core - apps/oversikt-frontend/** - .github/workflows/app.oversikt-frontend.yml + - .github/workflows/common.workflow.frontend.yml jobs: workflow: diff --git a/.github/workflows/app.pdl-forvalter.yml b/.github/workflows/app.pdl-forvalter.yml index 98a372deb3f..c074203f0ca 100644 --- a/.github/workflows/app.pdl-forvalter.yml +++ b/.github/workflows/app.pdl-forvalter.yml @@ -11,6 +11,7 @@ on: - libs/testing - apps/pdl-forvalter/** - .github/workflows/app.pdl-forvalter.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.person-export-api.yml b/.github/workflows/app.person-export-api.yml deleted file mode 100644 index 9625444e9a7..00000000000 --- a/.github/workflows/app.person-export-api.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: person-export-api - -on: - push: - paths: - - libs/csv-converter - - libs/reactive-core - - libs/servlet-core - - libs/servlet-security - - libs/slack - - apps/person-export-api/** - - .github/workflows/app.person-export-api.yml - -jobs: - workflow: - uses: ./.github/workflows/common.workflow.backend.yml - with: - working-directory: "apps/person-export-api" - deploy-tag: "#deploy-person-export-api" - permissions: - contents: read - id-token: write - secrets: - NAIS_DOLLY_DEPLOY_API_KEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }} - NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - NAV_TOKEN: ${{ secrets.NAV_TOKEN }} - SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/app.person-faste-data-service.yml b/.github/workflows/app.person-faste-data-service.yml index 99c4dc32e8a..6cc485ff6b9 100644 --- a/.github/workflows/app.person-faste-data-service.yml +++ b/.github/workflows/app.person-faste-data-service.yml @@ -8,6 +8,7 @@ on: - libs/reactive-security - apps/person-faste-data-service/** - .github/workflows/app.person-faste-data-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.person-organisasjon-tilgang-service.yml b/.github/workflows/app.person-organisasjon-tilgang-service.yml index 4d2730bf7c1..1bf80510d05 100644 --- a/.github/workflows/app.person-organisasjon-tilgang-service.yml +++ b/.github/workflows/app.person-organisasjon-tilgang-service.yml @@ -9,6 +9,7 @@ on: - libs/security-core - apps/person-organisasjon-tilgang-service/** - .github/workflows/app.person-organisasjon-tilgang-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.person-search-service.yml b/.github/workflows/app.person-search-service.yml index 991727895cb..1001d64dd10 100644 --- a/.github/workflows/app.person-search-service.yml +++ b/.github/workflows/app.person-search-service.yml @@ -10,6 +10,7 @@ on: - libs/servlet-security - apps/person-search-service/** - .github/workflows/app.person-search-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.person-service.yml b/.github/workflows/app.person-service.yml index de812278908..1f0436f4795 100644 --- a/.github/workflows/app.person-service.yml +++ b/.github/workflows/app.person-service.yml @@ -11,6 +11,7 @@ on: - libs/servlet-security - apps/person-service/** - .github/workflows/app.person-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.profil-api.yml b/.github/workflows/app.profil-api.yml index 80d2adf4334..87df454bfe1 100644 --- a/.github/workflows/app.profil-api.yml +++ b/.github/workflows/app.profil-api.yml @@ -10,6 +10,7 @@ on: - libs/servlet-security - apps/profil-api/** - .github/workflows/app.profil-api.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.sykemelding-api.yml b/.github/workflows/app.sykemelding-api.yml index 4d72174bee7..7449f666a6c 100644 --- a/.github/workflows/app.sykemelding-api.yml +++ b/.github/workflows/app.sykemelding-api.yml @@ -8,6 +8,7 @@ on: - libs/servlet-core - apps/sykemelding-api/** - .github/workflows/app.sykemelding-api.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.synt-sykemelding-api.yml b/.github/workflows/app.synt-sykemelding-api.yml index 6d8c1fc2098..99b0c235ccc 100644 --- a/.github/workflows/app.synt-sykemelding-api.yml +++ b/.github/workflows/app.synt-sykemelding-api.yml @@ -11,6 +11,7 @@ on: - libs/testing - apps/synt-sykemelding-api/** - .github/workflows/app.synt-sykemelding-api.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.synt-vedtakshistorikk-service.yml b/.github/workflows/app.synt-vedtakshistorikk-service.yml index 6b5bbb48c6b..d025e8e0e95 100644 --- a/.github/workflows/app.synt-vedtakshistorikk-service.yml +++ b/.github/workflows/app.synt-vedtakshistorikk-service.yml @@ -11,6 +11,7 @@ on: - libs/servlet-security - apps/synt-vedtakshistorikk-service/** - .github/workflows/app.synt-vedtakshistorikk-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.testnav-ident-pool.yml b/.github/workflows/app.testnav-ident-pool.yml index 91eeb585370..db4bde3bc37 100644 --- a/.github/workflows/app.testnav-ident-pool.yml +++ b/.github/workflows/app.testnav-ident-pool.yml @@ -11,6 +11,7 @@ on: - libs/testing - apps/testnav-ident-pool/** - .github/workflows/app.testnav-ident-pool.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.testnorge-statisk-data-forvalter.yml b/.github/workflows/app.testnorge-statisk-data-forvalter.yml index 4e9a952dfda..9aa0b356102 100644 --- a/.github/workflows/app.testnorge-statisk-data-forvalter.yml +++ b/.github/workflows/app.testnorge-statisk-data-forvalter.yml @@ -16,6 +16,7 @@ on: - libs/testing - apps/testnorge-statisk-data-forvalter/** - .github/workflows/app.testnorge-statisk-data-forvalter.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.tilbakemelding-api.yml b/.github/workflows/app.tilbakemelding-api.yml index e7bfacd165b..9e6d2b9db7a 100644 --- a/.github/workflows/app.tilbakemelding-api.yml +++ b/.github/workflows/app.tilbakemelding-api.yml @@ -11,6 +11,7 @@ on: - libs/slack - apps/tilbakemelding-api/** - .github/workflows/app.tilbakemelding-api.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.tps-messaging-service.yml b/.github/workflows/app.tps-messaging-service.yml index be914c409c6..f73c211c682 100644 --- a/.github/workflows/app.tps-messaging-service.yml +++ b/.github/workflows/app.tps-messaging-service.yml @@ -9,6 +9,7 @@ on: - libs/servlet-security - apps/tps-messaging-service/** - .github/workflows/app.tps-messaging-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.udi-stub.yml b/.github/workflows/app.udi-stub.yml index 63dfc1eaf31..ac1d2dde931 100644 --- a/.github/workflows/app.udi-stub.yml +++ b/.github/workflows/app.udi-stub.yml @@ -9,6 +9,7 @@ on: - libs/servlet-security - apps/udi-stub/** - .github/workflows/app.udi-stub.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/app.varslinger-service.yml b/.github/workflows/app.varslinger-service.yml index f31627c2694..1187386becf 100644 --- a/.github/workflows/app.varslinger-service.yml +++ b/.github/workflows/app.varslinger-service.yml @@ -10,6 +10,7 @@ on: - libs/servlet-security - apps/varslinger-service/** - .github/workflows/app.varslinger-service.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.aareg-proxy.yml b/.github/workflows/proxy.aareg-proxy.yml index 28d7ddc113a..a67bb3c1417 100644 --- a/.github/workflows/proxy.aareg-proxy.yml +++ b/.github/workflows/proxy.aareg-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/aareg-proxy/** - .github/workflows/proxy.aareg-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.aareg-synt-services-proxy.yml b/.github/workflows/proxy.aareg-synt-services-proxy.yml index 244813526fc..b1d91affc37 100644 --- a/.github/workflows/proxy.aareg-synt-services-proxy.yml +++ b/.github/workflows/proxy.aareg-synt-services-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/aareg-synt-services-proxy/** - .github/workflows/proxy.aareg-synt-services-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml index 404f0a8c062..12016f5f61f 100644 --- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml +++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/arbeidsplassencv-proxy/** - .github/workflows/proxy.arbeidsplassencv-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.arena-forvalteren-proxy.yml b/.github/workflows/proxy.arena-forvalteren-proxy.yml index be18f3e63fa..251146513b7 100644 --- a/.github/workflows/proxy.arena-forvalteren-proxy.yml +++ b/.github/workflows/proxy.arena-forvalteren-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/arena-forvalteren-proxy/** - .github/workflows/proxy.arena-forvalteren-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.batch-adeo-proxy.yml b/.github/workflows/proxy.batch-adeo-proxy.yml index 5baf1f00748..b47ac35679c 100644 --- a/.github/workflows/proxy.batch-adeo-proxy.yml +++ b/.github/workflows/proxy.batch-adeo-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/batch-adeo-proxy/** - .github/workflows/proxy.batch-adeo-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.brregstub-proxy.yml b/.github/workflows/proxy.brregstub-proxy.yml index 5e6995ee696..2f697f68d24 100644 --- a/.github/workflows/proxy.brregstub-proxy.yml +++ b/.github/workflows/proxy.brregstub-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/brregstub-proxy/** - .github/workflows/proxy.brregstub-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.dokarkiv-proxy.yml b/.github/workflows/proxy.dokarkiv-proxy.yml index 4d16fb4ff2a..cda0907e386 100644 --- a/.github/workflows/proxy.dokarkiv-proxy.yml +++ b/.github/workflows/proxy.dokarkiv-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/dokarkiv-proxy/** - .github/workflows/proxy.dokarkiv-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.ereg-proxy.yml b/.github/workflows/proxy.ereg-proxy.yml index 8ecffe0130e..56d1b009ce6 100644 --- a/.github/workflows/proxy.ereg-proxy.yml +++ b/.github/workflows/proxy.ereg-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/ereg-proxy/** - .github/workflows/proxy.ereg-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.histark-proxy.yml b/.github/workflows/proxy.histark-proxy.yml index cd477338e80..e146dee8b99 100644 --- a/.github/workflows/proxy.histark-proxy.yml +++ b/.github/workflows/proxy.histark-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/histark-proxy/** - .github/workflows/proxy.histark-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.inntektstub-proxy.yml b/.github/workflows/proxy.inntektstub-proxy.yml index 0d0ff4f0b24..16ee7a5d8f8 100644 --- a/.github/workflows/proxy.inntektstub-proxy.yml +++ b/.github/workflows/proxy.inntektstub-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/inntektstub-proxy/** - .github/workflows/proxy.inntektstub-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml index efcf944cc00..6e11223b2de 100644 --- a/.github/workflows/proxy.inst-proxy.yml +++ b/.github/workflows/proxy.inst-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/inst-proxy/** - .github/workflows/proxy.inst-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.kodeverk-proxy.yml b/.github/workflows/proxy.kodeverk-proxy.yml index 4a4c0befbca..2642a71caf7 100644 --- a/.github/workflows/proxy.kodeverk-proxy.yml +++ b/.github/workflows/proxy.kodeverk-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/kodeverk-proxy/** - .github/workflows/proxy.kodeverk-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.kontoregister-person-proxy.yml b/.github/workflows/proxy.kontoregister-person-proxy.yml index 2618e3be7d7..96dce2b2f5a 100644 --- a/.github/workflows/proxy.kontoregister-person-proxy.yml +++ b/.github/workflows/proxy.kontoregister-person-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/kontoregister-person-proxy/** - .github/workflows/proxy.kontoregister-person-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.krrstub-proxy.yml b/.github/workflows/proxy.krrstub-proxy.yml index 83f126d1f55..c6b0f93337f 100644 --- a/.github/workflows/proxy.krrstub-proxy.yml +++ b/.github/workflows/proxy.krrstub-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/krrstub-proxy/** - .github/workflows/proxy.krrstub-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml index 816b6fa3ad9..a0be21ff8f5 100644 --- a/.github/workflows/proxy.medl-proxy.yml +++ b/.github/workflows/proxy.medl-proxy.yml @@ -11,6 +11,7 @@ on: - libs/database - libs/data-transfer-objects - .github/workflows/proxy.medl-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.norg2-proxy.yml b/.github/workflows/proxy.norg2-proxy.yml index eeeab46890a..7ade7fffe37 100644 --- a/.github/workflows/proxy.norg2-proxy.yml +++ b/.github/workflows/proxy.norg2-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/norg2-proxy/** - .github/workflows/proxy.norg2-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.pdl-proxy.yml b/.github/workflows/proxy.pdl-proxy.yml index f9070b8401a..7c14776a2e5 100644 --- a/.github/workflows/proxy.pdl-proxy.yml +++ b/.github/workflows/proxy.pdl-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/pdl-proxy/** - .github/workflows/proxy.pdl-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml index cecc122f40a..0c495bfcf6d 100644 --- a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml +++ b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/pensjon-testdata-facade-proxy/** - .github/workflows/proxy.pensjon-testdata-facade-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.saf-proxy.yml b/.github/workflows/proxy.saf-proxy.yml index 8ad13efbf17..8786ad64df9 100644 --- a/.github/workflows/proxy.saf-proxy.yml +++ b/.github/workflows/proxy.saf-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/saf-proxy/** - .github/workflows/proxy.saf-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.sigrunstub-proxy.yml b/.github/workflows/proxy.sigrunstub-proxy.yml index 5ce006a6a9c..41f4ef91f53 100644 --- a/.github/workflows/proxy.sigrunstub-proxy.yml +++ b/.github/workflows/proxy.sigrunstub-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/sigrunstub-proxy/** - .github/workflows/proxy.sigrunstub-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.skjermingsregister-proxy.yml b/.github/workflows/proxy.skjermingsregister-proxy.yml index 227bcde795b..d03aff5d737 100644 --- a/.github/workflows/proxy.skjermingsregister-proxy.yml +++ b/.github/workflows/proxy.skjermingsregister-proxy.yml @@ -8,6 +8,7 @@ on: - libs/security-token-service - proxies/skjermingsregister-proxy/** - .github/workflows/proxy.skjermingsregister-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.synthdata-meldekort-proxy.yml b/.github/workflows/proxy.synthdata-meldekort-proxy.yml index ef36d482a0e..0277c9b06c4 100644 --- a/.github/workflows/proxy.synthdata-meldekort-proxy.yml +++ b/.github/workflows/proxy.synthdata-meldekort-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/synthdata-meldekort-proxy/** - .github/workflows/proxy.synthdata-meldekort-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.tps-forvalteren-proxy.yml b/.github/workflows/proxy.tps-forvalteren-proxy.yml index 7a81ab1a699..bd3dbbfac75 100644 --- a/.github/workflows/proxy.tps-forvalteren-proxy.yml +++ b/.github/workflows/proxy.tps-forvalteren-proxy.yml @@ -7,6 +7,7 @@ on: - libs/reactive-proxy - proxies/tps-forvalteren-proxy/** - .github/workflows/proxy.tps-forvalteren-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/.github/workflows/proxy.udistub-proxy.yml b/.github/workflows/proxy.udistub-proxy.yml index 9784f847502..1359253e785 100644 --- a/.github/workflows/proxy.udistub-proxy.yml +++ b/.github/workflows/proxy.udistub-proxy.yml @@ -9,6 +9,7 @@ on: - libs/security-core - proxies/udistub-proxy/** - .github/workflows/proxy.udistub-proxy.yml + - .github/workflows/common.workflow.backend.yml jobs: workflow: diff --git a/apps/adresse-service/src/main/resources/application.yaml b/apps/adresse-service/src/main/resources/application.yaml index 524e039d9e6..248874c9951 100644 --- a/apps/adresse-service/src/main/resources/application.yaml +++ b/apps/adresse-service/src/main/resources/application.yaml @@ -13,8 +13,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: diff --git a/apps/adresse-service/src/test/resources/application-test.properties b/apps/adresse-service/src/test/resources/application-test.properties new file mode 100644 index 00000000000..e5e55886152 --- /dev/null +++ b/apps/adresse-service/src/test/resources/application-test.properties @@ -0,0 +1 @@ +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml index 1b7e9b88b6a..fa8f86cbe4c 100644 --- a/apps/amelding-service/src/main/resources/application.yml +++ b/apps/amelding-service/src/main/resources/application.yml @@ -13,9 +13,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-amelding-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/amelding-service/src/test/resources/application-test.properties b/apps/amelding-service/src/test/resources/application-test.properties index f44e7773252..e5e55886152 100644 --- a/apps/amelding-service/src/test/resources/application-test.properties +++ b/apps/amelding-service/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml index 7760a09677b..822047d0729 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/application.yml +++ b/apps/app-tilgang-analyse-service/src/main/resources/application.yml @@ -16,9 +16,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-app-tilgang-analyse-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml b/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml index eccbfdfc4ce..060eeae71e3 100644 --- a/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml +++ b/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml @@ -4,4 +4,6 @@ spring: flyway: url: jdbc:h2:mem:testdb username: sa - password: \ No newline at end of file + password: + +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/arbeidsforhold-service/src/main/resources/application-dev.yml deleted file mode 100644 index a1cf247e4df..00000000000 --- a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,2 +0,0 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} \ No newline at end of file diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml index 4562a9a9d8f..a73601451b5 100644 --- a/apps/arbeidsforhold-service/src/main/resources/application.yml +++ b/apps/arbeidsforhold-service/src/main/resources/application.yml @@ -12,9 +12,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-arbeidsforhold-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/arbeidsforhold-service/src/test/resources/application-test.properties b/apps/arbeidsforhold-service/src/test/resources/application-test.properties index 01ff575320a..e5e55886152 100644 --- a/apps/arbeidsforhold-service/src/test/resources/application-test.properties +++ b/apps/arbeidsforhold-service/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.enabled=false - -azure.app.client.id=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml index 82505f2a5da..c94c017e80e 100644 --- a/apps/batch-bestilling-service/src/main/resources/application.yml +++ b/apps/batch-bestilling-service/src/main/resources/application.yml @@ -17,9 +17,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-batch-bestilling-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/batch-bestilling-service/src/test/resources/application-test.properties b/apps/batch-bestilling-service/src/test/resources/application-test.properties index 148b7a6e0e6..483fe127f1f 100644 --- a/apps/batch-bestilling-service/src/test/resources/application-test.properties +++ b/apps/batch-bestilling-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml index ae66cf64dcd..e5668233f25 100644 --- a/apps/bruker-service/src/main/resources/application-local.yml +++ b/apps/bruker-service/src/main/resources/application-local.yml @@ -1,11 +1,8 @@ CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} - TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev -TOKENDINGS_URL: https://tokenx.dev-gcp.nav.cloud.nais.io +TOKENDINGS_URL: ${TOKEN_X_ISSUER} spring: application: name: testnav-bruker-service-dev diff --git a/apps/bruker-service/src/main/resources/application.yml b/apps/bruker-service/src/main/resources/application.yml index f5a5045f3fe..7269e777be2 100644 --- a/apps/bruker-service/src/main/resources/application.yml +++ b/apps/bruker-service/src/main/resources/application.yml @@ -7,8 +7,8 @@ spring: oauth2: resourceserver: tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} jackson: serialization: diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yaml index 5986947850a..bbaad422b8f 100644 --- a/apps/dolly-backend/src/main/resources/application.yaml +++ b/apps/dolly-backend/src/main/resources/application.yaml @@ -47,8 +47,8 @@ spring: #The client_id of this application accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml index b5857a7a897..e12c19a2dc6 100644 --- a/apps/dolly-backend/src/test/resources/application-test.yaml +++ b/apps/dolly-backend/src/test/resources/application-test.yaml @@ -1,10 +1,7 @@ APP_NAME: dolly APP_VERSION: ${application.version} environment: localhost -CLIENT_ID: dummy -CLIENT_SECRET: dummy - -TOKEN_X_CLIENT_ID: test +TOKEN_X_ISSUER: dummy jira: host: http://localhost:${wiremock.server.port:0}/jira diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml index d4d7a0ccdc8..2c15148f945 100644 --- a/apps/dolly-frontend/src/main/resources/application.yml +++ b/apps/dolly-frontend/src/main/resources/application.yml @@ -23,8 +23,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} consumers: diff --git a/apps/dolly-frontend/src/test/resources/application-test.yml b/apps/dolly-frontend/src/test/resources/application-test.yml index 94ad768e500..74bf801179e 100644 --- a/apps/dolly-frontend/src/test/resources/application-test.yml +++ b/apps/dolly-frontend/src/test/resources/application-test.yml @@ -1,7 +1,4 @@ -spring.cloud.vault.token: dummy - -azure.app.client.id: dummy -azure.app.client.secret: dummy +TOKEN_X_ISSUER: dummy IDPORTEN_CLIENT_ID: dummy IDPORTEN_CLIENT_JWK: "{}" diff --git a/apps/endringsmelding-frontend/src/test/resources/application-test.properties b/apps/endringsmelding-frontend/src/test/resources/application-test.properties deleted file mode 100644 index 148b7a6e0e6..00000000000 --- a/apps/endringsmelding-frontend/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -spring.cloud.vault.token=dummy \ No newline at end of file diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml index fb09b764336..40398f5dfe6 100644 --- a/apps/endringsmelding-service/src/main/resources/application.yml +++ b/apps/endringsmelding-service/src/main/resources/application.yml @@ -13,9 +13,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-endringsmelding-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/endringsmelding-service/src/test/resources/application-test.properties b/apps/endringsmelding-service/src/test/resources/application-test.properties index f44e7773252..e5e55886152 100644 --- a/apps/endringsmelding-service/src/test/resources/application-test.properties +++ b/apps/endringsmelding-service/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/ereg-batch-status-service/src/main/resources/application.yml b/apps/ereg-batch-status-service/src/main/resources/application.yml index ce848b204f5..ede2e74d146 100644 --- a/apps/ereg-batch-status-service/src/main/resources/application.yml +++ b/apps/ereg-batch-status-service/src/main/resources/application.yml @@ -15,9 +15,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-fss:dolly:ereg-batch-status-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/ereg-batch-status-service/src/test/resources/application-test.properties b/apps/ereg-batch-status-service/src/test/resources/application-test.properties index 148b7a6e0e6..e5e55886152 100644 --- a/apps/ereg-batch-status-service/src/test/resources/application-test.properties +++ b/apps/ereg-batch-status-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/faste-data-frontend/src/main/resources/application-dev.yml b/apps/faste-data-frontend/src/main/resources/application-dev.yml index 642f62d64e9..4b73567c4dc 100644 --- a/apps/faste-data-frontend/src/main/resources/application-dev.yml +++ b/apps/faste-data-frontend/src/main/resources/application-dev.yml @@ -1,5 +1,3 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} consumers: testnorge-profil-api: diff --git a/apps/faste-data-frontend/src/test/resources/application-test.properties b/apps/faste-data-frontend/src/test/resources/application-test.properties deleted file mode 100644 index 148b7a6e0e6..00000000000 --- a/apps/faste-data-frontend/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -spring.cloud.vault.token=dummy \ No newline at end of file diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml index 85c6c31d85d..f00988c5f62 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml @@ -12,9 +12,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-generer-arbeidsforhold-populasjon-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: enabled: false diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties b/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties index 148b7a6e0e6..e5e55886152 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties +++ b/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/generer-navn-service/src/main/resources/application.yml b/apps/generer-navn-service/src/main/resources/application.yml index ed8733ceea6..fbf80725da1 100644 --- a/apps/generer-navn-service/src/main/resources/application.yml +++ b/apps/generer-navn-service/src/main/resources/application.yml @@ -15,9 +15,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:generer-navn-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: enabled: false diff --git a/apps/generer-navn-service/src/test/resources/application-test.properties b/apps/generer-navn-service/src/test/resources/application-test.properties index 148b7a6e0e6..e5e55886152 100644 --- a/apps/generer-navn-service/src/test/resources/application-test.properties +++ b/apps/generer-navn-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml index cb67c5b2ffe..1095396feec 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml +++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml @@ -12,9 +12,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-generer-organisasjon-populasjon-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties b/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties index d0fd67ad6d8..f039fb475ec 100644 --- a/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties +++ b/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties @@ -1,2 +1,2 @@ -spring.cloud.vault.token=dummy +TOKEN_X_ISSUER=dummy KAFKA_KEYSTORE_PATH="" \ No newline at end of file diff --git a/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml b/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml deleted file mode 100644 index 968e537aa99..00000000000 --- a/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,5 +0,0 @@ -azure: - app: - client: - id: ${client_id} - secret: ${client_secret} diff --git a/apps/generer-synt-amelding-service/src/main/resources/application.yml b/apps/generer-synt-amelding-service/src/main/resources/application.yml index ad9e81fac63..646d5965c2f 100644 --- a/apps/generer-synt-amelding-service/src/main/resources/application.yml +++ b/apps/generer-synt-amelding-service/src/main/resources/application.yml @@ -17,9 +17,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-generer-synt-amelding-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/generer-synt-amelding-service/src/test/resources/application-test.yml b/apps/generer-synt-amelding-service/src/test/resources/application-test.yml index 1513514ac87..c7ad525dd9c 100644 --- a/apps/generer-synt-amelding-service/src/test/resources/application-test.yml +++ b/apps/generer-synt-amelding-service/src/test/resources/application-test.yml @@ -18,3 +18,4 @@ consumers: AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token +TOKEN_X_ISSUER: dummy diff --git a/apps/geografiske-kodeverk-service/src/main/resources/application-dev.yml b/apps/geografiske-kodeverk-service/src/main/resources/application-dev.yml index 67429d094f5..76ddc7c5db2 100644 --- a/apps/geografiske-kodeverk-service/src/main/resources/application-dev.yml +++ b/apps/geografiske-kodeverk-service/src/main/resources/application-dev.yml @@ -1,3 +1 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} diff --git a/apps/geografiske-kodeverk-service/src/main/resources/application.yml b/apps/geografiske-kodeverk-service/src/main/resources/application.yml index 4b0f1c60c23..90f1aec1670 100644 --- a/apps/geografiske-kodeverk-service/src/main/resources/application.yml +++ b/apps/geografiske-kodeverk-service/src/main/resources/application.yml @@ -12,9 +12,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-geografiske-kodeverk-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java b/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java index d4e219fc3b7..f381bd8b4d9 100644 --- a/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java +++ b/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java @@ -4,8 +4,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.context.ActiveProfiles; @SpringBootTest +@ActiveProfiles("test") public class ApplicationContextTest { @MockBean diff --git a/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java b/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java index 5f8c8ade095..e84648bf685 100644 --- a/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java +++ b/apps/geografiske-kodeverk-service/src/test/java/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java @@ -9,6 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; @@ -17,10 +18,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; @SpringBootTest +@ActiveProfiles("test") @AutoConfigureMockMvc(addFilters = false) class KodeverkControllerTest { @@ -265,7 +266,7 @@ void should_return_bad_request_when_embetenavn_is_not_alphabetical() throws Exce private List readResponse(MvcResult result) throws Exception { Kodeverk[] array = objectMapper.readValue(result.getResponse().getContentAsString(), Kodeverk[].class); - return Arrays.stream(array).collect(Collectors.toUnmodifiableList()); + return Arrays.stream(array).toList(); } } \ No newline at end of file diff --git a/apps/geografiske-kodeverk-service/src/test/resources/application-test.properties b/apps/geografiske-kodeverk-service/src/test/resources/application-test.properties new file mode 100644 index 00000000000..38e5e4b2b5e --- /dev/null +++ b/apps/geografiske-kodeverk-service/src/test/resources/application-test.properties @@ -0,0 +1 @@ +TOKEN_X_ISSUER=DUMMY diff --git a/apps/helsepersonell-service/src/main/resources/application.yml b/apps/helsepersonell-service/src/main/resources/application.yml index 231c4c6e1d2..1d0a77c0f9f 100644 --- a/apps/helsepersonell-service/src/main/resources/application.yml +++ b/apps/helsepersonell-service/src/main/resources/application.yml @@ -18,9 +18,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-helsepersonell-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/helsepersonell-service/src/test/resources/application-test.properties b/apps/helsepersonell-service/src/test/resources/application-test.properties new file mode 100644 index 00000000000..e5e55886152 --- /dev/null +++ b/apps/helsepersonell-service/src/test/resources/application-test.properties @@ -0,0 +1 @@ +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application.yml b/apps/inntektsmelding-generator-service/src/main/resources/application.yml index fb8ffb03390..acd2b99aafa 100644 --- a/apps/inntektsmelding-generator-service/src/main/resources/application.yml +++ b/apps/inntektsmelding-generator-service/src/main/resources/application.yml @@ -14,9 +14,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-inntektsmelding-generator-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: enabled: false diff --git a/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java b/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java index f9e74976829..faee7505b3e 100644 --- a/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java +++ b/apps/inntektsmelding-generator-service/src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java @@ -4,7 +4,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.context.ActiveProfiles; +@ActiveProfiles("test") @SpringBootTest public class ApplicationContextTest { diff --git a/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties b/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties index da059fb49a7..69cc41673f4 100644 --- a/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties +++ b/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=DUMMY +TOKEN_X_ISSUER=dummy diff --git a/apps/inntektsmelding-service/src/main/resources/application.yml b/apps/inntektsmelding-service/src/main/resources/application.yml index dea9a38effe..c47500f7574 100644 --- a/apps/inntektsmelding-service/src/main/resources/application.yml +++ b/apps/inntektsmelding-service/src/main/resources/application.yml @@ -18,9 +18,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-inntektsmelding-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/inntektsmelding-service/src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java b/apps/inntektsmelding-service/src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java index 736cbb78c92..a06020db1b7 100644 --- a/apps/inntektsmelding-service/src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java +++ b/apps/inntektsmelding-service/src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java @@ -4,8 +4,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.context.ActiveProfiles; @SpringBootTest +@ActiveProfiles("test") public class ApplicationContextTest { @MockBean diff --git a/apps/inntektsmelding-service/src/test/resources/application-test.properties b/apps/inntektsmelding-service/src/test/resources/application-test.properties index 148b7a6e0e6..e5e55886152 100644 --- a/apps/inntektsmelding-service/src/test/resources/application-test.properties +++ b/apps/inntektsmelding-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/jenkins-batch-status-service/src/main/resources/application.yml b/apps/jenkins-batch-status-service/src/main/resources/application.yml index 6804a47faf7..282bf9b0a24 100644 --- a/apps/jenkins-batch-status-service/src/main/resources/application.yml +++ b/apps/jenkins-batch-status-service/src/main/resources/application.yml @@ -15,9 +15,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-jenkins-batch-status-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java b/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java index 365f550488c..9fc4b631887 100644 --- a/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java +++ b/apps/jenkins-batch-status-service/src/test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java @@ -4,8 +4,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.context.ActiveProfiles; @SpringBootTest +@ActiveProfiles("test") public class ApplicationContextTest { @MockBean diff --git a/apps/jenkins-batch-status-service/src/test/resources/application-test.properties b/apps/jenkins-batch-status-service/src/test/resources/application-test.properties index 148b7a6e0e6..e5e55886152 100644 --- a/apps/jenkins-batch-status-service/src/test/resources/application-test.properties +++ b/apps/jenkins-batch-status-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/joark-dokument-service/src/main/resources/application.yml b/apps/joark-dokument-service/src/main/resources/application.yml index 3f1f1aa66b9..d9900d2f2c7 100644 --- a/apps/joark-dokument-service/src/main/resources/application.yml +++ b/apps/joark-dokument-service/src/main/resources/application.yml @@ -20,9 +20,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-joark-dokument-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java b/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java index e3fb2a3f8a4..b6b552e1b36 100644 --- a/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java +++ b/apps/joark-dokument-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java @@ -4,7 +4,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.context.ActiveProfiles; +@ActiveProfiles("test") @SpringBootTest public class ApplicationContextTest { diff --git a/apps/joark-dokument-service/src/test/resources/application-test.properties b/apps/joark-dokument-service/src/test/resources/application-test.properties new file mode 100644 index 00000000000..483fe127f1f --- /dev/null +++ b/apps/joark-dokument-service/src/test/resources/application-test.properties @@ -0,0 +1 @@ +TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/miljoer-service/src/main/resources/application-dev.yml b/apps/miljoer-service/src/main/resources/application-dev.yml deleted file mode 100644 index a1cf247e4df..00000000000 --- a/apps/miljoer-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,2 +0,0 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} \ No newline at end of file diff --git a/apps/miljoer-service/src/main/resources/application.yml b/apps/miljoer-service/src/main/resources/application.yml index c0990b4c896..7fd89e5b822 100644 --- a/apps/miljoer-service/src/main/resources/application.yml +++ b/apps/miljoer-service/src/main/resources/application.yml @@ -17,9 +17,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-miljoer-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: enabled: false diff --git a/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java b/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java index 5c714c2b198..44ecb7599b0 100644 --- a/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java +++ b/apps/miljoer-service/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java @@ -4,7 +4,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.test.context.ActiveProfiles; +@ActiveProfiles("test") @SpringBootTest public class ApplicationContextTest { diff --git a/apps/miljoer-service/src/test/resources/application-test.properties b/apps/miljoer-service/src/test/resources/application-test.properties index 148b7a6e0e6..e5e55886152 100644 --- a/apps/miljoer-service/src/test/resources/application-test.properties +++ b/apps/miljoer-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application.yml b/apps/oppsummeringsdokument-service/src/main/resources/application.yml index 318962f7136..3c0c3943611 100644 --- a/apps/oppsummeringsdokument-service/src/main/resources/application.yml +++ b/apps/oppsummeringsdokument-service/src/main/resources/application.yml @@ -17,9 +17,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:oppsummeringsdokument-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} application: name: oppsummeringsdokument-service version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle diff --git a/apps/oppsummeringsdokument-service/src/test/resources/application-test.properties b/apps/oppsummeringsdokument-service/src/test/resources/application-test.properties index 5aedffc5dac..22db53e5b18 100644 --- a/apps/oppsummeringsdokument-service/src/test/resources/application-test.properties +++ b/apps/oppsummeringsdokument-service/src/test/resources/application-test.properties @@ -1,4 +1,4 @@ -spring.cloud.vault.token=dummy +TOKEN_X_ISSUER=dummy OPENSEARCH_USERNAME=username OPENSEARCH_PASSWORD=password OPENSEARCH_HOST=localhost diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application.yml b/apps/organisasjon-bestilling-service/src/main/resources/application.yml index 89c1961c4df..3d3df5fd455 100644 --- a/apps/organisasjon-bestilling-service/src/main/resources/application.yml +++ b/apps/organisasjon-bestilling-service/src/main/resources/application.yml @@ -16,9 +16,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:organisasjon-bestilling-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties b/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties index 148b7a6e0e6..e5e55886152 100644 --- a/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties +++ b/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml b/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml index bb9e89e1c87..b73f614e194 100644 --- a/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml +++ b/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml @@ -1,5 +1,3 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} spring: h2: diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application.yml b/apps/organisasjon-faste-data-service/src/main/resources/application.yml index fbe86598ef8..8a26cd2b93a 100644 --- a/apps/organisasjon-faste-data-service/src/main/resources/application.yml +++ b/apps/organisasjon-faste-data-service/src/main/resources/application.yml @@ -12,9 +12,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-organisasjon-faste-data-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: enabled: false diff --git a/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties b/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties index 148b7a6e0e6..e5e55886152 100644 --- a/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties +++ b/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties @@ -1 +1 @@ -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/organisasjon-forvalter/src/main/resources/application-prod.yml b/apps/organisasjon-forvalter/src/main/resources/application-prod.yml index f5023aac59f..4b8821847b5 100644 --- a/apps/organisasjon-forvalter/src/main/resources/application-prod.yml +++ b/apps/organisasjon-forvalter/src/main/resources/application-prod.yml @@ -1,6 +1,4 @@ -AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b - spring: flyway: enabled: true # Disabled by default as you should probably think twice before running Flyway-migrations diff --git a/apps/organisasjon-forvalter/src/main/resources/application.yml b/apps/organisasjon-forvalter/src/main/resources/application.yml index 47c0b8e553b..281ffe2add2 100644 --- a/apps/organisasjon-forvalter/src/main/resources/application.yml +++ b/apps/organisasjon-forvalter/src/main/resources/application.yml @@ -13,9 +13,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-organisasjon-forvalter + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/organisasjon-forvalter/src/test/resources/application-test.properties b/apps/organisasjon-forvalter/src/test/resources/application-test.properties index 938fc4b3fd4..2863d66abd4 100644 --- a/apps/organisasjon-forvalter/src/test/resources/application-test.properties +++ b/apps/organisasjon-forvalter/src/test/resources/application-test.properties @@ -1,4 +1,5 @@ -spring.cloud.vault.token=dummy +TOKEN_X_ISSUER=dummy +spring.cloud.vault.enabled=false spring.datasource.url=jdbc:h2:mem:testdb spring.datasource.driverClassName=org.h2.Driver diff --git a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OMSApplicationStarter.java b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OrganisasjonMottakServiceApplicationStarter.java similarity index 66% rename from apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OMSApplicationStarter.java rename to apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OrganisasjonMottakServiceApplicationStarter.java index fe9bafa3b67..d02898ddb45 100644 --- a/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OMSApplicationStarter.java +++ b/apps/organisasjon-mottak-service/src/main/java/no/nav/registre/testnorge/organisasjonmottak/OrganisasjonMottakServiceApplicationStarter.java @@ -6,10 +6,10 @@ @Slf4j @SpringBootApplication -public class OMSApplicationStarter { +public class OrganisasjonMottakServiceApplicationStarter { public static void main(String[] args) { - SpringApplication.run(OMSApplicationStarter.class, args); + SpringApplication.run(OrganisasjonMottakServiceApplicationStarter.class, args); } } diff --git a/apps/organisasjon-mottak-service/src/main/resources/application.yml b/apps/organisasjon-mottak-service/src/main/resources/application.yml index ccce4473604..12b7a1c3f77 100644 --- a/apps/organisasjon-mottak-service/src/main/resources/application.yml +++ b/apps/organisasjon-mottak-service/src/main/resources/application.yml @@ -12,9 +12,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-organisasjon-mottak-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: swagger-ui: diff --git a/apps/organisasjon-mottak-service/src/test/resources/application-test.properties b/apps/organisasjon-mottak-service/src/test/resources/application-test.properties index 62ea7c95ced..a550c3bea79 100644 --- a/apps/organisasjon-mottak-service/src/test/resources/application-test.properties +++ b/apps/organisasjon-mottak-service/src/test/resources/application-test.properties @@ -1,4 +1,4 @@ -spring.cloud.vault.token=dummy +TOKEN_X_ISSUER=dummy kafka.bootstrapservers= dummy kafka.schemaregistryservers= dummy diff --git a/apps/organisasjon-service/src/main/resources/application.yml b/apps/organisasjon-service/src/main/resources/application.yml index c2677e97d85..0b30288e953 100644 --- a/apps/organisasjon-service/src/main/resources/application.yml +++ b/apps/organisasjon-service/src/main/resources/application.yml @@ -11,9 +11,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-organisasjon-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: enabled: false diff --git a/apps/organisasjon-service/src/test/resources/application-test.properties b/apps/organisasjon-service/src/test/resources/application-test.properties index b14a316d82c..6763c44e6a5 100644 --- a/apps/organisasjon-service/src/test/resources/application-test.properties +++ b/apps/organisasjon-service/src/test/resources/application-test.properties @@ -1,3 +1,3 @@ consumers.ereg.url=http://localhost:${wiremock.server.port} -spring.cloud.vault.token=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/organisasjon-tilgang-service/config.yml b/apps/organisasjon-tilgang-service/config.yml index c2668b76ef2..81468423d37 100644 --- a/apps/organisasjon-tilgang-service/config.yml +++ b/apps/organisasjon-tilgang-service/config.yml @@ -71,10 +71,6 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - - name: ACCEPTED_AUDIENCE - value: dev-gcp:dolly:testnav-organisasjon-tilgang-service - - name: TOKENDINGS_URL - value: https://tokenx.dev-gcp.nav.cloud.nais.io gcp: sqlInstances: - type: POSTGRES_15 diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml index 247d2681871..f212b988f4a 100644 --- a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml +++ b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml @@ -1,6 +1,6 @@ +TOKEN_X_ISSUER: dummy ALTINN_URL: https://tt02.altinn.no -TOKENDINGS_URL: https://tokenx.dev-gcp.nav.cloud.nais.io altinn.api.key: dummy @@ -13,9 +13,4 @@ spring: flyway: url: jdbc:h2:mem:testdb username: sa - password: - security: - oauth2: - resourceserver: - tokenx: - accepted-audience: dev-gcp:dolly:testnav-organisasjon-tilgang-service \ No newline at end of file + password: \ No newline at end of file diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application.yml b/apps/organisasjon-tilgang-service/src/main/resources/application.yml index 0c72638d72d..c8e30c1fe89 100644 --- a/apps/organisasjon-tilgang-service/src/main/resources/application.yml +++ b/apps/organisasjon-tilgang-service/src/main/resources/application.yml @@ -13,9 +13,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: ${TOKENDINGS_URL} - jwk-set-uri: ${TOKENDINGS_URL}/jwks - accepted-audience: ${ACCEPTED_AUDIENCE} + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} jackson: serialization: write_dates_as_timestamps: false diff --git a/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml b/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml index e71cf08015e..dfbee67495e 100644 --- a/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml +++ b/apps/organisasjon-tilgang-service/src/test/resources/application-test.yml @@ -4,4 +4,4 @@ MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy MASKINPORTEN_SCOPES: dummy MASKINPORTEN_WELL_KNOWN_URL: http://localhost:8080 -TOKENDINGS_URL: dummy \ No newline at end of file +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/apps/orgnummer-service/src/main/resources/application.yml b/apps/orgnummer-service/src/main/resources/application.yml index 2112fa117a2..f46b42ceace 100644 --- a/apps/orgnummer-service/src/main/resources/application.yml +++ b/apps/orgnummer-service/src/main/resources/application.yml @@ -17,8 +17,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: dev-gcp:dolly:testnav-orgnummer-service cloud: vault: diff --git a/apps/orgnummer-service/src/test/resources/application-test.properties b/apps/orgnummer-service/src/test/resources/application-test.properties index 4e5df07aef2..e5e55886152 100644 --- a/apps/orgnummer-service/src/test/resources/application-test.properties +++ b/apps/orgnummer-service/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.enabled=false -spring.flyway.enabled=true -azure.app.client.id=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/orgnummer-service/src/test/resources/bootstrap.yml b/apps/orgnummer-service/src/test/resources/bootstrap.yml deleted file mode 100644 index 0451449ca23..00000000000 --- a/apps/orgnummer-service/src/test/resources/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - cloud: - vault: - enabled: false \ No newline at end of file diff --git a/apps/oversikt-frontend/src/main/resources/application.yml b/apps/oversikt-frontend/src/main/resources/application.yml index 0c2c8d365ce..f65bec9fdf9 100644 --- a/apps/oversikt-frontend/src/main/resources/application.yml +++ b/apps/oversikt-frontend/src/main/resources/application.yml @@ -9,8 +9,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} cloud: vault: enabled: false diff --git a/apps/oversikt-frontend/src/test/resources/application-test.properties b/apps/oversikt-frontend/src/test/resources/application-test.properties deleted file mode 100644 index f44e7773252..00000000000 --- a/apps/oversikt-frontend/src/test/resources/application-test.properties +++ /dev/null @@ -1,3 +0,0 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file diff --git a/apps/pdl-forvalter/config.test.yml b/apps/pdl-forvalter/config.test.yml index b2ad098c034..e1f6c9d8949 100644 --- a/apps/pdl-forvalter/config.test.yml +++ b/apps/pdl-forvalter/config.test.yml @@ -13,6 +13,8 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: dev + - name: ACCEPTED_AUDIENCE + value: dev-gcp:dolly:testnav-pdl-forvalter-dev image: "{{image}}" webproxy: true tokenx: diff --git a/apps/pdl-forvalter/config.yml b/apps/pdl-forvalter/config.yml index 0c2c84cabf1..a28f1a0bc6a 100644 --- a/apps/pdl-forvalter/config.yml +++ b/apps/pdl-forvalter/config.yml @@ -13,6 +13,8 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod + - name: ACCEPTED_AUDIENCE + value: dev-gcp:dolly:testnav-pdl-forvalter image: "{{image}}" webproxy: true tokenx: diff --git a/apps/pdl-forvalter/src/main/resources/application-dev.yaml b/apps/pdl-forvalter/src/main/resources/application-dev.yaml index 23e6a6f3668..a3f1c096f27 100644 --- a/apps/pdl-forvalter/src/main/resources/application-dev.yaml +++ b/apps/pdl-forvalter/src/main/resources/application-dev.yaml @@ -21,14 +21,3 @@ spring: enabled: true # Disabled by default as you should probably think twice before running Flyway-migrations locations: classpath:db/migration baseline-on-migrate: true - security: - oauth2: - resourceserver: - aad: - issuer-uri: ${AAD_ISSUER_URI}/v2.0 - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys - accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} - tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-pdl-forvalter-dev diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yaml b/apps/pdl-forvalter/src/main/resources/application-local.yaml index 9366e3d0546..76eb19897b0 100644 --- a/apps/pdl-forvalter/src/main/resources/application-local.yaml +++ b/apps/pdl-forvalter/src/main/resources/application-local.yaml @@ -1,3 +1,5 @@ +ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-pdl-forvalter-dev + spring: application: name: testnav-pdl-forvalter @@ -25,17 +27,6 @@ spring: hibernate: default-schema: public dialect: org.hibernate.dialect.PostgreSQLDialect - security: - oauth2: - resourceserver: - aad: - issuer-uri: ${AAD_ISSUER_URI}/v2.0 - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys - accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} - tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-pdl-forvalter-dev consumers: adresse-service: diff --git a/apps/pdl-forvalter/src/main/resources/application-prod.yaml b/apps/pdl-forvalter/src/main/resources/application-prod.yaml index c442949585d..d4ae8ef89f2 100644 --- a/apps/pdl-forvalter/src/main/resources/application-prod.yaml +++ b/apps/pdl-forvalter/src/main/resources/application-prod.yaml @@ -18,14 +18,3 @@ spring: enabled: true # Disabled by default as you should probably think twice before running Flyway-migrations locations: classpath:db/migration baseline-on-migrate: true - security: - oauth2: - resourceserver: - aad: - issuer-uri: ${AAD_ISSUER_URI}/v2.0 - jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys - accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} - tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-pdl-forvalter diff --git a/apps/pdl-forvalter/src/main/resources/application.yaml b/apps/pdl-forvalter/src/main/resources/application.yaml index 552ef633914..af9ae59450b 100644 --- a/apps/pdl-forvalter/src/main/resources/application.yaml +++ b/apps/pdl-forvalter/src/main/resources/application.yaml @@ -1,6 +1,5 @@ AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b - consumers: adresse-service: url: http://testnav-adresse-service.dolly.svc.cluster.local @@ -37,6 +36,17 @@ spring: cloud: vault: enabled: false + security: + oauth2: + resourceserver: + aad: + issuer-uri: ${AAD_ISSUER_URI}/v2.0 + jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys + accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} + tokenx: + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${ACCEPTED_AUDIENCE} springdoc: swagger-ui: diff --git a/apps/person-faste-data-service/src/main/resources/application.yml b/apps/person-faste-data-service/src/main/resources/application.yml index 9868e422af3..2515f413b99 100644 --- a/apps/person-faste-data-service/src/main/resources/application.yml +++ b/apps/person-faste-data-service/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: dev-gcp:dolly:testnav-person-faste-data-service springdoc: diff --git a/apps/person-faste-data-service/src/test/resources/application-test.properties b/apps/person-faste-data-service/src/test/resources/application-test.properties index f44e7773252..e5e55886152 100644 --- a/apps/person-faste-data-service/src/test/resources/application-test.properties +++ b/apps/person-faste-data-service/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/person-organisasjon-tilgang-service/config.test.yml b/apps/person-organisasjon-tilgang-service/config.test.yml index 335a4e36d27..54478aa5165 100644 --- a/apps/person-organisasjon-tilgang-service/config.test.yml +++ b/apps/person-organisasjon-tilgang-service/config.test.yml @@ -65,9 +65,5 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - - name: ACCEPTED_AUDIENCE - value: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service-dev - name: ALTINN_URL value: https://tt02.altinn.no - - name: TOKENDINGS_URL - value: https://tokenx.dev-gcp.nav.cloud.nais.io diff --git a/apps/person-organisasjon-tilgang-service/config.yml b/apps/person-organisasjon-tilgang-service/config.yml index c05b383219b..9cf9e9e8286 100644 --- a/apps/person-organisasjon-tilgang-service/config.yml +++ b/apps/person-organisasjon-tilgang-service/config.yml @@ -60,9 +60,5 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - - name: ACCEPTED_AUDIENCE - value: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service - name: ALTINN_URL - value: https://altinn.no - - name: TOKENDINGS_URL - value: https://tokenx.dev-gcp.nav.cloud.nais.io \ No newline at end of file + value: https://altinn.no \ No newline at end of file diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml index 619ed0070da..75b070dc5c2 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml @@ -1,7 +1,8 @@ -ACCEPTED_AUDIENCE: dev-gcp:dolly:testnav-person-tilgang-service-dev ALTINN_URL: https://tt02.altinn.no -TOKENDINGS_URL: dummy +TOKEN_X_ISSUER: dummy +OKEN_X_JWKS_URI: dummy +TOKEN_X_CLIENT_ID: dummy ALTINN_API_KEY: dummy MASKINPORTEN_CLIENT_ID: dummy diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml index 4ccf23a19b7..328010a8d87 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application-virtual.yml @@ -1,18 +1,12 @@ -spring: - security: - oauth2: - resourceserver: - tokenx: - issuer-uri: http://tokendings:8080 - jwk-set-uri: http://tokendings:8080/jwks - accepted-audience: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service +TOKEN_X_ISSUER: http://tokendings:8080 +OKEN_X_JWKS_URI: http://tokendings:8080/jwks +TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service + altinn: api: url: http://altinn:8080 key: dummy-altinn-key - -TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-person-organisasjon-tilgang-service TOKEN_X_WELL_KNOWN_URL: http://tokendings:8080/.well-known/oauth-authorization-server MASKINPORTEN_CLIENT_ID: client-id diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml index eb37aab219f..749173ef3ec 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application.yml @@ -8,9 +8,9 @@ spring: oauth2: resourceserver: tokenx: - issuer-uri: ${TOKENDINGS_URL} - jwk-set-uri: ${TOKENDINGS_URL}/jwks - accepted-audience: ${ACCEPTED_AUDIENCE} + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} jackson: serialization: write_dates_as_timestamps: false diff --git a/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml b/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml index 4498acd4c67..a52f05f20ca 100644 --- a/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml +++ b/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml @@ -1,4 +1,4 @@ -TOKENDINGS_URL: dummy +TOKEN_X_ISSUER: dummy ALTINN_URL: dummy ALTINN_API_KEY: dummy MASKINPORTEN_CLIENT_ID: dummy diff --git a/apps/person-search-service/src/main/resources/application.yml b/apps/person-search-service/src/main/resources/application.yml index 09d5349bba4..c98ec2ef19c 100644 --- a/apps/person-search-service/src/main/resources/application.yml +++ b/apps/person-search-service/src/main/resources/application.yml @@ -17,9 +17,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-person-search-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: enabled: false diff --git a/apps/person-search-service/src/test/resources/application-test.yml b/apps/person-search-service/src/test/resources/application-test.yml index 3a0f14cc6c1..6ddfd499610 100644 --- a/apps/person-search-service/src/test/resources/application-test.yml +++ b/apps/person-search-service/src/test/resources/application-test.yml @@ -1,13 +1,4 @@ -spring: - cloud: - vault: - token: dummy - -azure: - app: - client: - id: dummy - secret: dummy +TOKEN_X_ISSUER: dummy elasticsearch: client: diff --git a/apps/person-service/src/main/resources/application.yml b/apps/person-service/src/main/resources/application.yml index 687c887834d..484075fff2e 100644 --- a/apps/person-service/src/main/resources/application.yml +++ b/apps/person-service/src/main/resources/application.yml @@ -19,9 +19,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-person-service + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} jackson: serialization: write_dates_as_timestamps: false diff --git a/apps/person-service/src/test/resources/application-test.properties b/apps/person-service/src/test/resources/application-test.properties index f44e7773252..e5e55886152 100644 --- a/apps/person-service/src/test/resources/application-test.properties +++ b/apps/person-service/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/person-service/src/test/resources/bootstrap-test.yml b/apps/person-service/src/test/resources/bootstrap-test.yml deleted file mode 100644 index 0451449ca23..00000000000 --- a/apps/person-service/src/test/resources/bootstrap-test.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - cloud: - vault: - enabled: false \ No newline at end of file diff --git a/apps/profil-api/src/main/resources/application-dev.yml b/apps/profil-api/src/main/resources/application-dev.yml index b032d118d8e..67eeb473689 100644 --- a/apps/profil-api/src/main/resources/application-dev.yml +++ b/apps/profil-api/src/main/resources/application-dev.yml @@ -1,12 +1,3 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} -spring: - security: - oauth2: - resourceserver: - tokenx: - accepted-audience: dev-gcp:dolly:testnorge-profil-api-dev - consumers: testnav-person-organisasjon-tilgang-service: diff --git a/apps/profil-api/src/main/resources/application.yml b/apps/profil-api/src/main/resources/application.yml index e5648b8b0f8..9290a3c1203 100644 --- a/apps/profil-api/src/main/resources/application.yml +++ b/apps/profil-api/src/main/resources/application.yml @@ -15,8 +15,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: diff --git a/apps/profil-api/src/test/resources/application-test.yml b/apps/profil-api/src/test/resources/application-test.yml index b77364d0b03..91377f25679 100644 --- a/apps/profil-api/src/test/resources/application-test.yml +++ b/apps/profil-api/src/test/resources/application-test.yml @@ -1,9 +1,4 @@ -spring.cloud.vault.token: dummy - -CLIENT_SECRET: dummy -CLIENT_ID: dummy - -azure.app.client.id: dummy +TOKEN_X_ISSUER: dummy consumers: testnav-person-organisasjon-tilgang-service: diff --git a/apps/sykemelding-api/src/main/resources/application.yml b/apps/sykemelding-api/src/main/resources/application.yml index 0349eb801bd..d6dfd75a4f4 100644 --- a/apps/sykemelding-api/src/main/resources/application.yml +++ b/apps/sykemelding-api/src/main/resources/application.yml @@ -17,8 +17,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: diff --git a/apps/synt-sykemelding-api/src/main/resources/application.yml b/apps/synt-sykemelding-api/src/main/resources/application.yml index b803e88ed52..f080bf7ac5f 100644 --- a/apps/synt-sykemelding-api/src/main/resources/application.yml +++ b/apps/synt-sykemelding-api/src/main/resources/application.yml @@ -13,8 +13,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: diff --git a/apps/synt-sykemelding-api/src/test/resources/application-test.yml b/apps/synt-sykemelding-api/src/test/resources/application-test.yml index 36f73fafe86..1f8e50d2449 100644 --- a/apps/synt-sykemelding-api/src/test/resources/application-test.yml +++ b/apps/synt-sykemelding-api/src/test/resources/application-test.yml @@ -2,19 +2,7 @@ wiremock: server: port: 0 -spring: - cloud: - vault: - enabled: false - token: dummy - -azure: - app: - client: - id: dummy - secret: dummy - -TOKEN_X_CLIENT_ID: test +TOKEN_X_ISSUER: dummy consumers: synt-sykemelding: diff --git a/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml b/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml index aae5c789dd2..c3803f91db5 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml +++ b/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml @@ -1,13 +1,4 @@ -spring: - cloud: - vault: - token: dummy - -azure: - app: - client: - id: dummy - secret: dummy +TOKEN_X_ISSUER: dummy consumers: synt-vedtakshistorikk: diff --git a/apps/testnav-ident-pool/src/main/resources/application.yaml b/apps/testnav-ident-pool/src/main/resources/application.yaml index f1c6abaf7c5..baa41b6593b 100644 --- a/apps/testnav-ident-pool/src/main/resources/application.yaml +++ b/apps/testnav-ident-pool/src/main/resources/application.yaml @@ -46,8 +46,8 @@ spring: #The client_id of this application accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} diff --git a/apps/testnav-ident-pool/src/test/resources/application.properties b/apps/testnav-ident-pool/src/test/resources/application.properties index 38a61f770b5..1691598aacc 100644 --- a/apps/testnav-ident-pool/src/test/resources/application.properties +++ b/apps/testnav-ident-pool/src/test/resources/application.properties @@ -3,5 +3,5 @@ spring.datasource.driver-class-name=org.h2.Driver spring.datasource.url=jdbc:h2:mem:testdb;MODE=Postgresql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE; tps-forvalteren.rest.api.url=dummy -client_id=dummy -client_secret=dummy \ No newline at end of file + +TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml index c5394d92d07..fb67f5cfb3a 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml +++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application.yml @@ -18,8 +18,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: dev-fss:dolly:testnorge-statisk-data-forvalter springdoc: diff --git a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml index 796bbf785f2..645c29acb45 100644 --- a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml +++ b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml @@ -58,4 +58,6 @@ controller.staticdata.cache.hours: 24 azure.app.client.id: dummy KAFKA_SCHEMA_REGISTRY: http://localhost:9009 -kafka.groupid: organisasjon-forvalter-v1 \ No newline at end of file +kafka.groupid: organisasjon-forvalter-v1 + +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/apps/tilbakemelding-api/src/main/resources/application.yml b/apps/tilbakemelding-api/src/main/resources/application.yml index 5987913b666..f6eaecb9bc1 100644 --- a/apps/tilbakemelding-api/src/main/resources/application.yml +++ b/apps/tilbakemelding-api/src/main/resources/application.yml @@ -13,8 +13,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: dev-gcp:dolly:testnorge-tilbakemelding-api springdoc: diff --git a/apps/tilbakemelding-api/src/test/resources/application-test.properties b/apps/tilbakemelding-api/src/test/resources/application-test.properties index 3f367f2b39c..b03ff5a1383 100644 --- a/apps/tilbakemelding-api/src/test/resources/application-test.properties +++ b/apps/tilbakemelding-api/src/test/resources/application-test.properties @@ -1,3 +1,3 @@ -spring.cloud.vault.token=dummy SLACK_TOKEN=dummy -SLACK_CHANNEL=dummy \ No newline at end of file +SLACK_CHANNEL=dummy +TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/tps-messaging-service/src/main/resources/application-local.yaml b/apps/tps-messaging-service/src/main/resources/application-local.yaml index cdcdcf65c9f..449f2fdb185 100644 --- a/apps/tps-messaging-service/src/main/resources/application-local.yaml +++ b/apps/tps-messaging-service/src/main/resources/application-local.yaml @@ -1,4 +1,4 @@ -TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-tps-messaging-service +TOKEN_X_ISSUER: dummy config: mq: diff --git a/apps/tps-messaging-service/src/main/resources/application.yaml b/apps/tps-messaging-service/src/main/resources/application.yaml index 4e145094f38..3e415e2e3d7 100644 --- a/apps/tps-messaging-service/src/main/resources/application.yaml +++ b/apps/tps-messaging-service/src/main/resources/application.yaml @@ -13,9 +13,12 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} + cloud: + vault: + enabled: false springdoc: swagger-ui: diff --git a/apps/tps-messaging-service/src/test/Resources/application-test.yaml b/apps/tps-messaging-service/src/test/Resources/application-test.yaml index c26aab17ea7..9996130350b 100644 --- a/apps/tps-messaging-service/src/test/Resources/application-test.yaml +++ b/apps/tps-messaging-service/src/test/Resources/application-test.yaml @@ -12,4 +12,10 @@ consumers: url: http://not.actually.used cluster: dev-gcp namespace: dolly - name: testnav-miljoer-service \ No newline at end of file + name: testnav-miljoer-service + +TOKEN_X_ISSUER: dummy +spring: + cloud: + vault: + enabled: false \ No newline at end of file diff --git a/apps/udi-stub/src/main/resources/application.yml b/apps/udi-stub/src/main/resources/application.yml index 0fe4b83b6f8..0649406cfed 100644 --- a/apps/udi-stub/src/main/resources/application.yml +++ b/apps/udi-stub/src/main/resources/application.yml @@ -24,8 +24,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: dev-fss:dolly:testnav-udi-stub springdoc: diff --git a/apps/udi-stub/src/test/resources/application-test.yml b/apps/udi-stub/src/test/resources/application-test.yml index 8edb78eaf38..7e72df27c24 100644 --- a/apps/udi-stub/src/test/resources/application-test.yml +++ b/apps/udi-stub/src/test/resources/application-test.yml @@ -14,3 +14,5 @@ spring: ddl-auto: create flyway: enabled: false + +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/apps/varslinger-service/src/main/resources/application-local.yml b/apps/varslinger-service/src/main/resources/application-local.yml index 954b7376811..ff0bb76a278 100644 --- a/apps/varslinger-service/src/main/resources/application-local.yml +++ b/apps/varslinger-service/src/main/resources/application-local.yml @@ -1,5 +1,3 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} spring: h2: diff --git a/apps/varslinger-service/src/main/resources/application.yml b/apps/varslinger-service/src/main/resources/application.yml index 9de42b0129a..11ce8b758f9 100644 --- a/apps/varslinger-service/src/main/resources/application.yml +++ b/apps/varslinger-service/src/main/resources/application.yml @@ -15,8 +15,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} springdoc: diff --git a/apps/varslinger-service/src/test/resources/application-test.properties b/apps/varslinger-service/src/test/resources/application-test.properties index 08706a33278..483fe127f1f 100644 --- a/apps/varslinger-service/src/test/resources/application-test.properties +++ b/apps/varslinger-service/src/test/resources/application-test.properties @@ -1,2 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy \ No newline at end of file +TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/docs/_config.yml b/docs/_config.yml index e1c8d0dff2c..d2958df9953 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -3,7 +3,6 @@ remote_theme: pmarsceill/just-the-docs logo: "assets/logo.ico" exclude: [ - "applications/avhengighetsanalyse.md", "applications/endringsmelding.md", "applications/oppsummeringsdokument.md", "solution-description/index.md", diff --git a/docs/applications/avhengighetsanalyse.md b/docs/applications/avhengighetsanalyse.md deleted file mode 100644 index d62c8a232b4..00000000000 --- a/docs/applications/avhengighetsanalyse.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -layout: default -title: Avhengighetsanalyse -parent: Applikasjoner -has_children: true ---- - -# Avhengighetsanalyse - -Det er laget en applikasjon som analyserer avhengighetene mellom applikasjonene i testnorge-repoet. - -### Lenker -* [Frontend]( https://testnav-applikasjonsanalyse.dev.intern.nav.no/) -* [Swagger API](https://testnav-applikasjonsanalyse-service.dev.intern.nav.no/swagger) diff --git a/examples/reactive-rest-example/src/main/resources/application-local.yml b/examples/reactive-rest-example/src/main/resources/application-local.yml index ff9e565d327..94f1ea3900a 100644 --- a/examples/reactive-rest-example/src/main/resources/application-local.yml +++ b/examples/reactive-rest-example/src/main/resources/application-local.yml @@ -1,6 +1,3 @@ -# Rename from vault name to AzureAd name -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} spring: application: diff --git a/examples/reactive-rest-example/src/main/resources/application.yml b/examples/reactive-rest-example/src/main/resources/application.yml index 15f281e1f60..6842695513b 100644 --- a/examples/reactive-rest-example/src/main/resources/application.yml +++ b/examples/reactive-rest-example/src/main/resources/application.yml @@ -13,6 +13,6 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: dev-gcp:dolly:testnav-person-service \ No newline at end of file diff --git a/proxies/aareg-proxy/src/main/resources/application-local.yaml b/proxies/aareg-proxy/src/main/resources/application-local.yaml index c228d5d75c5..7d3efcea59b 100644 --- a/proxies/aareg-proxy/src/main/resources/application-local.yaml +++ b/proxies/aareg-proxy/src/main/resources/application-local.yaml @@ -1,4 +1,4 @@ -TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-aareg-proxy +TOKEN_X_ISSUER: dummy management: endpoint: diff --git a/proxies/aareg-proxy/src/main/resources/application.yaml b/proxies/aareg-proxy/src/main/resources/application.yaml index 155fc2463c4..581167fdfe9 100644 --- a/proxies/aareg-proxy/src/main/resources/application.yaml +++ b/proxies/aareg-proxy/src/main/resources/application.yaml @@ -13,8 +13,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/aareg-proxy/src/test/resources/application-test.properties b/proxies/aareg-proxy/src/test/resources/application-test.properties new file mode 100644 index 00000000000..e5e55886152 --- /dev/null +++ b/proxies/aareg-proxy/src/test/resources/application-test.properties @@ -0,0 +1 @@ +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/application.yml b/proxies/aareg-synt-services-proxy/src/main/resources/application.yml index 1a19b871615..c071ceed37d 100644 --- a/proxies/aareg-synt-services-proxy/src/main/resources/application.yml +++ b/proxies/aareg-synt-services-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/aareg-synt-services-proxy/src/test/resources/application-test.properties b/proxies/aareg-synt-services-proxy/src/test/resources/application-test.properties index f44e7773252..e5e55886152 100644 --- a/proxies/aareg-synt-services-proxy/src/test/resources/application-test.properties +++ b/proxies/aareg-synt-services-proxy/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml index 2ebbe70f171..e9ee116ac3c 100644 --- a/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml +++ b/proxies/arbeidsplassencv-proxy/src/main/resources/application.yml @@ -12,9 +12,9 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks - accepted-audience: dev-gcp:dolly:testnav-arbeidsplassencv-proxy + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} + accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: httpclient: diff --git a/proxies/arbeidsplassencv-proxy/src/test/resources/application-test.yml b/proxies/arbeidsplassencv-proxy/src/test/resources/application-test.yml index c84ad4a48ba..f00334410e1 100644 --- a/proxies/arbeidsplassencv-proxy/src/test/resources/application-test.yml +++ b/proxies/arbeidsplassencv-proxy/src/test/resources/application-test.yml @@ -1,4 +1,4 @@ -azure.app.client.id: dummy +TOKEN_X_ISSUER: dummy consumers: arbeidsplassencv: diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml index d1eee5e812a..0ce1e194fba 100644 --- a/proxies/arena-forvalteren-proxy/src/main/resources/application.yml +++ b/proxies/arena-forvalteren-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml b/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml index 8f6f189803a..57492dbb248 100644 --- a/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml +++ b/proxies/arena-forvalteren-proxy/src/test/resources/application-test.yml @@ -4,4 +4,6 @@ app: name: arena-dummy namespace: teamarenanais url: http://arena-dummy.dummy.no - cluster: dev-fss \ No newline at end of file + cluster: dev-fss + +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/proxies/batch-adeo-proxy/src/main/resources/application.yml b/proxies/batch-adeo-proxy/src/main/resources/application.yml index e8389f54b3f..2254c5bf0bf 100644 --- a/proxies/batch-adeo-proxy/src/main/resources/application.yml +++ b/proxies/batch-adeo-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/batch-adeo-proxy/src/test/resources/application-test.properties b/proxies/batch-adeo-proxy/src/test/resources/application-test.properties index f44e7773252..483fe127f1f 100644 --- a/proxies/batch-adeo-proxy/src/test/resources/application-test.properties +++ b/proxies/batch-adeo-proxy/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file +TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/proxies/brregstub-proxy/src/main/resources/application.yml b/proxies/brregstub-proxy/src/main/resources/application.yml index cd8ac31ae01..65a307c0448 100644 --- a/proxies/brregstub-proxy/src/main/resources/application.yml +++ b/proxies/brregstub-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/brregstub-proxy/src/test/resources/application-test.yml b/proxies/brregstub-proxy/src/test/resources/application-test.yml index 45a7f438eb7..f05debbd219 100644 --- a/proxies/brregstub-proxy/src/test/resources/application-test.yml +++ b/proxies/brregstub-proxy/src/test/resources/application-test.yml @@ -1 +1 @@ -azure.app.client.id: dummy \ No newline at end of file +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/proxies/dokarkiv-proxy/src/main/resources/application.yml b/proxies/dokarkiv-proxy/src/main/resources/application.yml index 557541271a9..f7ffec35e2d 100644 --- a/proxies/dokarkiv-proxy/src/main/resources/application.yml +++ b/proxies/dokarkiv-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/dokarkiv-proxy/src/test/resources/application-test.yml b/proxies/dokarkiv-proxy/src/test/resources/application-test.yml index fb5da8c5127..24e4a7df170 100644 --- a/proxies/dokarkiv-proxy/src/test/resources/application-test.yml +++ b/proxies/dokarkiv-proxy/src/test/resources/application-test.yml @@ -1,6 +1,4 @@ -spring.cloud.vault.token: dummy -azure.app.client.id: dummy -azure.app.client.secret: dummy +TOKEN_X_ISSUER: dummy consumers: dokarkiv: diff --git a/proxies/ereg-proxy/src/main/resources/application.yml b/proxies/ereg-proxy/src/main/resources/application.yml index 84051a419df..7f2ae7279b8 100644 --- a/proxies/ereg-proxy/src/main/resources/application.yml +++ b/proxies/ereg-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/ereg-proxy/src/test/resources/application-test.properties b/proxies/ereg-proxy/src/test/resources/application-test.properties index f44e7773252..e5e55886152 100644 --- a/proxies/ereg-proxy/src/test/resources/application-test.properties +++ b/proxies/ereg-proxy/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/proxies/histark-proxy/src/main/resources/application.yml b/proxies/histark-proxy/src/main/resources/application.yml index 0fa64ae1791..38fd86cbaf9 100644 --- a/proxies/histark-proxy/src/main/resources/application.yml +++ b/proxies/histark-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/histark-proxy/src/test/resources/application-test.yml b/proxies/histark-proxy/src/test/resources/application-test.yml index 737a427b9cc..6c4ae555764 100644 --- a/proxies/histark-proxy/src/test/resources/application-test.yml +++ b/proxies/histark-proxy/src/test/resources/application-test.yml @@ -1,2 +1 @@ -azure.app.client.id: dummy -azure.app.client.secret: dummy +TOKEN_X_ISSUER: dummy diff --git a/proxies/inntektstub-proxy/src/main/resources/application.yml b/proxies/inntektstub-proxy/src/main/resources/application.yml index fa886061fdd..d341f86a4e5 100644 --- a/proxies/inntektstub-proxy/src/main/resources/application.yml +++ b/proxies/inntektstub-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/inntektstub-proxy/src/test/resources/application-test.yml b/proxies/inntektstub-proxy/src/test/resources/application-test.yml index 45a7f438eb7..f05debbd219 100644 --- a/proxies/inntektstub-proxy/src/test/resources/application-test.yml +++ b/proxies/inntektstub-proxy/src/test/resources/application-test.yml @@ -1 +1 @@ -azure.app.client.id: dummy \ No newline at end of file +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/proxies/inst-proxy/src/main/resources/application.yml b/proxies/inst-proxy/src/main/resources/application.yml index a3275a98eb8..838ce3ffad1 100644 --- a/proxies/inst-proxy/src/main/resources/application.yml +++ b/proxies/inst-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: vault: diff --git a/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java b/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java index 8eb36dcd572..a306f7e9271 100644 --- a/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java +++ b/proxies/inst-proxy/src/test/java/no/nav/testnav/proxies/instproxy/ApplicationContextTest.java @@ -4,8 +4,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; +import org.springframework.test.context.ActiveProfiles; @SpringBootTest +@ActiveProfiles("test") class ApplicationContextTest { @MockBean diff --git a/proxies/inst-proxy/src/test/resources/application-test.properties b/proxies/inst-proxy/src/test/resources/application-test.properties new file mode 100644 index 00000000000..e5e55886152 --- /dev/null +++ b/proxies/inst-proxy/src/test/resources/application-test.properties @@ -0,0 +1 @@ +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/proxies/kodeverk-proxy/src/main/resources/application.yml b/proxies/kodeverk-proxy/src/main/resources/application.yml index bedf1d6543a..c4d1207f2a0 100644 --- a/proxies/kodeverk-proxy/src/main/resources/application.yml +++ b/proxies/kodeverk-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/kodeverk-proxy/src/test/resources/application-test.properties b/proxies/kodeverk-proxy/src/test/resources/application-test.properties index 18ea64dc24a..ee0ab3849bc 100644 --- a/proxies/kodeverk-proxy/src/test/resources/application-test.properties +++ b/proxies/kodeverk-proxy/src/test/resources/application-test.properties @@ -1,4 +1,2 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy +TOKEN_X_ISSUER=dummy proxy.url=http://localhost \ No newline at end of file diff --git a/proxies/kontoregister-person-proxy/src/main/resources/application.yml b/proxies/kontoregister-person-proxy/src/main/resources/application.yml index 3150f6b602c..da810748166 100644 --- a/proxies/kontoregister-person-proxy/src/main/resources/application.yml +++ b/proxies/kontoregister-person-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/kontoregister-person-proxy/src/test/resources/application-test.yml b/proxies/kontoregister-person-proxy/src/test/resources/application-test.yml index a45d3c87283..6c4ae555764 100644 --- a/proxies/kontoregister-person-proxy/src/test/resources/application-test.yml +++ b/proxies/kontoregister-person-proxy/src/test/resources/application-test.yml @@ -1 +1 @@ -azure.app.client.id: dummy +TOKEN_X_ISSUER: dummy diff --git a/proxies/krrstub-proxy/src/main/resources/application.yml b/proxies/krrstub-proxy/src/main/resources/application.yml index c17b2fce09a..ff8220fce27 100644 --- a/proxies/krrstub-proxy/src/main/resources/application.yml +++ b/proxies/krrstub-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/krrstub-proxy/src/test/resources/application-test.yml b/proxies/krrstub-proxy/src/test/resources/application-test.yml index 45a7f438eb7..f05debbd219 100644 --- a/proxies/krrstub-proxy/src/test/resources/application-test.yml +++ b/proxies/krrstub-proxy/src/test/resources/application-test.yml @@ -1 +1 @@ -azure.app.client.id: dummy \ No newline at end of file +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/proxies/medl-proxy/src/main/resources/application.yml b/proxies/medl-proxy/src/main/resources/application.yml index 91d852e5fac..83dedfa1672 100644 --- a/proxies/medl-proxy/src/main/resources/application.yml +++ b/proxies/medl-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/medl-proxy/src/test/resources/application-test.yml b/proxies/medl-proxy/src/test/resources/application-test.yml index 45a7f438eb7..5f3a2a2c0c8 100644 --- a/proxies/medl-proxy/src/test/resources/application-test.yml +++ b/proxies/medl-proxy/src/test/resources/application-test.yml @@ -1 +1,2 @@ -azure.app.client.id: dummy \ No newline at end of file +azure.app.client.id: dummy +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/proxies/norg2-proxy/src/main/resources/application.yml b/proxies/norg2-proxy/src/main/resources/application.yml index 91fe257e6df..656cb23834e 100644 --- a/proxies/norg2-proxy/src/main/resources/application.yml +++ b/proxies/norg2-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/norg2-proxy/src/test/resources/application-test.yml b/proxies/norg2-proxy/src/test/resources/application-test.yml index 45a7f438eb7..f05debbd219 100644 --- a/proxies/norg2-proxy/src/test/resources/application-test.yml +++ b/proxies/norg2-proxy/src/test/resources/application-test.yml @@ -1 +1 @@ -azure.app.client.id: dummy \ No newline at end of file +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/proxies/pdl-proxy/src/main/resources/application.yml b/proxies/pdl-proxy/src/main/resources/application.yml index 7a06b7ad5ce..0a99cca928d 100644 --- a/proxies/pdl-proxy/src/main/resources/application.yml +++ b/proxies/pdl-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/pdl-proxy/src/test/resources/application-test.properties b/proxies/pdl-proxy/src/test/resources/application-test.properties index aff06b97955..aa18dbf1e43 100644 --- a/proxies/pdl-proxy/src/test/resources/application-test.properties +++ b/proxies/pdl-proxy/src/test/resources/application-test.properties @@ -1,6 +1,4 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy +TOKEN_X_ISSUER=dummy sts.token.provider.username=dummy sts.token.provider.password=dummy diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml index b81dba22e28..a39776feb28 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml b/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml index f693ce3567f..30e48d6e0e9 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml +++ b/proxies/pensjon-testdata-facade-proxy/src/test/resources/application-test.yml @@ -1,4 +1,4 @@ -azure.app.client.id: dummy +TOKEN_X_ISSUER: dummy consumers: samboer-testdata: diff --git a/proxies/saf-proxy/src/main/resources/application.yml b/proxies/saf-proxy/src/main/resources/application.yml index 962d2834e86..c7952e5627b 100644 --- a/proxies/saf-proxy/src/main/resources/application.yml +++ b/proxies/saf-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/saf-proxy/src/test/resources/application-test.yml b/proxies/saf-proxy/src/test/resources/application-test.yml index a5f9b6a19d2..3a0b87cb27e 100644 --- a/proxies/saf-proxy/src/test/resources/application-test.yml +++ b/proxies/saf-proxy/src/test/resources/application-test.yml @@ -1,5 +1,4 @@ -azure.app.client.id: dummy -azure.app.client.secret: dummy +TOKEN_X_ISSUER: dummy consumers: saf: url: http://saf-dummy.dummy.no diff --git a/proxies/sigrunstub-proxy/src/main/resources/application.yml b/proxies/sigrunstub-proxy/src/main/resources/application.yml index b0ef8d47ecd..f2667f033bc 100644 --- a/proxies/sigrunstub-proxy/src/main/resources/application.yml +++ b/proxies/sigrunstub-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/sigrunstub-proxy/src/test/resources/application-test.properties b/proxies/sigrunstub-proxy/src/test/resources/application-test.properties index f44e7773252..e5e55886152 100644 --- a/proxies/sigrunstub-proxy/src/test/resources/application-test.properties +++ b/proxies/sigrunstub-proxy/src/test/resources/application-test.properties @@ -1,3 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy \ No newline at end of file +TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/proxies/skjermingsregister-proxy/src/main/resources/application.yml b/proxies/skjermingsregister-proxy/src/main/resources/application.yml index d34cb66d2b0..8de7657e097 100644 --- a/proxies/skjermingsregister-proxy/src/main/resources/application.yml +++ b/proxies/skjermingsregister-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml b/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml index 4772c647cd8..f77593af929 100644 --- a/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml +++ b/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml @@ -1,6 +1,4 @@ -spring.cloud.vault.token: dummy -azure.app.client.id: dummy -azure.app.client.secret: dummy +TOKEN_X_ISSUER: dummy proxy.url: http://localhost STS_TOKEN_PROVIDER_USERNAME: dummy STS_TOKEN_PROVIDER_PASSWORD: dummy \ No newline at end of file diff --git a/proxies/tps-forvalteren-proxy/src/main/resources/application-dev.yml b/proxies/tps-forvalteren-proxy/src/main/resources/application-dev.yml index e92aaaf34e1..987c041ac49 100644 --- a/proxies/tps-forvalteren-proxy/src/main/resources/application-dev.yml +++ b/proxies/tps-forvalteren-proxy/src/main/resources/application-dev.yml @@ -1,5 +1,3 @@ -azure.app.client.id: ${client_id} -azure.app.client.secret: ${client_secret} proxy.url: https://tps-forvalteren-dev.dev.adeo.no diff --git a/proxies/tps-forvalteren-proxy/src/main/resources/application.yml b/proxies/tps-forvalteren-proxy/src/main/resources/application.yml index 93506d24953..87ce883e8a1 100644 --- a/proxies/tps-forvalteren-proxy/src/main/resources/application.yml +++ b/proxies/tps-forvalteren-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/tps-forvalteren-proxy/src/test/resources/application-test.yml b/proxies/tps-forvalteren-proxy/src/test/resources/application-test.yml index 20fa5a451fa..438707ee212 100644 --- a/proxies/tps-forvalteren-proxy/src/test/resources/application-test.yml +++ b/proxies/tps-forvalteren-proxy/src/test/resources/application-test.yml @@ -8,4 +8,6 @@ proxy: url: http://localhost username: dummy -password: dummy \ No newline at end of file +password: dummy + +TOKEN_X_ISSUER: dummy \ No newline at end of file diff --git a/proxies/udistub-proxy/src/main/resources/application.yml b/proxies/udistub-proxy/src/main/resources/application.yml index 3f16ba355d0..06c736b4f2c 100644 --- a/proxies/udistub-proxy/src/main/resources/application.yml +++ b/proxies/udistub-proxy/src/main/resources/application.yml @@ -12,8 +12,8 @@ spring: jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} tokenx: - issuer-uri: https://tokenx.dev-gcp.nav.cloud.nais.io - jwk-set-uri: https://tokenx.dev-gcp.nav.cloud.nais.io/jwks + issuer-uri: ${TOKEN_X_ISSUER} + jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gateway: diff --git a/proxies/udistub-proxy/src/test/resources/application-test.properties b/proxies/udistub-proxy/src/test/resources/application-test.properties index 18ea64dc24a..483fe127f1f 100644 --- a/proxies/udistub-proxy/src/test/resources/application-test.properties +++ b/proxies/udistub-proxy/src/test/resources/application-test.properties @@ -1,4 +1 @@ -spring.cloud.vault.token=dummy -azure.app.client.id=dummy -azure.app.client.secret=dummy -proxy.url=http://localhost \ No newline at end of file +TOKEN_X_ISSUER= dummy \ No newline at end of file