From 17e1f30cd0ad86cef6456f42cdf88ec9bade5b37 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 9 Nov 2018 09:17:05 +0100 Subject: [PATCH] Polishing. Rearrange authentication method switch. See gh-250. --- .../config/ClientAuthenticationFactory.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java index 44a2d57e..b61f10b4 100644 --- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java +++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/ClientAuthenticationFactory.java @@ -61,20 +61,12 @@ class ClientAuthenticationFactory { switch (vaultProperties.getAuthentication()) { - case TOKEN: - Assert.hasText(vaultProperties.getToken(), - "Token (spring.cloud.vault.token) must not be empty"); - return new TokenAuthentication(vaultProperties.getToken()); - case APPID: return appIdAuthentication(vaultProperties); case APPROLE: return appRoleAuthentication(vaultProperties); - case CERT: - return new ClientCertificateAuthentication(restOperations); - case AWS_EC2: return awsEc2Authentication(vaultProperties); @@ -84,11 +76,19 @@ class ClientAuthenticationFactory { case AZURE_MSI: return azureMsiAuthentication(vaultProperties); + case CERT: + return new ClientCertificateAuthentication(restOperations); + case CUBBYHOLE: return cubbyholeAuthentication(); case KUBERNETES: return kubernetesAuthentication(vaultProperties); + + case TOKEN: + Assert.hasText(vaultProperties.getToken(), + "Token (spring.cloud.vault.token) must not be empty"); + return new TokenAuthentication(vaultProperties.getToken()); } throw new UnsupportedOperationException(String.format(