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

Upgrade to Spring Vault 2.1 snapshots, Reactor Californium, Spring Boot 2.1.

Browse Source 
Fix bean overrides caused by the reactive health indicator.

Disable TlsCert authentication tests because of Reactor's HttpClient interference with SSL configurations.

See gh-235.
This commit is contained in:
Mark Paluch
2018-08-02 16:56:44 +02:00
parent a492bad1dc
commit 79b04f2dc8
8 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlDatabaseTests.java
View File

@@ -52,7 +52,7 @@ import static org.junit.Assume.*;
@SpringBootTest(classes = VaultConfigMySqlDatabaseTests.TestApplication.class, properties = {
"spring.cloud.vault.database.enabled=true",
"spring.cloud.vault.database.role=readonly",
"spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false" })
"spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC" })
public class VaultConfigMySqlDatabaseTests {
private final static int MYSQL_PORT = 3306;
@@ -113,7 +113,7 @@ public class VaultConfigMySqlDatabaseTests {
@Test
public void shouldConnectUsingJdbcUrlConnection() throws SQLException {
String url = String.format("jdbc:mysql://%s?useSSL=false", MYSQL_HOST);
String url = String.format("jdbc:mysql://%s?useSSL=false&serverTimezone=UTC", MYSQL_HOST);
DriverManager.getConnection(url, username, password).close();
}

4
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigMySqlTests.java
View File

@@ -49,7 +49,7 @@ import static org.junit.Assume.*;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = VaultConfigMySqlTests.TestApplication.class, properties = {
"spring.cloud.vault.mysql.enabled=true", "spring.cloud.vault.mysql.role=readonly",
"spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false" })
"spring.datasource.url=jdbc:mysql://localhost:3306/mysql?useSSL=false&serverTimezone=UTC" })
public class VaultConfigMySqlTests {
private final static int MYSQL_PORT = 3306;
@@ -101,7 +101,7 @@ public class VaultConfigMySqlTests {
@Test
public void shouldConnectUsingJdbcUrlConnection() throws SQLException {
String url = String.format("jdbc:mysql://%s?useSSL=false", MYSQL_HOST);
String url = String.format("jdbc:mysql://%s?useSSL=false&serverTimezone=UTC", MYSQL_HOST);
DriverManager.getConnection(url, username, password).close();
}

3
spring-cloud-vault-config-databases/src/test/java/org/springframework/cloud/vault/config/databases/VaultConfigPostgreSqlTests.java
View File

@@ -53,7 +53,8 @@ import static org.junit.Assume.*;
@SpringBootTest(classes = VaultConfigPostgreSqlTests.TestApplication.class, properties = {
"spring.cloud.vault.postgresql.enabled=true",
"spring.cloud.vault.postgresql.role=readonly",
"spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?ssl=false" })
"spring.datasource.url=jdbc:postgresql://localhost:5432/postgres?ssl=false",
"spring.main.allow-bean-definition-overriding=true" })
public class VaultConfigPostgreSqlTests {
private final static String POSTGRES_HOST = "localhost";

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

@@ -72,7 +72,7 @@
</dependency>
<dependency>
<groupId>io.projectreactor.ipc</groupId>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty</artifactId>
<optional>true</optional>
</dependency>

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

@@ -50,7 +50,7 @@ class VaultReactiveHealthIndicatorConfiguration
@Bean
@ConditionalOnMissingBean(name = { "vaultReactiveHealthIndicator" })
public ReactiveHealthIndicator vaultHealthIndicator() {
public ReactiveHealthIndicator vaultReactiveHealthIndicator() {
return this.createHealthIndicator(this.reactiveVaultTemplates);
}
}

6
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigAppIdCustomMechanismTests.java
View File

@@ -28,7 +28,6 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.vault.config.VaultConfigAppIdCustomMechanismTests.BootstrapConfiguration;
import org.springframework.cloud.vault.util.Settings;
import org.springframework.cloud.vault.util.TestRestTemplateFactory;
import org.springframework.cloud.vault.util.VaultRule;
@@ -48,11 +47,12 @@ import static org.assertj.core.api.Assertions.*;
* @author Mark Paluch
*/
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = { BootstrapConfiguration.class,
@SpringBootTest(classes = {
VaultConfigAppIdCustomMechanismTests.TestApplication.class }, properties = {
"spring.cloud.vault.authentication=appid",
"VaultConfigAppIdCustomMechanismTests.custom.config=true",
"spring.cloud.vault.applicationName=VaultConfigAppIdCustomMechanismTests" })
"spring.cloud.vault.applicationName=VaultConfigAppIdCustomMechanismTests",
"spring.main.allow-bean-definition-overriding=true" })
public class VaultConfigAppIdCustomMechanismTests {
@BeforeClass

4
spring-cloud-vault-config/src/test/java/org/springframework/cloud/vault/config/VaultConfigTlsCertAuthenticationTests.java
View File

@@ -51,8 +51,8 @@ import static org.springframework.cloud.vault.util.Settings.*;
"spring.cloud.vault.authentication=cert",
"spring.cloud.vault.ssl.key-store=file:../work/client-cert.jks",
"spring.cloud.vault.ssl.key-store-password=changeit",
"spring.cloud.vault.application-name=VaultConfigTlsCertAuthenticationTests" }) // see
// https://github.com/spring-cloud/spring-cloud-commons/issues/214
"spring.cloud.vault.application-name=VaultConfigTlsCertAuthenticationTests",
"spring.cloud.vault.reactive.enabled=false" })
public class VaultConfigTlsCertAuthenticationTests {
@BeforeClass

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

@@ -18,7 +18,7 @@
<description>Spring Cloud Vault Dependencies</description>
<properties>
<spring-vault.version>2.0.1.RELEASE</spring-vault.version>
<spring-vault.version>2.1.0.BUILD-SNAPSHOT</spring-vault.version>
</properties>
<dependencyManagement>