Revert "bugfix/getgeneratedresourceservertype_npe (#3773)"

This reverts commit ce5f305.
navikt · Feb 26, 2025 · ab7d11d · ab7d11d
1 parent ce5f305
commit ab7d11d
Show file tree

Hide file tree

Showing 184 changed files with 300 additions and 454 deletions.
diff --git a/.github/workflows/common.integration-test.yml b/.github/workflows/common.integration-test.yml
@@ -41,7 +41,8 @@ jobs:
       - name: "Health check"
         timeout-minutes: 5
         run: |
-          bash -c 'while true; do status=$(curl --connect-timeout 2 -s -o /dev/null -w ''%{http_code}'' ${{ inputs.healthcheck }}); if [ "$status" -eq 200 ]; then echo Service is up; break; else echo "HTTP status: $status"; sleep 5; fi; done;'
+          echo Wait on service...
+          bash -c 'while [[ "$(curl --connect-timeout 2 -s -o /dev/null -w ''%{http_code}'' ${{ inputs.healthcheck }})" != "200" ]]; do echo ...; sleep 5; done; echo Service is up;'
       - name: "Run integration tests"
         uses: gradle/actions/setup-gradle@v3
         with:

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -2,8 +2,6 @@ name: Integration Tests
 on:
   push:
     paths:
-      - ".github/workflows/common.integration-test.yml"
-      - ".github/workflows/integration-tests.yml"
       - "apps/altinn3-tilgang-service/**"
       - "apps/bruker-service/**"
       - "mocks/maskinporten-mock/**"

diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
@@ -14,7 +14,6 @@ dependencies {
     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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-web"

diff --git a/apps/adresse-service/src/main/resources/application.yml b/apps/adresse-service/src/main/resources/application.yml
@@ -8,7 +8,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          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}
           accepted-audience: ${TOKEN_X_CLIENT_ID}

diff --git a/apps/altinn3-tilgang-service/build.gradle b/apps/altinn3-tilgang-service/build.gradle
@@ -13,7 +13,6 @@ dependencies {
     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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

diff --git a/apps/altinn3-tilgang-service/src/main/resources/application-local.yml b/apps/altinn3-tilgang-service/src/main/resources/application-local.yml
@@ -1,4 +1,3 @@
-ALTINN_URL: ${sm\://azure-openid-config-token-endpoint}
 MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
 MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
 

diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
@@ -16,7 +16,6 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml
@@ -8,7 +8,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
+          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -13,7 +13,6 @@ dependencies {
     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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-security"

diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
@@ -7,7 +7,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          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}
           accepted-audience: ${TOKEN_X_CLIENT_ID}

diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
@@ -16,7 +16,6 @@ dependencies {
     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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml
@@ -7,7 +7,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          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}
           accepted-audience: ${TOKEN_X_CLIENT_ID}

diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
@@ -18,7 +18,6 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml
@@ -7,7 +7,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          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}
           accepted-audience: ${TOKEN_X_CLIENT_ID}

diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -27,7 +27,6 @@ dependencies {
 
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:vault"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-web-services"

diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -27,7 +27,6 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml
@@ -1,5 +1,3 @@
-CRYPTOGRAPHY_SECRET: dummy
-JWT_SECRET: dummy
 TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
 
 spring:

diff --git a/apps/bruker-service/src/test/resources/application-test.yml b/apps/bruker-service/src/test/resources/application-test.yml
@@ -1,6 +1,3 @@
-CRYPTOGRAPHY_SECRET: dummy
-JWT_SECRET: dummy
-
 spring:
   flyway:
     url: jdbc:h2:mem:testdb

diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle
@@ -10,7 +10,6 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
     implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -10,56 +10,54 @@ sonarqube {
 }
 
 dependencies {
-    implementation "no.nav.testnav.libs:servlet-core"
-    implementation "no.nav.testnav.libs:servlet-security"
-    implementation "no.nav.testnav.libs:servlet-insecure-security"
-    implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:data-transfer-objects"
-    implementation "no.nav.testnav.libs:data-transfer-search-objects"
-    implementation "no.nav.testnav.libs:reactive-core"
-    implementation "no.nav.testnav.libs:reactive-security"
-    implementation "no.nav.testnav.libs:testing"
+    implementation 'no.nav.testnav.libs:servlet-core'
+    implementation 'no.nav.testnav.libs:servlet-security'
+    implementation 'no.nav.testnav.libs:servlet-insecure-security'
+    implementation 'no.nav.testnav.libs:security-core'
+    implementation 'no.nav.testnav.libs:data-transfer-objects'
+    implementation 'no.nav.testnav.libs:data-transfer-search-objects'
+    implementation 'no.nav.testnav.libs:reactive-core'
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    implementation "org.springframework.boot:spring-boot-starter-web"
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
-    implementation "org.springframework.boot:spring-boot-starter-data-jpa"
-    implementation "org.springframework.boot:spring-boot-starter-security"
-    implementation "org.springframework.boot:spring-boot-starter-validation"
-    implementation "org.springframework.retry:spring-retry"
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.retry:spring-retry'
 
-    implementation "org.springframework.boot:spring-boot-starter-data-elasticsearch"
+    implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
     implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch"
 
-    implementation "org.apache.commons:commons-lang3"
-    implementation "org.springframework.boot:spring-boot-starter-cache"
-    implementation "com.github.ben-manes.caffeine:caffeine"
+    implementation 'org.apache.commons:commons-lang3'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'com.github.ben-manes.caffeine:caffeine'
 
-    implementation "org.ehcache:ehcache:3.10.8"
+    implementation 'org.ehcache:ehcache:3.10.8'
     implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
-    implementation "org.postgresql:postgresql"
-    implementation "org.flywaydb:flyway-core"
-    implementation "org.flywaydb:flyway-database-postgresql"
+    implementation 'org.postgresql:postgresql'
+    implementation 'org.flywaydb:flyway-core'
+    implementation 'org.flywaydb:flyway-database-postgresql'
 
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
-    implementation "org.codehaus.jettison:jettison:1.5.4"
+    implementation 'org.codehaus.jettison:jettison:1.5.4'
     implementation "org.apache.poi:poi:$versions.apachePoi"
     implementation "org.apache.poi:poi-ooxml:$versions.apachePoi"
 
-    testImplementation "org.opensearch:opensearch-testcontainers:2.1.2"
+    testImplementation 'org.opensearch:opensearch-testcontainers:2.1.2'
 
-    testImplementation "org.springframework.security:spring-security-test"
-    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
-    testImplementation "com.h2database:h2"
+    testImplementation 'org.springframework.security:spring-security-test'
+    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+    testImplementation 'com.h2database:h2'
     testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
-    testImplementation "org.testcontainers:junit-jupiter"
-    testImplementation "org.springframework.boot:spring-boot-testcontainers"
-    testImplementation "org.testcontainers:postgresql"
-    testImplementation "org.bitbucket.b_c:jose4j:0.9.6"
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.springframework.boot:spring-boot-testcontainers'
+    testImplementation 'org.testcontainers:postgresql'
+    testImplementation 'org.bitbucket.b_c:jose4j:0.9.6'
 
-    implementation "net.java.dev.jna:jna:5.14.0"
+    implementation 'net.java.dev.jna:jna:5.14.0'
 }
diff --git a/apps/dolly-backend/settings.gradle b/apps/dolly-backend/settings.gradle
@@ -9,7 +9,6 @@ includeBuild "../../plugins/java"
 includeBuild "../../libs/data-transfer-objects"
 includeBuild "../../libs/data-transfer-search-objects"
 includeBuild "../../libs/reactive-core"
-includeBuild "../../libs/reactive-security"
 includeBuild "../../libs/security-core"
 includeBuild "../../libs/servlet-core"
 includeBuild "../../libs/servlet-insecure-security"

diff --git a/apps/dolly-backend/src/main/resources/application.yml b/apps/dolly-backend/src/main/resources/application.yml
@@ -44,7 +44,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
+          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
   jackson:
     parser:
       include-source-in-location: true

diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle
@@ -26,7 +26,6 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:reactive-session-security"
     implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:testing"
 
     // Session
     implementation "redis.clients:jedis:5.2.0"

diff --git a/apps/dolly-frontend/src/main/resources/application.yml b/apps/dolly-frontend/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          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}
           accepted-audience: ${TOKEN_X_CLIENT_ID}

diff --git a/apps/dolly-frontend/src/test/resources/application-test.yml b/apps/dolly-frontend/src/test/resources/application-test.yml
@@ -1,2 +0,0 @@
-IDPORTEN_CLIENT_ID: dummy
-IDPORTEN_CLIENT_JWK: dummy

diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle
@@ -11,7 +11,5 @@ sonarqube {
 }
 
 dependencies {
-    implementation "no.nav.testnav.libs:testing"
-
     implementation 'org.springframework.boot:spring-boot-starter-web'
 }
diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle
@@ -18,6 +18,8 @@ configurations {
 }
 
 dependencies {
+    implementation "io.grpc:grpc-netty:$versions.grpc"
+
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-frontend"
     implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -27,10 +29,9 @@ dependencies {
     implementation("no.nav.testnav.libs:security-core") {
         exclude group: "org.springframework.session", module: "spring-session-data-redis"
     }
-    implementation "no.nav.testnav.libs:testing"
 
-    implementation "io.grpc:grpc-netty:$versions.grpc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+
     implementation "org.springframework.cloud:spring-cloud-starter-gateway"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle
@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:security-core"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
 

diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml
@@ -8,7 +8,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          accepted-audience: ${AZURE_APP_CLIENT_ID}, api://${AZURE_APP_CLIENT_ID}
+          accepted-audience:  ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle
@@ -18,6 +18,8 @@ configurations {
 }
 
 dependencies {
+    implementation "io.grpc:grpc-netty:$versions.grpc"
+
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-frontend"
     implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -27,10 +29,9 @@ dependencies {
     implementation("no.nav.testnav.libs:security-core") {
         exclude group: "org.springframework.session", module: "spring-session-data-redis"
     }
-    implementation "no.nav.testnav.libs:testing"
 
-    implementation "io.grpc:grpc-netty:$versions.grpc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
+
     implementation "org.springframework.cloud:spring-cloud-starter-gateway"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle
@@ -15,7 +15,6 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
-    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
@@ -7,7 +7,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          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}
           accepted-audience: ${TOKEN_X_CLIENT_ID}

diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle
@@ -15,7 +15,6 @@ dependencies {
     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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

diff --git a/apps/generer-navn-service/src/main/resources/application.yml b/apps/generer-navn-service/src/main/resources/application.yml
@@ -8,7 +8,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          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}
           accepted-audience: ${TOKEN_X_CLIENT_ID}

diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle
@@ -19,7 +19,6 @@ dependencies {
     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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
@@ -7,7 +7,7 @@ spring:
       resourceserver:
         aad:
           issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
-          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}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		IDPORTEN_CLIENT_ID: dummy
		IDPORTEN_CLIENT_JWK: dummy