- Removed no longer used AbstractLocalVaultConfiguration.

- Simplified the remaining 3 API usages of VaultUtils.
navikt · Nov 27, 2024 · 467c34a · 467c34a
1 parent ebcf6e5
commit 467c34a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 114 deletions.
diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java
@@ -1,6 +1,6 @@
 package no.nav.brregstub;
 
-import no.nav.testnav.libs.vault.VaultUtil;
+import no.nav.testnav.libs.vault.VaultUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -9,10 +9,8 @@
 public class BrregApplicationLauncher {
 
     public static void main(String[] args) {
-
-        if ("prod".equals(System.getProperty("spring.profiles.active"))) {
-            VaultUtil.initCloudVaultToken();
-        }
+        VaultUtils.initCloudVaultToken("prod");
         SpringApplication.run(BrregApplicationLauncher.class, args);
     }
+
 }
diff --git a/...ter/src/main/java/no/nav/registre/sdforvalter/StatiskDataForvalterApplicationStarter.java b/...ter/src/main/java/no/nav/registre/sdforvalter/StatiskDataForvalterApplicationStarter.java
@@ -1,18 +1,16 @@
 package no.nav.registre.sdforvalter;
 
-import no.nav.testnav.libs.vault.VaultUtil;
+import no.nav.testnav.libs.vault.VaultUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class StatiskDataForvalterApplicationStarter {
 
     public static void main(String[] args) {
-
-        if ("prod".equals(System.getProperty("spring.profiles.active"))) {
-            VaultUtil.initCloudVaultToken();
-        }
+        VaultUtils.initCloudVaultToken("prod");
         SpringApplication.run(StatiskDataForvalterApplicationStarter.class, args);
 
     }
+
 }
diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java
@@ -1,18 +1,15 @@
 package no.nav.udistub;
 
-import no.nav.testnav.libs.vault.VaultUtil;
+import no.nav.testnav.libs.vault.VaultUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class UdiStubApplicationStarter {
 
     public static void main(String[] args) {
-
-        if ("prod".equals(System.getProperty("spring.profiles.active"))) {
-            VaultUtil.initCloudVaultToken();
-        }
-
+        VaultUtils.initCloudVaultToken("prod");
         SpringApplication.run(UdiStubApplicationStarter.class, args);
     }
+
 }
diff --git a/docs/local_vault.md b/docs/local_vault.md
diff --git a/libs/vault/src/main/java/no/nav/testnav/libs/vault/AbstractLocalVaultConfiguration.java b/libs/vault/src/main/java/no/nav/testnav/libs/vault/AbstractLocalVaultConfiguration.java
diff --git a/.../no/nav/testnav/libs/vault/VaultUtil.java → ...no/nav/testnav/libs/vault/VaultUtils.java b/.../no/nav/testnav/libs/vault/VaultUtil.java → ...no/nav/testnav/libs/vault/VaultUtils.java
@@ -13,7 +13,7 @@
 
 @NoArgsConstructor(access = PRIVATE)
 @Slf4j
-public final class VaultUtil {
+public final class VaultUtils {
 
     private static final String NAIS_CLUSTER_SYSTEM_PROPERTY = "NAIS_CLUSTER_NAME";
     private static final String VAULT_TOKEN_SYSTEM_PROPERTY = "spring.cloud.vault.token";
@@ -49,8 +49,10 @@ private static String getVaultToken() {
 
     }
 
-    public static void initCloudVaultToken() {
-        System.setProperty(VAULT_TOKEN_SYSTEM_PROPERTY, getVaultToken());
+    public static void initCloudVaultToken(String ifProfileIs) {
+        if (ifProfileIs.equals(System.getProperty("spring.profiles.active"))) {
+            System.setProperty(VAULT_TOKEN_SYSTEM_PROPERTY, getVaultToken());
+        }
     }
 
 }