Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix/missing_azure_app_client #3689

Merged
merged 3 commits into from
Dec 11, 2024
Merged

bugfix/missing_azure_app_client #3689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9a93f3
Changed to indicate we're using an environment variable, not a Spring…
rfc3092 Dec 9, 2024
6153153
- Renamed all .yaml to .yml.
rfc3092 Dec 9, 2024
0204e10
Merge branch 'master' into bugfix/missing_azure_app_client
rfc3092 Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apps/adresse-service/src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service

spring:
config:
import: "sm://"
0 ...rvice/src/main/resources/application.yaml → ...ervice/src/main/resources/application.yml
View file
Open in desktop
File renamed without changes.
8 changes: 3 additions & 5 deletions ...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"
security:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}

consumers:
oppsummeringsdokument-service:
Expand Down
2 changes: 1 addition & 1 deletion apps/amelding-service/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
Expand Down
9 changes: 3 additions & 6 deletions apps/app-tilgang-analyse-service/src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"
flyway:
url: jdbc:h2:mem:testdb
username: sa
password:
security:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}

8 changes: 3 additions & 5 deletions apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"
Expand All @@ -9,8 +12,3 @@ spring:
url: r2dbc:postgresql://localhost:3306/testnav-app-tilgang-analyse-service-db
username: testnav-app-tilgang-analyse-service
password: ${DB_PASSWORD}
security:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}
8 changes: 0 additions & 8 deletions apps/arbeidsforhold-service/src/main/resources/application-dev.yml
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-adresse-service
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
Expand Down
2 changes: 1 addition & 1 deletion apps/arbeidsforhold-service/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
Expand Down
12 changes: 0 additions & 12 deletions apps/batch-bestilling-service/src/main/resources/application-dev.yml
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions apps/batch-bestilling-service/src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"

consumers:
dolly-backend:
url: https://dolly-backend.intern.dev.nav.no
2 changes: 1 addition & 1 deletion apps/batch-bestilling-service/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
Expand Down
0 ...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml
View file
Open in desktop
File renamed without changes.
0 .../src/main/resources/application-prod.yaml → ...b/src/main/resources/application-prod.yml
View file
Open in desktop
File renamed without changes.
0 ...-stub/src/main/resources/application.yaml → ...g-stub/src/main/resources/application.yml
View file
Open in desktop
File renamed without changes.
10 changes: 7 additions & 3 deletions apps/bruker-service/src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
CRYPTOGRAPHY_SECRET: DUMMY SUPER SECRET CRYPTOGRAPHY KEY THAT IS NOT SECURE
JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE

TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-bruker-service-dev
TOKENDINGS_URL: ${TOKEN_X_ISSUER}
TOKENDINGS_URL: ${TOKEN_X_ISSUER}

spring:
application:
name: testnav-bruker-service-dev
config:
import: "sm://"
flyway:
url: jdbc:h2:mem:testdb
username: sa
Expand All @@ -14,4 +18,4 @@ spring:
consumers:
testnav-person-organisasjon-tilgang-service:
url: https://testnav-person-organisasjon-tilgang-service-dev.intern.dev.nav.no
name: testnav-person-organisasjon-tilgang-service-dev
name: testnav-person-organisasjon-tilgang-service-dev
10 changes: 4 additions & 6 deletions apps/budpro-service/src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"
security:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}

management:
endpoints:
Expand All @@ -15,4 +13,4 @@ management:

consumers:
generer-navn-service:
url: "https://generer-navn-service.intern.dev.nav.no"
url: "https://generer-navn-service.intern.dev.nav.no"
2 changes: 1 addition & 1 deletion apps/budpro-service/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<springProfile name="prod,dev">
<springProfile name="prod">
<appender name="stdout_json" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="no.nav.testnav.libs.servletcore.logging.TestnavLogbackEncoder">
<throwableConverter class="net.logstash.logback.stacktrace.ShortenedThrowableConverter">
Expand Down
0 ...d/src/main/resources/application-dev.yaml → ...nd/src/main/resources/application-dev.yml
View file
Open in desktop
File renamed without changes.
8 changes: 3 additions & 5 deletions ...src/main/resources/application-local.yaml → .../src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

dolly:
client:
general:
Expand All @@ -12,11 +15,6 @@ spring:
url: jdbc:postgresql://localhost:5432/testnav-dolly-backend-local
username: testnav-dolly-backend-local
password: ${sm://testnav-dolly-backend-local}
security:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}

management:
endpoints:
Expand Down
0 .../src/main/resources/application-prod.yaml → ...d/src/main/resources/application-prod.yml
View file
Open in desktop
File renamed without changes.
0 ...ckend/src/main/resources/application.yaml → ...ackend/src/main/resources/application.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@ActiveProfiles("test")
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(locations = "classpath:application.yaml")
@TestPropertySource(locations = "classpath:application.yml")
@AutoConfigureWireMock(port = 0)
class AaregConsumerTest {

Expand Down
2 changes: 1 addition & 1 deletion ...kend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
@ActiveProfiles("test")
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(locations = "classpath:application.yaml")
@TestPropertySource(locations = "classpath:application.yml")
@AutoConfigureWireMock(port = 0)
class ArenaForvalterConsumerTest {

Expand Down
2 changes: 1 addition & 1 deletion apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
@ActiveProfiles("test")
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(locations = "classpath:application.yaml")
@TestPropertySource(locations = "classpath:application.yml")
@AutoConfigureWireMock(port = 0)
class InstdataConsumerTest {

Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
@ActiveProfiles("test")
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(locations = "classpath:application.yaml")
@TestPropertySource(locations = "classpath:application.yml")
@AutoConfigureWireMock(port = 0)
class KontoregisterConsumerTest {
private static final String IDENT = "12345678901";
Expand Down
2 changes: 1 addition & 1 deletion apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
@ActiveProfiles("test")
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(locations = "classpath:application.yaml")
@TestPropertySource(locations = "classpath:application.yml")
@AutoConfigureWireMock(port = 0)
class KrrstubConsumerTest {

Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
@ActiveProfiles("test")
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(locations = "classpath:application.yaml")
@TestPropertySource(locations = "classpath:application.yml")
@AutoConfigureWireMock(port = 0)
class PensjonforvalterConsumerTest {

Expand Down
2 changes: 1 addition & 1 deletion ...olly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
@ActiveProfiles("test")
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(locations = "classpath:application.yaml")
@TestPropertySource(locations = "classpath:application.yml")
@AutoConfigureWireMock(port = 0)
class SigrunStubConsumerTest {

Expand Down
2 changes: 1 addition & 1 deletion ...d/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
@ActiveProfiles("test")
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@TestPropertySource(locations = "classpath:application.yaml")
@TestPropertySource(locations = "classpath:application.yml")
@AutoConfigureWireMock(port = 0)
class TpsMessagingConsumerTest {

Expand Down
0 .../src/test/resources/application-test.yaml → ...d/src/test/resources/application-test.yml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions apps/dolly-frontend/src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}
POST_LOGOUT_REDIRECT_URI: 'http://localhost:3000/login'
REDIS_HOST: localhost
TOKEN_X_ISSUER: dummy
Expand All @@ -13,8 +15,6 @@ spring:
client:
registration:
aad:
client-id: ${sm://azure-app-client-id}
client-secret: ${sm://azure-app-client-secret}
authorization-grant-type: authorization_code
redirect-uri: 'http://localhost:3000/login/oauth2/code/{registrationId}'
scope: openid, offline_access, ${sm://azure-app-client-id}/.default
Expand Down
0 ...us/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/dollystatus/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
Expand Down
11 changes: 3 additions & 8 deletions ...nd/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"
security:
oauth2:
client:
registration:
aad:
client-id: ${sm://azure-app-client-id}
client-secret: ${sm://azure-app-client-secret}
scope: openid, ${sm://azure-app-client-id}/.default

consumers:
endringsmelding-service:
Expand Down
2 changes: 1 addition & 1 deletion apps/endringsmelding-frontend/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
Expand Down
8 changes: 3 additions & 5 deletions ...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"
security:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}

consumers:
adresse-service:
Expand Down
2 changes: 1 addition & 1 deletion apps/endringsmelding-service/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
Expand Down
11 changes: 3 additions & 8 deletions ...nd/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"
security:
oauth2:
client:
registration:
aad:
client-id: ${sm://azure-app-client-id}
client-secret: ${sm://azure-app-client-secret}
scope: openid, ${sm://azure-app-client-id}/.default

consumers:
testnorge-profil-api:
Expand Down
2 changes: 1 addition & 1 deletion apps/faste-data-frontend/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
Expand Down
8 changes: 3 additions & 5 deletions ...ce/src/main/resources/application-dev.yml → .../src/main/resources/application-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id}
AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret}

spring:
config:
import: "sm://"
security:
oauth2:
resourceserver:
aad:
accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id}

consumers:
oppsummeringsdokument-service:
Expand Down
2 changes: 1 addition & 1 deletion apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</root>
</springProfile>

<springProfile name="dev">
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
Expand Down
Loading
Loading