diff --git a/apps/adresse-service/src/main/resources/application-local.yml b/apps/adresse-service/src/main/resources/application-local.yml index d2582a766ea..3b7f7922b16 100644 --- a/apps/adresse-service/src/main/resources/application-local.yml +++ b/apps/adresse-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml index b53b18bab13..ce391aeb6c8 100644 --- a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml +++ b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml @@ -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 @@ -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} \ No newline at end of file + password: ${sm\://testnav-altinn3-tilgang-local} \ No newline at end of file diff --git a/apps/amelding-service/src/main/resources/application-local.yml b/apps/amelding-service/src/main/resources/application-local.yml index fd9e94057e6..f6d25736e81 100644 --- a/apps/amelding-service/src/main/resources/application-local.yml +++ b/apps/amelding-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml b/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml index fa988806f6d..22fad865223 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml +++ b/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml b/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml index 191fc5b367f..1c295b0e6ba 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml +++ b/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml @@ -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: diff --git a/apps/arbeidsforhold-service/src/main/resources/application-local.yml b/apps/arbeidsforhold-service/src/main/resources/application-local.yml index e36d70419c6..f96a6c3384d 100644 --- a/apps/arbeidsforhold-service/src/main/resources/application-local.yml +++ b/apps/arbeidsforhold-service/src/main/resources/application-local.yml @@ -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: @@ -8,4 +8,4 @@ spring: oauth2: resourceserver: aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file + accepted-audience: ${sm\://azure-app-client-id}, api://${sm\://azure-app-client-id} \ No newline at end of file diff --git a/apps/batch-bestilling-service/src/main/resources/application-local.yml b/apps/batch-bestilling-service/src/main/resources/application-local.yml index ee40c021aad..e15926669a7 100644 --- a/apps/batch-bestilling-service/src/main/resources/application-local.yml +++ b/apps/batch-bestilling-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml index 9c14722dfc9..0007326e8a7 100644 --- a/apps/bruker-service/src/main/resources/application-local.yml +++ b/apps/bruker-service/src/main/resources/application-local.yml @@ -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 diff --git a/apps/budpro-service/src/main/resources/application-local.yml b/apps/budpro-service/src/main/resources/application-local.yml index 675d84c40f0..a85cbafffd4 100644 --- a/apps/budpro-service/src/main/resources/application-local.yml +++ b/apps/budpro-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/dolly-backend/src/main/resources/application-local.yml b/apps/dolly-backend/src/main/resources/application-local.yml index e2aa7e2a7e7..64954261ef2 100644 --- a/apps/dolly-backend/src/main/resources/application-local.yml +++ b/apps/dolly-backend/src/main/resources/application-local.yml @@ -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: @@ -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: @@ -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: diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml index 48b781833ba..ba73c626371 100644 --- a/apps/dolly-frontend/src/main/resources/application-local.yml +++ b/apps/dolly-frontend/src/main/resources/application-local.yml @@ -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 @@ -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: diff --git a/apps/endringsmelding-frontend/src/main/resources/application-local.yml b/apps/endringsmelding-frontend/src/main/resources/application-local.yml index baa3afe677c..e89d5c5acb2 100644 --- a/apps/endringsmelding-frontend/src/main/resources/application-local.yml +++ b/apps/endringsmelding-frontend/src/main/resources/application-local.yml @@ -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: diff --git a/apps/endringsmelding-service/src/main/resources/application-local.yml b/apps/endringsmelding-service/src/main/resources/application-local.yml index 88fa3ad63ce..1ecd5138903 100644 --- a/apps/endringsmelding-service/src/main/resources/application-local.yml +++ b/apps/endringsmelding-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/faste-data-frontend/src/main/resources/application-local.yml b/apps/faste-data-frontend/src/main/resources/application-local.yml index 8a5ed30f192..9917ce669f4 100644 --- a/apps/faste-data-frontend/src/main/resources/application-local.yml +++ b/apps/faste-data-frontend/src/main/resources/application-local.yml @@ -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: diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml index 195b7f9833e..e85f6008cab 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/generer-navn-service/src/main/resources/application-local.yml b/apps/generer-navn-service/src/main/resources/application-local.yml index 6997e9cd385..ab118e92594 100644 --- a/apps/generer-navn-service/src/main/resources/application-local.yml +++ b/apps/generer-navn-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml index 76d1abfaa71..e3f9a11ea46 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml +++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/generer-synt-amelding-service/src/main/resources/application-local.yml b/apps/generer-synt-amelding-service/src/main/resources/application-local.yml index 6997e9cd385..ab118e92594 100644 --- a/apps/generer-synt-amelding-service/src/main/resources/application-local.yml +++ b/apps/generer-synt-amelding-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/helsepersonell-service/src/main/resources/application-local.yml b/apps/helsepersonell-service/src/main/resources/application-local.yml index 6997e9cd385..ab118e92594 100644 --- a/apps/helsepersonell-service/src/main/resources/application-local.yml +++ b/apps/helsepersonell-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml b/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml index 6997e9cd385..ab118e92594 100644 --- a/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml +++ b/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/inntektsmelding-service/src/main/resources/application-local.yml b/apps/inntektsmelding-service/src/main/resources/application-local.yml index f20e7c285ff..91d46b78314 100644 --- a/apps/inntektsmelding-service/src/main/resources/application-local.yml +++ b/apps/inntektsmelding-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/jenkins-batch-status-service/src/main/resources/application-local.yml b/apps/jenkins-batch-status-service/src/main/resources/application-local.yml index a43ee99dd61..fcf42b01840 100644 --- a/apps/jenkins-batch-status-service/src/main/resources/application-local.yml +++ b/apps/jenkins-batch-status-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/joark-dokument-service/src/main/resources/application-local.yml b/apps/joark-dokument-service/src/main/resources/application-local.yml index 897ae1309cd..d21a0f0088e 100644 --- a/apps/joark-dokument-service/src/main/resources/application-local.yml +++ b/apps/joark-dokument-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/kodeverk-service/src/main/resources/application-local.yml b/apps/kodeverk-service/src/main/resources/application-local.yml index 897ae1309cd..d21a0f0088e 100644 --- a/apps/kodeverk-service/src/main/resources/application-local.yml +++ b/apps/kodeverk-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml index f595e996a5c..653f6806c94 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml @@ -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: diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml index cd7fef63722..78498dfb9f8 100644 --- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml +++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml @@ -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: diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml b/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml index d33808ad24a..aa716446e10 100644 --- a/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml +++ b/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/miljoer-service/src/main/resources/application-local.yml b/apps/miljoer-service/src/main/resources/application-local.yml index 897ae1309cd..d21a0f0088e 100644 --- a/apps/miljoer-service/src/main/resources/application-local.yml +++ b/apps/miljoer-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml b/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml index e99f0053156..649ba32da52 100644 --- a/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml +++ b/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml b/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml index fdba653f095..e96082712b7 100644 --- a/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml +++ b/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/organisasjon-forvalter/src/main/resources/application-local.yml b/apps/organisasjon-forvalter/src/main/resources/application-local.yml index 4fbf4a1b9bf..a5051e47f01 100644 --- a/apps/organisasjon-forvalter/src/main/resources/application-local.yml +++ b/apps/organisasjon-forvalter/src/main/resources/application-local.yml @@ -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: @@ -7,7 +7,7 @@ spring: 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: diff --git a/apps/organisasjon-mottak-service/src/main/resources/application-local.yml b/apps/organisasjon-mottak-service/src/main/resources/application-local.yml index 143b32c27b6..8259b5e3f70 100644 --- a/apps/organisasjon-mottak-service/src/main/resources/application-local.yml +++ b/apps/organisasjon-mottak-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/organisasjon-service/src/main/resources/application-local.yml b/apps/organisasjon-service/src/main/resources/application-local.yml index 897ae1309cd..d21a0f0088e 100644 --- a/apps/organisasjon-service/src/main/resources/application-local.yml +++ b/apps/organisasjon-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/orgnummer-service/src/main/resources/application-local.yml b/apps/orgnummer-service/src/main/resources/application-local.yml index db96ea8dea6..2d3852b914f 100644 --- a/apps/orgnummer-service/src/main/resources/application-local.yml +++ b/apps/orgnummer-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/oversikt-frontend/src/main/resources/application-local.yml b/apps/oversikt-frontend/src/main/resources/application-local.yml index 42d104adaa8..75193d7fd24 100644 --- a/apps/oversikt-frontend/src/main/resources/application-local.yml +++ b/apps/oversikt-frontend/src/main/resources/application-local.yml @@ -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: diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yml b/apps/pdl-forvalter/src/main/resources/application-local.yml index 8f283cdd847..7199c469afa 100644 --- a/apps/pdl-forvalter/src/main/resources/application-local.yml +++ b/apps/pdl-forvalter/src/main/resources/application-local.yml @@ -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: @@ -7,7 +7,7 @@ spring: 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: diff --git a/apps/person-faste-data-service/src/main/resources/application-local.yml b/apps/person-faste-data-service/src/main/resources/application-local.yml index d1b7052bba3..103ab8f928a 100644 --- a/apps/person-faste-data-service/src/main/resources/application-local.yml +++ b/apps/person-faste-data-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/person-search-service/src/main/resources/application-local.yml b/apps/person-search-service/src/main/resources/application-local.yml index 2ce8cadd46f..9dcce0e5e6b 100644 --- a/apps/person-search-service/src/main/resources/application-local.yml +++ b/apps/person-search-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/person-service/src/main/resources/application-local.yml b/apps/person-service/src/main/resources/application-local.yml index 6997e9cd385..ab118e92594 100644 --- a/apps/person-service/src/main/resources/application-local.yml +++ b/apps/person-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/profil-api/src/main/resources/application-local.yml b/apps/profil-api/src/main/resources/application-local.yml index e2e00d9b43f..c9a50a38ad4 100644 --- a/apps/profil-api/src/main/resources/application-local.yml +++ b/apps/profil-api/src/main/resources/application-local.yml @@ -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 diff --git a/apps/skattekort-service/src/main/resources/application-local.yml b/apps/skattekort-service/src/main/resources/application-local.yml index 897ae1309cd..d21a0f0088e 100644 --- a/apps/skattekort-service/src/main/resources/application-local.yml +++ b/apps/skattekort-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/sykemelding-api/src/main/resources/application-local.yml b/apps/sykemelding-api/src/main/resources/application-local.yml index 23b6606964a..6ec2867bb04 100644 --- a/apps/sykemelding-api/src/main/resources/application-local.yml +++ b/apps/sykemelding-api/src/main/resources/application-local.yml @@ -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} ibm: mq: diff --git a/apps/synt-sykemelding-api/src/main/resources/application-local.yml b/apps/synt-sykemelding-api/src/main/resources/application-local.yml index b3521f2f369..84acd30c373 100644 --- a/apps/synt-sykemelding-api/src/main/resources/application-local.yml +++ b/apps/synt-sykemelding-api/src/main/resources/application-local.yml @@ -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: diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml b/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml index 27f16041946..2de2a1488c8 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml +++ b/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml index d3d95ce153e..779a64b6908 100644 --- a/apps/tenor-search-service/src/main/resources/application-local.yml +++ b/apps/tenor-search-service/src/main/resources/application-local.yml @@ -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} MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy MASKINPORTEN_SCOPES: dummy diff --git a/apps/testnav-ident-pool/src/main/resources/application-local.yml b/apps/testnav-ident-pool/src/main/resources/application-local.yml index a62687fc5ca..c33460129c8 100644 --- a/apps/testnav-ident-pool/src/main/resources/application-local.yml +++ b/apps/testnav-ident-pool/src/main/resources/application-local.yml @@ -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: diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml index 29eabc600d3..e2d4ca046cf 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml +++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml @@ -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: diff --git a/apps/tps-messaging-service/src/main/resources/application-local.yml b/apps/tps-messaging-service/src/main/resources/application-local.yml index fd4511ffe20..2d02bf8416f 100644 --- a/apps/tps-messaging-service/src/main/resources/application-local.yml +++ b/apps/tps-messaging-service/src/main/resources/application-local.yml @@ -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 spring: diff --git a/apps/udi-stub/src/main/resources/application-local.yml b/apps/udi-stub/src/main/resources/application-local.yml index 6e2eefaa874..2d70665504d 100644 --- a/apps/udi-stub/src/main/resources/application-local.yml +++ b/apps/udi-stub/src/main/resources/application-local.yml @@ -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: cloud: diff --git a/apps/varslinger-service/src/main/resources/application-local.yml b/apps/varslinger-service/src/main/resources/application-local.yml index 0e326499a15..a11dbc52e45 100644 --- a/apps/varslinger-service/src/main/resources/application-local.yml +++ b/apps/varslinger-service/src/main/resources/application-local.yml @@ -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: diff --git a/docs/local_secretmanager.md b/docs/local_secretmanager.md index 030d8428314..3056f3f30ba 100644 --- a/docs/local_secretmanager.md +++ b/docs/local_secretmanager.md @@ -18,10 +18,10 @@ Alternativt kan man installere [NAIS CLI](https://doc.nais.io/operate/cli/), som ``` Applikasjonen må ha en dependency på `com.google.cloud:spring-cloud-gcp-starter-secretmanager`. Denne er inkludert ved bruk av plugins [dolly-apps](../plugins/java/src/main/groovy/dolly-apps.gradle) eller [dolly-proxies](../plugins/java/src/main/groovy/dolly-proxies.gradle). -La Spring Boot-config'en din importere namespace `sm://` og referer til secrets med `${sm://SECRET_NAME}`. Eks. fra en `application-local.yml`: +La Spring Boot-config'en din importere namespace `sm\://` og referer til secrets med `${sm\://SECRET_NAME}`. Eks. fra en `application-local.yml`: ```yaml -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: diff --git a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json index bb1048cb6d6..4d6addd1db8 100644 --- a/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/libs/security-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -3,12 +3,12 @@ { "name": "AZURE_APP_CLIENT_ID", "type": "java.lang.String", - "description": "Satt av NAIS i pod. Se ClientCredentialConfig#azureNavClientCredential. Kan erstattes med ${sm://azure-app-client-id} for lokal kjøring." + "description": "Satt av NAIS i pod. Se ClientCredentialConfig#azureNavClientCredential. Kan erstattes med ${sm\://azure-app-client-id} for lokal kjøring." }, { "name": "AZURE_APP_CLIENT_SECRET", "type": "java.lang.String", - "description": "Satt av NAIS i pod. Se ClientCredentialConfig#azureNavClientCredential. Kan erstattes med ${sm://azure-app-client-secret} for lokal kjøring." + "description": "Satt av NAIS i pod. Se ClientCredentialConfig#azureNavClientCredential. Kan erstattes med ${sm\://azure-app-client-secret} for lokal kjøring." }, { "name": "AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT", diff --git a/proxies/aareg-proxy/src/main/resources/application-local.yml b/proxies/aareg-proxy/src/main/resources/application-local.yml index e36c5e44fa2..cd275dea85e 100644 --- a/proxies/aareg-proxy/src/main/resources/application-local.yml +++ b/proxies/aareg-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml b/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml +++ b/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml b/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml index 72a6b5d092b..c7ff0af12a4 100644 --- a/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml +++ b/proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml +++ b/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml +++ b/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/batch-adeo-proxy/src/main/resources/application-local.yml b/proxies/batch-adeo-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/batch-adeo-proxy/src/main/resources/application-local.yml +++ b/proxies/batch-adeo-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/brregstub-proxy/src/main/resources/application-local.yml b/proxies/brregstub-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/brregstub-proxy/src/main/resources/application-local.yml +++ b/proxies/brregstub-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/dokarkiv-proxy/src/main/resources/application-local.yml b/proxies/dokarkiv-proxy/src/main/resources/application-local.yml index 3949ecdfc49..40b8b97cec6 100644 --- a/proxies/dokarkiv-proxy/src/main/resources/application-local.yml +++ b/proxies/dokarkiv-proxy/src/main/resources/application-local.yml @@ -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-dokarkiv-proxy TOKEN_X_ISSUER: dummy diff --git a/proxies/ereg-proxy/src/main/resources/application-local.yml b/proxies/ereg-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/ereg-proxy/src/main/resources/application-local.yml +++ b/proxies/ereg-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/fullmakt-proxy/src/main/resources/application-local.yml b/proxies/fullmakt-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/fullmakt-proxy/src/main/resources/application-local.yml +++ b/proxies/fullmakt-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/histark-proxy/src/main/resources/application-local.yml b/proxies/histark-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/histark-proxy/src/main/resources/application-local.yml +++ b/proxies/histark-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/inntektstub-proxy/src/main/resources/application-local.yml b/proxies/inntektstub-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/inntektstub-proxy/src/main/resources/application-local.yml +++ b/proxies/inntektstub-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/inst-proxy/src/main/resources/application-local.yml b/proxies/inst-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/inst-proxy/src/main/resources/application-local.yml +++ b/proxies/inst-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml b/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml +++ b/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/krrstub-proxy/src/main/resources/application-local.yml b/proxies/krrstub-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/krrstub-proxy/src/main/resources/application-local.yml +++ b/proxies/krrstub-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/medl-proxy/src/main/resources/application-local.yml b/proxies/medl-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/medl-proxy/src/main/resources/application-local.yml +++ b/proxies/medl-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/norg2-proxy/src/main/resources/application-local.yml b/proxies/norg2-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/norg2-proxy/src/main/resources/application-local.yml +++ b/proxies/norg2-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/pdl-proxy/src/main/resources/application-local.yml b/proxies/pdl-proxy/src/main/resources/application-local.yml index 97c5228e923..85690133a6f 100644 --- a/proxies/pdl-proxy/src/main/resources/application-local.yml +++ b/proxies/pdl-proxy/src/main/resources/application-local.yml @@ -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} AZURE_TRYGDEETATEN_APP_CLIENT_ID: placeholder AZURE_TRYGDEETATEN_APP_CLIENT_SECRET: placeholder AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT: http://localhost/placeholder @@ -15,7 +15,7 @@ spring: app: elastic: - username: ${sm://elastic-username} - password: ${sm://elastic-password} - hendelse.lager.api.key: ${sm://hendelse-lager-api-key} - person.aktor.api.key: ${sm://person-aktor-api-key} \ No newline at end of file + username: ${sm\://elastic-username} + password: ${sm\://elastic-password} + hendelse.lager.api.key: ${sm\://hendelse-lager-api-key} + person.aktor.api.key: ${sm\://person-aktor-api-key} \ No newline at end of file diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml index cf297c5e4ad..b2185684a25 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml @@ -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: cloud: diff --git a/proxies/saf-proxy/src/main/resources/application-local.yml b/proxies/saf-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/saf-proxy/src/main/resources/application-local.yml +++ b/proxies/saf-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/sigrunstub-proxy/src/main/resources/application-local.yml b/proxies/sigrunstub-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/sigrunstub-proxy/src/main/resources/application-local.yml +++ b/proxies/sigrunstub-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml b/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml index 72a6b5d092b..c7ff0af12a4 100644 --- a/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml +++ b/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml b/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml index b7a307293a4..c08427aa13c 100644 --- a/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml +++ b/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml @@ -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: cloud: diff --git a/proxies/udistub-proxy/src/main/resources/application-local.yml b/proxies/udistub-proxy/src/main/resources/application-local.yml index 7c09739eb91..759c1f7dc2d 100644 --- a/proxies/udistub-proxy/src/main/resources/application-local.yml +++ b/proxies/udistub-proxy/src/main/resources/application-local.yml @@ -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 spring: diff --git a/proxies/yrkesskade-proxy/src/main/resources/application-local.yml b/proxies/yrkesskade-proxy/src/main/resources/application-local.yml index f319813176d..e6280025b16 100644 --- a/proxies/yrkesskade-proxy/src/main/resources/application-local.yml +++ b/proxies/yrkesskade-proxy/src/main/resources/application-local.yml @@ -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: cloud: