Cleanup of spring.cloud.vault configuration.

navikt · Dec 4, 2024 · c3f002c · c3f002c
1 parent 74eb09c
commit c3f002c
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
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
@@ -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
diff --git 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