From cdfd8616b33254719d344a137853f7c3a3f25539 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Thu, 17 Oct 2024 12:15:35 +0200 Subject: [PATCH] Now using GCP Secret Manager instead of Vault. --- apps/budpro-service/build.gradle | 1 - .../java/no/nav/dolly/budpro/LocalVaultConfig.java | 10 ---------- .../src/main/resources/application-local.yml | 8 +++----- 3 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 apps/budpro-service/src/main/java/no/nav/dolly/budpro/LocalVaultConfig.java diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index 1746c789889..4fc43f98721 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -10,7 +10,6 @@ dependencies { implementation "no.nav.testnav.libs:servlet-core" implementation "no.nav.testnav.libs:servlet-insecure-security" implementation "no.nav.testnav.libs:servlet-security" - implementation "no.nav.testnav.libs:vault" implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" implementation "org.springframework.boot:spring-boot-starter-oauth2-client" diff --git a/apps/budpro-service/src/main/java/no/nav/dolly/budpro/LocalVaultConfig.java b/apps/budpro-service/src/main/java/no/nav/dolly/budpro/LocalVaultConfig.java deleted file mode 100644 index f1db761cd03..00000000000 --- a/apps/budpro-service/src/main/java/no/nav/dolly/budpro/LocalVaultConfig.java +++ /dev/null @@ -1,10 +0,0 @@ -package no.nav.dolly.budpro; - -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 { -} diff --git a/apps/budpro-service/src/main/resources/application-local.yml b/apps/budpro-service/src/main/resources/application-local.yml index d934bb26140..fe95d12e035 100644 --- a/apps/budpro-service/src/main/resources/application-local.yml +++ b/apps/budpro-service/src/main/resources/application-local.yml @@ -1,13 +1,11 @@ spring: - cloud: - vault: - host: vault.adeo.no - port: 443 + config: + import: "sm://" security: oauth2: resourceserver: aad: - accepted-audience: ${azure.app.client.id}, api://${azure.app.client.id} + accepted-audience: ${sm://azureAppClientId}, api://${sm://azureAppClientId} management: endpoints: