From a4bc90464815c25813a333bb8beb9698c6dd4b4e Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Fri, 6 Dec 2024 14:13:41 +0100
Subject: [PATCH] Normalizing config to indicate values are read from
 environment.

---
 proxies/fullmakt-proxy/src/main/resources/application.yml    | 2 +-
 proxies/sykemelding-proxy/src/main/resources/application.yml | 2 +-
 .../src/main/resources/application.yml                       | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/proxies/fullmakt-proxy/src/main/resources/application.yml b/proxies/fullmakt-proxy/src/main/resources/application.yml
index da6230fc5bd..653461daebf 100644
--- a/proxies/fullmakt-proxy/src/main/resources/application.yml
+++ b/proxies/fullmakt-proxy/src/main/resources/application.yml
@@ -10,7 +10,7 @@ spring:
         aad:
           issuer-uri: ${AAD_ISSUER_URI}/v2.0
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
+          accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
diff --git a/proxies/sykemelding-proxy/src/main/resources/application.yml b/proxies/sykemelding-proxy/src/main/resources/application.yml
index 1d29c30041d..a9cbc9053b1 100644
--- a/proxies/sykemelding-proxy/src/main/resources/application.yml
+++ b/proxies/sykemelding-proxy/src/main/resources/application.yml
@@ -10,7 +10,7 @@ spring:
         aad:
           issuer-uri: ${AAD_ISSUER_URI}/v2.0
           jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
-          accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id}
+          accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/application.yml b/proxies/synthdata-meldekort-proxy/src/main/resources/application.yml
index 72804a26497..48c88a26e19 100644
--- a/proxies/synthdata-meldekort-proxy/src/main/resources/application.yml
+++ b/proxies/synthdata-meldekort-proxy/src/main/resources/application.yml
@@ -1,13 +1,12 @@
 spring:
   application:
     name: testnav-synthdata-meldekort-proxy
-    desciption: Proxy for synthdata-arena-meldekort som legger på sikkerhet.
   security:
     oauth2:
       resourceserver:
         trygdeetaten:
-          issuer-uri: ${azure.openid.config.issuer}
-          jwk-set-uri: ${azure.openid.config.jwks.uri}
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
+          jwk-set-uri: ${AZURE_OPENID_CONFIG_JWKS_URI}
           accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
   codec:
     max-in-memory-size: 15MB