Skip to content

Commit

Permalink
Fix for lokalkjøring med ny versjon av spring-boot som endret default…
Browse files Browse the repository at this point in the history
… secret-manager pattern

#deploy-test-bruker-service
#deploy-test-pdl-forvalter
#deploy-test-frontend
  • Loading branch information
stigus committed Jan 16, 2025
1 parent 4cd9c77 commit 9caf50b
Show file tree
Hide file tree
Showing 77 changed files with 168 additions and 168 deletions.
4 changes: 2 additions & 2 deletions apps/adresse-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service

spring:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ALTINN_URL: https://platform.tt02.altinn.no
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
MASKINPORTEN_CLIENT_JWK: dummy
MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
Expand All @@ -22,8 +22,8 @@ spring:
baseline-on-migrate: true
url: jdbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
user: testnav-altinn3-tilgang-local
password: ${sm://testnav-altinn3-tilgang-local}
password: ${sm\://testnav-altinn3-tilgang-local}
r2dbc:
url: r2dbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
username: testnav-altinn3-tilgang-local
password: ${sm://testnav-altinn3-tilgang-local}
password: ${sm\://testnav-altinn3-tilgang-local}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand All @@ -8,4 +8,4 @@ spring:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
accepted-audience: ${sm\://azure-app-client-id}, api://${sm\://azure-app-client-id}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
4 changes: 2 additions & 2 deletions apps/bruker-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE
JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE

Expand Down
4 changes: 2 additions & 2 deletions apps/budpro-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
10 changes: 5 additions & 5 deletions apps/dolly-backend/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

dolly:
client:
Expand All @@ -14,7 +14,7 @@ spring:
datasource:
url: jdbc:postgresql://localhost:5432/testnav-dolly-backend-local
username: testnav-dolly-backend-local
password: ${sm://testnav-dolly-backend-local}
password: ${sm\://testnav-dolly-backend-local}

management:
endpoints:
Expand All @@ -30,8 +30,8 @@ management:
azure:
app:
client:
id: ${sm://azure-app-client-id}
secret: ${sm://azure-app-client-secret}
id: ${sm\://azure-app-client-id}
secret: ${sm\://azure-app-client-secret}

open:
search:
Expand Down
6 changes: 3 additions & 3 deletions apps/dolly-frontend/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
POST_LOGOUT_REDIRECT_URI: 'http://localhost:3000/login'
REDIS_HOST: localhost
TOKEN_X_ISSUER: dummy
Expand All @@ -17,7 +17,7 @@ spring:
aad:
authorization-grant-type: authorization_code
redirect-uri: 'http://localhost:3000/login/oauth2/code/{registrationId}'
scope: openid, offline_access, ${sm://azure-app-client-id}/.default
scope: openid, offline_access, ${sm\://azure-app-client-id}/.default
client-id: ${AZURE_APP_CLIENT_ID}
client-secret: ${AZURE_APP_CLIENT_SECRET}
provider:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
4 changes: 2 additions & 2 deletions apps/miljoer-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
import: "sm://"
datasource:
url: jdbc:postgresql://localhost:5432/testnav-organisasjon-forvalter-local
username: testnav-organisasjon-forvalter-local
password: ${sm://testnav-organisasjon-forvalter-local}
password: ${sm\://testnav-organisasjon-forvalter-local}

consumers:
generer-navn-service:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
TOKEN_X_ISSUER: dummy

server:
Expand Down
6 changes: 3 additions & 3 deletions apps/pdl-forvalter/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
import: "sm://"
datasource:
url: jdbc:postgresql://localhost:5432/testnav-pdl-forvalter-local
username: testnav-pdl-forvalter-local
password: ${sm://testnav-pdl-forvalter-local}
password: ${sm\://testnav-pdl-forvalter-local}

consumers:
adresse-service:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
TOKEN_X_ISSUER: https://tokenx.dev-gcp.nav.cloud.nais.io

spring:
Expand Down
4 changes: 2 additions & 2 deletions apps/person-service/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
4 changes: 2 additions & 2 deletions apps/profil-api/src/main/resources/application-local.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

TOKEN_X_ISSUER: https://tokenx.dev-gcp.nav.cloud.nais.io
TOKEN_X_JWKS_URI: https://tokenx.dev-gcp.nav.cloud.nais.io
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}

spring:
config:
Expand Down
Loading

0 comments on commit 9caf50b

Please sign in to comment.