Skip to content

Commit dfa04f3

Browse files
krharumkrharum
committed
Merge branch 'master' into bugfix/sivilstand-revisited
1 parent 3cf4da8 commit dfa04f3

File tree

469 files changed

+1988
-2893
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

469 files changed

+1988
-2893
lines changed

‎apps/adresse-service/settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.gradle.develocity" version "3.17.4"
2+
id "com.gradle.develocity" version "3.19"
33
}
44

55
rootProject.name = 'adresse-service'

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

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package no.nav.testnav.apps.adresseservice;
22

3-
import org.springframework.boot.SpringApplication;
3+
import no.nav.testnav.libs.servletcore.config.NaisEnvironmentApplicationContextInitializer;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.builder.SpringApplicationBuilder;
56

67
@SpringBootApplication
78
public class AdresseServiceApplicationStarter {
89

910
public static void main(String[] args) {
10-
11-
SpringApplication.run(AdresseServiceApplicationStarter.class, args);
11+
new SpringApplicationBuilder(AdresseServiceApplicationStarter.class)
12+
.initializers(new NaisEnvironmentApplicationContextInitializer())
13+
.run(args);
1214
}
15+
1316
}

‎apps/adresse-service/src/main/java/no/nav/testnav/apps/adresseservice/config/ApplicationConfig.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package no.nav.testnav.apps.adresseservice.config;
22

33
import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
4-
import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;
54
import org.springframework.context.annotation.Configuration;
65
import org.springframework.context.annotation.Import;
76

87
@Configuration
9-
@Import({ApplicationCoreConfig.class,
10-
SecureOAuth2ServerToServerConfiguration.class})
8+
@Import({ApplicationCoreConfig.class})
119
public class ApplicationConfig {
1210
}

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

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
31
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service
42

53
spring:

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
2-
31
spring:
42
application:
53
name: adresse-service
@@ -9,12 +7,10 @@ spring:
97
oauth2:
108
resourceserver:
119
aad:
12-
issuer-uri: ${AAD_ISSUER_URI}/v2.0
13-
jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
10+
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
1411
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
1512
tokenx:
16-
issuer-uri: ${TOKEN_X_ISSUER}
17-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
13+
issuer-uri: ${TOKEN_X_ISSUER}
1814
accepted-audience: ${TOKEN_X_CLIENT_ID}
1915

2016
springdoc:
@@ -31,7 +27,8 @@ consumers:
3127

3228
management:
3329
endpoints:
34-
enabled-by-default: true
30+
access:
31+
default: read_only
3532
web:
3633
base-path: /internal
3734
exposure:
@@ -40,7 +37,7 @@ management:
4037
prometheus: metrics
4138
endpoint:
4239
prometheus:
43-
enabled: true
40+
access: read_only
4441
prometheus:
4542
metrics:
4643
export:

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
package no.nav.testnav.apps.adresseservice;
22

3+
import no.nav.testnav.libs.servletcore.config.NaisEnvironmentApplicationContextInitializer;
34
import org.junit.jupiter.api.Test;
45
import org.springframework.boot.test.context.SpringBootTest;
5-
import org.springframework.boot.test.mock.mockito.MockBean;
6-
import org.springframework.security.oauth2.jwt.JwtDecoder;
76
import org.springframework.test.context.ActiveProfiles;
7+
import org.springframework.test.context.ContextConfiguration;
8+
9+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
810

911
@SpringBootTest
1012
@ActiveProfiles("test")
13+
@ContextConfiguration(initializers = NaisEnvironmentApplicationContextInitializer.class)
1114
class ApplicationContextTest {
1215

13-
@MockBean
14-
public JwtDecoder jwtDecoder;
15-
1616
@Test
17-
@SuppressWarnings("java:S2699")
1817
void load_app_context() {
18+
assertThat(true).isTrue();
1919
}
20+
2021
}

‎apps/adresse-service/src/test/resources/application-test.yml

-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
TOKEN_X_ISSUER: dummy
2-
3-
spring:
4-
cloud:
5-
gcp:
6-
secretmanager:
7-
enabled: false

‎apps/altinn3-tilgang-service/settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.gradle.develocity" version "3.17.4"
2+
id "com.gradle.develocity" version "3.19"
33
}
44

55
rootProject.name = 'altinn3-tilgang-service'

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ALTINN_URL: https://platform.tt02.altinn.no
2-
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
3-
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
2+
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
3+
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
44
MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
55
MASKINPORTEN_CLIENT_JWK: dummy
66
MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
@@ -22,8 +22,8 @@ spring:
2222
baseline-on-migrate: true
2323
url: jdbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
2424
user: testnav-altinn3-tilgang-local
25-
password: ${sm://testnav-altinn3-tilgang-local}
25+
password: ${sm\://testnav-altinn3-tilgang-local}
2626
r2dbc:
2727
url: r2dbc:postgresql://localhost:5432/testnav-altinn3-tilgang-local
2828
username: testnav-altinn3-tilgang-local
29-
password: ${sm://testnav-altinn3-tilgang-local}
29+
password: ${sm\://testnav-altinn3-tilgang-local}

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

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,18 @@
11
package no.nav.testnav.altinn3tilgangservice;
22

3-
import com.google.cloud.secretmanager.v1.SecretManagerServiceClient;
43
import org.junit.jupiter.api.Test;
54
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.boot.test.mock.mockito.MockBean;
7-
import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
85
import org.springframework.test.context.ActiveProfiles;
96

7+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
8+
109
@SpringBootTest
1110
@ActiveProfiles("test")
1211
class ApplicationContextTest {
1312

14-
@MockBean
15-
public ReactiveJwtDecoder jwtDecoder;
16-
17-
@MockBean
18-
public SecretManagerServiceClient secretManagerClient;
19-
2013
@Test
21-
@SuppressWarnings("java:S2699")
2214
void load_app_context() {
15+
assertThat(true).isTrue();
2316
}
17+
2418
}

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,10 @@ MASKINPORTEN_CLIENT_ID: dummy
44
MASKINPORTEN_CLIENT_JWK: dummy
55
MASKINPORTEN_SCOPES: dummy
66
MASKINPORTEN_WELL_KNOWN_URL: http://localhost:8080
7-
TOKEN_X_ISSUER: dummy
7+
TOKEN_X_ISSUER: dummy
8+
9+
spring:
10+
cloud:
11+
gcp:
12+
secretmanager:
13+
enabled: false

‎apps/amelding-service/settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.gradle.develocity" version "3.17.4"
2+
id "com.gradle.develocity" version "3.19"
33
}
44

55
rootProject.name = 'amelding-service'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
1+
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
2+
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
33

44
spring:
55
config:

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22

33
import org.junit.jupiter.api.Test;
44
import org.springframework.boot.test.context.SpringBootTest;
5-
import org.springframework.boot.test.mock.mockito.MockBean;
6-
import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder;
75
import org.springframework.test.context.ActiveProfiles;
86

7+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
8+
99
@SpringBootTest
1010
@ActiveProfiles("test")
1111
class ApplicationContextTest {
1212

13-
@MockBean
14-
public ReactiveJwtDecoder reactiveJwtDecoder;
15-
1613
@Test
17-
@SuppressWarnings("java:S2699")
1814
void load_app_context() {
15+
assertThat(true).isTrue();
1916
}
17+
2018
}

‎apps/app-tilgang-analyse-service/settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.gradle.develocity" version "3.17.4"
2+
id "com.gradle.develocity" version "3.19"
33
}
44

55
rootProject.name = 'app-tilgang-analyse-service'

‎apps/app-tilgang-analyse-service/src/main/resources/application-local.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
1+
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
2+
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
33

44
spring:
55
config:

‎apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
1+
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
2+
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
33

44
spring:
55
config:

‎apps/app-tilgang-analyse-service/src/test/java/no/nav/testnav/apps/apptilganganalyseservice/ApplicationContextTest.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22

33
import org.junit.jupiter.api.Test;
44
import org.springframework.boot.test.context.SpringBootTest;
5-
import org.springframework.boot.test.mock.mockito.MockBean;
6-
import org.springframework.security.oauth2.jwt.JwtDecoder;
75
import org.springframework.test.context.ActiveProfiles;
86

7+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
8+
99
@SpringBootTest
1010
@ActiveProfiles("test")
1111
class ApplicationContextTest {
1212

13-
@MockBean
14-
public JwtDecoder jwtDecoder;
15-
1613
@Test
17-
@SuppressWarnings("java:S2699")
1814
void load_app_context() {
15+
assertThat(true).isTrue();
1916
}
2017
}

‎apps/arbeidsforhold-service/settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.gradle.develocity" version "3.17.4"
2+
id "com.gradle.develocity" version "3.19"
33
}
44

55
rootProject.name = 'arbeidsforhold-service'

‎apps/arbeidsforhold-service/src/main/java/no/nav/registre/testnorge/arbeidsforholdservice/config/ApplicationConfig.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
import org.springframework.context.annotation.Import;
55

66
import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
7-
import no.nav.testnav.libs.servletsecurity.config.SecureOAuth2ServerToServerConfiguration;
87

98
@Configuration
10-
@Import({
11-
ApplicationCoreConfig.class,
12-
SecureOAuth2ServerToServerConfiguration.class
13-
})
9+
@Import({ApplicationCoreConfig.class})
1410
public class ApplicationConfig {
1511
}

‎apps/arbeidsforhold-service/src/main/resources/application-local.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
1+
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
2+
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
33

44
spring:
55
config:
@@ -8,4 +8,4 @@ spring:
88
oauth2:
99
resourceserver:
1010
aad:
11-
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
11+
accepted-audience: ${sm\://azure-app-client-id}, api://${sm\://azure-app-client-id}

‎apps/arbeidsforhold-service/src/test/java/no/nav/registre/testnorge/arbeidsforholdservice/ApplicationContextTest.java

-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import org.junit.jupiter.api.DisplayName;
44
import org.junit.jupiter.api.Test;
55
import org.springframework.boot.test.context.SpringBootTest;
6-
import org.springframework.boot.test.mock.mockito.MockBean;
7-
import org.springframework.security.oauth2.jwt.JwtDecoder;
86
import org.springframework.test.context.ActiveProfiles;
97

108
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -13,10 +11,6 @@
1311
@ActiveProfiles("test")
1412
class ApplicationContextTest {
1513

16-
@MockBean
17-
@SuppressWarnings("unused")
18-
private JwtDecoder jwtDecoder;
19-
2014
@Test
2115
@DisplayName("Application context should load")
2216
void load_app_context() {

‎apps/batch-bestilling-service/settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id "com.gradle.develocity" version "3.17.4"
2+
id "com.gradle.develocity" version "3.19"
33
}
44

55
rootProject.name = 'batch-bestilling-service'

‎apps/batch-bestilling-service/src/main/java/no/nav/registre/testnorge/batchbestillingservice/config/ApplicationConfig.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
package no.nav.registre.testnorge.batchbestillingservice.config;
22

33
import no.nav.testnav.libs.servletcore.config.ApplicationCoreConfig;
4-
import no.nav.testnav.libs.standalone.servletsecurity.config.InsecureJwtServerToServerConfiguration;
54
import org.springframework.context.annotation.Configuration;
65
import org.springframework.context.annotation.Import;
76

87
@Configuration
9-
@Import({
10-
ApplicationCoreConfig.class,
11-
InsecureJwtServerToServerConfiguration.class
12-
})
8+
@Import({ApplicationCoreConfig.class})
139
public class ApplicationConfig {
1410

1511
}

‎apps/batch-bestilling-service/src/main/resources/application-local.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
1+
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
2+
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
33

44
spring:
55
config:

‎apps/batch-bestilling-service/src/test/java/no/nav/registre/testnorge/batchbestillingservice/ApplicationContextTest.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22

33
import org.junit.jupiter.api.Test;
44
import org.springframework.boot.test.context.SpringBootTest;
5-
import org.springframework.boot.test.mock.mockito.MockBean;
6-
import org.springframework.security.oauth2.jwt.JwtDecoder;
75
import org.springframework.test.context.ActiveProfiles;
86

7+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
8+
99
@ActiveProfiles("test")
1010
@SpringBootTest
11-
public class ApplicationContextTest {
12-
13-
@MockBean
14-
public JwtDecoder jwtDecoder;
11+
class ApplicationContextTest {
1512

1613
@Test
17-
@SuppressWarnings("java:S2699")
1814
void load_app_context() {
15+
assertThat(true).isTrue();
1916
}
17+
2018
}

0 commit comments

Comments
 (0)