Oppdatert tester

navikt · Jan 9, 2024 · ed332ab · ed332ab
1 parent 544c5e6
commit ed332ab
Show file tree

Hide file tree

Showing 110 changed files with 137 additions and 205 deletions.
diff --git a/apps/adresse-service/src/test/resources/application-test.properties b/apps/adresse-service/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER=dummy
diff --git a/apps/amelding-service/src/main/resources/application.yml b/apps/amelding-service/src/main/resources/application.yml
@@ -15,7 +15,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-amelding-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/amelding-service/src/test/resources/application-test.properties b/apps/amelding-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application.yml b/apps/app-tilgang-analyse-service/src/main/resources/application.yml
@@ -18,7 +18,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-app-tilgang-analyse-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml b/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml
@@ -4,4 +4,6 @@ spring:
   flyway:
     url: jdbc:h2:mem:testdb
     username: sa
-    password:
+    password:
+
+TOKEN_X_ISSUER: dummy
diff --git a/apps/arbeidsforhold-service/src/main/resources/application.yml b/apps/arbeidsforhold-service/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-arbeidsforhold-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/arbeidsforhold-service/src/test/resources/application-test.properties b/apps/arbeidsforhold-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.enabled=false
-
-azure.app.client.id=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/batch-bestilling-service/src/main/resources/application.yml b/apps/batch-bestilling-service/src/main/resources/application.yml
@@ -19,7 +19,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-batch-bestilling-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/batch-bestilling-service/src/test/resources/application-test.properties b/apps/batch-bestilling-service/src/test/resources/application-test.properties
@@ -1 +1,2 @@
-spring.cloud.vault.token=dummy
+spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER= dummy
diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yaml
@@ -1,10 +1,7 @@
 APP_NAME: dolly
 APP_VERSION: ${application.version}
 environment: localhost
-CLIENT_ID: dummy
-CLIENT_SECRET: dummy
-
-TOKEN_X_CLIENT_ID: test
+TOKEN_X_ISSUER: dummy
 
 jira:
   host: http://localhost:${wiremock.server.port:0}/jira

diff --git a/apps/dolly-frontend/src/test/resources/application-test.yml b/apps/dolly-frontend/src/test/resources/application-test.yml
@@ -1,7 +1,4 @@
-spring.cloud.vault.token: dummy
-
-azure.app.client.id: dummy
-azure.app.client.secret: dummy
+TOKEN_X_ISSUER: dummy
 
 IDPORTEN_CLIENT_ID: dummy
 IDPORTEN_CLIENT_JWK: "{}"
diff --git a/apps/endringsmelding-service/src/main/resources/application.yml b/apps/endringsmelding-service/src/main/resources/application.yml
@@ -15,7 +15,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-endringsmelding-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/endringsmelding-service/src/test/resources/application-test.properties b/apps/endringsmelding-service/src/test/resources/application-test.properties
@@ -1,3 +1 @@
-spring.cloud.vault.token=dummy
-azure.app.client.id=dummy
-azure.app.client.secret=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/ereg-batch-status-service/src/main/resources/application.yml b/apps/ereg-batch-status-service/src/main/resources/application.yml
@@ -17,7 +17,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-fss:dolly:ereg-batch-status-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/ereg-batch-status-service/src/test/resources/application-test.properties b/apps/ereg-batch-status-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-generer-arbeidsforhold-populasjon-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false

diff --git a/.../generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties b/.../generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/generer-navn-service/src/main/resources/application.yml b/apps/generer-navn-service/src/main/resources/application.yml
@@ -17,7 +17,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:generer-navn-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false

diff --git a/apps/generer-navn-service/src/test/resources/application-test.properties b/apps/generer-navn-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-generer-organisasjon-populasjon-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties b/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties
@@ -1,2 +1,2 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
 KAFKA_KEYSTORE_PATH=""
diff --git a/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml b/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml
diff --git a/apps/generer-synt-amelding-service/src/main/resources/application.yml b/apps/generer-synt-amelding-service/src/main/resources/application.yml
@@ -19,7 +19,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-generer-synt-amelding-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/generer-synt-amelding-service/src/test/resources/application-test.yml b/apps/generer-synt-amelding-service/src/test/resources/application-test.yml
@@ -18,3 +18,4 @@ consumers:
 
 
 AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token
+TOKEN_X_ISSUER: dummy
diff --git a/apps/geografiske-kodeverk-service/src/main/resources/application.yml b/apps/geografiske-kodeverk-service/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-geografiske-kodeverk-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/.../test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java b/.../test/java/no/nav/registre/testnav/geografiskekodeverkservice/ApplicationContextTest.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 public class ApplicationContextTest {
 
     @MockBean

diff --git a/...a/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java b/...a/no/nav/registre/testnav/geografiskekodeverkservice/provider/KodeverkControllerTest.java
@@ -9,6 +9,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@@ -17,10 +18,10 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 
 @SpringBootTest
+@ActiveProfiles("test")
 @AutoConfigureMockMvc(addFilters = false)
 class KodeverkControllerTest {
 
@@ -265,7 +266,7 @@ void should_return_bad_request_when_embetenavn_is_not_alphabetical() throws Exce
 
     private List<Kodeverk> readResponse(MvcResult result) throws Exception {
         Kodeverk[] array = objectMapper.readValue(result.getResponse().getContentAsString(), Kodeverk[].class);
-        return Arrays.stream(array).collect(Collectors.toUnmodifiableList());
+        return Arrays.stream(array).toList();
     }
 
 }
diff --git a/apps/geografiske-kodeverk-service/src/test/resources/application-test.properties b/apps/geografiske-kodeverk-service/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER=DUMMY
diff --git a/apps/helsepersonell-service/src/main/resources/application.yml b/apps/helsepersonell-service/src/main/resources/application.yml
@@ -20,7 +20,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-helsepersonell-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/helsepersonell-service/src/test/resources/application-test.properties b/apps/helsepersonell-service/src/test/resources/application-test.properties
@@ -0,0 +1 @@
+TOKEN_X_ISSUER=dummy
diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application.yml b/apps/inntektsmelding-generator-service/src/main/resources/application.yml
@@ -16,7 +16,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-inntektsmelding-generator-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false

diff --git a/...src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java b/...src/test/java/no/nav/registre/inntektsmeldinggeneratorservice/ApplicationContextTest.java
@@ -4,7 +4,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
+@ActiveProfiles("test")
 @SpringBootTest
 public class ApplicationContextTest {
 

diff --git a/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties b/apps/inntektsmelding-generator-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=DUMMY
+TOKEN_X_ISSUER=dummy
diff --git a/apps/inntektsmelding-service/src/main/resources/application.yml b/apps/inntektsmelding-service/src/main/resources/application.yml
@@ -20,7 +20,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-inntektsmelding-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/.../src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java b/.../src/test/java/no/nav/registre/testnav/inntektsmeldingservice/ApplicationContextTest.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 public class ApplicationContextTest {
 
     @MockBean

diff --git a/apps/inntektsmelding-service/src/test/resources/application-test.properties b/apps/inntektsmelding-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/jenkins-batch-status-service/src/main/resources/application.yml b/apps/jenkins-batch-status-service/src/main/resources/application.yml
@@ -17,7 +17,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-jenkins-batch-status-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/...test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java b/...test/java/no/nav/registre/testnorge/jenkinsbatchstatusservice/ApplicationContextTest.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
+@ActiveProfiles("test")
 public class ApplicationContextTest {
 
     @MockBean

diff --git a/apps/jenkins-batch-status-service/src/test/resources/application-test.properties b/apps/jenkins-batch-status-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/joark-dokument-service/src/main/resources/application.yml b/apps/joark-dokument-service/src/main/resources/application.yml
@@ -22,7 +22,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-joark-dokument-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/...ent-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java b/...ent-service/src/test/java/no/nav/testnav/joarkdokumentservice/ApplicationContextTest.java
@@ -4,7 +4,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
+@ActiveProfiles("test")
 @SpringBootTest
 public class ApplicationContextTest {
 

diff --git a/apps/joark-dokument-service/src/test/resources/application-test.properties b/apps/joark-dokument-service/src/test/resources/application-test.properties
@@ -0,0 +1,3 @@
+spring.cloud.vault.token=dummy
+azure.app.client.id=dummy
+TOKEN_X_ISSUER= dummy
diff --git a/apps/miljoer-service/src/main/resources/application.yml b/apps/miljoer-service/src/main/resources/application.yml
@@ -19,7 +19,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-miljoer-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false

diff --git a/...ervice/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java b/...ervice/src/test/java/no/nav/registre/testnorge/miljoerservice/ApplicationContextTest.java
@@ -4,7 +4,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.security.oauth2.jwt.JwtDecoder;
+import org.springframework.test.context.ActiveProfiles;
 
+@ActiveProfiles("test")
 @SpringBootTest
 public class ApplicationContextTest {
 

diff --git a/apps/miljoer-service/src/test/resources/application-test.properties b/apps/miljoer-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application.yml b/apps/oppsummeringsdokument-service/src/main/resources/application.yml
@@ -19,7 +19,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:oppsummeringsdokument-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   application:
     name: oppsummeringsdokument-service
     version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle

diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application.yml b/apps/organisasjon-bestilling-service/src/main/resources/application.yml
@@ -18,7 +18,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:organisasjon-bestilling-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
 
 springdoc:
   swagger-ui:

diff --git a/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties b/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties
@@ -1 +1 @@
-spring.cloud.vault.token=dummy
+TOKEN_X_ISSUER=dummy
diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application.yml b/apps/organisasjon-faste-data-service/src/main/resources/application.yml
@@ -14,7 +14,7 @@ spring:
         tokenx:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
-          accepted-audience: dev-gcp:dolly:testnav-organisasjon-faste-data-service
+          accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
       enabled: false
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		spring.cloud.vault.token=dummy
		TOKEN_X_ISSUER=dummy
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ consumers:


		AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token
		TOKEN_X_ISSUER: dummy