Minor changes in system variables set when starting applications in local profile.

- Adds Secret Manager provided value AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT in local profile.
- Moves ALTINN_URL handling to altinn3-tilgang-service config (only used here).
- Moves CRYPTOGRAPHY_SECRET handling to bruker-service config (only used here).
- Moves SLACK_CHANNEL/SLACK_TOKEN handling to tilbakemelding-api config (only used here).
- Moves IDPORTEN_CLIENT_ID/IDPORTEN_CLIENT_JWK handling to dolly-frontend config (only used here).

Author: rfc3092

apps/altinn3-tilgang-service/src/main/resources/application-local.yml

@@ -1,3 +1,4 @@
+ALTINN_URL: ${sm\://altinn-url}
 MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
 MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
 

apps/altinn3-tilgang-service/src/test/resources/application-test.yml

@@ -0,0 +1 @@
+ALTINN_URL: dummy

apps/bruker-service/src/main/resources/application-local.yml

@@ -1,3 +1,4 @@
+CRYPTOGRAPHY_SECRET: dummy
 TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
 
 spring:

apps/bruker-service/src/test/resources/application-test.yml

@@ -1,3 +1,5 @@
+CRYPTOGRAPHY_SECRET: dummy
+
 spring:
   flyway:
     url: jdbc:h2:mem:testdb

apps/dolly-frontend/src/test/resources/application-test.yml

@@ -0,0 +1,2 @@
+IDPORTEN_CLIENT_ID: dummy
+IDPORTEN_CLIENT_JWK: dummy

apps/tilbakemelding-api/src/main/resources/application-local.yml

@@ -1,3 +1,6 @@
+SLACK_CHANNEL: dummy
+SLACK_TOKEN: dummy
+
 consumers:
   profil-api:
     url: https://testnorge-profil-api.intern.dev.nav.no

apps/tilbakemelding-api/src/test/resources/application-test.yml

@@ -1,2 +1,2 @@
-SLACK_TOKEN: dummy
-SLACK_CHANNEL: dummy
+SLACK_CHANNEL: dummy
+SLACK_TOKEN: dummy

libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java

@@ -34,25 +34,21 @@ private static void configureForLocalProfile(Map<String, Object> properties) {
         log.info("Configuring environment for local profile using Secret Manager");
 
         // Emulating NAIS provided environment variables.
-        properties.putIfAbsent("ALTINN_URL", "${sm\\://altinn-url}"); // Used by altinn3-tilgang-service only.
         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_NAV_APP_CLIENT_ID", DUMMY); // Value found in pod, if needed.
         properties.putIfAbsent("AZURE_NAV_APP_CLIENT_SECRET", DUMMY); // Value found in pod, if needed.
         properties.putIfAbsent("AZURE_NAV_OPENID_CONFIG_TOKEN_ENDPOINT", "${sm\\://azure-nav-openid-config-token-endpoint}");
         properties.putIfAbsent("AZURE_OPENID_CONFIG_ISSUER", "${sm\\://azure-openid-config-issuer}");
         properties.putIfAbsent("AZURE_OPENID_CONFIG_TOKEN_ENDPOINT", "${sm\\://azure-openid-config-token-endpoint}");
-        properties.putIfAbsent("AZURE_TRYGDEETATEN_APP_CLIENT_ID", DUMMY);
-        properties.putIfAbsent("AZURE_TRYGDEETATEN_APP_CLIENT_SECRET", DUMMY);
-        properties.putIfAbsent("AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT", DUMMY);
-        properties.putIfAbsent("CRYPTOGRAPHY_SECRET", DUMMY); // Used by bruker-service only.
-        properties.putIfAbsent("JWT_SECRET", DUMMY); // Used by bruker-service only.
+        properties.putIfAbsent("AZURE_TRYGDEETATEN_APP_CLIENT_ID", DUMMY); // Value found in pod, if needed.
+        properties.putIfAbsent("AZURE_TRYGDEETATEN_APP_CLIENT_SECRET", DUMMY); // Value found in pod, if needed.
+        properties.putIfAbsent("AZURE_TRYGDEETATEN_OPENID_CONFIG_TOKEN_ENDPOINT", "${sm\\://azure-trygdeetaten-openid-config-token-endpoint}");
+        properties.putIfAbsent("JWT_SECRET", DUMMY);
         properties.putIfAbsent("MASKINPORTEN_CLIENT_ID", DUMMY); // Used by tenor-search-service and altinn3-tilgang-service only.
         properties.putIfAbsent("MASKINPORTEN_CLIENT_JWK", DUMMY); // Used by tenor-search-service and altinn3-tilgang-service only.
         properties.putIfAbsent("MASKINPORTEN_SCOPES", DUMMY); // Used by tenor-search-service and altinn3-tilgang-service only.
         properties.putIfAbsent("MASKINPORTEN_WELL_KNOWN_URL", "${sm\\://maskinporten-well-known-url}"); // Used by tenor-search-service and altinn3-tilgang-service only.
-        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}");
 
     }
@@ -70,13 +66,9 @@ private static void configureForTestProfile(Map<String, Object> properties) {
                         "spring.cloud.vault.token", // For apps using no.nav.testnav.libs:vault.
 
                         "ALTINN_API_KEY",
-                        "ALTINN_URL",
                         "AZURE_OPENID_CONFIG_ISSUER",
                         "AZURE_OPENID_CONFIG_TOKEN_ENDPOINT",
-                        "CRYPTOGRAPHY_SECRET", // Used by bruker-service only.
-                        "IDPORTEN_CLIENT_ID", // Used by dolly-frontend only.
-                        "IDPORTEN_CLIENT_JWK", // Used by dolly-frontend only.
-                        "JWT_SECRET", // Used by bruker-service only.
+                        "JWT_SECRET",
                         "MASKINPORTEN_CLIENT_ID",
                         "MASKINPORTEN_CLIENT_JWK",
                         "MASKINPORTEN_SCOPES",