Merge branch 'master' into change/opensearch_config_cleanup

# Conflicts: # apps/dolly-backend/src/main/resources/application-local.yml # apps/oppsummeringsdokument-service/src/main/resources/application-local.yml # libs/security-core/src/main/java/no/nav/testnav/libs/securitycore/domain/azuread/AzureNavClientCredential.java
navikt · Dec 11, 2024 · 9d5d25a · 9d5d25a
2 parents a4e278a + cc262c9
commit 9d5d25a
Show file tree

Hide file tree

Showing 195 changed files with 526 additions and 717 deletions.
diff --git a/apps/adresse-service/src/main/resources/application-local.yml b/apps/adresse-service/src/main/resources/application-local.yml
@@ -0,0 +1,7 @@
+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:
+  config:
+    import: "sm://"
diff --git a/...rvice/src/main/resources/application.yaml → ...ervice/src/main/resources/application.yml b/...rvice/src/main/resources/application.yaml → ...ervice/src/main/resources/application.yml
diff --git a/...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml b/...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   oppsummeringsdokument-service:

diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

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
@@ -1,13 +1,10 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
   flyway:
     url: jdbc:h2:mem:testdb
     username: sa
     password:
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
-
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
@@ -1,3 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
@@ -9,8 +12,3 @@ spring:
     url: r2dbc:postgresql://localhost:3306/testnav-app-tilgang-analyse-service-db
     username: testnav-app-tilgang-analyse-service
     password: ${DB_PASSWORD}
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
diff --git a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/arbeidsforhold-service/src/main/resources/application-dev.yml
diff --git a/...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml b/...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml
@@ -1,4 +1,5 @@
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service
+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/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

diff --git a/apps/batch-bestilling-service/src/main/resources/application-dev.yml b/apps/batch-bestilling-service/src/main/resources/application-dev.yml
diff --git a/apps/batch-bestilling-service/src/main/resources/application-local.yml b/apps/batch-bestilling-service/src/main/resources/application-local.yml
@@ -0,0 +1,10 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"
+
+consumers:
+  dolly-backend:
+    url: https://dolly-backend.intern.dev.nav.no
diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

diff --git a/...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml b/...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml
diff --git a/.../src/main/resources/application-prod.yaml → ...b/src/main/resources/application-prod.yml b/.../src/main/resources/application-prod.yaml → ...b/src/main/resources/application-prod.yml
diff --git a/...-stub/src/main/resources/application.yaml → ...g-stub/src/main/resources/application.yml b/...-stub/src/main/resources/application.yaml → ...g-stub/src/main/resources/application.yml
diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml
@@ -1,11 +1,15 @@
+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
-
 TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
-TOKENDINGS_URL: ${TOKEN_X_ISSUER} 
+TOKENDINGS_URL: ${TOKEN_X_ISSUER}
+
 spring:
   application:
     name: testnav-bruker-service-dev
+  config:
+    import: "sm://"
   flyway:
     url: jdbc:h2:mem:testdb
     username: sa
@@ -14,4 +18,4 @@ spring:
 consumers:
   testnav-person-organisasjon-tilgang-service:
     url: https://testnav-person-organisasjon-tilgang-service-dev.intern.dev.nav.no
-    name: testnav-person-organisasjon-tilgang-service-dev
+    name: testnav-person-organisasjon-tilgang-service-dev
diff --git a/apps/budpro-service/src/main/resources/application-local.yml b/apps/budpro-service/src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 management:
   endpoints:
@@ -15,4 +13,4 @@ management:
 
 consumers:
   generer-navn-service:
-    url: "https://generer-navn-service.intern.dev.nav.no"
+    url: "https://generer-navn-service.intern.dev.nav.no"
diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-    <springProfile name="prod,dev">
+    <springProfile name="prod">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
                 <throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">

diff --git a/...d/src/main/resources/application-dev.yaml → ...nd/src/main/resources/application-dev.yml b/...d/src/main/resources/application-dev.yaml → ...nd/src/main/resources/application-dev.yml
diff --git a/...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml b/...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml
diff --git a/.../src/main/resources/application-prod.yaml → ...d/src/main/resources/application-prod.yml b/.../src/main/resources/application-prod.yaml → ...d/src/main/resources/application-prod.yml
diff --git a/...ckend/src/main/resources/application.yaml → ...ackend/src/main/resources/application.yml b/...ckend/src/main/resources/application.yaml → ...ackend/src/main/resources/application.yml
diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java
@@ -39,7 +39,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class AaregConsumerTest {
 

diff --git a/...kend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java b/...kend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java
@@ -35,7 +35,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class ArenaForvalterConsumerTest {
 

diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java
@@ -37,7 +37,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class InstdataConsumerTest {
 

diff --git a/...src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java b/...src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java
@@ -42,7 +42,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class KontoregisterConsumerTest {
     private static final String IDENT = "12345678901";

diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java
@@ -44,7 +44,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class KrrstubConsumerTest {
 

diff --git a/.../src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java b/.../src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java
@@ -38,7 +38,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class PensjonforvalterConsumerTest {
 

diff --git a/...olly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java b/...olly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java
@@ -41,7 +41,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class SigrunStubConsumerTest {
 

diff --git a/...d/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java b/...d/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java
@@ -41,7 +41,7 @@
 @ActiveProfiles("test")
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@TestPropertySource(locations = "classpath:application.yaml")
+@TestPropertySource(locations = "classpath:application.yml")
 @AutoConfigureWireMock(port = 0)
 class TpsMessagingConsumerTest {
 

diff --git a/.../src/test/resources/application-test.yaml → ...d/src/test/resources/application-test.yml b/.../src/test/resources/application-test.yaml → ...d/src/test/resources/application-test.yml
diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml
@@ -1,3 +1,5 @@
+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
@@ -13,8 +15,6 @@ spring:
       client:
         registration:
           aad:
-            client-id: ${sm://azure-app-client-id}
-            client-secret: ${sm://azure-app-client-secret}
             authorization-grant-type: authorization_code
             redirect-uri: 'http://localhost:3000/login/oauth2/code/{registrationId}'
             scope: openid, offline_access,  ${sm://azure-app-client-id}/.default

diff --git a/...us/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml b/...us/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
diff --git a/apps/dollystatus/src/main/resources/logback-spring.xml b/apps/dollystatus/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

diff --git a/...nd/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml b/...nd/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
@@ -1,14 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      client:
-        registration:
-          aad:
-            client-id: ${sm://azure-app-client-id}
-            client-secret: ${sm://azure-app-client-secret}
-            scope: openid,  ${sm://azure-app-client-id}/.default
 
 consumers:
   endringsmelding-service:

diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

diff --git a/...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml b/...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   adresse-service:

diff --git a/apps/endringsmelding-service/src/main/resources/logback-spring.xml b/apps/endringsmelding-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

diff --git a/...nd/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml b/...nd/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
@@ -1,14 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      client:
-        registration:
-          aad:
-            client-id: ${sm://azure-app-client-id}
-            client-secret: ${sm://azure-app-client-secret}
-            scope: openid,  ${sm://azure-app-client-id}/.default
 
 consumers:
   testnorge-profil-api:

diff --git a/apps/faste-data-frontend/src/main/resources/logback-spring.xml b/apps/faste-data-frontend/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

diff --git a/...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml b/...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
@@ -1,11 +1,9 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
 spring:
   config:
     import: "sm://"
-  security:
-    oauth2:
-      resourceserver:
-        aad:
-          accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
 
 consumers:
   oppsummeringsdokument-service:

diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
@@ -22,7 +22,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="dev">
+    <springProfile name="local">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

diff --git a/apps/generer-navn-service/src/main/resources/application-dev.yml b/apps/generer-navn-service/src/main/resources/application-dev.yml
diff --git a/apps/generer-navn-service/src/main/resources/application-local.yml b/apps/generer-navn-service/src/main/resources/application-local.yml
@@ -0,0 +1,6 @@
+AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
+AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
+
+spring:
+  config:
+    import: "sm://"