diff --git a/apps/adresse-service/src/main/resources/application-local.yml b/apps/adresse-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..d2582a766ea --- /dev/null +++ b/apps/adresse-service/src/main/resources/application-local.yml @@ -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://" diff --git a/apps/adresse-service/src/main/resources/application.yaml b/apps/adresse-service/src/main/resources/application.yml similarity index 100% rename from apps/adresse-service/src/main/resources/application.yaml rename to apps/adresse-service/src/main/resources/application.yml diff --git a/apps/amelding-service/src/main/resources/application-dev.yml b/apps/amelding-service/src/main/resources/application-local.yml similarity index 50% rename from apps/amelding-service/src/main/resources/application-dev.yml rename to apps/amelding-service/src/main/resources/application-local.yml index e222fbad757..fd9e94057e6 100644 --- a/apps/amelding-service/src/main/resources/application-dev.yml +++ b/apps/amelding-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/amelding-service/src/main/resources/logback-spring.xml b/apps/amelding-service/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/apps/amelding-service/src/main/resources/logback-spring.xml +++ b/apps/amelding-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml b/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml index 6e81acdc788..fa988806f6d 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml +++ b/apps/app-tilgang-analyse-service/src/main/resources/application-local.yml @@ -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://" @@ -5,9 +8,3 @@ spring: 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} - diff --git a/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml b/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml index baf2a030a5e..191fc5b367f 100644 --- a/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml +++ b/apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml @@ -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://" @@ -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} \ No newline at end of file diff --git a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/arbeidsforhold-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/arbeidsforhold-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/adresse-service/src/main/resources/application-local.yaml b/apps/arbeidsforhold-service/src/main/resources/application-local.yml similarity index 64% rename from apps/adresse-service/src/main/resources/application-local.yaml rename to apps/arbeidsforhold-service/src/main/resources/application-local.yml index 4b75550d16b..e36d70419c6 100644 --- a/apps/adresse-service/src/main/resources/application-local.yaml +++ b/apps/arbeidsforhold-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml index 6e928942d90..c6f5a93ab27 100644 --- a/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml +++ b/apps/arbeidsforhold-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/batch-bestilling-service/src/main/resources/application-dev.yml b/apps/batch-bestilling-service/src/main/resources/application-dev.yml deleted file mode 100644 index c3bbec56cd7..00000000000 --- a/apps/batch-bestilling-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,12 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} - -consumers: - dolly-backend: - url: https://dolly-backend.intern.dev.nav.no \ No newline at end of file diff --git a/apps/batch-bestilling-service/src/main/resources/application-local.yml b/apps/batch-bestilling-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..ee40c021aad --- /dev/null +++ b/apps/batch-bestilling-service/src/main/resources/application-local.yml @@ -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 \ No newline at end of file diff --git a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml index 7309420d4fd..7573f10edb7 100644 --- a/apps/batch-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/batch-bestilling-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/brreg-stub/src/main/resources/application-local.yaml b/apps/brreg-stub/src/main/resources/application-local.yml similarity index 100% rename from apps/brreg-stub/src/main/resources/application-local.yaml rename to apps/brreg-stub/src/main/resources/application-local.yml diff --git a/apps/brreg-stub/src/main/resources/application-prod.yaml b/apps/brreg-stub/src/main/resources/application-prod.yml similarity index 100% rename from apps/brreg-stub/src/main/resources/application-prod.yaml rename to apps/brreg-stub/src/main/resources/application-prod.yml diff --git a/apps/brreg-stub/src/main/resources/application.yaml b/apps/brreg-stub/src/main/resources/application.yml similarity index 100% rename from apps/brreg-stub/src/main/resources/application.yaml rename to apps/brreg-stub/src/main/resources/application.yml diff --git a/apps/bruker-service/src/main/resources/application-local.yml b/apps/bruker-service/src/main/resources/application-local.yml index e5668233f25..c348e6eb2a7 100644 --- a/apps/bruker-service/src/main/resources/application-local.yml +++ b/apps/bruker-service/src/main/resources/application-local.yml @@ -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 @@ -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 \ No newline at end of file + name: testnav-person-organisasjon-tilgang-service-dev diff --git a/apps/budpro-service/src/main/resources/application-local.yml b/apps/budpro-service/src/main/resources/application-local.yml index 10148a7de46..675d84c40f0 100644 --- a/apps/budpro-service/src/main/resources/application-local.yml +++ b/apps/budpro-service/src/main/resources/application-local.yml @@ -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: @@ -15,4 +13,4 @@ management: consumers: generer-navn-service: - url: "https://generer-navn-service.intern.dev.nav.no" \ No newline at end of file + url: "https://generer-navn-service.intern.dev.nav.no" diff --git a/apps/budpro-service/src/main/resources/logback-spring.xml b/apps/budpro-service/src/main/resources/logback-spring.xml index 8d108ba7157..51d34a83c96 100644 --- a/apps/budpro-service/src/main/resources/logback-spring.xml +++ b/apps/budpro-service/src/main/resources/logback-spring.xml @@ -1,6 +1,6 @@ - + diff --git a/apps/dolly-backend/src/main/resources/application-dev.yaml b/apps/dolly-backend/src/main/resources/application-dev.yml similarity index 100% rename from apps/dolly-backend/src/main/resources/application-dev.yaml rename to apps/dolly-backend/src/main/resources/application-dev.yml diff --git a/apps/dolly-backend/src/main/resources/application-local.yaml b/apps/dolly-backend/src/main/resources/application-local.yml similarity index 93% rename from apps/dolly-backend/src/main/resources/application-local.yaml rename to apps/dolly-backend/src/main/resources/application-local.yml index e4f1a7387b8..ac07258e578 100644 --- a/apps/dolly-backend/src/main/resources/application-local.yaml +++ b/apps/dolly-backend/src/main/resources/application-local.yml @@ -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: @@ -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: diff --git a/apps/dolly-backend/src/main/resources/application-prod.yaml b/apps/dolly-backend/src/main/resources/application-prod.yml similarity index 100% rename from apps/dolly-backend/src/main/resources/application-prod.yaml rename to apps/dolly-backend/src/main/resources/application-prod.yml diff --git a/apps/dolly-backend/src/main/resources/application.yaml b/apps/dolly-backend/src/main/resources/application.yml similarity index 100% rename from apps/dolly-backend/src/main/resources/application.yaml rename to apps/dolly-backend/src/main/resources/application.yml diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java index 2a3a2c43845..217d0de176d 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/aareg/AaregConsumerTest.java @@ -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 { diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java index d8e29a9d42d..99f38233dbf 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/arenaforvalter/ArenaForvalterConsumerTest.java @@ -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 { diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java index 8a5bdf1c5ea..21b887d970e 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/instdata/InstdataConsumerTest.java @@ -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 { diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java index 2e26426511d..40a6ede774a 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/kontoregisterservice/KontoregisterConsumerTest.java @@ -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"; diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java index d5afa94ac60..76437c53abc 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/krrstub/KrrstubConsumerTest.java @@ -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 { diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java index 6aa4613ac43..58d401d7fae 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterConsumerTest.java @@ -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 { diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java index a2d09fd56ad..90d4946730c 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/sigrunstub/SigrunStubConsumerTest.java @@ -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 { diff --git a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java index 8c3f2a441a9..4f29d5b8985 100644 --- a/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java +++ b/apps/dolly-backend/src/test/java/no/nav/dolly/bestilling/tpsmessagingservice/TpsMessagingConsumerTest.java @@ -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 { diff --git a/apps/dolly-backend/src/test/resources/application-test.yaml b/apps/dolly-backend/src/test/resources/application-test.yml similarity index 100% rename from apps/dolly-backend/src/test/resources/application-test.yaml rename to apps/dolly-backend/src/test/resources/application-test.yml diff --git a/apps/dolly-frontend/src/main/resources/application-local.yml b/apps/dolly-frontend/src/main/resources/application-local.yml index 4d5c7544302..658916c4809 100644 --- a/apps/dolly-frontend/src/main/resources/application-local.yml +++ b/apps/dolly-frontend/src/main/resources/application-local.yml @@ -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 @@ -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 diff --git a/apps/dollystatus/src/main/resources/application-dev.yml b/apps/dollystatus/src/main/resources/application-local.yml similarity index 100% rename from apps/dollystatus/src/main/resources/application-dev.yml rename to apps/dollystatus/src/main/resources/application-local.yml diff --git a/apps/dollystatus/src/main/resources/logback-spring.xml b/apps/dollystatus/src/main/resources/logback-spring.xml index bda6e2fe01e..bfc6c10dbeb 100644 --- a/apps/dollystatus/src/main/resources/logback-spring.xml +++ b/apps/dollystatus/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/endringsmelding-frontend/src/main/resources/application-dev.yml b/apps/endringsmelding-frontend/src/main/resources/application-local.yml similarity index 58% rename from apps/endringsmelding-frontend/src/main/resources/application-dev.yml rename to apps/endringsmelding-frontend/src/main/resources/application-local.yml index f280c84ef1e..baa3afe677c 100644 --- a/apps/endringsmelding-frontend/src/main/resources/application-dev.yml +++ b/apps/endringsmelding-frontend/src/main/resources/application-local.yml @@ -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: diff --git a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml index 567d9f139e0..05ead4bd0b2 100644 --- a/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-frontend/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/endringsmelding-service/src/main/resources/application-dev.yml b/apps/endringsmelding-service/src/main/resources/application-local.yml similarity index 70% rename from apps/endringsmelding-service/src/main/resources/application-dev.yml rename to apps/endringsmelding-service/src/main/resources/application-local.yml index ba56e2420c7..88fa3ad63ce 100644 --- a/apps/endringsmelding-service/src/main/resources/application-dev.yml +++ b/apps/endringsmelding-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/endringsmelding-service/src/main/resources/logback-spring.xml b/apps/endringsmelding-service/src/main/resources/logback-spring.xml index 0b85920eee1..7e71f477274 100644 --- a/apps/endringsmelding-service/src/main/resources/logback-spring.xml +++ b/apps/endringsmelding-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/faste-data-frontend/src/main/resources/application-dev.yml b/apps/faste-data-frontend/src/main/resources/application-local.yml similarity index 72% rename from apps/faste-data-frontend/src/main/resources/application-dev.yml rename to apps/faste-data-frontend/src/main/resources/application-local.yml index a77714ef5d5..8a5ed30f192 100644 --- a/apps/faste-data-frontend/src/main/resources/application-dev.yml +++ b/apps/faste-data-frontend/src/main/resources/application-local.yml @@ -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: diff --git a/apps/faste-data-frontend/src/main/resources/logback-spring.xml b/apps/faste-data-frontend/src/main/resources/logback-spring.xml index b2989b19b94..9aed9d5f0bc 100644 --- a/apps/faste-data-frontend/src/main/resources/logback-spring.xml +++ b/apps/faste-data-frontend/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-dev.yml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml similarity index 71% rename from apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-dev.yml rename to apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml index 59f4904438e..195b7f9833e 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-dev.yml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/application-local.yml @@ -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: diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml index 3d7fef3768d..2b8e3e07012 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml +++ b/apps/generer-arbeidsforhold-populasjon-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/generer-navn-service/src/main/resources/application-dev.yml b/apps/generer-navn-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/generer-navn-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/generer-navn-service/src/main/resources/application-local.yml b/apps/generer-navn-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..6997e9cd385 --- /dev/null +++ b/apps/generer-navn-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" \ No newline at end of file diff --git a/apps/generer-navn-service/src/main/resources/logback-spring.xml b/apps/generer-navn-service/src/main/resources/logback-spring.xml index 7309420d4fd..7573f10edb7 100644 --- a/apps/generer-navn-service/src/main/resources/logback-spring.xml +++ b/apps/generer-navn-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/application-dev.yml b/apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml similarity index 78% rename from apps/generer-organisasjon-populasjon-service/src/main/resources/application-dev.yml rename to apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml index c8f5ecd88f7..76d1abfaa71 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/resources/application-dev.yml +++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/application-local.yml @@ -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://" @@ -16,11 +19,6 @@ spring: properties: hibernate: dialect: org.hibernate.dialect.H2Dialect - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} consumers: generer-navn-service: diff --git a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml index 3d7fef3768d..2b8e3e07012 100644 --- a/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml +++ b/apps/generer-organisasjon-populasjon-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + 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 deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/generer-synt-amelding-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/generer-synt-amelding-service/src/main/resources/application-local.yml b/apps/generer-synt-amelding-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..6997e9cd385 --- /dev/null +++ b/apps/generer-synt-amelding-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" \ No newline at end of file diff --git a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml index 7b0b3b1cca1..7185afb4ac0 100644 --- a/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml +++ b/apps/generer-synt-amelding-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/helsepersonell-service/src/main/resources/application-dev.yml b/apps/helsepersonell-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/helsepersonell-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/helsepersonell-service/src/main/resources/application-local.yml b/apps/helsepersonell-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..6997e9cd385 --- /dev/null +++ b/apps/helsepersonell-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" \ No newline at end of file diff --git a/apps/helsepersonell-service/src/main/resources/logback-spring.xml b/apps/helsepersonell-service/src/main/resources/logback-spring.xml index c2304354f25..520565e1ba0 100644 --- a/apps/helsepersonell-service/src/main/resources/logback-spring.xml +++ b/apps/helsepersonell-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application-dev.yml b/apps/inntektsmelding-generator-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/inntektsmelding-generator-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml b/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..6997e9cd385 --- /dev/null +++ b/apps/inntektsmelding-generator-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" \ No newline at end of file diff --git a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml index 3d7fef3768d..2b8e3e07012 100644 --- a/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml +++ b/apps/inntektsmelding-generator-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/inntektsmelding-service/src/main/resources/application-dev.yml b/apps/inntektsmelding-service/src/main/resources/application-local.yml similarity index 74% rename from apps/inntektsmelding-service/src/main/resources/application-dev.yml rename to apps/inntektsmelding-service/src/main/resources/application-local.yml index 5d2fe16fb8b..f20e7c285ff 100644 --- a/apps/inntektsmelding-service/src/main/resources/application-dev.yml +++ b/apps/inntektsmelding-service/src/main/resources/application-local.yml @@ -1,6 +1,5 @@ -consumers: - inntektsmelding-generator-service: - url: https://testnav-inntektsmelding-generator-service.intern.dev.nav.no +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} spring: config: @@ -20,8 +19,7 @@ spring: properties: hibernate: dialect: org.hibernate.dialect.H2Dialect - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file + +consumers: + inntektsmelding-generator-service: + url: https://testnav-inntektsmelding-generator-service.intern.dev.nav.no \ No newline at end of file diff --git a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml index 3d7fef3768d..2b8e3e07012 100644 --- a/apps/inntektsmelding-service/src/main/resources/logback-spring.xml +++ b/apps/inntektsmelding-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/jenkins-batch-status-service/src/main/resources/application-dev.yml b/apps/jenkins-batch-status-service/src/main/resources/application-local.yml similarity index 50% rename from apps/jenkins-batch-status-service/src/main/resources/application-dev.yml rename to apps/jenkins-batch-status-service/src/main/resources/application-local.yml index f1aa0058e84..a43ee99dd61 100644 --- a/apps/jenkins-batch-status-service/src/main/resources/application-dev.yml +++ b/apps/jenkins-batch-status-service/src/main/resources/application-local.yml @@ -1,15 +1,11 @@ +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: organisasjon-bestilling-service: url: https://organisasjon-bestilling-service.intern.dev.nav.no name: organisasjon-bestilling-service - cluster: dev-gcp - namespace: dolly diff --git a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml index e7a32604657..19a53d24c89 100644 --- a/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml +++ b/apps/jenkins-batch-status-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/joark-dokument-service/src/main/resources/application-dev.yml b/apps/joark-dokument-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/joark-dokument-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/joark-dokument-service/src/main/resources/application-local.yml b/apps/joark-dokument-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..897ae1309cd --- /dev/null +++ b/apps/joark-dokument-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" diff --git a/apps/joark-dokument-service/src/main/resources/logback-spring.xml b/apps/joark-dokument-service/src/main/resources/logback-spring.xml index 7309420d4fd..7573f10edb7 100644 --- a/apps/joark-dokument-service/src/main/resources/logback-spring.xml +++ b/apps/joark-dokument-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/kodeverk-service/src/main/resources/application-dev.yml b/apps/kodeverk-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/kodeverk-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/kodeverk-service/src/main/resources/application-local.yml b/apps/kodeverk-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..897ae1309cd --- /dev/null +++ b/apps/kodeverk-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" diff --git a/apps/kodeverk-service/src/main/resources/logback-spring.xml b/apps/kodeverk-service/src/main/resources/logback-spring.xml index 7b0b3b1cca1..7185afb4ac0 100644 --- a/apps/kodeverk-service/src/main/resources/logback-spring.xml +++ b/apps/kodeverk-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-dev.yml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml similarity index 79% rename from apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-dev.yml rename to apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml index 3fab1d15b70..f595e996a5c 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-dev.yml +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml @@ -1,3 +1,5 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} spring: config: @@ -10,7 +12,6 @@ spring: url: jdbc:h2:mem:testdb username: sa password: - driverClassName: org.h2.Driver flyway: # InMemmory database url: jdbc:postgresql://localhost:5432/testnav-levende-arbeidsforhold @@ -20,11 +21,6 @@ spring: url: r2dbc:postgresql://localhost:5432/testnav-levende-arbeidsforhold username: ${NAV_USERNAME} password: - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} sql: init: mode: always diff --git a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml index 7feaa817ab0..b8d3ffda284 100644 --- a/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-ansettelse/src/main/resources/logback-spring.xml @@ -13,7 +13,7 @@ - + diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-dev.yml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml similarity index 52% rename from apps/levende-arbeidsforhold-scheduler/src/main/resources/application-dev.yml rename to apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml index 1aaf694b9f8..cd7fef63722 100644 --- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-dev.yml +++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml @@ -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: levende-arbeidsforhold-ansettelse: diff --git a/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml index 5f39b7c7b9b..cf6f9f54728 100644 --- a/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-scheduler/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/application-dev.yml b/apps/levende-arbeidsforhold-service/src/main/resources/application-dev.yml deleted file mode 100644 index b2f3d1346f0..00000000000 --- a/apps/levende-arbeidsforhold-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,11 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} - -kafka: - group-id: testnav-levende-arbeidsforhold-service diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml b/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..d33808ad24a --- /dev/null +++ b/apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml @@ -0,0 +1,9 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" + +kafka: + group-id: testnav-levende-arbeidsforhold-service diff --git a/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml b/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml index 5f39b7c7b9b..cf6f9f54728 100644 --- a/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml +++ b/apps/levende-arbeidsforhold-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/miljoer-service/src/main/resources/application-dev.yml b/apps/miljoer-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/miljoer-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/miljoer-service/src/main/resources/application-local.yml b/apps/miljoer-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..897ae1309cd --- /dev/null +++ b/apps/miljoer-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" diff --git a/apps/miljoer-service/src/main/resources/logback-spring.xml b/apps/miljoer-service/src/main/resources/logback-spring.xml index 7309420d4fd..7573f10edb7 100644 --- a/apps/miljoer-service/src/main/resources/logback-spring.xml +++ b/apps/miljoer-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/oppsummeringsdokument-service/src/main/resources/application-dev.yml b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml similarity index 98% rename from apps/oppsummeringsdokument-service/src/main/resources/application-dev.yml rename to apps/oppsummeringsdokument-service/src/main/resources/application-local.yml index 63a8d41d38e..64119eb026f 100644 --- a/apps/oppsummeringsdokument-service/src/main/resources/application-dev.yml +++ b/apps/oppsummeringsdokument-service/src/main/resources/application-local.yml @@ -1,4 +1,3 @@ - open: search: index: local diff --git a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml index 2b9ec4cb86b..2388e84a184 100644 --- a/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml +++ b/apps/oppsummeringsdokument-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application-dev.yml b/apps/organisasjon-bestilling-service/src/main/resources/application-dev.yml deleted file mode 100644 index c56790d0bd9..00000000000 --- a/apps/organisasjon-bestilling-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,28 +0,0 @@ - -spring: - config: - import: "sm://" - h2: - console: - enabled: true - path: /h2 - flyway: - enabled: true - datasource: - url: jdbc:h2:mem:testdb - username: sa - password: - driverClassName: org.h2.Driver - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} - sql: - init: - mode: always - data-locations: classpath:/db/dev/h2-init-db.sql - jpa: - properties: - hibernate: - dialect: org.hibernate.dialect.H2Dialect \ No newline at end of file diff --git a/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml b/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..e99f0053156 --- /dev/null +++ b/apps/organisasjon-bestilling-service/src/main/resources/application-local.yml @@ -0,0 +1,20 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" + h2: + console: + enabled: true + path: /h2 + flyway: + enabled: true + datasource: + url: jdbc:h2:mem:testdb + username: sa + password: + sql: + init: + mode: always + data-locations: classpath:/db/dev/h2-init-db.sql \ No newline at end of file diff --git a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml index e7a32604657..19a53d24c89 100644 --- a/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-bestilling-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml b/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml deleted file mode 100644 index f1f72efbd09..00000000000 --- a/apps/organisasjon-faste-data-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,24 +0,0 @@ - -spring: - config: - import: "sm://" - h2: - console: - enabled: true - path: /h2 - flyway: - enabled: true - datasource: - url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8 - username: sa - password: - driverClassName: org.h2.Driver - jpa: - properties: - hibernate: - dialect: org.hibernate.dialect.H2Dialect - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml b/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..fdba653f095 --- /dev/null +++ b/apps/organisasjon-faste-data-service/src/main/resources/application-local.yml @@ -0,0 +1,16 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" + h2: + console: + enabled: true + path: /h2 + flyway: + enabled: true + datasource: + url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8 + username: sa + password: \ No newline at end of file diff --git a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml index e7a32604657..19a53d24c89 100644 --- a/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-faste-data-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/organisasjon-forvalter/src/main/resources/application-local.yml b/apps/organisasjon-forvalter/src/main/resources/application-local.yml index 52c41656e48..4fbf4a1b9bf 100644 --- a/apps/organisasjon-forvalter/src/main/resources/application-local.yml +++ b/apps/organisasjon-forvalter/src/main/resources/application-local.yml @@ -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://" @@ -5,11 +8,6 @@ spring: url: jdbc:postgresql://localhost:5432/testnav-organisasjon-forvalter-local username: testnav-organisasjon-forvalter-local password: ${sm://testnav-organisasjon-forvalter-local} - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} consumers: generer-navn-service: @@ -23,4 +21,4 @@ consumers: testnav-organisasjon-service: url: https://testnav-organisasjon-service.intern.dev.nav.no testnav-miljoer-service: - url: https://testnav-miljoer-service.intern.dev.nav.no \ No newline at end of file + url: https://testnav-miljoer-service.intern.dev.nav.no diff --git a/apps/organisasjon-mottak-service/src/main/resources/application-dev.yml b/apps/organisasjon-mottak-service/src/main/resources/application-local.yml similarity index 61% rename from apps/organisasjon-mottak-service/src/main/resources/application-dev.yml rename to apps/organisasjon-mottak-service/src/main/resources/application-local.yml index ff1273cc8cc..143b32c27b6 100644 --- a/apps/organisasjon-mottak-service/src/main/resources/application-dev.yml +++ b/apps/organisasjon-mottak-service/src/main/resources/application-local.yml @@ -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: jenkins-batch-status-service: diff --git a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml index 6e928942d90..c6f5a93ab27 100644 --- a/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-mottak-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/organisasjon-service/src/main/resources/application-dev.yml b/apps/organisasjon-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/organisasjon-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/organisasjon-service/src/main/resources/application-local.yml b/apps/organisasjon-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..897ae1309cd --- /dev/null +++ b/apps/organisasjon-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" diff --git a/apps/organisasjon-service/src/main/resources/logback-spring.xml b/apps/organisasjon-service/src/main/resources/logback-spring.xml index 3d7fef3768d..2b8e3e07012 100644 --- a/apps/organisasjon-service/src/main/resources/logback-spring.xml +++ b/apps/organisasjon-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml index 3ab69be9150..e6debad7f2a 100644 --- a/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml +++ b/apps/organisasjon-tilgang-service/src/main/resources/application-local.yml @@ -1,13 +1,12 @@ -TOKEN_X_ISSUER: dummy - +ALTINN_API_KEY: dummy ALTINN_URL: https://tt02.altinn.no - -altinn.api.key: dummy - +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy MASKINPORTEN_SCOPES: dummy MASKINPORTEN_WELL_KNOWN_URL: dummy +TOKEN_X_ISSUER: dummy spring: config: @@ -16,8 +15,3 @@ spring: 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} \ No newline at end of file diff --git a/apps/orgnummer-service/src/main/resources/application-dev.yml b/apps/orgnummer-service/src/main/resources/application-local.yml similarity index 72% rename from apps/orgnummer-service/src/main/resources/application-dev.yml rename to apps/orgnummer-service/src/main/resources/application-local.yml index 4e86cc4cf3c..db96ea8dea6 100644 --- a/apps/orgnummer-service/src/main/resources/application-dev.yml +++ b/apps/orgnummer-service/src/main/resources/application-local.yml @@ -1,3 +1,5 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} spring: config: @@ -10,16 +12,10 @@ spring: url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8 username: sa password: - driverClassName: org.h2.Driver jpa: properties: hibernate: dialect: org.hibernate.dialect.H2Dialect - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} consumers: testnav-organisasjon-service: diff --git a/apps/orgnummer-service/src/main/resources/logback-spring.xml b/apps/orgnummer-service/src/main/resources/logback-spring.xml index 7b0b3b1cca1..7185afb4ac0 100644 --- a/apps/orgnummer-service/src/main/resources/logback-spring.xml +++ b/apps/orgnummer-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/oversikt-frontend/src/main/resources/application-dev.yml b/apps/oversikt-frontend/src/main/resources/application-local.yml similarity index 77% rename from apps/oversikt-frontend/src/main/resources/application-dev.yml rename to apps/oversikt-frontend/src/main/resources/application-local.yml index 86865e8d705..f186349ca25 100644 --- a/apps/oversikt-frontend/src/main/resources/application-dev.yml +++ b/apps/oversikt-frontend/src/main/resources/application-local.yml @@ -1,3 +1,5 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} TOKEN_X_ISSUER: dummy server: @@ -6,11 +8,6 @@ server: spring: config: import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} consumers: testnorge-profil-api: diff --git a/apps/oversikt-frontend/src/main/resources/logback-spring.xml b/apps/oversikt-frontend/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/apps/oversikt-frontend/src/main/resources/logback-spring.xml +++ b/apps/oversikt-frontend/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/pdl-forvalter/src/main/resources/application-dev.yaml b/apps/pdl-forvalter/src/main/resources/application-dev.yml similarity index 100% rename from apps/pdl-forvalter/src/main/resources/application-dev.yaml rename to apps/pdl-forvalter/src/main/resources/application-dev.yml diff --git a/apps/pdl-forvalter/src/main/resources/application-local.yaml b/apps/pdl-forvalter/src/main/resources/application-local.yml similarity index 82% rename from apps/pdl-forvalter/src/main/resources/application-local.yaml rename to apps/pdl-forvalter/src/main/resources/application-local.yml index 4f89efa5869..8f283cdd847 100644 --- a/apps/pdl-forvalter/src/main/resources/application-local.yaml +++ b/apps/pdl-forvalter/src/main/resources/application-local.yml @@ -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://" @@ -5,11 +8,6 @@ spring: url: jdbc:postgresql://localhost:5432/testnav-pdl-forvalter-local username: testnav-pdl-forvalter-local password: ${sm://testnav-pdl-forvalter-local} - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} consumers: adresse-service: diff --git a/apps/pdl-forvalter/src/main/resources/application-prod.yaml b/apps/pdl-forvalter/src/main/resources/application-prod.yml similarity index 100% rename from apps/pdl-forvalter/src/main/resources/application-prod.yaml rename to apps/pdl-forvalter/src/main/resources/application-prod.yml diff --git a/apps/pdl-forvalter/src/main/resources/application.yaml b/apps/pdl-forvalter/src/main/resources/application.yml similarity index 100% rename from apps/pdl-forvalter/src/main/resources/application.yaml rename to apps/pdl-forvalter/src/main/resources/application.yml diff --git a/apps/person-faste-data-service/src/main/resources/application-dev.yml b/apps/person-faste-data-service/src/main/resources/application-local.yml similarity index 50% rename from apps/person-faste-data-service/src/main/resources/application-dev.yml rename to apps/person-faste-data-service/src/main/resources/application-local.yml index a4ca1d03845..d1b7052bba3 100644 --- a/apps/person-faste-data-service/src/main/resources/application-dev.yml +++ b/apps/person-faste-data-service/src/main/resources/application-local.yml @@ -1,3 +1,5 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} spring: config: @@ -12,16 +14,6 @@ spring: url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8 username: sa password: - driverClassName: org.h2.Driver - jpa: - properties: - hibernate: - dialect: org.hibernate.dialect.H2Dialect - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} testnav: config: diff --git a/apps/person-faste-data-service/src/main/resources/logback-spring.xml b/apps/person-faste-data-service/src/main/resources/logback-spring.xml index b2989b19b94..9aed9d5f0bc 100644 --- a/apps/person-faste-data-service/src/main/resources/logback-spring.xml +++ b/apps/person-faste-data-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml index 584cb8082a4..1d0b7c93e9d 100644 --- a/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml +++ b/apps/person-organisasjon-tilgang-service/src/main/resources/application-local.yml @@ -1,20 +1,15 @@ -ALTINN_URL: https://tt02.altinn.no - -TOKEN_X_ISSUER: dummy -OKEN_X_JWKS_URI: dummy -TOKEN_X_CLIENT_ID: dummy ALTINN_API_KEY: dummy - +ALTINN_URL: https://tt02.altinn.no +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy MASKINPORTEN_SCOPES: dummy MASKINPORTEN_WELL_KNOWN_URL: dummy +OKEN_X_JWKS_URI: dummy +TOKEN_X_CLIENT_ID: dummy +TOKEN_X_ISSUER: dummy spring: config: import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/person-search-service/src/main/resources/application-dev.yml b/apps/person-search-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/person-search-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/person-search-service/src/main/resources/application-local.yml b/apps/person-search-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..897ae1309cd --- /dev/null +++ b/apps/person-search-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" diff --git a/apps/person-search-service/src/main/resources/logback-spring.xml b/apps/person-search-service/src/main/resources/logback-spring.xml index bde1862f2bc..7f81f72aa83 100644 --- a/apps/person-search-service/src/main/resources/logback-spring.xml +++ b/apps/person-search-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/person-service/src/main/resources/application-dev.yml b/apps/person-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/person-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/person-service/src/main/resources/application-local.yml b/apps/person-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..6997e9cd385 --- /dev/null +++ b/apps/person-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" \ No newline at end of file diff --git a/apps/person-service/src/main/resources/logback-spring.xml b/apps/person-service/src/main/resources/logback-spring.xml index 80126b63465..a4ec4bc85cf 100644 --- a/apps/person-service/src/main/resources/logback-spring.xml +++ b/apps/person-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/profil-api/src/main/resources/application-dev.yml b/apps/profil-api/src/main/resources/application-dev.yml deleted file mode 100644 index 712e852d148..00000000000 --- a/apps/profil-api/src/main/resources/application-dev.yml +++ /dev/null @@ -1,15 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} - -consumers: - testnav-person-organisasjon-tilgang-service: - cluster: dev-gcp - namespace: dolly - name: testnav-person-organisasjon-tilgang-service-dev - url: https://testnav-person-organisasjon-tilgang-service-dev.dev.intern.nav.no diff --git a/apps/profil-api/src/main/resources/application-local.yml b/apps/profil-api/src/main/resources/application-local.yml new file mode 100644 index 00000000000..ab2961d30c7 --- /dev/null +++ b/apps/profil-api/src/main/resources/application-local.yml @@ -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: + testnav-person-organisasjon-tilgang-service: + url: https://testnav-person-organisasjon-tilgang-service-dev.dev.intern.nav.no diff --git a/apps/profil-api/src/main/resources/logback-spring.xml b/apps/profil-api/src/main/resources/logback-spring.xml index 7309420d4fd..7573f10edb7 100644 --- a/apps/profil-api/src/main/resources/logback-spring.xml +++ b/apps/profil-api/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/skattekort-service/src/main/resources/application-dev.yml b/apps/skattekort-service/src/main/resources/application-dev.yml deleted file mode 100644 index bea43da510a..00000000000 --- a/apps/skattekort-service/src/main/resources/application-dev.yml +++ /dev/null @@ -1,8 +0,0 @@ -spring: - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/apps/skattekort-service/src/main/resources/application-local.yml b/apps/skattekort-service/src/main/resources/application-local.yml new file mode 100644 index 00000000000..897ae1309cd --- /dev/null +++ b/apps/skattekort-service/src/main/resources/application-local.yml @@ -0,0 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + +spring: + config: + import: "sm://" diff --git a/apps/skattekort-service/src/main/resources/application-prod.yaml b/apps/skattekort-service/src/main/resources/application-prod.yml similarity index 100% rename from apps/skattekort-service/src/main/resources/application-prod.yaml rename to apps/skattekort-service/src/main/resources/application-prod.yml diff --git a/apps/skattekort-service/src/main/resources/application.yaml b/apps/skattekort-service/src/main/resources/application.yml similarity index 100% rename from apps/skattekort-service/src/main/resources/application.yaml rename to apps/skattekort-service/src/main/resources/application.yml diff --git a/apps/skattekort-service/src/main/resources/logback-spring.xml b/apps/skattekort-service/src/main/resources/logback-spring.xml index 0fe593266ce..5b7cdad28de 100644 --- a/apps/skattekort-service/src/main/resources/logback-spring.xml +++ b/apps/skattekort-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/sykemelding-api/src/main/resources/application-local.yml b/apps/sykemelding-api/src/main/resources/application-local.yml index bea43da510a..897ae1309cd 100644 --- a/apps/sykemelding-api/src/main/resources/application-local.yml +++ b/apps/sykemelding-api/src/main/resources/application-local.yml @@ -1,8 +1,6 @@ +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} \ No newline at end of file diff --git a/apps/synt-sykemelding-api/src/main/resources/application-local.yml b/apps/synt-sykemelding-api/src/main/resources/application-local.yml index 974482f7e91..b3521f2f369 100644 --- a/apps/synt-sykemelding-api/src/main/resources/application-local.yml +++ b/apps/synt-sykemelding-api/src/main/resources/application-local.yml @@ -1,13 +1,10 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} TOKEN_X_ISSUER: https://tokenx.dev-gcp.nav.cloud.nais.io spring: config: import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} consumers: synt-sykemelding: @@ -20,4 +17,4 @@ consumers: url: https://testnav-helsepersonell-service.intern.dev.nav.no sykemelding-api: url: https://testnav-sykemelding-api-dev.intern.dev.nav.no - name: testnav-sykemelding-api-dev \ No newline at end of file + name: testnav-sykemelding-api-dev diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/application-dev.yml b/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml similarity index 77% rename from apps/synt-vedtakshistorikk-service/src/main/resources/application-dev.yml rename to apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml index 428a4204f6f..27f16041946 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/resources/application-dev.yml +++ b/apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml @@ -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} batch: miljoe: q2 diff --git a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml index cb801609c61..80fd9d94742 100644 --- a/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml +++ b/apps/synt-vedtakshistorikk-service/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/tenor-search-service/src/main/resources/application-local.yml b/apps/tenor-search-service/src/main/resources/application-local.yml index 4b2ebb35015..d3d95ce153e 100644 --- a/apps/tenor-search-service/src/main/resources/application-local.yml +++ b/apps/tenor-search-service/src/main/resources/application-local.yml @@ -1,21 +1,17 @@ -TOKEN_X_ISSUER: dummy - +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy MASKINPORTEN_SCOPES: dummy MASKINPORTEN_WELL_KNOWN_URL: dummy +TOKEN_X_ISSUER: dummy spring: config: import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} consumers: dolly-backend: url: https://dolly-backend.intern.dev.nav.no dolly-backend-dev: - url: https://dolly-backend-dev.intern.dev.nav.no \ No newline at end of file + url: https://dolly-backend-dev.intern.dev.nav.no diff --git a/apps/testnav-ident-pool/src/main/resources/application-local.yml b/apps/testnav-ident-pool/src/main/resources/application-local.yml index e548e6ffc9e..a62687fc5ca 100644 --- a/apps/testnav-ident-pool/src/main/resources/application-local.yml +++ b/apps/testnav-ident-pool/src/main/resources/application-local.yml @@ -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://" @@ -9,12 +12,6 @@ spring: url: jdbc:h2:mem:testdb username: sa password: - driverClassName: org.h2.Driver - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} sql: init: mode: always @@ -24,4 +21,4 @@ consumers: tps: messaging: service: - url: https://testnav-tps-messaging-service.intern.dev.nav.no \ No newline at end of file + url: https://testnav-tps-messaging-service.intern.dev.nav.no diff --git a/apps/testnav-ident-pool/src/main/resources/application-prod.yaml b/apps/testnav-ident-pool/src/main/resources/application-prod.yml similarity index 100% rename from apps/testnav-ident-pool/src/main/resources/application-prod.yaml rename to apps/testnav-ident-pool/src/main/resources/application-prod.yml diff --git a/apps/testnav-ident-pool/src/main/resources/application.yaml b/apps/testnav-ident-pool/src/main/resources/application.yml similarity index 100% rename from apps/testnav-ident-pool/src/main/resources/application.yaml rename to apps/testnav-ident-pool/src/main/resources/application.yml diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml index 990670ce6dc..5ca60787a43 100644 --- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml +++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml @@ -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://" @@ -13,23 +16,12 @@ spring: console: enabled: true path: /h2 - jpa: - properties: - hibernate: - dialect: org.hibernate.dialect.H2Dialect - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} ereg.api: dummy -#VAULT_URL: dummy - consumers: testnav-bruker-service: name: testnav-bruker-service-dev url: https://testnav-bruker-service-dev.intern.dev.nav.no synthdata-aareg: - url: https://nais-synthdata-aareg.dev.intern.nav.no \ No newline at end of file + url: https://nais-synthdata-aareg.dev.intern.nav.no diff --git a/apps/tilbakemelding-api/src/main/resources/application-dev.yml b/apps/tilbakemelding-api/src/main/resources/application-local.yml similarity index 66% rename from apps/tilbakemelding-api/src/main/resources/application-dev.yml rename to apps/tilbakemelding-api/src/main/resources/application-local.yml index 6d22c7f56a1..a85d4316259 100644 --- a/apps/tilbakemelding-api/src/main/resources/application-dev.yml +++ b/apps/tilbakemelding-api/src/main/resources/application-local.yml @@ -5,6 +5,3 @@ SLACK_TOKEN: dummy consumers: profil-api: url: https://testnorge-profil-api.intern.dev.nav.no - cluster: dev-gcp - namespace: dolly - name: testnorge-profil-api diff --git a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml index 7309420d4fd..7573f10edb7 100644 --- a/apps/tilbakemelding-api/src/main/resources/logback-spring.xml +++ b/apps/tilbakemelding-api/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/apps/tps-messaging-service/src/main/resources/application-local.yml b/apps/tps-messaging-service/src/main/resources/application-local.yml index 449f2fdb185..fd4511ffe20 100644 --- a/apps/tps-messaging-service/src/main/resources/application-local.yml +++ b/apps/tps-messaging-service/src/main/resources/application-local.yml @@ -1,5 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} TOKEN_X_ISSUER: dummy +spring: + config: + import: "sm://" + config: mq: test: @@ -19,4 +25,4 @@ config: consumers: testmiljoerService: - url: https://testnav-miljoer-service.intern.dev.nav.no \ No newline at end of file + url: https://testnav-miljoer-service.intern.dev.nav.no diff --git a/apps/udi-stub/src/main/resources/application-local.yml b/apps/udi-stub/src/main/resources/application-local.yml index 655f30ef7a8..6e2eefaa874 100644 --- a/apps/udi-stub/src/main/resources/application-local.yml +++ b/apps/udi-stub/src/main/resources/application-local.yml @@ -1,7 +1,12 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + spring: cloud: vault: enabled: false + config: + import: "sm://" datasource: hikari: maximum-pool-size: 3 diff --git a/apps/varslinger-service/src/main/resources/application-local.yml b/apps/varslinger-service/src/main/resources/application-local.yml index d3b9d76b55c..0e326499a15 100644 --- a/apps/varslinger-service/src/main/resources/application-local.yml +++ b/apps/varslinger-service/src/main/resources/application-local.yml @@ -1,3 +1,5 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} spring: config: @@ -12,15 +14,8 @@ spring: url: jdbc:h2:mem:testdb?useUnicode=yes&characterEncoding=UTF-8 username: sa password: - driverClassName: org.h2.Driver - jpa: - properties: - hibernate: - dialect: org.hibernate.dialect.H2Dialect security: oauth2: resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} tokenx: accepted-audience: dev-gcp:dolly:testnav-varslinger-service-dev diff --git a/docs/compose.yaml b/docs/compose.yml similarity index 100% rename from docs/compose.yaml rename to docs/compose.yml diff --git a/proxies/aareg-proxy/src/main/resources/application-local.yaml b/proxies/aareg-proxy/src/main/resources/application-local.yml similarity index 54% rename from proxies/aareg-proxy/src/main/resources/application-local.yaml rename to proxies/aareg-proxy/src/main/resources/application-local.yml index 8cfb4ce9a21..e36c5e44fa2 100644 --- a/proxies/aareg-proxy/src/main/resources/application-local.yaml +++ b/proxies/aareg-proxy/src/main/resources/application-local.yml @@ -1,13 +1,10 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} TOKEN_X_ISSUER: dummy spring: config: import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} management: endpoint: diff --git a/proxies/aareg-proxy/src/main/resources/application.yaml b/proxies/aareg-proxy/src/main/resources/application.yml similarity index 100% rename from proxies/aareg-proxy/src/main/resources/application.yaml rename to proxies/aareg-proxy/src/main/resources/application.yml diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/application-dev.yml b/proxies/aareg-synt-services-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/aareg-synt-services-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml b/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/aareg-synt-services-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml +++ b/proxies/aareg-synt-services-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application-dev.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/arbeidsplassencv-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml b/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml index 3196c68e393..2c8e6560458 100644 --- a/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml +++ b/proxies/arbeidsplassencv-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application-dev.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/arena-forvalteren-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml b/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/arena-forvalteren-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml +++ b/proxies/arena-forvalteren-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/batch-adeo-proxy/src/main/resources/application-dev.yml b/proxies/batch-adeo-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/batch-adeo-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/batch-adeo-proxy/src/main/resources/application-local.yml b/proxies/batch-adeo-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/batch-adeo-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml +++ b/proxies/batch-adeo-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/brregstub-proxy/src/main/resources/application-dev.yml b/proxies/brregstub-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/brregstub-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/brregstub-proxy/src/main/resources/application-local.yml b/proxies/brregstub-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/brregstub-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/brregstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/brregstub-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/dokarkiv-proxy/src/main/resources/application-dev.yml b/proxies/dokarkiv-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 19dd01a26ed..00000000000 --- a/proxies/dokarkiv-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,15 +0,0 @@ -TOKEN_X_CLIENT_ID: dev-gcp:dolly:testnav-dokarkiv-proxy -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/dokarkiv-proxy/src/main/resources/application-local.yml b/proxies/dokarkiv-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..3949ecdfc49 --- /dev/null +++ b/proxies/dokarkiv-proxy/src/main/resources/application-local.yml @@ -0,0 +1,12 @@ +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-dokarkiv-proxy +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml +++ b/proxies/dokarkiv-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/ereg-proxy/src/main/resources/application-dev.yml b/proxies/ereg-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/ereg-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/ereg-proxy/src/main/resources/application-local.yml b/proxies/ereg-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/ereg-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/ereg-proxy/src/main/resources/logback-spring.xml b/proxies/ereg-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/ereg-proxy/src/main/resources/logback-spring.xml +++ b/proxies/ereg-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/fullmakt-proxy/src/main/resources/application-local.yml b/proxies/fullmakt-proxy/src/main/resources/application-local.yml index 0f24d85a8e2..7c09739eb91 100644 --- a/proxies/fullmakt-proxy/src/main/resources/application-local.yml +++ b/proxies/fullmakt-proxy/src/main/resources/application-local.yml @@ -1,3 +1,5 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} TOKEN_X_ISSUER: dummy spring: @@ -6,9 +8,4 @@ spring: secretmanager: enabled: true config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file + import: "sm://" \ No newline at end of file diff --git a/proxies/histark-proxy/src/main/resources/application-dev.yml b/proxies/histark-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/histark-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/histark-proxy/src/main/resources/application-local.yml b/proxies/histark-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/histark-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/histark-proxy/src/main/resources/logback-spring.xml b/proxies/histark-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/histark-proxy/src/main/resources/logback-spring.xml +++ b/proxies/histark-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/inntektstub-proxy/src/main/resources/application-dev.yml b/proxies/inntektstub-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/inntektstub-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/inntektstub-proxy/src/main/resources/application-local.yml b/proxies/inntektstub-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/inntektstub-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml index b2989b19b94..9aed9d5f0bc 100644 --- a/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/inntektstub-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/inst-proxy/src/main/resources/application-dev.yml b/proxies/inst-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/inst-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/inst-proxy/src/main/resources/application-local.yml b/proxies/inst-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/inst-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/inst-proxy/src/main/resources/logback-spring.xml b/proxies/inst-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/inst-proxy/src/main/resources/logback-spring.xml +++ b/proxies/inst-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/kontoregister-person-proxy/src/main/resources/application-dev.yml b/proxies/kontoregister-person-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/kontoregister-person-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml b/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/kontoregister-person-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml index ecf519e83b1..d2c0307816e 100644 --- a/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml +++ b/proxies/kontoregister-person-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/krrstub-proxy/src/main/resources/application-dev.yml b/proxies/krrstub-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/krrstub-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/krrstub-proxy/src/main/resources/application-local.yml b/proxies/krrstub-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/krrstub-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/krrstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/krrstub-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/medl-proxy/src/main/resources/application-dev.yml b/proxies/medl-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/medl-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/medl-proxy/src/main/resources/application-local.yml b/proxies/medl-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/medl-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/medl-proxy/src/main/resources/logback-spring.xml b/proxies/medl-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/medl-proxy/src/main/resources/logback-spring.xml +++ b/proxies/medl-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/norg2-proxy/src/main/resources/application-dev.yml b/proxies/norg2-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/norg2-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/norg2-proxy/src/main/resources/application-local.yml b/proxies/norg2-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/norg2-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/norg2-proxy/src/main/resources/logback-spring.xml b/proxies/norg2-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/norg2-proxy/src/main/resources/logback-spring.xml +++ b/proxies/norg2-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/pdl-proxy/src/main/resources/application-dev.yml b/proxies/pdl-proxy/src/main/resources/application-local.yml similarity index 75% rename from proxies/pdl-proxy/src/main/resources/application-dev.yml rename to proxies/pdl-proxy/src/main/resources/application-local.yml index 946f65f4c53..ddc652232c4 100644 --- a/proxies/pdl-proxy/src/main/resources/application-dev.yml +++ b/proxies/pdl-proxy/src/main/resources/application-local.yml @@ -1,3 +1,5 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} TOKEN_X_ISSUER: dummy spring: diff --git a/proxies/pdl-proxy/src/main/resources/logback-spring.xml b/proxies/pdl-proxy/src/main/resources/logback-spring.xml index fa34559da64..f4aa8827aa1 100644 --- a/proxies/pdl-proxy/src/main/resources/logback-spring.xml +++ b/proxies/pdl-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-dev.yml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml similarity index 56% rename from proxies/pensjon-testdata-facade-proxy/src/main/resources/application-dev.yml rename to proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml index 50f5dcfd4c1..cf297c5e4ad 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-dev.yml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/application-local.yml @@ -1,3 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + spring: cloud: gcp: @@ -5,11 +8,6 @@ spring: enabled: true config: import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} consumers: pensjon-testdata-facade: diff --git a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml index 67da608456f..c00168b2e23 100644 --- a/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml +++ b/proxies/pensjon-testdata-facade-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/saf-proxy/src/main/resources/application-dev.yml b/proxies/saf-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/saf-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/saf-proxy/src/main/resources/application-local.yml b/proxies/saf-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/saf-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/saf-proxy/src/main/resources/logback-spring.xml b/proxies/saf-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/saf-proxy/src/main/resources/logback-spring.xml +++ b/proxies/saf-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/sigrunstub-proxy/src/main/resources/application-dev.yml b/proxies/sigrunstub-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/sigrunstub-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/sigrunstub-proxy/src/main/resources/application-local.yml b/proxies/sigrunstub-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/sigrunstub-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml index f874dcc44c1..ae836bf1b11 100644 --- a/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/sigrunstub-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml b/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml index 0f24d85a8e2..72a6b5d092b 100644 --- a/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml +++ b/proxies/skjermingsregister-proxy/src/main/resources/application-local.yml @@ -1,3 +1,5 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} TOKEN_X_ISSUER: dummy spring: @@ -7,8 +9,3 @@ spring: enabled: true config: import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/application-dev.yml b/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml similarity index 72% rename from proxies/synthdata-meldekort-proxy/src/main/resources/application-dev.yml rename to proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml index 0931b73834a..b7a307293a4 100644 --- a/proxies/synthdata-meldekort-proxy/src/main/resources/application-dev.yml +++ b/proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml @@ -1,3 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + spring: cloud: gcp: @@ -7,11 +10,6 @@ spring: import: "sm://" azure: - nav: - app: - client: - id: ${sm://azure-app-client-id} - secret: ${sm://azure-app-client-secret} openid: config: issuer: https://login.microsoftonline.com/62366534-1ec3-4962-8869-9b5535279d0b diff --git a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml index 0b85920eee1..7e71f477274 100644 --- a/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml +++ b/proxies/synthdata-meldekort-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/udistub-proxy/src/main/resources/application-dev.yml b/proxies/udistub-proxy/src/main/resources/application-dev.yml deleted file mode 100644 index 0f24d85a8e2..00000000000 --- a/proxies/udistub-proxy/src/main/resources/application-dev.yml +++ /dev/null @@ -1,14 +0,0 @@ -TOKEN_X_ISSUER: dummy - -spring: - cloud: - gcp: - secretmanager: - enabled: true - config: - import: "sm://" - security: - oauth2: - resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} \ No newline at end of file diff --git a/proxies/udistub-proxy/src/main/resources/application-local.yml b/proxies/udistub-proxy/src/main/resources/application-local.yml new file mode 100644 index 00000000000..7c09739eb91 --- /dev/null +++ b/proxies/udistub-proxy/src/main/resources/application-local.yml @@ -0,0 +1,11 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: true + config: + import: "sm://" \ No newline at end of file diff --git a/proxies/udistub-proxy/src/main/resources/logback-spring.xml b/proxies/udistub-proxy/src/main/resources/logback-spring.xml index b2989b19b94..9aed9d5f0bc 100644 --- a/proxies/udistub-proxy/src/main/resources/logback-spring.xml +++ b/proxies/udistub-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - + diff --git a/proxies/yrkesskade-proxy/src/main/resources/application-dev.yaml b/proxies/yrkesskade-proxy/src/main/resources/application-local.yml similarity index 72% rename from proxies/yrkesskade-proxy/src/main/resources/application-dev.yaml rename to proxies/yrkesskade-proxy/src/main/resources/application-local.yml index 4fcf0345fde..f319813176d 100644 --- a/proxies/yrkesskade-proxy/src/main/resources/application-dev.yaml +++ b/proxies/yrkesskade-proxy/src/main/resources/application-local.yml @@ -1,3 +1,6 @@ +AZURE_APP_CLIENT_ID: ${sm://azure-app-client-id} +AZURE_APP_CLIENT_SECRET: ${sm://azure-app-client-secret} + spring: cloud: gcp: @@ -8,8 +11,6 @@ spring: security: oauth2: resourceserver: - aad: - accepted-audience: ${sm://azure-app-client-id}, api://${sm://azure-app-client-id} tokenx: issuer-uri: dummy diff --git a/proxies/yrkesskade-proxy/src/main/resources/logback-spring.xml b/proxies/yrkesskade-proxy/src/main/resources/logback-spring.xml index fa34559da64..f4aa8827aa1 100644 --- a/proxies/yrkesskade-proxy/src/main/resources/logback-spring.xml +++ b/proxies/yrkesskade-proxy/src/main/resources/logback-spring.xml @@ -22,7 +22,7 @@ - +