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

Updates spring-vault to version 2.3.0-M1

Browse Source 
Fixes gh-1751
This commit is contained in:
spencergibb
2020-11-17 15:17:57 -05:00
parent cf620f1e7c
commit af20e6176f
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-config-dependencies/pom.xml
View File

@@ -16,7 +16,7 @@
<description>Spring Cloud Config Dependencies</description>
<properties>
<jgit.version>5.1.3.201810200350-r</jgit.version>
<spring-vault.version>2.2.0.RELEASE</spring-vault.version>
<spring-vault.version>2.3.0-M1</spring-vault.version>
<spring-credhub.version>2.0.0.RELEASE</spring-credhub.version>
</properties>
<dependencyManagement>

12
spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/environment/vault/SpringVaultClientConfigurationTests.java
View File

@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.Base64;
import java.util.List;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
@@ -45,6 +46,7 @@ import org.springframework.cloud.config.server.environment.vault.authentication.
import org.springframework.cloud.config.server.environment.vault.authentication.KubernetesClientAuthenticationProvider;
import org.springframework.cloud.config.server.environment.vault.authentication.PcfClientAuthenticationProvider;
import org.springframework.cloud.config.server.environment.vault.authentication.TokenClientAuthenticationProvider;
import org.springframework.context.support.StaticApplicationContext;
import org.springframework.core.io.ClassPathResource;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
@@ -92,6 +94,8 @@ class SpringVaultClientConfigurationTests {
private List<SpringVaultClientAuthenticationProvider> authProviders;
private StaticApplicationContext applicationContext;
@BeforeEach
public void setUp() {
authProviders = Arrays.asList(new AppRoleClientAuthenticationProvider(),
@@ -100,6 +104,13 @@ class SpringVaultClientConfigurationTests {
new CubbyholeClientAuthenticationProvider(), new GcpGceClientAuthenticationProvider(),
new GcpIamClientAuthenticationProvider(), new KubernetesClientAuthenticationProvider(),
new PcfClientAuthenticationProvider(), new TokenClientAuthenticationProvider());
applicationContext = new StaticApplicationContext();
applicationContext.refresh();
}
@AfterEach
public void teardown() {
applicationContext.close();
}
@Test
@@ -325,6 +336,7 @@ class SpringVaultClientConfigurationTests {
SpringVaultClientConfiguration configuration = new SpringVaultClientConfiguration(properties, () -> null,
authProviders);
configuration.afterPropertiesSet();
configuration.setApplicationContext(applicationContext);
return configuration;
}