SpringCloud/spring-cloud-vault
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use unique bean names for SecretBackendMetadataFactory beans.

Browse Source 
We now use unique bean names for SecretBackendMetadataFactory beans for bean definition. Previously, we used the same bean name (secretBackendMetadataFactory) across all bean definitions which causes definition overrides. The overrides erased previously defined beans so only a single instance of SecretBackendMetadataFactory was defined and using multiple Spring Cloud Vault modules at the same time was not possible.

Closes gh-94.
This commit is contained in:
Mark Paluch
2017-04-05 19:39:17 +02:00
parent 0add1698d5
commit 44f3c10b9b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-vault-config-aws/src/main/java/org/springframework/cloud/vault/config/aws/VaultConfigAwsBootstrapConfiguration.java
View File

@@ -38,7 +38,7 @@ import org.springframework.vault.core.util.PropertyTransformer;
public class VaultConfigAwsBootstrapConfiguration {
@Bean
public SecretBackendMetadataFactory<VaultAwsProperties> secretBackendMetadataFactory() {
public SecretBackendMetadataFactory<VaultAwsProperties> awsSecretBackendMetadataFactory() {
return new AwsSecretBackendMetadataFactory();
}

2
spring-cloud-vault-config-consul/src/main/java/org/springframework/cloud/vault/config/consul/VaultConfigConsulBootstrapConfiguration.java
View File

@@ -38,7 +38,7 @@ import org.springframework.vault.core.util.PropertyTransformer;
public class VaultConfigConsulBootstrapConfiguration {
@Bean
public SecretBackendMetadataFactory<VaultConsulProperties> secretBackendAccessorFactory() {
public SecretBackendMetadataFactory<VaultConsulProperties> consulSecretBackendAccessorFactory() {
return new ConsulSecretBackendMetadataFactory();
}

2
spring-cloud-vault-config-databases/src/main/java/org/springframework/cloud/vault/config/databases/VaultConfigDatabaseBootstrapConfiguration.java
View File

@@ -41,7 +41,7 @@ import org.springframework.vault.core.util.PropertyTransformer;
public class VaultConfigDatabaseBootstrapConfiguration {
@Bean
public SecretBackendMetadataFactory<DatabaseSecretProperties> secretBackendMetadataFactory() {
public SecretBackendMetadataFactory<DatabaseSecretProperties> databaseSecretBackendMetadataFactory() {
return new DatabaseSecretBackendMetadataFactory();
}

2
spring-cloud-vault-config-rabbitmq/src/main/java/org/springframework/cloud/vault/config/rabbitmq/VaultConfigRabbitMqBootstrapConfiguration.java
View File

@@ -38,7 +38,7 @@ import org.springframework.vault.core.util.PropertyTransformer;
public class VaultConfigRabbitMqBootstrapConfiguration {
@Bean
public SecretBackendMetadataFactory<VaultRabbitMqProperties> secureBackendAccessorFactory() {
public SecretBackendMetadataFactory<VaultRabbitMqProperties> rabbitMqSecureBackendAccessorFactory() {
return new RabbitMqSecretBackendMetadataFactory();
}