From ea002f048428155a5d45236b1edf5c975824e73e Mon Sep 17 00:00:00 2001 From: stigus Date: Fri, 20 Oct 2023 10:27:46 +0200 Subject: [PATCH] =?UTF-8?q?Fikset=20aareg-proxy=20Endret=20deploy=20for=20?= =?UTF-8?q?proxyer,=20kan=20n=C3=A5=20bruke=20kun=20deploy-proxy=20#deploy?= =?UTF-8?q?-proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/proxy.aareg-proxy.yml | 2 +- .github/workflows/proxy.aareg-synt-services-proxy.yml | 2 +- .github/workflows/proxy.arbeidsplassencv-proxy.yml | 2 +- .github/workflows/proxy.arena-forvalteren-proxy.yml | 2 +- .github/workflows/proxy.batch-adeo-proxy.yml | 2 +- .github/workflows/proxy.brregstub-proxy.yml | 2 +- .github/workflows/proxy.dokarkiv-proxy.yml | 2 +- .github/workflows/proxy.ereg-proxy.yml | 2 +- .github/workflows/proxy.histark-proxy.yml | 2 +- .github/workflows/proxy.hodejegeren-proxy.yml | 2 +- .github/workflows/proxy.inntektstub-proxy.yml | 2 +- .github/workflows/proxy.inst-proxy.yml | 2 +- .github/workflows/proxy.kodeverk-proxy.yml | 2 +- .github/workflows/proxy.kontoregister-person-proxy.yml | 2 +- .github/workflows/proxy.krrstub-proxy.yml | 2 +- .github/workflows/proxy.medl-proxy.yml | 2 +- .github/workflows/proxy.norg2-proxy.yml | 2 +- .github/workflows/proxy.pdl-proxy.yml | 2 +- .github/workflows/proxy.pensjon-testdata-facade-proxy.yml | 2 +- .github/workflows/proxy.saf-proxy.yml | 2 +- .github/workflows/proxy.sigrunstub-proxy.yml | 2 +- .github/workflows/proxy.skjermingsregister-proxy.yml | 2 +- .github/workflows/proxy.statisk-data-forvalter-proxy.yml | 2 +- .github/workflows/proxy.synthdata-meldekort-proxy.yml | 2 +- .github/workflows/proxy.tps-forvalteren-proxy.yml | 2 +- .github/workflows/proxy.udistub-proxy.yml | 2 +- .../no/nav/testnav/proxies/aareg/LocalSecurityConfig.java | 8 ++------ .../nav/testnav/proxies/aareg/ApplicationContextTest.java | 3 +-- 28 files changed, 29 insertions(+), 34 deletions(-) diff --git a/.github/workflows/proxy.aareg-proxy.yml b/.github/workflows/proxy.aareg-proxy.yml index ecee09af164..28d7ddc113a 100644 --- a/.github/workflows/proxy.aareg-proxy.yml +++ b/.github/workflows/proxy.aareg-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/aareg-proxy" - deploy-tag: "#deploy-aareg-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.aareg-synt-services-proxy.yml b/.github/workflows/proxy.aareg-synt-services-proxy.yml index ae62d4ea7ba..244813526fc 100644 --- a/.github/workflows/proxy.aareg-synt-services-proxy.yml +++ b/.github/workflows/proxy.aareg-synt-services-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/aareg-synt-services-proxy" - deploy-tag: "#deploy-aareg-synt-services-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml index 70d2fcde8b6..4692437fb9d 100644 --- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml +++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/arbeidsplassencv-proxy" - deploy-tag: "#deploy-arbeidsplassencv-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.arena-forvalteren-proxy.yml b/.github/workflows/proxy.arena-forvalteren-proxy.yml index 8ccf7bba6c3..be18f3e63fa 100644 --- a/.github/workflows/proxy.arena-forvalteren-proxy.yml +++ b/.github/workflows/proxy.arena-forvalteren-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/arena-forvalteren-proxy" - deploy-tag: "#deploy-arena-forvalteren-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.batch-adeo-proxy.yml b/.github/workflows/proxy.batch-adeo-proxy.yml index 6c8fc6a9103..5baf1f00748 100644 --- a/.github/workflows/proxy.batch-adeo-proxy.yml +++ b/.github/workflows/proxy.batch-adeo-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/batch-adeo-proxy" - deploy-tag: "#deploy-batch-adeo-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.brregstub-proxy.yml b/.github/workflows/proxy.brregstub-proxy.yml index aa7e46b61eb..5e6995ee696 100644 --- a/.github/workflows/proxy.brregstub-proxy.yml +++ b/.github/workflows/proxy.brregstub-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/brregstub-proxy" - deploy-tag: "#deploy-brregstub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.dokarkiv-proxy.yml b/.github/workflows/proxy.dokarkiv-proxy.yml index 0e9a68f76cd..4d16fb4ff2a 100644 --- a/.github/workflows/proxy.dokarkiv-proxy.yml +++ b/.github/workflows/proxy.dokarkiv-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/dokarkiv-proxy" - deploy-tag: "#deploy-dokarkiv-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.ereg-proxy.yml b/.github/workflows/proxy.ereg-proxy.yml index be9bb11fe9b..8ecffe0130e 100644 --- a/.github/workflows/proxy.ereg-proxy.yml +++ b/.github/workflows/proxy.ereg-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/ereg-proxy" - deploy-tag: "#deploy-ereg-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.histark-proxy.yml b/.github/workflows/proxy.histark-proxy.yml index c57b338d254..cd477338e80 100644 --- a/.github/workflows/proxy.histark-proxy.yml +++ b/.github/workflows/proxy.histark-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/histark-proxy" - deploy-tag: "#deploy-histark-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.hodejegeren-proxy.yml b/.github/workflows/proxy.hodejegeren-proxy.yml index 51d1078b31d..362a1235fe8 100644 --- a/.github/workflows/proxy.hodejegeren-proxy.yml +++ b/.github/workflows/proxy.hodejegeren-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/hodejegeren-proxy" - deploy-tag: "#deploy-hodejegeren-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.inntektstub-proxy.yml b/.github/workflows/proxy.inntektstub-proxy.yml index 8f6e06f5052..0d0ff4f0b24 100644 --- a/.github/workflows/proxy.inntektstub-proxy.yml +++ b/.github/workflows/proxy.inntektstub-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/inntektstub-proxy" - deploy-tag: "#deploy-inntektstub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml index efcf944cc00..007c64c1239 100644 --- a/.github/workflows/proxy.inst-proxy.yml +++ b/.github/workflows/proxy.inst-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/inst-proxy" - deploy-tag: "#deploy-inst-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.kodeverk-proxy.yml b/.github/workflows/proxy.kodeverk-proxy.yml index 48626f04f1c..4a4c0befbca 100644 --- a/.github/workflows/proxy.kodeverk-proxy.yml +++ b/.github/workflows/proxy.kodeverk-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/kodeverk-proxy" - deploy-tag: "#deploy-kodeverk-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.kontoregister-person-proxy.yml b/.github/workflows/proxy.kontoregister-person-proxy.yml index 7020e5780e4..2618e3be7d7 100644 --- a/.github/workflows/proxy.kontoregister-person-proxy.yml +++ b/.github/workflows/proxy.kontoregister-person-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/kontoregister-person-proxy" - deploy-tag: "#deploy-kontoregister-person-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.krrstub-proxy.yml b/.github/workflows/proxy.krrstub-proxy.yml index d976f81e0ee..83f126d1f55 100644 --- a/.github/workflows/proxy.krrstub-proxy.yml +++ b/.github/workflows/proxy.krrstub-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/krrstub-proxy" - deploy-tag: "#deploy-krrstub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml index 0511372612a..816b6fa3ad9 100644 --- a/.github/workflows/proxy.medl-proxy.yml +++ b/.github/workflows/proxy.medl-proxy.yml @@ -18,7 +18,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/medl-proxy" - deploy-tag: "#deploy-medl-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.norg2-proxy.yml b/.github/workflows/proxy.norg2-proxy.yml index 4eb1135424b..eeeab46890a 100644 --- a/.github/workflows/proxy.norg2-proxy.yml +++ b/.github/workflows/proxy.norg2-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/norg2-proxy" - deploy-tag: "#deploy-norg2-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.pdl-proxy.yml b/.github/workflows/proxy.pdl-proxy.yml index 8c95138d8ca..f9070b8401a 100644 --- a/.github/workflows/proxy.pdl-proxy.yml +++ b/.github/workflows/proxy.pdl-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/pdl-proxy" - deploy-tag: "#deploy-pdl-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml index 9b77a04c49a..cecc122f40a 100644 --- a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml +++ b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/pensjon-testdata-facade-proxy" - deploy-tag: "#deploy-pensjon-testdata-facade-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.saf-proxy.yml b/.github/workflows/proxy.saf-proxy.yml index b8b1f57dadf..8ad13efbf17 100644 --- a/.github/workflows/proxy.saf-proxy.yml +++ b/.github/workflows/proxy.saf-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/saf-proxy" - deploy-tag: "#deploy-saf-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.sigrunstub-proxy.yml b/.github/workflows/proxy.sigrunstub-proxy.yml index 6c3c1d4aed4..5ce006a6a9c 100644 --- a/.github/workflows/proxy.sigrunstub-proxy.yml +++ b/.github/workflows/proxy.sigrunstub-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/sigrunstub-proxy" - deploy-tag: "#deploy-sigrunstub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.skjermingsregister-proxy.yml b/.github/workflows/proxy.skjermingsregister-proxy.yml index 0cc683568dc..227bcde795b 100644 --- a/.github/workflows/proxy.skjermingsregister-proxy.yml +++ b/.github/workflows/proxy.skjermingsregister-proxy.yml @@ -15,7 +15,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/skjermingsregister-proxy" - deploy-tag: "#deploy-skjermingsregister-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.statisk-data-forvalter-proxy.yml b/.github/workflows/proxy.statisk-data-forvalter-proxy.yml index 67a2c6c356a..8e3de7516dd 100644 --- a/.github/workflows/proxy.statisk-data-forvalter-proxy.yml +++ b/.github/workflows/proxy.statisk-data-forvalter-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/statisk-data-forvalter-proxy" - deploy-tag: "#deploy-statisk-data-forvalter-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.synthdata-meldekort-proxy.yml b/.github/workflows/proxy.synthdata-meldekort-proxy.yml index 135b056b076..ef36d482a0e 100644 --- a/.github/workflows/proxy.synthdata-meldekort-proxy.yml +++ b/.github/workflows/proxy.synthdata-meldekort-proxy.yml @@ -15,7 +15,7 @@ jobs: uses: ./.github/workflows/common.workflow.backend.yml with: working-directory: "proxies/synthdata-meldekort-proxy" - deploy-tag: "#deploy-synthdata-meldekort-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.tps-forvalteren-proxy.yml b/.github/workflows/proxy.tps-forvalteren-proxy.yml index a0a477369c3..7a81ab1a699 100644 --- a/.github/workflows/proxy.tps-forvalteren-proxy.yml +++ b/.github/workflows/proxy.tps-forvalteren-proxy.yml @@ -14,7 +14,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/tps-forvalteren-proxy" - deploy-tag: "#deploy-tps-forvalteren-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/.github/workflows/proxy.udistub-proxy.yml b/.github/workflows/proxy.udistub-proxy.yml index ac0c5e49216..9784f847502 100644 --- a/.github/workflows/proxy.udistub-proxy.yml +++ b/.github/workflows/proxy.udistub-proxy.yml @@ -16,7 +16,7 @@ jobs: with: cluster: "dev-fss" working-directory: "proxies/udistub-proxy" - deploy-tag: "#deploy-udistub-proxy" + deploy-tag: "#deploy-proxy" permissions: contents: read id-token: write diff --git a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/LocalSecurityConfig.java b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/LocalSecurityConfig.java index 834a7dc6241..4bdc6517be5 100644 --- a/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/LocalSecurityConfig.java +++ b/proxies/aareg-proxy/src/main/java/no/nav/testnav/proxies/aareg/LocalSecurityConfig.java @@ -16,12 +16,8 @@ public class LocalSecurityConfig { @Bean public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) { return http - .csrf().disable() - .authorizeExchange() - .anyExchange() - .permitAll() - .and() + .csrf(ServerHttpSecurity.CsrfSpec::disable) + .authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.anyExchange().permitAll()) .build(); } - } \ No newline at end of file diff --git a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java index 5176a12c1cc..97893924508 100644 --- a/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java +++ b/proxies/aareg-proxy/src/test/java/no/nav/testnav/proxies/aareg/ApplicationContextTest.java @@ -1,6 +1,5 @@ package no.nav.testnav.proxies.aareg; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; @@ -15,7 +14,7 @@ class ApplicationContextTest { @MockBean @SuppressWarnings("unused") - private JwtDecoder jwtDecoder; + private ReactiveJwtDecoder jwtDecoder; @Test void contextLoads() {