Merge pull request AOT-Technologies#2124 from auslin-aot/feature/FWF-…

…3370-BPM-Vault-support

FWF-3370: [Feature] Added conditional property to Vault Config

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 Mark  items as `Added`, `Changed`, `Fixed`, `Modified`, `Removed`, `Untested Features`, `Upcoming Features`, `Known Issues`
 
+## 6.1.0
+
+`Added`
+
+ **forms-flow-bpm**
+* Added support to fetch secrets from Vault.
+* Added environment variables 
+ `VAULT_ENABLED`, `VAULT_URL`, `VAULT_TOKEN`, `VAULT_PATH`, `VAULT_SECRET` to support Vault.
+
 ## 6.0.2 - 2024-06-05
 
 `Added`

deployment/docker/sample.env

@@ -255,6 +255,6 @@ CUSTOM_SUBMISSION_URL=http://{your-ip-address}:{port}
 # Vault configuration
 # VAULT_ENABLED=false
 # VAULT_URL=http://{your-ip-address}:8200
-# VAULT_TOKEN=<PASSWORD>
+# VAULT_TOKEN=<token>
 # VAULT_PATH=
 # VAULT_SECRET=

forms-flow-bpm/forms-flow-bpm-camunda/src/main/java/org/camunda/bpm/extension/commons/utils/VaultConfig.java

@@ -4,6 +4,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.vault.core.VaultTemplate;
 import org.springframework.vault.support.VaultResponse;
@@ -12,6 +13,7 @@
 import org.slf4j.LoggerFactory;
 
 @Configuration
+@ConditionalOnProperty(name = "spring.cloud.vault.enabled", havingValue = "true", matchIfMissing = false)
 public class VaultConfig {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(VaultConfig.class);