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

Merge branch '2.2.x' of https://github.com/rosuvlad/spring-cloud-config into rosuvlad-2.2.x

Browse Source
This commit is contained in:
Scott Frederick
2020-03-30 11:42:19 -05:00
parent 904ae1e3e6 9ef8deea04
commit fedbee05db
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/environment/vault/SpringVaultClientConfiguration.java
View File

@@ -103,9 +103,7 @@ public class SpringVaultClientConfiguration extends AbstractVaultConfiguration
endpointProvider, requestFactory);
if (vaultProperties.getNamespace() != null) {
restTemplateBuilder.customizers(
restTemplate -> restTemplate.getInterceptors().add(VaultClients
.createNamespaceInterceptor(vaultProperties.getNamespace())));
restTemplateBuilder.customizers(this::applyNamespaceInterceptor);
}
return restTemplateBuilder;
@@ -132,6 +130,13 @@ public class SpringVaultClientConfiguration extends AbstractVaultConfiguration
return new SslConfiguration(keyStoreConfiguration, trustStoreConfiguration);
}
@Override
public RestOperations restOperations() {
RestTemplate restOperations = (RestTemplate) super.restOperations();
applyNamespaceInterceptor(restOperations);
return restOperations;
}
private SslConfiguration.KeyStoreConfiguration getKeyStoreConfiguration(
Resource resourceProperty, String passwordProperty) {
@@ -147,6 +152,15 @@ public class SpringVaultClientConfiguration extends AbstractVaultConfiguration
return SslConfiguration.KeyStoreConfiguration.of(resourceProperty);
}
private RestOperations applyNamespaceInterceptor(RestTemplate restTemplate) {
if (vaultProperties.getNamespace() != null) {
restTemplate.getInterceptors().add(VaultClients
.createNamespaceInterceptor(vaultProperties.getNamespace()));
}
return restTemplate;
}
/**
* @return a new {@link ClientAuthentication}.
*/