From c3f002c4f6cdfbcd9b242cdb87ced9eda847f098 Mon Sep 17 00:00:00 2001
From: Cato Olsen <olsen.cato@gmail.com>
Date: Wed, 4 Dec 2024 13:11:19 +0100
Subject: [PATCH] Cleanup of spring.cloud.vault configuration.

---
 .../src/main/resources/application.yaml       |  3 ---
 .../src/main/resources/application.yml        |  3 ---
 .../src/main/resources/application.yml        |  3 ---
 .../src/main/resources/application-prod.yml   |  2 ++
 .../src/main/resources/bootstrap.yaml         | 20 -------------------
 .../src/test/resources/application-test.yml   |  2 +-
 .../src/test/resources/bootstrap.yml          |  5 -----
 .../src/test/resources/application-test.yml   |  3 ---
 8 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 apps/testnorge-statisk-data-forvalter/src/main/resources/bootstrap.yaml
 delete mode 100644 apps/testnorge-statisk-data-forvalter/src/test/resources/bootstrap.yml

diff --git a/apps/adresse-service/src/main/resources/application.yaml b/apps/adresse-service/src/main/resources/application.yaml
index 98dbbe9e7bf..5b96088b72e 100644
--- a/apps/adresse-service/src/main/resources/application.yaml
+++ b/apps/adresse-service/src/main/resources/application.yaml
@@ -16,9 +16,6 @@ spring:
           issuer-uri: ${TOKEN_X_ISSUER} 
           jwk-set-uri: ${TOKEN_X_JWKS_URI}
           accepted-audience: ${TOKEN_X_CLIENT_ID}
-  cloud:
-    vault:
-      enabled: false
 
 springdoc:
   swagger-ui:
diff --git a/apps/sykemelding-api/src/main/resources/application.yml b/apps/sykemelding-api/src/main/resources/application.yml
index 6075f7a084a..9e2485911f2 100644
--- a/apps/sykemelding-api/src/main/resources/application.yml
+++ b/apps/sykemelding-api/src/main/resources/application.yml
@@ -9,9 +9,6 @@ spring:
     version: application.version.todo
     name: testnav-sykemelding-api
     description: Api for opprettelse av detaljerte sykemeldinger
-  cloud:
-    vault:
-      enabled: false
   security:
     oauth2:
       resourceserver:
diff --git a/apps/synt-sykemelding-api/src/main/resources/application.yml b/apps/synt-sykemelding-api/src/main/resources/application.yml
index 6e4c9d4a232..a9ff3f6ba65 100644
--- a/apps/synt-sykemelding-api/src/main/resources/application.yml
+++ b/apps/synt-sykemelding-api/src/main/resources/application.yml
@@ -5,9 +5,6 @@ spring:
     version: application.version.todo
     name: testnav-synt-sykemelding-api
     description: Api for opprettelse av syntetiske sykemeldinger
-  cloud:
-    vault:
-      enabled: false
   security:
     oauth2:
       resourceserver:
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml
index 8cee85b29e6..45926e2190b 100644
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/main/resources/application-prod.yml
@@ -21,6 +21,8 @@ spring:
           accepted-audience: ${TOKEN_X_CLIENT_ID}
   cloud:
     vault:
+      application-name: preprod/fss/testnorge-statisk-data-forvalter
+      authentication: token
       kv:
         enabled: false
       host: vault.adeo.no
diff --git a/apps/testnorge-statisk-data-forvalter/src/main/resources/bootstrap.yaml b/apps/testnorge-statisk-data-forvalter/src/main/resources/bootstrap.yaml
deleted file mode 100644
index f830ab610ad..00000000000
--- a/apps/testnorge-statisk-data-forvalter/src/main/resources/bootstrap.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-spring.cloud.vault:
-  host: vault.adeo.no
-  port: 443
-  connection-timeout: 15000
-  read-timeout: 30000
-  application-name: preprod/fss/testnorge-statisk-data-forvalter
-
-  authentication: TOKEN
-
-  generic:
-    enabled: false
-    backend: kv
-    application-name: preprod/fss/testnorge-statisk-data/dolly
-    default-context: preprod/fss/testnorge-statisk-data/dolly
-  database:
-    enabled: true
-    role: testnorge-statisk-data-admin
-    backend: postgresql/preprod-fss
-    username-property: spring.datasource.username
-    password-property: spring.datasource.password
\ No newline at end of file
diff --git a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
index 00f18d3c630..a4c5a1d25d2 100644
--- a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
+++ b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml
@@ -16,7 +16,7 @@ spring:
       secretmanager:
         enabled: false
     vault:
-      token: dummy
+      enabled: false
 
 AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token
 
diff --git a/apps/testnorge-statisk-data-forvalter/src/test/resources/bootstrap.yml b/apps/testnorge-statisk-data-forvalter/src/test/resources/bootstrap.yml
deleted file mode 100644
index 85b05c6c99b..00000000000
--- a/apps/testnorge-statisk-data-forvalter/src/test/resources/bootstrap.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-spring:
-  flyway.enabled: false
-  cloud:
-    vault:
-      enabled: false
\ No newline at end of file
diff --git a/apps/udi-stub/src/test/resources/application-test.yml b/apps/udi-stub/src/test/resources/application-test.yml
index e191f5ee131..fe24f5b2071 100644
--- a/apps/udi-stub/src/test/resources/application-test.yml
+++ b/apps/udi-stub/src/test/resources/application-test.yml
@@ -6,9 +6,6 @@ spring:
       secretmanager:
         enabled: false
     vault:
-      database:
-        enabled: false
-      token: "test"
       enabled: false
   datasource:
     url: jdbc:tc:postgresql:15:///test?TC_REUSABLE=true