diff --git a/pom.xml b/pom.xml
index cf8c11be..57078b49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,6 @@
-
org.bouncycastle
bcpkix-jdk15on
diff --git a/spring-cloud-vault-config/pom.xml b/spring-cloud-vault-config/pom.xml
index 68e0c0b4..6ac2c138 100644
--- a/spring-cloud-vault-config/pom.xml
+++ b/spring-cloud-vault-config/pom.xml
@@ -38,6 +38,66 @@
+
+
+
+ org.springframework
+ spring-webflux
+ true
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+ true
+
+
+
+ org.springframework.boot
+ spring-boot-starter-logging
+ true
+
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ true
+
+
+
+ org.apache.httpcomponents
+ httpcore
+ true
+
+
+
+ io.netty
+ netty-all
+ true
+
+
+
+ com.squareup.okhttp3
+ okhttp
+ true
+
+
+
+
+
+ io.projectreactor
+ reactor-core
+ true
+
+
+
+ io.projectreactor.netty
+ reactor-netty
+ true
+
+
+
com.amazonaws
aws-java-sdk-core
@@ -55,12 +115,14 @@
+
org.bouncycastle
bcpkix-jdk15on
true
+
com.google.apis
google-api-services-iam
@@ -73,60 +135,6 @@
true
-
- com.squareup.okhttp3
- okhttp
- true
-
-
-
- io.netty
- netty-all
- true
-
-
-
- io.projectreactor
- reactor-core
- true
-
-
-
- io.projectreactor.netty
- reactor-netty
- true
-
-
-
- org.apache.httpcomponents
- httpclient
- true
-
-
-
- org.apache.httpcomponents
- httpcore
- true
-
-
-
- org.springframework
- spring-webflux
- true
-
-
-
- org.springframework.boot
- spring-boot-starter-actuator
- true
-
-
-
- org.springframework.boot
- spring-boot-starter-logging
- true
-
-
org.springframework.boot
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 563f8223..b4949373 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
@@ -159,12 +159,12 @@ class ClientAuthenticationFactory {
AppIdAuthenticationOptions authenticationOptions = AppIdAuthenticationOptions
.builder().appId(vaultProperties.getApplicationName()) //
.path(appId.getAppIdPath()) //
- .userIdMechanism(getClientAuthentication(appId)).build();
+ .userIdMechanism(getAppIdMechanism(appId)).build();
return new AppIdAuthentication(authenticationOptions, this.restOperations);
}
- private AppIdUserIdMechanism getClientAuthentication(
+ private AppIdUserIdMechanism getAppIdMechanism(
VaultProperties.AppIdProperties appId) {
try {
@@ -197,6 +197,14 @@ class ClientAuthenticationFactory {
}
}
+ private ClientAuthentication appRoleAuthentication(VaultProperties vaultProperties) {
+
+ AppRoleAuthenticationOptions options = getAppRoleAuthenticationOptions(
+ vaultProperties);
+
+ return new AppRoleAuthentication(options, this.restOperations);
+ }
+
static AppRoleAuthenticationOptions getAppRoleAuthenticationOptions(
VaultProperties vaultProperties) {
@@ -256,14 +264,6 @@ class ClientAuthenticationFactory {
return SecretId.absent();
}
- private ClientAuthentication appRoleAuthentication(VaultProperties vaultProperties) {
-
- AppRoleAuthenticationOptions options = getAppRoleAuthenticationOptions(
- vaultProperties);
-
- return new AppRoleAuthentication(options, this.restOperations);
- }
-
private ClientAuthentication awsEc2Authentication(VaultProperties vaultProperties) {
VaultProperties.AwsEc2Properties awsEc2 = vaultProperties.getAwsEc2();
diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java
index 9247f1b0..5fe63a6e 100644
--- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java
+++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultBootstrapPropertySourceConfiguration.java
@@ -49,8 +49,8 @@ import org.springframework.vault.core.lease.SecretLeaseContainer;
*/
@Configuration
@ConditionalOnProperty(name = "spring.cloud.vault.enabled", matchIfMissing = true)
-@EnableConfigurationProperties({VaultGenericBackendProperties.class,
- VaultKeyValueBackendProperties.class})
+@EnableConfigurationProperties({ VaultGenericBackendProperties.class,
+ VaultKeyValueBackendProperties.class })
@Order(Ordered.LOWEST_PRECEDENCE - 10)
public class VaultBootstrapPropertySourceConfiguration implements InitializingBean {
diff --git a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java
index d23ca80b..427bbe22 100644
--- a/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java
+++ b/spring-cloud-vault-config/src/main/java/org/springframework/cloud/vault/config/VaultProperties.java
@@ -323,7 +323,7 @@ public class VaultProperties implements EnvironmentAware {
*/
public enum AuthenticationMethod {
- TOKEN, APPID, APPROLE, AWS_EC2, AWS_IAM, AZURE_MSI, CERT, CUBBYHOLE, GCP_GCE, GCP_IAM, KUBERNETES, PCF;
+ APPID, APPROLE, AWS_EC2, AWS_IAM, AZURE_MSI, CERT, CUBBYHOLE, GCP_GCE, GCP_IAM, KUBERNETES, PCF, TOKEN;
}
diff --git a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java
index f8ce2b5f..085ecc9a 100644
--- a/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java
+++ b/spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/ClientAuthenticationFactoryUnitTests.java
@@ -178,7 +178,7 @@ public class ClientAuthenticationFactoryUnitTests {
ClientAuthentication clientAuthentication = new ClientAuthenticationFactory(
properties, new RestTemplate(), new RestTemplate())
- .createClientAuthentication();
+ .createClientAuthentication();
assertThat(clientAuthentication).isInstanceOf(PcfAuthentication.class);
}