Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Reorder & simplify isKeyVaultEnabled #894

Closed
jmax01 wants to merge 4 commits into from
Closed

Reorder & simplify isKeyVaultEnabled #894

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96d043e
Reorder & simplify isKeyVaultEnabled
jmax01 May 20, 2020
dfa9594
Merge branch 'master' into patch-3
saragluna May 21, 2020
da44de6
Merge branch 'master' into patch-3
saragluna Jun 9, 2020
5b2e6a0
Merge branch 'master' into patch-3
Jun 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ...t/src/main/java/com/microsoft/azure/keyvault/spring/KeyVaultEnvironmentPostProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,12 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
* @return true if the key vault is enabled, false otherwise.
*/
private boolean isKeyVaultEnabled(ConfigurableEnvironment environment, String normalizedName) {
if (environment.getProperty(AZURE_KEYVAULT_PREFIX + normalizedName + AZURE_KEYVAULT_VAULT_URI) == null) {
return false;
}
return environment.getProperty(AZURE_KEYVAULT_PREFIX + normalizedName + AZURE_KEYVAULT_ENABLED,
Boolean.class, true) && isKeyVaultClientAvailable();
final String normalizedPrefix = AZURE_KEYVAULT_PREFIX + normalizedName;
return environment.getProperty(normalizedPrefix + AZURE_KEYVAULT_ENABLED,
Boolean.class, true) && environment.getProperty(normalizedPrefix + AZURE_KEYVAULT_VAULT_URI) != null
&& isKeyVaultClientAvailable();
}

/**
* Determine whether or not multiple key vaults are enabled.
*
Expand Down