From bd07fb9da5e47d2e5e8e9981168c4976909d6cfe Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Fri, 14 Feb 2025 10:54:25 +0100 Subject: [PATCH] Removes remaining configration of jwk-set-uri (instead using issuer-uri). --- .../bruker-service/src/main/resources/application-dev.yml | 1 - .../src/main/resources/application-prod.yml | 1 - .../src/main/resources/application-virtual.yml | 1 - .../src/test/resources/application-test.yml | 1 - apps/dolly-backend/src/main/resources/application-dev.yml | 1 - .../dolly-backend/src/main/resources/application-prod.yml | 1 - .../src/main/resources/application-prod.yml | 2 -- .../src/main/resources/application-prod.yml | 1 - .../src/main/resources/application-prod.yml | 4 +--- .../src/main/resources/application-prod.yml | 4 +--- .../src/main/resources/application-prod.yml | 3 +-- .../src/main/resources/application-prod.yml | 2 -- .../pdl-forvalter/src/main/resources/application-prod.yml | 2 -- .../src/main/resources/application-prod.yml | 2 -- .../src/main/resources/application-prod.yml | 1 - .../src/main/resources/application-prod.yml | 1 - .../src/main/resources/application-prod.yml | 2 -- .../src/main/resources/application-prod.yml | 1 - .../src/main/resources/application-prod.yml | 4 +--- apps/udi-stub/src/main/resources/application-prod.yml | 1 - .../NaisEnvironmentApplicationContextInitializer.java | 8 +++----- .../src/main/resources/application-prod.yml | 1 - .../src/main/resources/application-prod.yml | 1 - 23 files changed, 7 insertions(+), 39 deletions(-) diff --git a/apps/bruker-service/src/main/resources/application-dev.yml b/apps/bruker-service/src/main/resources/application-dev.yml index 35c9fa83539..781bcf26167 100644 --- a/apps/bruker-service/src/main/resources/application-dev.yml +++ b/apps/bruker-service/src/main/resources/application-dev.yml @@ -6,7 +6,6 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} r2dbc: url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_HOST}:${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_PORT}/${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_DEV_TESTNAV_BRUKER_SERVICE_DEV_DB_DATABASE} diff --git a/apps/bruker-service/src/main/resources/application-prod.yml b/apps/bruker-service/src/main/resources/application-prod.yml index e6f872195b9..83132022776 100644 --- a/apps/bruker-service/src/main/resources/application-prod.yml +++ b/apps/bruker-service/src/main/resources/application-prod.yml @@ -4,7 +4,6 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} r2dbc: url: r2dbc:postgresql://${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_HOST}:${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_PORT}/${NAIS_DATABASE_TESTNAV_BRUKER_SERVICE_TESTNAV_BRUKER_SERVICE_DB_DATABASE} diff --git a/apps/bruker-service/src/main/resources/application-virtual.yml b/apps/bruker-service/src/main/resources/application-virtual.yml index ec196e5f432..80bbe9b7879 100644 --- a/apps/bruker-service/src/main/resources/application-virtual.yml +++ b/apps/bruker-service/src/main/resources/application-virtual.yml @@ -4,7 +4,6 @@ spring: resourceserver: tokenx: issuer-uri: http://tokendings:8080 - jwk-set-uri: http://tokendings:8080/jwks accepted-audience: dev-gcp:dolly:testnav-bruker-service jackson: serialization: diff --git a/apps/bruker-service/src/test/resources/application-test.yml b/apps/bruker-service/src/test/resources/application-test.yml index 02b6582d120..cf96147fb34 100644 --- a/apps/bruker-service/src/test/resources/application-test.yml +++ b/apps/bruker-service/src/test/resources/application-test.yml @@ -8,7 +8,6 @@ spring: resourceserver: tokenx: issuer-uri: ${wiremockBaseUrl} - jwk-set-uri: ${wiremockBaseUrl}/jwks consumers: testnav-altinn3-tilgang-service: diff --git a/apps/dolly-backend/src/main/resources/application-dev.yml b/apps/dolly-backend/src/main/resources/application-dev.yml index 0c57e96f7bf..dc1ea40c10a 100644 --- a/apps/dolly-backend/src/main/resources/application-dev.yml +++ b/apps/dolly-backend/src/main/resources/application-dev.yml @@ -15,7 +15,6 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} consumers: diff --git a/apps/dolly-backend/src/main/resources/application-prod.yml b/apps/dolly-backend/src/main/resources/application-prod.yml index ff6ca3670af..d74988c487c 100644 --- a/apps/dolly-backend/src/main/resources/application-prod.yml +++ b/apps/dolly-backend/src/main/resources/application-prod.yml @@ -11,5 +11,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/apps/endringsmelding-service/src/main/resources/application-prod.yml b/apps/endringsmelding-service/src/main/resources/application-prod.yml index 894f2d09e4e..db46c2d97de 100644 --- a/apps/endringsmelding-service/src/main/resources/application-prod.yml +++ b/apps/endringsmelding-service/src/main/resources/application-prod.yml @@ -1,9 +1,7 @@ - spring: security: oauth2: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/apps/inntektsmelding-service/src/main/resources/application-prod.yml b/apps/inntektsmelding-service/src/main/resources/application-prod.yml index f28a3f16484..d5f6c292bfb 100644 --- a/apps/inntektsmelding-service/src/main/resources/application-prod.yml +++ b/apps/inntektsmelding-service/src/main/resources/application-prod.yml @@ -18,5 +18,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} diff --git a/apps/kodeverk-service/src/main/resources/application-prod.yml b/apps/kodeverk-service/src/main/resources/application-prod.yml index 896466cec53..db46c2d97de 100644 --- a/apps/kodeverk-service/src/main/resources/application-prod.yml +++ b/apps/kodeverk-service/src/main/resources/application-prod.yml @@ -1,9 +1,7 @@ - spring: security: oauth2: resourceserver: tokenx: - issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} + issuer-uri: ${TOKEN_X_ISSUER} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application-prod.yml b/apps/oppsummeringsdokument-service/src/main/resources/application-prod.yml index b44fd2f93a9..ec43a1bd21f 100644 --- a/apps/oppsummeringsdokument-service/src/main/resources/application-prod.yml +++ b/apps/oppsummeringsdokument-service/src/main/resources/application-prod.yml @@ -1,11 +1,9 @@ - spring: security: oauth2: resourceserver: tokenx: - issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} + issuer-uri: ${TOKEN_X_ISSUER} accepted-audience: ${TOKEN_X_CLIENT_ID} open: diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application-prod.yml b/apps/organisasjon-bestilling-service/src/main/resources/application-prod.yml index 8a908b470e1..94cbeb86b93 100644 --- a/apps/organisasjon-bestilling-service/src/main/resources/application-prod.yml +++ b/apps/organisasjon-bestilling-service/src/main/resources/application-prod.yml @@ -18,8 +18,7 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} - accepted-audience: ${TOKEN_X_CLIENT_ID + accepted-audience: ${TOKEN_X_CLIENT_ID} testnorge: analyse: diff --git a/apps/organisasjon-forvalter/src/main/resources/application-prod.yml b/apps/organisasjon-forvalter/src/main/resources/application-prod.yml index 10387eafeb2..17144666c5c 100644 --- a/apps/organisasjon-forvalter/src/main/resources/application-prod.yml +++ b/apps/organisasjon-forvalter/src/main/resources/application-prod.yml @@ -1,4 +1,3 @@ - spring: datasource: url: jdbc:postgresql://${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_HOST}:${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_PORT}/${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_DATABASE}?user=${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_USERNAME}&password=${NAIS_DATABASE_TESTNAV_ORGANISASJON_FORVALTER_ORGANISASJON_FORVALTER_DB_PASSWORD} @@ -15,5 +14,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/apps/pdl-forvalter/src/main/resources/application-prod.yml b/apps/pdl-forvalter/src/main/resources/application-prod.yml index 5db2b2abd9f..7b667f3faab 100644 --- a/apps/pdl-forvalter/src/main/resources/application-prod.yml +++ b/apps/pdl-forvalter/src/main/resources/application-prod.yml @@ -1,4 +1,3 @@ - spring: application: name: testnav-pdl-forvalter @@ -22,5 +21,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${ACCEPTED_AUDIENCE} \ No newline at end of file diff --git a/apps/person-service/src/main/resources/application-prod.yml b/apps/person-service/src/main/resources/application-prod.yml index 894f2d09e4e..db46c2d97de 100644 --- a/apps/person-service/src/main/resources/application-prod.yml +++ b/apps/person-service/src/main/resources/application-prod.yml @@ -1,9 +1,7 @@ - spring: security: oauth2: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/apps/skattekort-service/src/main/resources/application-prod.yml b/apps/skattekort-service/src/main/resources/application-prod.yml index 0311ce578e3..db46c2d97de 100644 --- a/apps/skattekort-service/src/main/resources/application-prod.yml +++ b/apps/skattekort-service/src/main/resources/application-prod.yml @@ -4,5 +4,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/apps/synt-sykemelding-api/src/main/resources/application-prod.yml b/apps/synt-sykemelding-api/src/main/resources/application-prod.yml index 0311ce578e3..db46c2d97de 100644 --- a/apps/synt-sykemelding-api/src/main/resources/application-prod.yml +++ b/apps/synt-sykemelding-api/src/main/resources/application-prod.yml @@ -4,5 +4,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/apps/testnav-ident-pool/src/main/resources/application-prod.yml b/apps/testnav-ident-pool/src/main/resources/application-prod.yml index 6ca2a2eedec..3bbfa37a247 100644 --- a/apps/testnav-ident-pool/src/main/resources/application-prod.yml +++ b/apps/testnav-ident-pool/src/main/resources/application-prod.yml @@ -1,9 +1,7 @@ - spring: oauth2: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} datasource: url: jdbc:postgresql://${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_HOST}:${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_PORT}/${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_DATABASE}?user=${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_USERNAME}&password=${NAIS_DATABASE_TESTNAV_IDENTPOOL_TESTNAV_IDENTPOOL_PASSWORD} diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml index 384571cb71d..f1797b7c158 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml +++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml @@ -17,7 +17,6 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: gcp: diff --git a/apps/tps-messaging-service/src/main/resources/application-prod.yml b/apps/tps-messaging-service/src/main/resources/application-prod.yml index 896466cec53..db46c2d97de 100644 --- a/apps/tps-messaging-service/src/main/resources/application-prod.yml +++ b/apps/tps-messaging-service/src/main/resources/application-prod.yml @@ -1,9 +1,7 @@ - spring: security: oauth2: resourceserver: tokenx: - issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} + issuer-uri: ${TOKEN_X_ISSUER} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/apps/udi-stub/src/main/resources/application-prod.yml b/apps/udi-stub/src/main/resources/application-prod.yml index 5f2ac6157da..70c46e646f7 100644 --- a/apps/udi-stub/src/main/resources/application-prod.yml +++ b/apps/udi-stub/src/main/resources/application-prod.yml @@ -30,5 +30,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java b/libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java index 608d6e725a2..c87a598db65 100644 --- a/libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java +++ b/libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java @@ -38,7 +38,6 @@ private static void configureForLocalProfile(Map properties) { properties.putIfAbsent("AZURE_APP_CLIENT_ID", "${sm\\://azure-app-client-id}"); properties.putIfAbsent("AZURE_APP_CLIENT_SECRET", "${sm\\://azure-app-client-secret}"); properties.putIfAbsent("AZURE_OPENID_CONFIG_ISSUER", "${sm\\://azure-openid-config-issuer}"); - properties.putIfAbsent("AZURE_OPENID_CONFIG_JWKS_URI", "${sm\\://azure-openid-config-jwks-uri}"); properties.putIfAbsent("AZURE_OPENID_CONFIG_TOKEN_ENDPOINT", "${sm\\://azure-openid-config-token-endpoint}"); properties.putIfAbsent("CRYPTOGRAPHY_SECRET", DUMMY); // Used by bruker-service only. properties.putIfAbsent("JWT_SECRET", DUMMY); // Used by bruker-service only. @@ -49,7 +48,6 @@ private static void configureForLocalProfile(Map properties) { properties.putIfAbsent("SLACK_CHANNEL", DUMMY); // Used by tilbakemelding-api only. properties.putIfAbsent("SLACK_TOKEN", DUMMY); // Used by tilbakemelding-api only. properties.putIfAbsent("TOKEN_X_ISSUER", "${sm\\://token-x-issuer}"); - properties.putIfAbsent("TOKEN_X_JWKS_URI", "${sm\\://token-x-jwks-uri}"); } @@ -63,10 +61,11 @@ private static void configureForTestProfile(Map properties) { // Setting dummy placeholders. Stream .of( + "spring.cloud.vault.token", // For apps using no.nav.testnav.libs:vault. + "ALTINN_API_KEY", "ALTINN_URL", "AZURE_OPENID_CONFIG_ISSUER", - "AZURE_OPENID_CONFIG_JWKS_URI", "AZURE_OPENID_CONFIG_TOKEN_ENDPOINT", "CRYPTOGRAPHY_SECRET", // Used by bruker-service only. "IDPORTEN_CLIENT_ID", // Used by dolly-frontend only. @@ -77,8 +76,7 @@ private static void configureForTestProfile(Map properties) { "MASKINPORTEN_SCOPES", "MASKINPORTEN_WELL_KNOWN_URL", "TOKEN_X_CLIENT_ID", - "TOKEN_X_ISSUER", - "spring.cloud.vault.token" // For apps using no.nav.testnav.libs:vault. + "TOKEN_X_ISSUER" ) .forEach(key -> properties.putIfAbsent(key, DUMMY)); diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-prod.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-prod.yml index 0311ce578e3..db46c2d97de 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-prod.yml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-prod.yml @@ -4,5 +4,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file diff --git a/proxies/yrkesskade-proxy/src/main/resources/application-prod.yml b/proxies/yrkesskade-proxy/src/main/resources/application-prod.yml index 894f2d09e4e..5b2473efedc 100644 --- a/proxies/yrkesskade-proxy/src/main/resources/application-prod.yml +++ b/proxies/yrkesskade-proxy/src/main/resources/application-prod.yml @@ -5,5 +5,4 @@ spring: resourceserver: tokenx: issuer-uri: ${TOKEN_X_ISSUER} - jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} \ No newline at end of file