Merge branch 'master' into feature/rydde-utdaterte-tps-trivia

Author: krharum

apps/adresse-service/build.gradle

@@ -10,10 +10,10 @@ sonarqube {
 }
 
 dependencies {
+    implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:data-transfer-objects"
 
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-web"

apps/adresse-service/settings.gradle

@@ -2,14 +2,15 @@ plugins {
     id "com.gradle.develocity" version "3.19"
 }
 
-rootProject.name = 'adresse-service'
+rootProject.name = "adresse-service"
 
 includeBuild "../../plugins/java"
 
-includeBuild '../../libs/data-transfer-objects'
-includeBuild '../../libs/security-core'
-includeBuild '../../libs/servlet-core'
-includeBuild '../../libs/servlet-security'
+includeBuild "../../libs/data-transfer-objects"
+includeBuild "../../libs/security-core"
+includeBuild "../../libs/servlet-core"
+includeBuild "../../libs/servlet-security"
+includeBuild "../../libs/testing"
 
 develocity {
     buildScan {

apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/AdresseServiceApplicationStarter.java

@@ -1,6 +1,6 @@
 package no.nav.testnav.apps.adresseservice;
 
-import no.nav.testnav.libs.servletcore.config.NaisEnvironmentApplicationContextInitializer;
+import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 

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

@@ -1,5 +1,8 @@
-TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service
-
 spring:
   config:
     import: "sm://"
+  security:
+    oauth2:
+      resourceserver:
+        tokenx:
+          accepted-audience: dev-gcp:dolly:testnav-adresse-service

apps/adresse-service/src/main/resources/application.yml

@@ -35,9 +35,6 @@ management:
         include: prometheus,health
       path-mapping:
         prometheus: metrics
-  endpoint:
-    prometheus:
-      access: read_only
   prometheus:
     metrics:
       export:

apps/adresse-service/src/test/java/no/nav/testnav/apps/adresseservice/ApplicationContextTest.java

@@ -1,16 +1,11 @@
 package no.nav.testnav.apps.adresseservice;
 
-import no.nav.testnav.libs.servletcore.config.NaisEnvironmentApplicationContextInitializer;
+import no.nav.dolly.libs.nais.DollySpringBootTest;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.ContextConfiguration;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-@SpringBootTest
-@ActiveProfiles("test")
-@ContextConfiguration(initializers = NaisEnvironmentApplicationContextInitializer.class)
+@DollySpringBootTest
 class ApplicationContextTest {
 
     @Test

apps/altinn3-tilgang-service/settings.gradle

@@ -2,13 +2,14 @@ plugins {
     id "com.gradle.develocity" version "3.19"
 }
 
-rootProject.name = 'altinn3-tilgang-service'
+rootProject.name = "altinn3-tilgang-service"
 
 includeBuild "../../plugins/java"
 
-includeBuild '../../libs/data-transfer-objects'
-includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/reactive-security'
+includeBuild "../../libs/data-transfer-objects"
+includeBuild "../../libs/reactive-core"
+includeBuild "../../libs/reactive-security"
+includeBuild "../../libs/testing"
 
 develocity {
     buildScan {

apps/altinn3-tilgang-service/src/main/java/no/nav/testnav/altinn3tilgangservice/Altinn3TilgangServiceApplicationStarter.java

@@ -1,9 +1,10 @@
 package no.nav.testnav.altinn3tilgangservice;
 
+import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
 import no.nav.testnav.libs.reactivecore.config.CoreConfig;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.r2dbc.config.EnableR2dbcAuditing;
 import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
@@ -20,6 +21,8 @@
 public class Altinn3TilgangServiceApplicationStarter {
 
     public static void main(String[] args) {
-        SpringApplication.run(Altinn3TilgangServiceApplicationStarter.class, args);
+        new SpringApplicationBuilder(Altinn3TilgangServiceApplicationStarter.class)
+                .initializers(new NaisEnvironmentApplicationContextInitializer())
+                .run(args);
     }
 }

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

@@ -1,19 +1,9 @@
-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}
 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
-MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
-TOKEN_X_ISSUER: dummy
 
 spring:
   cache:
     type: none
-  cloud:
-    gcp:
-      secretmanager:
-        project-id: dolly-dev-ff83
   config:
     import: "sm://"
   flyway:

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

@@ -1,20 +1,15 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   application:
-    version: application.version.todo
     name: testnav-altinn3-tilgang-service
     description: Tjeneste for å hente og sette tilganger for orgnisasjoner
   security:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
           accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER}
-          jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
   jackson:
     serialization:
@@ -34,20 +29,19 @@ altinn:
 
 management:
   endpoints:
-    enabled-by-default: true
+    access:
+      default: read_only
     web:
       base-path: /internal
       exposure:
         include: prometheus,health
       path-mapping:
         prometheus: metrics
-  endpoint:
-    prometheus:
-      enabled: true
   prometheus:
     metrics:
       export:
         enabled: true
+
 server:
   servlet:
     encoding:

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+
     <springProfile name="prod,dev">
         <appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
             <encoder class="no.nav.testnav.libs.reactivecore.logging.TestnavLogbackEncoder">
@@ -13,7 +14,7 @@
         </root>
     </springProfile>
 
-    <springProfile name="local">
+    <springProfile name="local,virtual">
         <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
             <encoder>
                 <pattern>

apps/altinn3-tilgang-service/src/main/resources/logback-spring.xml

@@ -1,13 +1,11 @@
 package no.nav.testnav.altinn3tilgangservice;
 
+import no.nav.dolly.libs.nais.DollySpringBootTest;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-@SpringBootTest
-@ActiveProfiles("test")
+@DollySpringBootTest
 class ApplicationContextTest {
 
     @Test

apps/altinn3-tilgang-service/src/test/java/no/nav/testnav/altinn3tilgangservice/ApplicationContextTest.java

@@ -1,13 +0,0 @@
-ALTINN_URL: http://localhost:8080
-ALTINN_API_KEY: dummy
-MASKINPORTEN_CLIENT_ID: dummy
-MASKINPORTEN_CLIENT_JWK: dummy
-MASKINPORTEN_SCOPES: dummy
-MASKINPORTEN_WELL_KNOWN_URL: http://localhost:8080
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: false

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

@@ -10,22 +10,18 @@ sonarqube {
 }
 
 dependencies {
-
-    implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:reactive-core"
-    implementation "no.nav.testnav.libs:reactive-security"
-
-    implementation "no.nav.testnav.libs:commands"
     implementation "no.nav.testnav.libs:avro-schema"
+    implementation "no.nav.testnav.libs:commands"
     implementation "no.nav.testnav.libs:data-transfer-objects"
+    implementation "no.nav.testnav.libs:reactive-core"
+    implementation "no.nav.testnav.libs:reactive-security"
+    implementation "no.nav.testnav.libs:security-core"
 
-    implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+    implementation "org.springframework.boot:spring-boot-starter-security"
 
-    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
-
-    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/amelding-service/build.gradle

@@ -2,16 +2,17 @@ plugins {
     id "com.gradle.develocity" version "3.19"
 }
 
-rootProject.name = 'amelding-service'
+rootProject.name = "amelding-service"
 
 includeBuild "../../plugins/java"
 
-includeBuild '../../libs/avro-schema'
-includeBuild '../../libs/commands'
-includeBuild '../../libs/data-transfer-objects'
-includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/reactive-security'
-includeBuild '../../libs/security-core'
+includeBuild "../../libs/avro-schema"
+includeBuild "../../libs/commands"
+includeBuild "../../libs/data-transfer-objects"
+includeBuild "../../libs/reactive-core"
+includeBuild "../../libs/reactive-security"
+includeBuild "../../libs/security-core"
+includeBuild "../../libs/testing"
 
 develocity {
     buildScan {

apps/amelding-service/settings.gradle

@@ -1,9 +1,10 @@
 package no.nav.registre.testnav.ameldingservice;
 
+import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
 import no.nav.testnav.libs.reactivecore.config.CoreConfig;
 import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
-import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.reactive.config.EnableWebFlux;
 
@@ -16,6 +17,9 @@
 public class AMeldingServiceApplicationStarter {
 
     public static void main(String[] args) {
-        SpringApplication.run(AMeldingServiceApplicationStarter.class, args);
+        new SpringApplicationBuilder(AMeldingServiceApplicationStarter.class)
+                .initializers(new NaisEnvironmentApplicationContextInitializer())
+                .run(args);
     }
+
 }

apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/AMeldingServiceApplicationStarter.java

@@ -1,6 +1,3 @@
-AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
-AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
-
 spring:
   config:
     import: "sm://"

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

@@ -1,5 +1,3 @@
-AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
-
 spring:
   application:
     name: testnav-amelding-service
@@ -9,8 +7,7 @@ spring:
     oauth2:
       resourceserver:
         aad:
-          issuer-uri: ${AAD_ISSUER_URI}/v2.0
-          jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
+          issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
           accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
 
 springdoc:

apps/amelding-service/src/main/resources/application.yml

@@ -1,13 +1,11 @@
 package no.nav.registre.testnav.ameldingservice;
 
+import no.nav.dolly.libs.nais.DollySpringBootTest;
 import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-@SpringBootTest
-@ActiveProfiles("test")
+@DollySpringBootTest
 class ApplicationContextTest {
 
     @Test

apps/amelding-service/src/test/java/no/nav/registre/testnav/ameldingservice/ApplicationContextTest.java

@@ -1,7 +0,0 @@
-TOKEN_X_ISSUER: dummy
-
-spring:
-  cloud:
-    gcp:
-      secretmanager:
-        enabled: false

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

@@ -2,13 +2,14 @@ plugins {
     id "com.gradle.develocity" version "3.19"
 }
 
-rootProject.name = 'app-tilgang-analyse-service'
+rootProject.name = "app-tilgang-analyse-service"
 
 includeBuild "../../plugins/java"
 
-includeBuild '../../libs/data-transfer-objects'
-includeBuild '../../libs/reactive-core'
-includeBuild '../../libs/reactive-security'
+includeBuild "../../libs/data-transfer-objects"
+includeBuild "../../libs/reactive-core"
+includeBuild "../../libs/reactive-security"
+includeBuild "../../libs/testing"
 
 develocity {
     buildScan {