From Vault to SM for varslinger-service.

navikt · Oct 21, 2024 · 760cd6b · 760cd6b
1 parent 9e7da50
commit 760cd6b
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 23 deletions.
diff --git a/apps/varslinger-service/README.md b/apps/varslinger-service/README.md
@@ -13,7 +13,6 @@ Swagger finnes under [/swagger](https://testnav-varslinger-service.intern.dev.na
 ## Lokal kjøring
 Ha naisdevice kjørende og kjør deretter VarslingerServiceApplicationStarter med følgende argumenter:
 ```
--Dspring.cloud.vault.token=[kopier token fra vault]
 -Dspring.profiles.active=dev
 ```
 

diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle
@@ -17,12 +17,9 @@ dependencies {
  implementation "no.nav.testnav.libs:security-core"
  implementation "no.nav.testnav.libs:servlet-core"
  implementation "no.nav.testnav.libs:servlet-security"
- implementation "no.nav.testnav.libs:vault"
 
  implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
 
- implementation "org.springframework.cloud:spring-cloud-vault-config-databases"
-
  implementation "org.springframework.boot:spring-boot-starter-security"
  implementation "org.springframework.boot:spring-boot-starter-data-jpa"
  implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

diff --git a/apps/varslinger-service/settings.gradle b/apps/varslinger-service/settings.gradle
@@ -11,7 +11,6 @@ includeBuild '../../libs/database'
 includeBuild '../../libs/security-core'
 includeBuild '../../libs/servlet-core'
 includeBuild '../../libs/servlet-security'
-includeBuild '../../libs/vault'
 
 develocity {
  buildScan {

diff --git a/...nger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalVaultConfig.java b/...nger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalVaultConfig.java
diff --git a/apps/varslinger-service/src/main/resources/application-local.yml b/apps/varslinger-service/src/main/resources/application-local.yml
@@ -1,5 +1,7 @@
 
 spring:
+ config:
+ import: "sm://"
  h2:
  console:
  enabled: true
@@ -15,7 +17,10 @@ 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}
  tokenx:
  accepted-audience: dev-gcp:dolly:testnav-varslinger-service-dev
diff --git a/apps/varslinger-service/src/main/resources/bootstrap.yml b/apps/varslinger-service/src/main/resources/bootstrap.yml
diff --git a/apps/varslinger-service/src/test/resources/bootstrap.yml b/apps/varslinger-service/src/test/resources/bootstrap.yml