Skip to content

Commit c58d21a

Browse files
rfc3092rfc3092
committed
Application execution now uses NaisEnvironmentApplicationContextInitializer, with config cleanup.
1 parent 71c6eff commit c58d21a

File tree

170 files changed

+519
-805
lines changed

Some content is hidden

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

170 files changed

+519
-805
lines changed

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service
2-
31
spring:
42
config:
53
import: "sm://"
4+
security:
5+
oauth2:
6+
resourceserver:
7+
tokenx:
8+
accepted-audience: dev-gcp:dolly:testnav-adresse-service

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

-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ management:
3535
include: prometheus,health
3636
path-mapping:
3737
prometheus: metrics
38-
endpoint:
39-
prometheus:
40-
access: read_only
4138
prometheus:
4239
metrics:
4340
export:

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package no.nav.testnav.altinn3tilgangservice;
22

3+
import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
34
import no.nav.testnav.libs.reactivecore.config.CoreConfig;
45
import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
5-
import org.springframework.boot.SpringApplication;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
7+
import org.springframework.boot.builder.SpringApplicationBuilder;
78
import org.springframework.context.annotation.Import;
89
import org.springframework.data.r2dbc.config.EnableR2dbcAuditing;
910
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
@@ -20,6 +21,8 @@
2021
public class Altinn3TilgangServiceApplicationStarter {
2122

2223
public static void main(String[] args) {
23-
SpringApplication.run(Altinn3TilgangServiceApplicationStarter.class, args);
24+
new SpringApplicationBuilder(Altinn3TilgangServiceApplicationStarter.class)
25+
.initializers(new NaisEnvironmentApplicationContextInitializer())
26+
.run(args);
2427
}
2528
}

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

-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
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}
42
MASKINPORTEN_CLIENT_ID: ef2960de-7fa6-4396-80a5-2eca00e4af28
53
MASKINPORTEN_CLIENT_JWK: dummy
64
MASKINPORTEN_SCOPES: altinn:resourceregistry/accesslist.read altinn:resourceregistry/accesslist.write altinn:accessmanagement/authorizedparties.resourceowner
75
MASKINPORTEN_WELL_KNOWN_URL: https://test.maskinporten.no/.well-known/oauth-authorization-server
8-
TOKEN_X_ISSUER: dummy
96

107
spring:
118
cache:
129
type: none
13-
cloud:
14-
gcp:
15-
secretmanager:
16-
project-id: dolly-dev-ff83
1710
config:
1811
import: "sm://"
1912
flyway:

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

+1-5
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
version: application.version.todo
@@ -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:
1613
issuer-uri: ${TOKEN_X_ISSUER}
17-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
1814
accepted-audience: ${TOKEN_X_CLIENT_ID}
1915
jackson:
2016
serialization:

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package no.nav.registre.testnav.ameldingservice;
22

3+
import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
34
import no.nav.testnav.libs.reactivecore.config.CoreConfig;
45
import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
5-
import org.springframework.boot.SpringApplication;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
7+
import org.springframework.boot.builder.SpringApplicationBuilder;
78
import org.springframework.context.annotation.Import;
89
import org.springframework.web.reactive.config.EnableWebFlux;
910

@@ -16,6 +17,9 @@
1617
public class AMeldingServiceApplicationStarter {
1718

1819
public static void main(String[] args) {
19-
SpringApplication.run(AMeldingServiceApplicationStarter.class, args);
20+
new SpringApplicationBuilder(AMeldingServiceApplicationStarter.class)
21+
.initializers(new NaisEnvironmentApplicationContextInitializer())
22+
.run(args);
2023
}
24+
2125
}

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

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
3-
41
spring:
52
config:
63
import: "sm://"

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

+1-4
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: testnav-amelding-service
@@ -9,8 +7,7 @@ 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

1613
springdoc:

‎apps/app-tilgang-analyse-service/src/main/java/no/nav/testnav/apps/apptilganganalyseservice/AppTilgangAnalyseServiceApplicationStarter.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package no.nav.testnav.apps.apptilganganalyseservice;
22

3+
import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
34
import no.nav.testnav.libs.reactivecore.config.CoreConfig;
45
import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
5-
import org.springframework.boot.SpringApplication;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
7+
import org.springframework.boot.builder.SpringApplicationBuilder;
78
import org.springframework.context.annotation.Import;
89
import org.springframework.web.reactive.config.EnableWebFlux;
910

@@ -16,6 +17,8 @@
1617
public class AppTilgangAnalyseServiceApplicationStarter {
1718

1819
public static void main(String[] args) {
19-
SpringApplication.run(AppTilgangAnalyseServiceApplicationStarter.class, args);
20+
new SpringApplicationBuilder(AppTilgangAnalyseServiceApplicationStarter.class)
21+
.initializers(new NaisEnvironmentApplicationContextInitializer())
22+
.run(args);
2023
}
2124
}

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

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

43
spring:
54
config:

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

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

43
spring:
54
config:

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

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
2-
31
spring:
42
application:
5-
version: application.version.todo #TODO Finn ut hvordan denne kan settes fra gradle
63
name: testnav-app-tilgang-analyse-service
74
description: API for å app tilgang analyse
85
security:
96
oauth2:
107
resourceserver:
118
aad:
12-
issuer-uri: ${AAD_ISSUER_URI}/v2.0
13-
jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
9+
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
1410
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
1511
tokenx:
16-
issuer-uri: ${TOKEN_X_ISSUER}
17-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
12+
issuer-uri: ${TOKEN_X_ISSUER}
1813
accepted-audience: ${TOKEN_X_CLIENT_ID}
1914

2015
springdoc:

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

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

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

67
@SpringBootApplication
78
public class ArbeidsforholdApiApplicationStarter {
89

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

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

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
3-
41
spring:
52
config:
6-
import: "sm://"
7-
security:
8-
oauth2:
9-
resourceserver:
10-
aad:
11-
accepted-audience: ${sm\://azure-app-client-id}, api://${sm\://azure-app-client-id}
3+
import: "sm://"

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

+2-6
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: testnav-arbeidsforhold-service
@@ -8,12 +6,10 @@ spring:
86
oauth2:
97
resourceserver:
108
aad:
11-
issuer-uri: ${AAD_ISSUER_URI}/v2.0
12-
jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
9+
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
1310
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
1411
tokenx:
15-
issuer-uri: ${TOKEN_X_ISSUER}
16-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
12+
issuer-uri: ${TOKEN_X_ISSUER}
1713
accepted-audience: ${TOKEN_X_CLIENT_ID}
1814

1915
springdoc:

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

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

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

67
@SpringBootApplication
78
public class BatchBestillingServiceApplicationStarter {
89
public static void main(String[] args) {
9-
SpringApplication.run(BatchBestillingServiceApplicationStarter.class, args);
10+
new SpringApplicationBuilder(BatchBestillingServiceApplicationStarter.class)
11+
.initializers(new NaisEnvironmentApplicationContextInitializer())
12+
.run(args);
1013
}
1114
}

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

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
2-
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
3-
41
spring:
52
config:
63
import: "sm://"

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
AAD_ISSUER_URI: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b
2-
31
spring:
4-
main:
5-
banner-mode: off
62
application:
73
name: batch-bestilling-service
84
description: App for å sende batch bestillinger til backend
95
security:
106
oauth2:
117
resourceserver:
128
aad:
13-
issuer-uri: ${AAD_ISSUER_URI}/v2.0
14-
jwk-set-uri: ${AAD_ISSUER_URI}/discovery/v2.0/keys
9+
issuer-uri: ${AZURE_OPENID_CONFIG_ISSUER}
1510
accepted-audience: ${AZURE_APP_CLIENT_ID}, api:// ${AZURE_APP_CLIENT_ID}
1611
tokenx:
17-
issuer-uri: ${TOKEN_X_ISSUER}
18-
jwk-set-uri: ${TOKEN_X_JWKS_URI}
12+
issuer-uri: ${TOKEN_X_ISSUER}
1913
accepted-audience: ${TOKEN_X_CLIENT_ID}
2014

2115
springdoc:

‎apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package no.nav.brregstub;
22

3+
import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
34
import no.nav.testnav.libs.vault.VaultUtils;
4-
import org.springframework.boot.SpringApplication;
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
6+
import org.springframework.boot.builder.SpringApplicationBuilder;
67

78

89
@SpringBootApplication
910
public class BrregApplicationLauncher {
1011

1112
public static void main(String[] args) {
1213
VaultUtils.initCloudVaultToken("prod");
13-
SpringApplication.run(BrregApplicationLauncher.class, args);
14+
new SpringApplicationBuilder(BrregApplicationLauncher.class)
15+
.initializers(new NaisEnvironmentApplicationContextInitializer())
16+
.run(args);
1417
}
1518

1619
}

‎apps/brreg-stub/src/main/resources/application-prod.yml

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
spring:
33
flyway:
44
locations: classpath:db/migration/postgresql
5-
main:
6-
banner-mode: off
75
datasource:
86
url: jdbc:postgresql://b27dbvl032.preprod.local:5432/testnav-brregstub?useUnicode=yes&characterEncoding=UTF-8
97
hikari:

‎apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/BrukerServiceApplicationStarter.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package no.nav.testnav.apps.brukerservice;
22

3+
import no.nav.dolly.libs.nais.NaisEnvironmentApplicationContextInitializer;
34
import no.nav.testnav.libs.reactivecore.config.CoreConfig;
45
import no.nav.testnav.libs.reactivesecurity.config.SecureOAuth2ServerToServerConfiguration;
5-
import org.springframework.boot.SpringApplication;
66
import org.springframework.boot.autoconfigure.SpringBootApplication;
7+
import org.springframework.boot.builder.SpringApplicationBuilder;
78
import org.springframework.context.annotation.Import;
89
import org.springframework.web.reactive.config.EnableWebFlux;
910

@@ -17,6 +18,8 @@
1718
public class BrukerServiceApplicationStarter {
1819

1920
public static void main(String[] args) {
20-
SpringApplication.run(BrukerServiceApplicationStarter.class, args);
21+
new SpringApplicationBuilder(BrukerServiceApplicationStarter.class)
22+
.initializers(new NaisEnvironmentApplicationContextInitializer())
23+
.run(args);
2124
}
2225
}

‎apps/bruker-service/src/main/java/no/nav/testnav/apps/brukerservice/service/JwtService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public JwtService(
2828
GetAuthenticatedUserId getAuthenticatedUserId,
2929
CryptographyService cryptographyService,
3030
@Value("${JWT_SECRET}") String secretKey,
31-
@Value("${TOKEN_X_CLIENT_ID}") String issuer) {
31+
@Value("${spring.security.oauth2.resourceserver.tokenx.accepted-audience}") String issuer) {
3232
this.getAuthenticatedUserId = getAuthenticatedUserId;
3333
this.cryptographyService = cryptographyService;
3434
this.secretKey = secretKey;

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

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
2-
AZURE_APP_CLIENT_ID: ${sm\://azure-app-client-id}
3-
AZURE_APP_CLIENT_SECRET: ${sm\://azure-app-client-secret}
4-
CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE
5-
JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE
6-
71
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
82

93
spring:
10-
application:
11-
name: testnav-bruker-service-dev
124
config:
135
import: "sm://"
146
flyway:
157
url: jdbc:h2:mem:testdb
168
username: sa
179
password:
10+
security:
11+
oauth2:
12+
resourceserver:
13+
tokenx:
14+
accepted-audience: ${TOKEN_X_CLIENT_ID}
1815

1916
consumers:
2017
testnav-altinn3-tilgang-service:

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

+3-4
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
version: application.version.todo
@@ -9,9 +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}
12+
tokenx:
13+
accepted-audience: ${TOKEN_X_CLIENT_ID}
1514
jackson:
1615
serialization:
1716
write_dates_as_timestamps:

0 commit comments

Comments
 (0)