From 760cd6b109856802e35473d373dc8cfef3e2bf71 Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Mon, 21 Oct 2024 16:15:08 +0200
Subject: [PATCH] From Vault to SM for varslinger-service.

---
 apps/varslinger-service/README.md                      |  1 -
 apps/varslinger-service/build.gradle                   |  3 ---
 apps/varslinger-service/settings.gradle                |  1 -
 .../varslingerservice/config/LocalVaultConfig.java     | 10 ----------
 .../src/main/resources/application-local.yml           |  5 +++++
 .../src/main/resources/bootstrap.yml                   |  4 ----
 .../src/test/resources/bootstrap.yml                   |  4 ----
 7 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalVaultConfig.java
 delete mode 100644 apps/varslinger-service/src/main/resources/bootstrap.yml
 delete mode 100644 apps/varslinger-service/src/test/resources/bootstrap.yml

diff --git a/apps/varslinger-service/README.md b/apps/varslinger-service/README.md
index 5a0cd75447f..e2514716f83 100644
--- 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
index fb8da68e8c9..3d0696be134 100644
--- 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
index a8de5bf5f9e..4f583e6c517 100644
--- 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/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalVaultConfig.java b/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalVaultConfig.java
deleted file mode 100644
index 4eef1029192..00000000000
--- a/apps/varslinger-service/src/main/java/no/nav/registre/varslingerservice/config/LocalVaultConfig.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package no.nav.registre.varslingerservice.config;
-
-import no.nav.testnav.libs.vault.AbstractLocalVaultConfiguration;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-
-@Configuration
-@Profile("local")
-public class LocalVaultConfig extends AbstractLocalVaultConfiguration {
-}
\ No newline at end of file
diff --git a/apps/varslinger-service/src/main/resources/application-local.yml b/apps/varslinger-service/src/main/resources/application-local.yml
index ff0bb76a278..d3b9d76b55c 100644
--- 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
deleted file mode 100644
index 0451449ca23..00000000000
--- a/apps/varslinger-service/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
-  cloud:
-    vault:
-      enabled: false
\ No newline at end of file
diff --git a/apps/varslinger-service/src/test/resources/bootstrap.yml b/apps/varslinger-service/src/test/resources/bootstrap.yml
deleted file mode 100644
index 0451449ca23..00000000000
--- a/apps/varslinger-service/src/test/resources/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-spring:
-  cloud:
-    vault:
-      enabled: false
\ No newline at end of file